Use new keyboard icon for Android keyboard toggle button

Since the icon does not work well with light themes, this CL specifies
Holo Dark theme for the app, instead of the device default.

Also removed text next to icons, as the keyboard icon does not have
sufficient padding. The icon is descriptive enough in itself, and the
text appears anyway if you long-press the buttons.

BUG=338773
NOTRY=true

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253372 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 31 insertions, 6 deletions

diff --git a/remoting/android/java/AndroidManifest.xml.jinja2 b/remoting/android/java/AndroidManifest.xml.jinja2
index 7afae2f..a08b72a 100644
--- a/remoting/android/java/AndroidManifest.xml.jinja2
+++ b/remoting/android/java/AndroidManifest.xml.jinja2
@@ -8,7 +8,8 @@
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
     <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
     <application android:label="@string/product_name"
-            android:icon="@drawable/chromoting128">
+            android:icon="@drawable/chromoting128"
+            android:theme="@android:style/Theme.Holo">
         <activity android:name="org.chromium.chromoting.Chromoting"
                 android:configChanges="orientation|screenSize"
                 android:theme="@style/MainTheme">
diff --git a/remoting/remoting_android.gypi b/remoting/remoting_android.gypi
index 371eb2a..08c7366 100644
--- a/remoting/remoting_android.gypi
+++ b/remoting/remoting_android.gypi
@@ -52,6 +52,30 @@
               ],
             },
             {
+              'destination': '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res/drawable-hdpi',
+              'files': [
+                'resources/android/drawable-hdpi/ic_action_keyboard.png',
+              ],
+            },
+            {
+              'destination': '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res/drawable-mdpi',
+              'files': [
+                'resources/android/drawable-mdpi/ic_action_keyboard.png',
+              ],
+            },
+            {
+              'destination': '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res/drawable-xhdpi',
+              'files': [
+                'resources/android/drawable-xhdpi/ic_action_keyboard.png',
+              ],
+            },
+            {
+              'destination': '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res/drawable-xxhdpi',
+              'files': [
+                'resources/android/drawable-xxhdpi/ic_action_keyboard.png',
+              ],
+            },
+            {
               'destination': '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res/layout',
               'files': [
                 'resources/android/layout/account_dropdown.xml',
diff --git a/remoting/resources/android/menu/desktop_actionbar.xml b/remoting/resources/android/menu/desktop_actionbar.xml
index e67615e..bdb20b4 100644
--- a/remoting/resources/android/menu/desktop_actionbar.xml
+++ b/remoting/resources/android/menu/desktop_actionbar.xml
@@ -9,12 +9,12 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/actionbar_keyboard"
             android:title="@string/actionbar_keyboard"
-            android:icon="@android:drawable/ic_menu_edit"
-            android:showAsAction="ifRoom|withText"/>
+            android:icon="@drawable/ic_action_keyboard"
+            android:showAsAction="ifRoom"/>
     <item android:id="@+id/actionbar_hide"
             android:title="@string/actionbar_hide"
             android:icon="@android:drawable/ic_menu_close_clear_cancel"
-            android:showAsAction="ifRoom|withText"/>
+            android:showAsAction="ifRoom"/>
     <item android:id="@+id/actionbar_send_ctrl_alt_del"
             android:title="@string/actionbar_send_ctrl_alt_del"
             android:showAsAction="withText"/>
diff --git a/remoting/resources/android/values/styles.xml b/remoting/resources/android/values/styles.xml
index 7157205..a78a6d9 100644
--- a/remoting/resources/android/values/styles.xml
+++ b/remoting/resources/android/values/styles.xml
@@ -6,10 +6,10 @@
 -->
 
 <resources>
-    <style name="MainTheme" parent="@android:style/Theme.DeviceDefault">
+    <style name="MainTheme" parent="@android:style/Theme.Holo">
         <item name="android:actionBarStyle">@style/MainActionBar</item>
     </style>
-    <style name="MainActionBar" parent="@android:style/Widget.DeviceDefault.ActionBar">
+    <style name="MainActionBar" parent="@android:style/Widget.Holo.ActionBar">
         <item name="android:displayOptions">showHome</item>
     </style>
 </resources>