Revert "Revert "Tune number letter size of Material keyboard""

This reverts commit 5ad718f2cad358e0c84fb0ba8463b428bce3127a.

4 files changed, 14 insertions, 10 deletions

diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index ce93c7e57..af3b5890b 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -47,10 +47,12 @@
     <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">65%</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_label_ratio">34%</fraction>
     <fraction name="config_key_hint_letter_ratio">25%</fraction>
-    <fraction name="config_key_hint_label_ratio">44%</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_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>
diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml
index 507f5cff2..6805830cb 100644
--- a/java/res/values/themes-common.xml
+++ b/java/res/values/themes-common.xml
@@ -38,13 +38,11 @@
         <!-- 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="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio_holo</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</item>
+        <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio_holo</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>
diff --git a/java/res/values/themes-holo.xml b/java/res/values/themes-holo.xml
index f344dd7c8..cb3ad7a3a 100644
--- a/java/res/values/themes-holo.xml
+++ b/java/res/values/themes-holo.xml
@@ -25,8 +25,10 @@
         parent="KeyboardView"
     >
         <item name="keyTypeface">bold</item>
-        <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio</item>
-        <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio</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>
         <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
         <item name="keyPopupHintLetter">&#x2026;</item>
     </style>
diff --git a/java/res/values/themes-lxx.xml b/java/res/values/themes-lxx.xml
index 3a022e591..f4e7933bb 100644
--- a/java/res/values/themes-lxx.xml
+++ b/java/res/values/themes-lxx.xml
@@ -25,8 +25,10 @@
         parent="KeyboardView"
     >
         <item name="keyTypeface">normal</item>
-        <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio</item>
-        <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio</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="spacebarIconWidthRatio">0.9</item>
         <!-- No popup hint letter -->
         <item name="keyPopupHintLetter"></item>