Fix and suppress some lint warnings

For target android_webview_apk. This only fixes a subset
of the issues.

BUG=

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

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

3 files changed, 13 insertions, 11 deletions

diff --git a/android_webview/test/shell/AndroidManifest.xml b/android_webview/test/shell/AndroidManifest.xml
index 0dd6d47..b966699 100644
--- a/android_webview/test/shell/AndroidManifest.xml
+++ b/android_webview/test/shell/AndroidManifest.xml
@@ -8,6 +8,14 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.chromium.android_webview.shell">
+  <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="21" />
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+  <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-permission android:name="android.permission.WAKE_LOCK"/>
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.RECORD_AUDIO" />
+  <uses-permission android:name="android.permission.RECORD_VIDEO" />
+  <uses-permission android:name="android.permission.CAMERA" />
 
   <application android:name="org.chromium.android_webview.shell.AwShellApplication"
       android:label="AwShellApplication"
@@ -30,13 +38,4 @@
     <provider android:name="org.chromium.android_webview.test.TestContentProvider"
         android:authorities="org.chromium.android_webview.test.TestContentProvider" />
   </application>
-
-  <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="21" />
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-  <uses-permission android:name="android.permission.INTERNET"/>
-  <uses-permission android:name="android.permission.WAKE_LOCK"/>
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-  <uses-permission android:name="android.permission.RECORD_AUDIO" />
-  <uses-permission android:name="android.permission.RECORD_VIDEO" />
-  <uses-permission android:name="android.permission.CAMERA" />
 </manifest>
diff --git a/android_webview/test/shell/res/layout/testshell_activity.xml b/android_webview/test/shell/res/layout/testshell_activity.xml
index 0a997fa..d4d72e3 100644
--- a/android_webview/test/shell/res/layout/testshell_activity.xml
+++ b/android_webview/test/shell/res/layout/testshell_activity.xml
@@ -15,30 +15,32 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
+        <!--suppress LabelFor -->
         <EditText android:id="@+id/url"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="bottom"
             android:textSize="18sp"
-            android:autoText="true"
-            android:capitalize="sentences"
             android:singleLine="true"
             android:selectAllOnFocus="true"
             android:inputType="textUri"
             android:imeOptions="actionGo" />
         <ImageButton android:id="@+id/prev"
+            android:contentDescription="@null"
             android:layout_width="38dp"
             android:layout_height="38dp"
             android:src="@android:drawable/ic_media_previous"
             android:scaleType="center" />
         <ImageButton android:id="@+id/next"
+            android:contentDescription="@null"
             android:layout_width="38dp"
             android:layout_height="38dp"
             android:src="@android:drawable/ic_media_next"
             android:scaleType="center" />
     </LinearLayout>
     <LinearLayout android:id="@+id/content_container"
+        android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
     </LinearLayout>
diff --git a/android_webview/test/shell/res/values/config.xml b/android_webview/test/shell/res/values/config.xml
index d875170..4d2b7d8 100644
--- a/android_webview/test/shell/res/values/config.xml
+++ b/android_webview/test/shell/res/values/config.xml
@@ -8,6 +8,7 @@
     <!-- Array of "[keySystemName],[UuidOfMediaDrm]" -->
     <string-array name="config_key_system_uuid_mapping" translatable="false">
         <!-- Use Widevine's UUID to pass the availability-test of MediaDRM plugin -->
+        <!--suppress TypographyDashes -->
         <item>"com.oem.test-keysystem,EDEF8BA9-79D6-4ACE-A3C8-27DCD51D21ED"</item>
     </string-array>
 </resources>