From 5ad718f2cad358e0c84fb0ba8463b428bce3127a Mon Sep 17 00:00:00 2001
From: Ken Wakasa <kwakasa@google.com>
Date: Thu, 7 Aug 2014 11:36:20 +0000
Subject: [PATCH] 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-land/config.xml | 6 ++----
java/res/values-sw600dp-land/config.xml | 6 ++----
java/res/values-sw600dp/config.xml | 6 ++----
java/res/values-sw768dp-land/config.xml | 6 ++----
java/res/values-sw768dp/config.xml | 6 ++----
java/res/values/config.xml | 6 ++----
java/res/values/themes-common.xml | 6 ++++--
java/res/values/themes-holo.xml | 6 ++----
java/res/values/themes-lxx.xml | 6 ++----
9 files changed, 20 insertions(+), 34 deletions(-)
diff --git a/java/res/values-land/config.xml b/java/res/values-land/config.xml
index 34d6d4e19d..5eea4c1c64 100644
--- a/java/res/values-land/config.xml
+++ b/java/res/values-land/config.xml
@@ -43,12 +43,10 @@
<fraction name="config_key_preview_text_ratio">90%</fraction>
<fraction name="config_key_letter_ratio">65%</fraction>
- <fraction name="config_key_large_letter_ratio_holo">74%</fraction>
- <fraction name="config_key_large_letter_ratio_lxx">90%</fraction>
+ <fraction name="config_key_large_letter_ratio">74%</fraction>
<fraction name="config_key_label_ratio">40%</fraction>
<fraction name="config_key_hint_letter_ratio">30%</fraction>
- <fraction name="config_key_hint_label_ratio_holo">52%</fraction>
- <fraction name="config_key_hint_label_ratio_lxx">30%</fraction>
+ <fraction name="config_key_hint_label_ratio">52%</fraction>
<fraction name="config_key_shifted_letter_hint_ratio">40%</fraction>
<fraction name="config_language_on_spacebar_text_ratio">40.000%</fraction>
diff --git a/java/res/values-sw600dp-land/config.xml b/java/res/values-sw600dp-land/config.xml
index c238b2c42a..6368eef414 100644
--- a/java/res/values-sw600dp-land/config.xml
+++ b/java/res/values-sw600dp-land/config.xml
@@ -33,12 +33,10 @@
<fraction name="config_key_horizontal_gap_holo">0.9%p</fraction>
<fraction name="config_key_letter_ratio">50%</fraction>
- <fraction name="config_key_large_letter_ratio_holo">48%</fraction>
- <fraction name="config_key_large_letter_ratio_lxx">60%</fraction>
+ <fraction name="config_key_large_letter_ratio">48%</fraction>
<fraction name="config_key_label_ratio">32%</fraction>
<fraction name="config_key_hint_letter_ratio">23%</fraction>
- <fraction name="config_key_hint_label_ratio_holo">34%</fraction>
- <fraction name="config_key_hint_label_ratio_lxx">20%</fraction>
+ <fraction name="config_key_hint_label_ratio">34%</fraction>
<fraction name="config_key_shifted_letter_hint_ratio">29%</fraction>
<fraction name="config_language_on_spacebar_text_ratio">30.0%</fraction>
<dimen name="config_key_shifted_letter_hint_padding">4dp</dimen>
diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-sw600dp/config.xml
index 3c489bbe8f..7af79f085d 100644
--- a/java/res/values-sw600dp/config.xml
+++ b/java/res/values-sw600dp/config.xml
@@ -45,12 +45,10 @@
<dimen name="config_key_preview_height">94.5dp</dimen>
<fraction name="config_key_preview_text_ratio">50%</fraction>
<fraction name="config_key_letter_ratio">42%</fraction>
- <fraction name="config_key_large_letter_ratio_holo">45%</fraction>
- <fraction name="config_key_large_letter_ratio_lxx">60%</fraction>
+ <fraction name="config_key_large_letter_ratio">45%</fraction>
<fraction name="config_key_label_ratio">25%</fraction>
<fraction name="config_key_hint_letter_ratio">23%</fraction>
- <fraction name="config_key_hint_label_ratio_holo">28%</fraction>
- <fraction name="config_key_hint_label_ratio_lxx">20%</fraction>
+ <fraction name="config_key_hint_label_ratio">28%</fraction>
<fraction name="config_key_shifted_letter_hint_ratio">22%</fraction>
<fraction name="config_language_on_spacebar_text_ratio">28.0%</fraction>
<dimen name="config_key_hint_letter_padding">3dp</dimen>
diff --git a/java/res/values-sw768dp-land/config.xml b/java/res/values-sw768dp-land/config.xml
index 587a3c1a4f..a1659b45ae 100644
--- a/java/res/values-sw768dp-land/config.xml
+++ b/java/res/values-sw768dp-land/config.xml
@@ -35,12 +35,10 @@
<dimen name="config_key_preview_height">107.1dp</dimen>
<fraction name="config_key_letter_ratio">43%</fraction>
- <fraction name="config_key_large_letter_ratio_holo">42%</fraction>
- <fraction name="config_key_large_letter_ratio_lxx">60%</fraction>
+ <fraction name="config_key_large_letter_ratio">42%</fraction>
<fraction name="config_key_label_ratio">28%</fraction>
<fraction name="config_key_hint_letter_ratio">23%</fraction>
- <fraction name="config_key_hint_label_ratio_holo">28%</fraction>
- <fraction name="config_key_hint_label_ratio_lxx">20%</fraction>
+ <fraction name="config_key_hint_label_ratio">28%</fraction>
<fraction name="config_key_shifted_letter_hint_ratio">24%</fraction>
<fraction name="config_language_on_spacebar_text_ratio">24.00%</fraction>
diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml
index f573c40df0..12dd232792 100644
--- a/java/res/values-sw768dp/config.xml
+++ b/java/res/values-sw768dp/config.xml
@@ -43,12 +43,10 @@
<dimen name="config_key_preview_height">94.5dp</dimen>
<fraction name="config_key_preview_text_ratio">50%</fraction>
<fraction name="config_key_letter_ratio">40%</fraction>
- <fraction name="config_key_large_letter_ratio_holo">42%</fraction>
- <fraction name="config_key_large_letter_ratio_lxx">60%</fraction>
+ <fraction name="config_key_large_letter_ratio">42%</fraction>
<fraction name="config_key_label_ratio">28%</fraction>
<fraction name="config_key_hint_letter_ratio">23%</fraction>
- <fraction name="config_key_hint_label_ratio_holo">28%</fraction>
- <fraction name="config_key_hint_label_ratio_lxx">20%</fraction>
+ <fraction name="config_key_hint_label_ratio">28%</fraction>
<fraction name="config_key_shifted_letter_hint_ratio">26%</fraction>
<fraction name="config_language_on_spacebar_text_ratio">29.03%</fraction>
<dimen name="config_key_hint_letter_padding">3dp</dimen>
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index af3b5890b2..ce93c7e57c 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>
diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml
index 46f2553994..696a99c1ac 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>
diff --git a/java/res/values/themes-holo.xml b/java/res/values/themes-holo.xml
index cb3ad7a3a9..f344dd7c8a 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">…</item>
</style>
diff --git a/java/res/values/themes-lxx.xml b/java/res/values/themes-lxx.xml
index f4e7933bb9..3a022e5911 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>
--
GitLab