From f7f657436872959fa9f8c5b90d2a4a97d104eaae Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Thu, 7 Aug 2014 14:36:27 +0000 Subject: [PATCH] Revert "Revert "Remove unused Key and Keyboard attributes"" This reverts commit 44e20f4fb42380061b1c4aa8905c2b301d7130cd. Change-Id: I6560c8f4ef15bf8318d9eedf68a9eb5031f0581d --- java/res/values-sw600dp/config.xml | 1 - java/res/values-sw768dp/config.xml | 1 - java/res/values/attrs.xml | 3 --- java/res/values/config.xml | 1 - java/res/values/themes-common.xml | 1 - java/src/com/android/inputmethod/keyboard/Key.java | 3 --- .../android/inputmethod/keyboard/internal/KeyDrawParams.java | 3 --- .../inputmethod/keyboard/internal/KeyVisualAttributes.java | 4 ---- 8 files changed, 17 deletions(-) diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-sw600dp/config.xml index 9d16e2cb9..7af79f085 100644 --- a/java/res/values-sw600dp/config.xml +++ b/java/res/values-sw600dp/config.xml @@ -47,7 +47,6 @@ 42% 45% 25% - 32% 23% 28% 22% diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml index 635061d24..12dd23279 100644 --- a/java/res/values-sw768dp/config.xml +++ b/java/res/values-sw768dp/config.xml @@ -45,7 +45,6 @@ 40% 42% 28% - 28% 23% 28% 26% diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 91cd01723..8b3687a8c 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -300,7 +300,6 @@ - @@ -359,8 +358,6 @@ - - diff --git a/java/res/values/config.xml b/java/res/values/config.xml index d748c9179..ce93c7e57 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -49,7 +49,6 @@ 55% 65% 34% - 40% 25% 44% 35% diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml index cc61de03d..507f5cff2 100644 --- a/java/res/values/themes-common.xml +++ b/java/res/values/themes-common.xml @@ -40,7 +40,6 @@ @fraction/config_key_letter_ratio @fraction/config_key_large_letter_ratio @fraction/config_key_label_ratio - @fraction/config_key_large_label_ratio @fraction/config_key_hint_letter_ratio @fraction/config_key_hint_label_ratio @fraction/config_key_shifted_letter_hint_ratio diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java index 18b81161c..f8c005845 100644 --- a/java/src/com/android/inputmethod/keyboard/Key.java +++ b/java/src/com/android/inputmethod/keyboard/Key.java @@ -70,7 +70,6 @@ public class Key implements Comparable { private static final int LABEL_FLAGS_FOLLOW_KEY_LARGE_LETTER_RATIO = 0x40; private static final int LABEL_FLAGS_FOLLOW_KEY_LETTER_RATIO = 0x80; private static final int LABEL_FLAGS_FOLLOW_KEY_LABEL_RATIO = 0xC0; - private static final int LABEL_FLAGS_FOLLOW_KEY_LARGE_LABEL_RATIO = 0x100; private static final int LABEL_FLAGS_FOLLOW_KEY_HINT_LABEL_RATIO = 0x140; // End of key text ratio mask enum values private static final int LABEL_FLAGS_HAS_POPUP_HINT = 0x200; @@ -580,8 +579,6 @@ public class Key implements Comparable { return params.mLargeLetterSize; case LABEL_FLAGS_FOLLOW_KEY_LABEL_RATIO: return params.mLabelSize; - case LABEL_FLAGS_FOLLOW_KEY_LARGE_LABEL_RATIO: - return params.mLargeLabelSize; case LABEL_FLAGS_FOLLOW_KEY_HINT_LABEL_RATIO: return params.mHintLabelSize; default: // No follow key ratio flag specified. diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyDrawParams.java b/java/src/com/android/inputmethod/keyboard/internal/KeyDrawParams.java index 6dbee55ae..df50efdc1 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyDrawParams.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyDrawParams.java @@ -26,7 +26,6 @@ public final class KeyDrawParams { public int mLetterSize; public int mLabelSize; public int mLargeLetterSize; - public int mLargeLabelSize; public int mHintLetterSize; public int mShiftedLetterHintSize; public int mHintLabelSize; @@ -56,7 +55,6 @@ public final class KeyDrawParams { mLetterSize = copyFrom.mLetterSize; mLabelSize = copyFrom.mLabelSize; mLargeLetterSize = copyFrom.mLargeLetterSize; - mLargeLabelSize = copyFrom.mLargeLabelSize; mHintLetterSize = copyFrom.mHintLetterSize; mShiftedLetterHintSize = copyFrom.mShiftedLetterHintSize; mHintLabelSize = copyFrom.mHintLabelSize; @@ -92,7 +90,6 @@ public final class KeyDrawParams { attr.mLetterSize, attr.mLetterRatio, mLetterSize); mLabelSize = selectTextSizeFromDimensionOrRatio(keyHeight, attr.mLabelSize, attr.mLabelRatio, mLabelSize); - mLargeLabelSize = selectTextSize(keyHeight, attr.mLargeLabelRatio, mLargeLabelSize); mLargeLetterSize = selectTextSize(keyHeight, attr.mLargeLetterRatio, mLargeLetterSize); mHintLetterSize = selectTextSize(keyHeight, attr.mHintLetterRatio, mHintLetterSize); mShiftedLetterHintSize = selectTextSize(keyHeight, diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyVisualAttributes.java b/java/src/com/android/inputmethod/keyboard/internal/KeyVisualAttributes.java index 69cf2e389..c60d587db 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyVisualAttributes.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyVisualAttributes.java @@ -31,7 +31,6 @@ public final class KeyVisualAttributes { public final float mLabelRatio; public final int mLabelSize; public final float mLargeLetterRatio; - public final float mLargeLabelRatio; public final float mHintLetterRatio; public final float mShiftedLetterHintRatio; public final float mHintLabelRatio; @@ -56,7 +55,6 @@ public final class KeyVisualAttributes { R.styleable.Keyboard_Key_keyLetterSize, R.styleable.Keyboard_Key_keyLabelSize, R.styleable.Keyboard_Key_keyLargeLetterRatio, - R.styleable.Keyboard_Key_keyLargeLabelRatio, R.styleable.Keyboard_Key_keyHintLetterRatio, R.styleable.Keyboard_Key_keyShiftedLetterHintRatio, R.styleable.Keyboard_Key_keyHintLabelRatio, @@ -113,8 +111,6 @@ public final class KeyVisualAttributes { R.styleable.Keyboard_Key_keyLabelSize); mLargeLetterRatio = ResourceUtils.getFraction(keyAttr, R.styleable.Keyboard_Key_keyLargeLetterRatio); - mLargeLabelRatio = ResourceUtils.getFraction(keyAttr, - R.styleable.Keyboard_Key_keyLargeLabelRatio); mHintLetterRatio = ResourceUtils.getFraction(keyAttr, R.styleable.Keyboard_Key_keyHintLetterRatio); mShiftedLetterHintRatio = ResourceUtils.getFraction(keyAttr,