commit e9ed396f6c1dea09e14edc69118c3421275058bb
author Tadashi G. Takaoka <takaoka@google.com> Thu Aug 07 14:36:19 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 05 00:03:09 2014 +0000
tree 8e892805f4787af705346222c58724503c6c7703
parent 0df148fce03899a15e1243dd30e6260de6ed4547
parent 0b5d12c6b4df6ddea2514a6646feb7db68e37ff4

Merge "Revert "Revert "Add Key label off center attribute""" into lmp-dev

java/res/values/themes-common.xml

diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml
index fd1c9f8..cc61de0 100644
--- a/java/res/values/themes-common.xml
+++ b/java/res/values/themes-common.xml
@@ -34,6 +34,9 @@
         <item name="maxMoreKeysColumn">@integer/config_max_more_keys_column</item>
     </style>
     <style name="KeyboardView">
+        <!-- This keyBackground is needed to run unit tests based on {@link InputTestBase}. -->
+        <!-- TODO: Apply default {@link KeyboardTheme} to {@link InputTestBase} and remove this. -->
+        <item name="keyBackground">@drawable/btn_keyboard_key_klp</item>
         <item name="keyLetterSize">@fraction/config_key_letter_ratio</item>
         <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio</item>
         <item name="keyLabelSize">@fraction/config_key_label_ratio</item>
@@ -117,7 +120,7 @@
     <style name="MoreKeysKeyboard" />
     <style
         name="MoreKeysKeyboardView"
-        parent="MainKeyboardView" />
+        parent="KeyboardView" />
     <style name="MoreKeysKeyboardContainer" />
     <style name="SuggestionStripView" />
     <style name="SuggestionWord">