diff options
author | 2014-08-07 16:53:21 +0900 | |
---|---|---|
committer | 2014-08-07 17:23:37 +0900 | |
commit | cdcaa37a372799eecf796f7002bf49bf3a5f42c1 (patch) | |
tree | e731d3ac1c80631065ffc397e8185412b90870ac /java/src | |
parent | 91f47b03fecbfbc62adb93aa0331924c1fb38995 (diff) | |
download | latinime-cdcaa37a372799eecf796f7002bf49bf3a5f42c1.tar.gz latinime-cdcaa37a372799eecf796f7002bf49bf3a5f42c1.tar.xz latinime-cdcaa37a372799eecf796f7002bf49bf3a5f42c1.zip |
Remove unused Key and Keyboard attributes
This CL removes the following unused Key attributes
- Key.keyLabelFlags' followKeyLargeLabelRatio
- Keyboard.keyLargeLabelRatio
Change-Id: Ib4fb13cc7ca902ac1733ecf27bd284d07e10bc3e
Diffstat (limited to 'java/src')
3 files changed, 0 insertions, 10 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java index aaa55d79c..b7f6d268b 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<Key> { 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<Key> { 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 07ac06bab..72477ce62 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; @@ -52,7 +51,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; @@ -84,7 +82,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 133462ac7..b94f4834b 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; @@ -54,7 +53,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, @@ -109,8 +107,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, |