From 7a5ca9982fae2c17df4e597d2c54c81782946ed1 Mon Sep 17 00:00:00 2001 From: Ken Wakasa Date: Wed, 29 Aug 2012 04:32:24 -0700 Subject: [PATCH] Revert "Fix key letter size of 5-rows Thai keyboard" This reverts commit ac621d1527ee998e7d299788c2ab240f94046046 Change-Id: I17b1d17c773c2fe89c0cdef2c423c8ccd1d2c9c8 --- java/res/values-land/dimens.xml | 2 - java/res/values-sw600dp-land/dimens.xml | 2 - java/res/values-sw600dp/dimens.xml | 2 - java/res/values-sw768dp-land/dimens.xml | 2 - java/res/values-sw768dp/dimens.xml | 2 - java/res/values/dimens.xml | 2 - java/res/xml-sw600dp-land/kbd_thai.xml | 2 - java/res/xml-sw600dp/kbd_thai.xml | 2 - java/res/xml-sw768dp-land/kbd_thai.xml | 2 - java/res/xml-sw768dp/kbd_thai.xml | 2 - .../inputmethod/keyboard/Keyboard.java | 20 ------ .../inputmethod/keyboard/KeyboardView.java | 69 ++++++------------- .../inputmethod/latin/ResourceUtils.java | 10 --- 13 files changed, 22 insertions(+), 97 deletions(-) diff --git a/java/res/values-land/dimens.xml b/java/res/values-land/dimens.xml index fbfbb512c..62597258c 100644 --- a/java/res/values-land/dimens.xml +++ b/java/res/values-land/dimens.xml @@ -53,8 +53,6 @@ 40% 90% 40.000% - 78% - 48% 0.0dp 1.6dp diff --git a/java/res/values-sw600dp-land/dimens.xml b/java/res/values-sw600dp-land/dimens.xml index 8283cd9fb..a478df89a 100644 --- a/java/res/values-sw600dp-land/dimens.xml +++ b/java/res/values-sw600dp-land/dimens.xml @@ -51,8 +51,6 @@ 34% 29% 30.0% - 62% - 36% 4dp 252.0dp diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml index 78aa60533..5596ba41c 100644 --- a/java/res/values-sw600dp/dimens.xml +++ b/java/res/values-sw600dp/dimens.xml @@ -63,8 +63,6 @@ 22% 50% 28.0% - 52% - 27% 94.5dp 16.0dp diff --git a/java/res/values-sw768dp-land/dimens.xml b/java/res/values-sw768dp-land/dimens.xml index ac94c9293..b95c858dc 100644 --- a/java/res/values-sw768dp-land/dimens.xml +++ b/java/res/values-sw768dp-land/dimens.xml @@ -53,8 +53,6 @@ 28% 24% 24.00% - 53% - 30% 107.1dp 8.0dp diff --git a/java/res/values-sw768dp/dimens.xml b/java/res/values-sw768dp/dimens.xml index 0fd9cedcb..ce33b73cb 100644 --- a/java/res/values-sw768dp/dimens.xml +++ b/java/res/values-sw768dp/dimens.xml @@ -64,8 +64,6 @@ 26% 50% 29.03% - 51% - 33% 94.5dp 16.0dp diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml index e0fcd5e2d..4fd942b14 100644 --- a/java/res/values/dimens.xml +++ b/java/res/values/dimens.xml @@ -65,8 +65,6 @@ 35% 82% 33.735% - 64% - 41% 80dp -8.0dp diff --git a/java/res/xml-sw600dp-land/kbd_thai.xml b/java/res/xml-sw600dp-land/kbd_thai.xml index a7763f2c7..314306140 100644 --- a/java/res/xml-sw600dp-land/kbd_thai.xml +++ b/java/res/xml-sw600dp-land/kbd_thai.xml @@ -23,8 +23,6 @@ latin:rowHeight="20%p" latin:verticalGap="3.20%p" latin:keyTypeface="normal" - latin:keyLetterSize="@fraction/key_letter_ratio_5rows" - latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5rows" latin:touchPositionCorrectionData="@null" > = 0.0f; } - // {@link Resources#getDimensionPixelSize(int)} returns at least one pixel size. - public static boolean isValidDimensionPixelSize(final int dimension) { - return dimension > 0; - } - - // {@link Resources#getDimensionPixelOffset(int)} may return zero pixel offset. - public static boolean isValidDimensionPixelOffset(final int dimension) { - return dimension >= 0; - } - public static float getFraction(final TypedArray a, final int index, final float defValue) { final TypedValue value = a.peekValue(index); if (value == null || !isFractionValue(value)) {