commit 5ad718f2cad358e0c84fb0ba8463b428bce3127a
author Ken Wakasa <kwakasa@google.com> Thu Aug 07 11:36:20 2014 +0000
committer Ken Wakasa <kwakasa@google.com> Thu Aug 07 11:36:20 2014 +0000
tree 1bb7079c0f6547f391af24794ba47712e858e449
parent 44454c2b2be765618d0c19651f3ee50c373a2d59

Revert "Tune number letter size of Material keyboard"

This reverts commit 44454c2b2be765618d0c19651f3ee50c373a2d59.

Due to unit test breakage.

Bug: 14419121
Change-Id: Id0bbc2276fc035aa090f7bb4fa8112a1aecd483f

java/res/values/config.xml

diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index af3b589..ce93c7e 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -47,12 +47,10 @@
     <dimen name="config_key_preview_height">80dp</dimen>
     <fraction name="config_key_preview_text_ratio">82%</fraction>
     <fraction name="config_key_letter_ratio">55%</fraction>
-    <fraction name="config_key_large_letter_ratio_holo">65%</fraction>
-    <fraction name="config_key_large_letter_ratio_lxx">90%</fraction>
+    <fraction name="config_key_large_letter_ratio">65%</fraction>
     <fraction name="config_key_label_ratio">34%</fraction>
     <fraction name="config_key_hint_letter_ratio">25%</fraction>
-    <fraction name="config_key_hint_label_ratio_holo">44%</fraction>
-    <fraction name="config_key_hint_label_ratio_lxx">30%</fraction>
+    <fraction name="config_key_hint_label_ratio">44%</fraction>
     <fraction name="config_key_shifted_letter_hint_ratio">35%</fraction>
     <fraction name="config_language_on_spacebar_text_ratio">33.735%</fraction>
     <dimen name="config_key_hint_letter_padding">1dp</dimen>

java/res/values/themes-common.xml

diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml
index 46f2553..696a99c 100644
--- a/java/res/values/themes-common.xml
+++ b/java/res/values/themes-common.xml
@@ -35,11 +35,13 @@
     </style>
     <style name="KeyboardView">
         <item name="keyLetterSize">@fraction/config_key_letter_ratio</item>
-        <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio_holo</item>
+        <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio</item>
         <item name="keyLabelSize">@fraction/config_key_label_ratio</item>
         <item name="keyHintLetterRatio">@fraction/config_key_hint_letter_ratio</item>
-        <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio_holo</item>
+        <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio</item>
         <item name="keyShiftedLetterHintRatio">@fraction/config_key_shifted_letter_hint_ratio</item>
+        <item name="keyLabelOffCenterRatio">-175%</item>
+        <item name="keyHintLabelOffCenterRatio">200%</item>
         <item name="keyTypeface">normal</item>
         <!-- A negative value to disable key text shadow layer. -->
         <item name="keyTextShadowRadius">-1.0</item>

java/res/values/themes-holo.xml

diff --git a/java/res/values/themes-holo.xml b/java/res/values/themes-holo.xml
index cb3ad7a..f344dd7 100644
--- a/java/res/values/themes-holo.xml
+++ b/java/res/values/themes-holo.xml
@@ -25,10 +25,8 @@
         parent="KeyboardView"
     >
         <item name="keyTypeface">bold</item>
-        <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio_holo</item>
-        <item name="keyLabelOffCenterRatio">-175%</item>
-        <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio_holo</item>
-        <item name="keyHintLabelOffCenterRatio">200%</item>
+        <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio</item>
+        <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio</item>
         <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
         <item name="keyPopupHintLetter">&#x2026;</item>
     </style>

java/res/values/themes-lxx.xml

diff --git a/java/res/values/themes-lxx.xml b/java/res/values/themes-lxx.xml
index f4e7933..3a022e5 100644
--- a/java/res/values/themes-lxx.xml
+++ b/java/res/values/themes-lxx.xml
@@ -25,10 +25,8 @@
         parent="KeyboardView"
     >
         <item name="keyTypeface">normal</item>
-        <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio_lxx</item>
-        <item name="keyLabelOffCenterRatio">-100%</item>
-        <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio_lxx</item>
-        <item name="keyHintLabelOffCenterRatio">400%</item>
+        <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio</item>
+        <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio</item>
         <item name="spacebarIconWidthRatio">0.9</item>
         <!-- No popup hint letter -->
         <item name="keyPopupHintLetter"></item>