Fix a bunch of lint warnings.

BUG=266140

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

Cr-Commit-Position: refs/heads/master@{#316026}

3 files changed, 51 insertions, 54 deletions

diff --git a/ui/android/java/res/layout/color_picker_dialog_title.xml b/ui/android/java/res/layout/color_picker_dialog_title.xml
index d97cafb..52aa08e 100644
--- a/ui/android/java/res/layout/color_picker_dialog_title.xml
+++ b/ui/android/java/res/layout/color_picker_dialog_title.xml
@@ -29,7 +29,7 @@
         android:layout_alignParentEnd="true"
         android:id="@+id/selected_color_view_border"
         android:background="@drawable/color_picker_border"
-        android:padding="2px">
+        android:padding="2dp">
 
         <View
             android:id="@+id/selected_color_view"
diff --git a/ui/android/java/res/layout/dropdown_item.xml b/ui/android/java/res/layout/dropdown_item.xml
index ad89bb7..abf3b31 100644
--- a/ui/android/java/res/layout/dropdown_item.xml
+++ b/ui/android/java/res/layout/dropdown_item.xml
@@ -6,46 +6,53 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="center_vertical">
+    android:gravity="center_vertical"
+    android:orientation="horizontal" >
 
     <!-- These layout params are overwritten in DropdownAdapter.java -->
-    <LinearLayout android:id="@+id/dropdown_label_wrapper"
-        android:layout_weight="1"
+
+    <LinearLayout
+        android:id="@+id/dropdown_label_wrapper"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:orientation="vertical"
-        android:gravity="center_vertical">
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:orientation="vertical" >
 
-        <TextView android:id="@+id/dropdown_label"
+        <TextView
+            android:id="@+id/dropdown_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
+            android:layout_marginStart="10dp"
             android:ellipsize="end"
+            android:includeFontPadding="false"
             android:singleLine="true"
             android:textAlignment="viewStart"
-            android:textSize="18sp"
             android:textColor="#333"
-            android:includeFontPadding="false"/>
-        <TextView android:id="@+id/dropdown_sublabel"
+            android:textSize="18sp" />
+
+        <TextView
+            android:id="@+id/dropdown_sublabel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
-            android:textSize="14sp"
-            android:textColor="#8b8b8b"
+            android:layout_marginStart="10dp"
             android:ellipsize="end"
+            android:includeFontPadding="false"
             android:singleLine="true"
             android:textAlignment="viewStart"
-            android:includeFontPadding="false"/>
+            android:textColor="#8b8b8b"
+            android:textSize="14sp" />
     </LinearLayout>
 
-    <ImageView android:id="@+id/dropdown_icon"
+    <ImageView
+        android:id="@+id/dropdown_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"/>
+        android:layout_margin="8dp"
+        android:contentDescription="@null" />
 
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/ui/android/java/res/layout/two_field_date_picker.xml b/ui/android/java/res/layout/two_field_date_picker.xml
index 0660251..a37960e 100644
--- a/ui/android/java/res/layout/two_field_date_picker.xml
+++ b/ui/android/java/res/layout/two_field_date_picker.xml
@@ -2,47 +2,37 @@
 <!-- Copyright 2013 The Chromium Authors. All rights reserved.
 
      Use of this source code is governed by a BSD-style license that can be
-     found in the LICENSE file.
--->
+     found in the LICENSE file. -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_horizontal"
-    android:orientation="horizontal"
-    android:gravity="center">
+    android:id="@+id/pickers"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="horizontal" >
 
-    <LinearLayout android:id="@+id/pickers"
+    <!-- Position in year -->
+
+    <NumberPicker
+        android:id="@+id/position_in_year"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="horizontal"
-        android:gravity="center">
-
-        <!-- Position in year -->
-        <NumberPicker
-            android:id="@+id/position_in_year"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:contentDescription="@string/accessibility_date_picker_month"
-            />
+        android:layout_marginEnd="16dp"
+        android:layout_marginStart="16dp"
+        android:contentDescription="@string/accessibility_date_picker_month"
+        android:focusable="true"
+        android:focusableInTouchMode="true" />
 
-        <!-- Year -->
-        <NumberPicker
-            android:id="@+id/year"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:contentDescription="@string/accessibility_date_picker_year"
-            />
+    <!-- Year -->
 
-    </LinearLayout>
+    <NumberPicker
+        android:id="@+id/year"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginStart="16dp"
+        android:contentDescription="@string/accessibility_date_picker_year"
+        android:focusable="true"
+        android:focusableInTouchMode="true" />
 
 </LinearLayout>