From 328e80e03a9bb66df558667a10ac6de8b6cac3c6 Mon Sep 17 00:00:00 2001
From: Tiger Oakes <toakes@mozilla.com>
Date: Mon, 29 Jun 2020 16:36:52 -0700
Subject: [PATCH] [fenix] Fix ignored XML lint issues
 (https://github.com/mozilla-mobile/fenix/pull/12094)

---
 .../res/drawable/ic_addons_extensions.xml     |  8 +++----
 app/src/main/res/drawable/ic_copy.xml         | 17 +++++++--------
 app/src/main/res/drawable/ic_open_in_app.xml  |  8 +++----
 .../main/res/layout/fragment_edit_login.xml   | 21 ++++++++-----------
 .../main/res/layout/preference_cat_style.xml  |  5 ++---
 .../main/res/layout/search_widget_large.xml   |  5 ++---
 .../main/res/layout/search_widget_medium.xml  |  5 ++---
 7 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/app/src/main/res/drawable/ic_addons_extensions.xml b/app/src/main/res/drawable/ic_addons_extensions.xml
index c227de01c4..5fabf10b2e 100644
--- a/app/src/main/res/drawable/ic_addons_extensions.xml
+++ b/app/src/main/res/drawable/ic_addons_extensions.xml
@@ -3,13 +3,11 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="m20.125,12c-1.213,0 -1.25,1.25 -2.187,1.25 -0.5138,-0.0101 -0.9279,-0.4242 -0.938,-0.938v-4.062c0,-0.6904 -0.5596,-1.25 -1.25,-1.25h-4.062c-0.5138,-0.0101 -0.9279,-0.4242 -0.938,-0.938 0,-0.937 1.25,-0.974 1.25,-2.187 0,-1.081 -1.119,-1.875 -2.5,-1.875s-2.5,0.794 -2.5,1.875c0,1.213 1.25,1.25 1.25,2.187 -0.0101,0.5138 -0.4242,0.9279 -0.938,0.938h-4.062c-0.3315,0 -0.6495,0.1317 -0.8839,0.3661 -0.2344,0.2344 -0.3661,0.5524 -0.3661,0.8839v2.812c0.0101,0.5138 0.4242,0.9279 0.938,0.938 0.937,0 0.974,-1.25 2.187,-1.25 1.081,0 1.875,1.119 1.875,2.5s-0.794,2.5 -1.875,2.5c-1.213,0 -1.25,-1.25 -2.187,-1.25 -0.5138,0.0101 -0.9279,0.4242 -0.938,0.938v5.312c0,0.6904 0.5596,1.25 1.25,1.25h4.062c0.5138,-0.0101 0.9279,-0.4242 0.938,-0.938 0,-0.937 -1.25,-0.974 -1.25,-2.187 0,-1.081 1.119,-1.875 2.5,-1.875s2.5,0.794 2.5,1.875c0,1.213 -1.25,1.25 -1.25,2.187 0.0101,0.5138 0.4242,0.9279 0.938,0.938h4.062c0.6904,0 1.25,-0.5596 1.25,-1.25v-4.062c0.0101,-0.5138 0.4242,-0.9279 0.938,-0.938 0.937,0 0.974,1.25 2.187,1.25 1.081,0 1.875,-1.119 1.875,-2.5s-0.794,-2.5 -1.875,-2.5z"
-      android:fillColor="?primaryText"
-      tools:ignore="VectorPath" />
+    <path
+        android:pathData="M20.125 12c-1.2 0-1.25 1.25-2.2 1.25-0.5-0-0.9-0.424-0.94-0.94V8.25C17 7.56 16.44 7 15.75 7h-4.062c-0.5-0-0.928-0.424-0.94-0.94 0-0.937 1.25-0.974 1.25-2.187C12 2.794 11 2 9.5 2S7 2.794 7 3.875c0 1.213 1.25 1.25 1.25 2.187C8.24 6.576 7.826 7 7.312 7H3.25C2.918 7 2.6 7.132 2.366 7.366 2.132 7.601 2 7.92 2 8.25v2.812C2.01 11.576 2.424 12 3 12c1 0 1-1.25 2.187-1.25C6.206 10.75 7 11.869 7 13.25s-0.794 2.5-1.875 2.5c-1.213 0-1.25-1.25-2.187-1.25C2.424 14.51 2.01 14.924 2 15.438v5.312C2 21.44 2.56 22 3.25 22h4.062c0.514-0 1-0.4 0.94-0.94 0-1-1.25-1-1.25-2.2C7 17.794 8.119 17 9.5 17s2.5 0.8 2.5 1.875c0 1.213-1.25 1.25-1.25 2.2 0 0.514 0.424 0.928 0.938 0.938h4.062c0.69 0 1.25-0.56 1.25-1.25v-4.062c0-0.514 0.424-1 1-0.9 0.9 0 0.9 1.25 2.2 1.25C21.2 17 22 16 22 14.5S21.2 12 20.125 12z"
+        android:fillColor="?primaryText" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_copy.xml b/app/src/main/res/drawable/ic_copy.xml
index f50c9d054c..2780493992 100644
--- a/app/src/main/res/drawable/ic_copy.xml
+++ b/app/src/main/res/drawable/ic_copy.xml
@@ -1,15 +1,14 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    xmlns:tools="http://schemas.android.com/tools"
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:viewportWidth="14"
     android:viewportHeight="17"
     android:width="14dp"
     android:height="17dp">
-  <group
-      android:translateX="-1">
     <path
-        android:pathData="M14.707 9.143075L11.707 6.143075C11.5195073 5.95552563 11.2651948 5.85013164 11 5.850075L10 5.850075L10 4.850075C9.99994336 4.58488019 9.89454937 4.33056773 9.707 4.143075L6.707 1.143075C6.51950727 0.955525625 6.26519481 0.850075 6 0.850075L3 0.850075C1.8954305 0.850075 1 1.7455055 1 2.850075L1 9.850075C1 10.9546445 1.8954305 11.850075 3 11.850075L6 11.850075L6 14.850075C6 15.9546445 6.8954305 16.850075 8 16.850075L13 16.850075C14.1045695 16.850075 15 15.9546445 15 14.850075L15 9.850075C15 9.58488019 14.8945494 9.33056773 14.707 9.143075ZM12.586 9.850075L11 9.850075L11 8.264075L12.586 9.850075ZM7.586 4.850075L6 4.850075L6 3.264075L7.586 4.850075ZM6 7.850075L6 9.850075L3 9.850075L3 2.850075L5 2.850075L5 5.350075C5 5.62621737 5.22385763 5.850075 5.5 5.850075L8 5.850075C6.8954305 5.850075 6 6.7455055 6 7.850075ZM8 14.850075L8 7.850075L10 7.850075L10 10.350075C10 10.6262174 10.2238576 10.850075 10.5 10.850075L13 10.850075L13 14.850075L8 14.850075Z"
+        android:pathData="M13.707 9.143l-3-3C10.52 5.955 10.265 5.85 10 5.85H9v-1c0-0.265-0.105-0.52-0.293-0.707l-3-3C5.52 0.955 5.265 0.85 5 0.85H2c-1.105 0-2 0.895-2 2v7c0 1.105 0.895 2 2 2h3v3c0 1.105 0.895 2 2 2h5c1.105 0 2-0.895 2-2v-5c0-0.265-0.105-0.52-0.293-0.707zM11.586 9.85H10V8.264l1.586 1.586zm-5-5H5V3.264L6.586 4.85zM5 7.85v2H2v-7h2v2.5c0 0.276 0.224 0.5 0.5 0.5H7c-1.105 0-2 0.895-2 2zm2 7v-7h2v2.5c0 0.276 0.224 0.5 0.5 0.5H12v4H7z"
         android:fillColor="?primaryText"
-        android:fillAlpha="0.8"
-        tools:ignore="VectorPath" />
-  </group>
-</vector>
\ No newline at end of file
+        android:fillAlpha="0.8" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_open_in_app.xml b/app/src/main/res/drawable/ic_open_in_app.xml
index be5f9f3d1d..b874dda34d 100644
--- a/app/src/main/res/drawable/ic_open_in_app.xml
+++ b/app/src/main/res/drawable/ic_open_in_app.xml
@@ -3,13 +3,11 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="m5.5,16c1.3807,0 2.5,1.1193 2.5,2.5s-1.1193,2.5 -2.5,2.5 -2.5,-1.1193 -2.5,-2.5 1.1193,-2.5 2.5,-2.5zM18.5,16c1.3807,0 2.5,1.1193 2.5,2.5s-1.1193,2.5 -2.5,2.5 -2.5,-1.1193 -2.5,-2.5 1.1193,-2.5 2.5,-2.5zM12,16c1.3807,0 2.5,1.1193 2.5,2.5s-1.1193,2.5 -2.5,2.5 -2.5,-1.1193 -2.5,-2.5 1.1193,-2.5 2.5,-2.5zM5.5,9.5c1.3807,0 2.5,1.1193 2.5,2.5s-1.1193,2.5 -2.5,2.5 -2.5,-1.1193 -2.5,-2.5 1.1193,-2.5 2.5,-2.5zM18.5,9.5c1.3807,0 2.5,1.1193 2.5,2.5s-1.1193,2.5 -2.5,2.5 -2.5,-1.1193 -2.5,-2.5 1.1193,-2.5 2.5,-2.5zM12,9.5c1.3807,0 2.5,1.1193 2.5,2.5s-1.1193,2.5 -2.5,2.5 -2.5,-1.1193 -2.5,-2.5 1.1193,-2.5 2.5,-2.5zM5.5,3c1.3807,0 2.5,1.1193 2.5,2.5s-1.1193,2.5 -2.5,2.5 -2.5,-1.1193 -2.5,-2.5 1.1193,-2.5 2.5,-2.5zM18.5,3c1.3807,0 2.5,1.1193 2.5,2.5s-1.1193,2.5 -2.5,2.5 -2.5,-1.1193 -2.5,-2.5 1.1193,-2.5 2.5,-2.5zM12,3c1.3807,0 2.5,1.1193 2.5,2.5s-1.1193,2.5 -2.5,2.5 -2.5,-1.1193 -2.5,-2.5 1.1193,-2.5 2.5,-2.5z"
-      android:fillColor="?primaryText"
-      tools:ignore="VectorPath" />
+    <path
+        android:pathData="M5.5 16C6.88 16 8 17.12 8 18.5S6.88 21 5.5 21 3 19.88 3 18.5 4.12 16 5.5 16zm13 0c1.38 0 2.5 1.12 2.5 2.5S19.88 21 18.5 21 16 19.88 16 18.5s1.12-2.5 2.5-2.5zM12 16c1.38 0 2.5 1.12 2.5 2.5S13.38 21 12 21s-2.5-1.12-2.5-2.5S10.62 16 12 16zM5.5 9.5C6.88 9.5 8 10.62 8 12s-1.12 2.5-2.5 2.5S3 13.38 3 12s1.12-2.5 2.5-2.5zm13 0c1.38 0 2.5 1.12 2.5 2.5s-1.12 2.5-2.5 2.5S16 13.38 16 12s1.12-2.5 2.5-2.5zm-6.5 0c1.38 0 2.5 1.12 2.5 2.5s-1.12 2.5-2.5 2.5-2.5-1.12-2.5-2.5 1.12-2.5 2.5-2.5zM5.5 3C6.88 3 8 4.12 8 5.5S6.88 8 5.5 8 3 6.88 3 5.5 4.12 3 5.5 3zm13 0C19.88 3 21 4.12 21 5.5S19.88 8 18.5 8 16 6.88 16 5.5 17.12 3 18.5 3zM12 3c1.38 0 2.5 1.12 2.5 2.5S13.38 8 12 8 9.5 6.88 9.5 5.5 10.62 3 12 3z"
+        android:fillColor="?primaryText" />
 </vector>
diff --git a/app/src/main/res/layout/fragment_edit_login.xml b/app/src/main/res/layout/fragment_edit_login.xml
index 344aeb0436..5881ed11c7 100644
--- a/app/src/main/res/layout/fragment_edit_login.xml
+++ b/app/src/main/res/layout/fragment_edit_login.xml
@@ -21,6 +21,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:paddingStart="3dp"
+        android:paddingEnd="0dp"
         android:gravity="center_vertical"
         android:text="@string/preferences_passwords_saved_logins_site"
         android:textColor="?primaryText"
@@ -30,8 +31,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:ignore="RtlSymmetry" />
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/inputLayoutHostname"
@@ -48,8 +48,7 @@
         app:hintEnabled="false"
         app:layout_constraintEnd_toEndOf="@id/hostnameHeaderText"
         app:layout_constraintStart_toStartOf="@id/hostnameHeaderText"
-        app:layout_constraintTop_toBottomOf="@id/hostnameHeaderText"
-        tools:ignore="RtlSymmetry">
+        app:layout_constraintTop_toBottomOf="@id/hostnameHeaderText">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/hostnameText"
@@ -80,6 +79,7 @@
         android:layout_height="16dp"
         android:gravity="center_vertical"
         android:paddingStart="3dp"
+        android:paddingEnd="0dp"
         android:layout_marginTop="20dp"
         android:text="@string/preferences_passwords_saved_logins_username"
         android:textColor="?primaryText"
@@ -90,8 +90,7 @@
         app:layout_constraintEnd_toStartOf="@id/clearUsernameTextButton"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/inputLayoutHostname"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:ignore="RtlSymmetry" />
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/inputLayoutUsername"
@@ -105,8 +104,7 @@
         app:layout_constraintStart_toStartOf="@id/usernameHeader"
         app:layout_constraintTop_toBottomOf="@id/usernameHeader"
         app:layout_constraintVertical_chainStyle="packed"
-        app:hintEnabled="false"
-        tools:ignore="RtlSymmetry">
+        app:hintEnabled="false">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/usernameText"
@@ -150,6 +148,7 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:paddingStart="3dp"
+        android:paddingEnd="0dp"
         android:text="@string/preferences_passwords_saved_logins_password"
         android:textColor="?primaryText"
         android:textSize="12sp"
@@ -160,8 +159,7 @@
         app:layout_constraintEnd_toStartOf="@id/revealPasswordButton"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/inputLayoutUsername"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:ignore="RtlSymmetry" />
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/inputLayoutPassword"
@@ -177,8 +175,7 @@
         app:layout_constraintEnd_toEndOf="@id/passwordHeader"
         app:layout_constraintStart_toStartOf="@id/passwordHeader"
         app:layout_constraintTop_toBottomOf="@id/passwordHeader"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:ignore="RtlSymmetry">
+        app:layout_constraintVertical_chainStyle="packed">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/passwordText"
diff --git a/app/src/main/res/layout/preference_cat_style.xml b/app/src/main/res/layout/preference_cat_style.xml
index ecffaff663..0fc62c98e5 100644
--- a/app/src/main/res/layout/preference_cat_style.xml
+++ b/app/src/main/res/layout/preference_cat_style.xml
@@ -8,7 +8,6 @@
     android:layout_marginTop="16dp"
     android:textAlignment="viewStart"
     android:layout_marginStart="16dp"
-    android:gravity="center_vertical"
+    android:gravity="start|center_vertical"
     app:fontFamily="@font/metropolis_semibold"
-    android:id="@android:id/title"
-    tools:ignore="RtlCompat" />
+    android:id="@android:id/title" />
diff --git a/app/src/main/res/layout/search_widget_large.xml b/app/src/main/res/layout/search_widget_large.xml
index 07887b8ac8..0f06e86b0e 100644
--- a/app/src/main/res/layout/search_widget_large.xml
+++ b/app/src/main/res/layout/search_widget_large.xml
@@ -24,12 +24,11 @@
         android:layout_marginStart="9dp"
         android:layout_toEndOf="@id/button_search_widget_new_tab_icon"
         android:layout_alignEnd="@id/button_search_widget_voice"
-        android:gravity="center_vertical"
+        android:gravity="start|center_vertical"
         android:letterSpacing="-0.025"
         android:textAlignment="viewStart"
         android:textColor="@color/search_widget_text"
         android:textSize="15sp"
-        tools:ignore="RtlCompat"
         tools:text="Search the web"/>
 
     <ImageButton
@@ -41,4 +40,4 @@
         android:layout_centerVertical="true"
         android:layout_marginEnd="1dp"
         android:background="@drawable/ic_microphone_widget_padded" />
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/search_widget_medium.xml b/app/src/main/res/layout/search_widget_medium.xml
index 140fae17c6..e27b1229a5 100644
--- a/app/src/main/res/layout/search_widget_medium.xml
+++ b/app/src/main/res/layout/search_widget_medium.xml
@@ -24,12 +24,11 @@
         android:layout_marginStart="9dp"
         android:layout_toEndOf="@id/button_search_widget_new_tab_icon"
         android:layout_alignEnd="@id/button_search_widget_voice"
-        android:gravity="center_vertical"
+        android:gravity="start|center_vertical"
         android:letterSpacing="-0.025"
         android:textAlignment="viewStart"
         android:textColor="@color/search_widget_text"
         android:textSize="15sp"
-        tools:ignore="RtlCompat"
         tools:text="Search"/>
 
     <ImageButton
@@ -41,4 +40,4 @@
         android:layout_centerVertical="true"
         android:layout_marginEnd="1dp"
         android:background="@drawable/ic_microphone_widget_padded" />
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>