From 44c6947c069fbcbd5ce0be0da3a2920684ffebd3 Mon Sep 17 00:00:00 2001
From: aurimas <aurimas@chromium.org>
Date: Wed, 25 Feb 2015 11:59:38 -0800
Subject: [PATCH] Fix up a few more lint warnings in chrome/

BUG=266140
TBR=jbudorick@chromium.org

Review URL: https://codereview.chromium.org/923803003

Cr-Commit-Position: refs/heads/master@{#318094}
---
 build/android/lint/suppressions.xml                | 25 ++++++++++++++++++++++
 .../res/layout/autofill_card_unmask_prompt.xml     |  7 ++++--
 .../password_generation_popup_suggestion.xml       |  2 ++
 .../java/res/layout/preference_category.xml        |  4 +++-
 .../res/layout/website_settings_permission_row.xml |  3 ++-
 chrome/android/java/res/values/colors.xml          |  1 +
 6 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/build/android/lint/suppressions.xml b/build/android/lint/suppressions.xml
index d8422a74e425..8d9b628c7223 100644
--- a/build/android/lint/suppressions.xml
+++ b/build/android/lint/suppressions.xml
@@ -41,6 +41,20 @@ Still reading?
   <issue id="HandlerLeak">
     <ignore path="remoting/android/java/src/org/chromium/chromoting/TapGestureDetector.java"/>
   </issue>
+  <issue id="IconDensities">
+    <!-- crbug.com/457918 is tracking missing assets -->
+    <ignore path="content/public/android/java/res/drawable-xxhdpi"/>
+    <ignore path="content/public/android/java/res/drawable-xxxhdpi"/>
+    <ignore path="chrome/android/java/res/drawable-xxhdpi"/>
+    <ignore path="chrome/android/java/res/drawable-xxxhdpi"/>
+    <ignore path="ui/android/java/res/drawable-xxhdpi"/>
+    <ignore path="ui/android/java/res/drawable-xxxhdpi"/>
+  </issue>
+  <!-- It is OK for content_shell_apk and chrome_shell_apk to have missing assets. -->
+  <issue id="IconLocation">
+    <ignore path="content/shell/android/java/res/"/>
+    <ignore path="chrome/android/shell/res/"/>
+  </issue>
   <issue id="MissingApplicationIcon" severity="ignore"/>
   <issue id="MissingRegistered" severity="ignore"/>
   <issue id="MissingVersion">
@@ -52,12 +66,23 @@ Still reading?
   <issue id="OldTargetApi">
     <ignore path="AndroidManifest.xml"/>
   </issue>
+  <issue id="Overdraw" severity="ignore"/>
   <issue id="Recycle" severity="ignore"/>
   <issue id="Registered" severity="ignore"/>
+  <issue id="RtlEnabled" severity="ignore"/>
   <issue id="SdCardPath">
     <ignore path="content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java"/>
   </issue>
   <issue id="SetJavaScriptEnabled" severity="ignore"/>
+  <issue id="UnusedResources">
+    <!-- TODO(aurimas): remove suppression once crbug.com/458328 is fixed. -->
+    <ignore path="content/public/android/java/res/layout/validation_message_bubble.xml" />
+
+    <!-- These files are used by chrome_shell_apk and chrome_apk targets. -->
+    <ignore path="chrome/android/java/res/layout/accessibility_tab_switcher.xml" />
+    <ignore path="chrome/android/java/res/drawable/btn_back.xml" />
+    <ignore path="chrome/android/java/res/drawable/btn_forward.xml" />
+  </issue>
   <issue id="ViewConstructor" severity="ignore"/>
   <issue id="WrongCall" severity="ignore"/>
 </lint>
diff --git a/chrome/android/java/res/layout/autofill_card_unmask_prompt.xml b/chrome/android/java/res/layout/autofill_card_unmask_prompt.xml
index d0ee7e6d268b..009e56921d1e 100644
--- a/chrome/android/java/res/layout/autofill_card_unmask_prompt.xml
+++ b/chrome/android/java/res/layout/autofill_card_unmask_prompt.xml
@@ -82,7 +82,8 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="8dp"
-                android:layout_marginEnd="16dp" />
+                android:layout_marginEnd="16dp"
+                android:contentDescription="@null" />
         </LinearLayout>
 
         <TextView
@@ -126,12 +127,14 @@
             android:layout_marginTop="30dp"
             android:visibility="gone" />
 
+        <!--  TODO(estade): add a real content description for this image. -->
         <ImageView
             android:id="@+id/verification_success"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/verify_checkmark"
-            android:visibility="gone" />
+            android:visibility="gone"
+            android:contentDescription="@null" />
 
         <TextView
             android:id="@+id/verification_message"
diff --git a/chrome/android/java/res/layout/password_generation_popup_suggestion.xml b/chrome/android/java/res/layout/password_generation_popup_suggestion.xml
index f8284dd58498..a928ac267f36 100644
--- a/chrome/android/java/res/layout/password_generation_popup_suggestion.xml
+++ b/chrome/android/java/res/layout/password_generation_popup_suggestion.xml
@@ -9,6 +9,8 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
+    <!-- Lint flags this as a false positive overlap. -->
+    <!--suppress RelativeOverlap -->
     <RelativeLayout android:id="@+id/password_generation_suggestion"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
diff --git a/chrome/android/java/res/layout/preference_category.xml b/chrome/android/java/res/layout/preference_category.xml
index e03b2760b56a..52bba26002a2 100644
--- a/chrome/android/java/res/layout/preference_category.xml
+++ b/chrome/android/java/res/layout/preference_category.xml
@@ -18,6 +18,7 @@
         android:layout_height="wrap_content"
         android:textAppearance="@style/PreferenceCategoryTextStyle" />
 
+    <!-- Users of this layout are responsible to set contentDescription. -->
     <ImageView
         android:id="@android:id/icon"
         android:layout_width="wrap_content"
@@ -25,6 +26,7 @@
         android:minHeight="@dimen/min_touch_target_size"
         android:minWidth="@dimen/min_touch_target_size"
         android:scaleType="center"
-        android:background="?android:attr/selectableItemBackground" />
+        android:background="?android:attr/selectableItemBackground"
+        android:contentDescription="@null" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/chrome/android/java/res/layout/website_settings_permission_row.xml b/chrome/android/java/res/layout/website_settings_permission_row.xml
index fdd4f2dbf0b0..ff2be4d05c35 100644
--- a/chrome/android/java/res/layout/website_settings_permission_row.xml
+++ b/chrome/android/java/res/layout/website_settings_permission_row.xml
@@ -12,7 +12,8 @@
         android:id="@+id/website_settings_permission_icon"
         android:layout_width="@dimen/website_settings_popup_permission_icon_size"
         android:layout_height="@dimen/website_settings_popup_permission_icon_size"
-        android:layout_marginEnd="16dp" />
+        android:layout_marginEnd="16dp"
+        android:contentDescription="@null" />
 
     <TextView
         android:id="@+id/website_settings_permission_name"
diff --git a/chrome/android/java/res/values/colors.xml b/chrome/android/java/res/values/colors.xml
index 0173fc31c52a..e5e9b55a3b33 100644
--- a/chrome/android/java/res/values/colors.xml
+++ b/chrome/android/java/res/values/colors.xml
@@ -41,6 +41,7 @@
     <color name="url_emphasis_domain_and_registry">#333333</color>
     <color name="url_emphasis_light_domain_and_registry">#ffffff</color>
     <color name="url_emphasis_default_text">#333333</color>
+    <!--suppress UnusedResources -->
     <color name="url_emphasis_light_default_text">#ffffff</color>
 
     <!--  Distilled Page Prefs colors -->
-- 
2.11.4.GIT