commit 414e9470d81c3b8a654714363785e0c77f599440
author Ken Wakasa <kwakasa@google.com> Thu Aug 07 11:40:05 2014 +0000
committer Ken Wakasa <kwakasa@google.com> Thu Aug 07 11:40:14 2014 +0000
tree 67152c30c7b81d6d105facbc6537d936a6455136
parent 0f2de75e310a95cf39a12fde56b9e7d81e9ac30b

Revert "Clean up Keyboard and KeyboardView theme"

This reverts commit ef231984edd6536e6fef84d9fb01f11d1eeaba5c.

Due to unit test breakage.

Change-Id: I2136e950c3f72fb82b01e90758c1036bb0b7d508

java/res/values/themes-ics.xml

diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml
index 6fddcb9..a6f390c 100644
--- a/java/res/values/themes-ics.xml
+++ b/java/res/values/themes-ics.xml
@@ -35,15 +35,21 @@
     >
         <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] -->
         <item name="themeId">2</item>
+        <item name="keyboardTopPadding">@fraction/config_keyboard_top_padding_holo</item>
+        <item name="keyboardBottomPadding">@fraction/config_keyboard_bottom_padding_holo</item>
+        <item name="horizontalGap">@fraction/config_key_horizontal_gap_holo</item>
+        <item name="verticalGap">@fraction/config_key_vertical_gap_holo</item>
+        <item name="touchPositionCorrectionData">@array/touch_position_correction_data_holo</item>
     </style>
     <style
         name="KeyboardView.ICS"
-        parent="KeyboardView.Holo"
+        parent="KeyboardView"
     >
         <item name="android:background">@drawable/keyboard_background_holo</item>
         <item name="keyBackground">@drawable/btn_keyboard_key_ics</item>
         <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_ics</item>
         <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_ics</item>
+        <item name="keyTypeface">bold</item>
         <item name="keyTextColor">@color/key_text_color_holo</item>
         <item name="keyTextInactivatedColor">@color/key_text_inactivated_color_holo</item>
         <item name="functionalTextColor">@color/key_text_color_holo</item>
@@ -52,6 +58,10 @@
         <item name="keyShiftedLetterHintInactivatedColor">@color/key_shifted_letter_hint_inactivated_color_holo</item>
         <item name="keyShiftedLetterHintActivatedColor">@color/key_shifted_letter_hint_activated_color_holo</item>
         <item name="keyPreviewTextColor">@color/key_text_color_holo</item>
+        <!-- A negative value to disable key text shadow layer. -->
+        <item name="keyTextShadowRadius">-1.0</item>
+        <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
+        <item name="keyPopupHintLetter">&#x2026;</item>
     </style>
     <style
         name="MainKeyboardView.ICS"