nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am f1ca6b73: am cbc2c253: am f7f65743: Revert "Revert "Remove unused Key and Keyboard attributes"" 

* commit 'f1ca6b73341aad819c651810852fd03a93c2d5cd':
  Revert "Revert "Remove unused Key and Keyboard attributes""
main
Tadashi G. Takaoka 2014-08-07 15:20:14 +00:00 committed by Android Git Automerger
parent fd3fbdf0e6 f1ca6b7334
commit 4290412dbe
8 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java/res/values-sw600dp/config.xml
View File

@ -47,7 +47,6 @@
<fraction name="config_key_letter_ratio">42%</fraction> <fraction name="config_key_letter_ratio">42%</fraction>
<fraction name="config_key_large_letter_ratio">45%</fraction> <fraction name="config_key_large_letter_ratio">45%</fraction>
<fraction name="config_key_label_ratio">25%</fraction> <fraction name="config_key_label_ratio">25%</fraction>
<fraction name="config_key_large_label_ratio">32%</fraction>
<fraction name="config_key_hint_letter_ratio">23%</fraction> <fraction name="config_key_hint_letter_ratio">23%</fraction>
<fraction name="config_key_hint_label_ratio">28%</fraction> <fraction name="config_key_hint_label_ratio">28%</fraction>
<fraction name="config_key_shifted_letter_hint_ratio">22%</fraction> <fraction name="config_key_shifted_letter_hint_ratio">22%</fraction>

1
java/res/values-sw768dp/config.xml
View File

@ -45,7 +45,6 @@
<fraction name="config_key_letter_ratio">40%</fraction> <fraction name="config_key_letter_ratio">40%</fraction>
<fraction name="config_key_large_letter_ratio">42%</fraction> <fraction name="config_key_large_letter_ratio">42%</fraction>
<fraction name="config_key_label_ratio">28%</fraction> <fraction name="config_key_label_ratio">28%</fraction>
<fraction name="config_key_large_label_ratio">28%</fraction>
<fraction name="config_key_hint_letter_ratio">23%</fraction> <fraction name="config_key_hint_letter_ratio">23%</fraction>
<fraction name="config_key_hint_label_ratio">28%</fraction> <fraction name="config_key_hint_label_ratio">28%</fraction>
<fraction name="config_key_shifted_letter_hint_ratio">26%</fraction> <fraction name="config_key_shifted_letter_hint_ratio">26%</fraction>

3
java/res/values/attrs.xml
View File

@ -300,7 +300,6 @@
<flag name="followKeyLargeLetterRatio" value="0x40" /> <flag name="followKeyLargeLetterRatio" value="0x40" />
<flag name="followKeyLetterRatio" value="0x80" /> <flag name="followKeyLetterRatio" value="0x80" />
<flag name="followKeyLabelRatio" value="0xC0" /> <flag name="followKeyLabelRatio" value="0xC0" />
<flag name="followKeyLargeLabelRatio" value="0x100" />
<flag name="followKeyHintLabelRatio" value="0x140" /> <flag name="followKeyHintLabelRatio" value="0x140" />
<flag name="hasPopupHint" value="0x200" /> <flag name="hasPopupHint" value="0x200" />
<flag name="hasShiftedLetterHint" value="0x400" /> <flag name="hasShiftedLetterHint" value="0x400" />
@ -359,8 +358,6 @@
<attr name="keyLabelSize" format="dimension|fraction" /> <attr name="keyLabelSize" format="dimension|fraction" />
<!-- Large size of the text for one letter keys, in the proportion of key height. --> <!-- Large size of the text for one letter keys, in the proportion of key height. -->
<attr name="keyLargeLetterRatio" format="fraction" /> <attr name="keyLargeLetterRatio" format="fraction" />
<!-- Large size of the text for keys with multiple letters, in the proportion of key height. -->
<attr name="keyLargeLabelRatio" format="fraction" />
<!-- Size of the text for hint letter (= one character hint label), in the proportion of <!-- Size of the text for hint letter (= one character hint label), in the proportion of
key height. --> key height. -->
<attr name="keyHintLetterRatio" format="fraction" /> <attr name="keyHintLetterRatio" format="fraction" />

1
java/res/values/config.xml
View File

@ -49,7 +49,6 @@
<fraction name="config_key_letter_ratio">55%</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">65%</fraction>
<fraction name="config_key_label_ratio">34%</fraction> <fraction name="config_key_label_ratio">34%</fraction>
<fraction name="config_key_large_label_ratio">40%</fraction>
<fraction name="config_key_hint_letter_ratio">25%</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">44%</fraction>
<fraction name="config_key_shifted_letter_hint_ratio">35%</fraction> <fraction name="config_key_shifted_letter_hint_ratio">35%</fraction>

1
java/res/values/themes-common.xml
View File

@ -40,7 +40,6 @@
<item name="keyLetterSize">@fraction/config_key_letter_ratio</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</item>
<item name="keyLabelSize">@fraction/config_key_label_ratio</item> <item name="keyLabelSize">@fraction/config_key_label_ratio</item>
<item name="keyLargeLabelRatio">@fraction/config_key_large_label_ratio</item>
<item name="keyHintLetterRatio">@fraction/config_key_hint_letter_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</item>
<item name="keyShiftedLetterHintRatio">@fraction/config_key_shifted_letter_hint_ratio</item> <item name="keyShiftedLetterHintRatio">@fraction/config_key_shifted_letter_hint_ratio</item>

3
java/src/com/android/inputmethod/keyboard/Key.java
View File

@ -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_LARGE_LETTER_RATIO = 0x40;
private static final int LABEL_FLAGS_FOLLOW_KEY_LETTER_RATIO = 0x80; 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_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; private static final int LABEL_FLAGS_FOLLOW_KEY_HINT_LABEL_RATIO = 0x140;
// End of key text ratio mask enum values // End of key text ratio mask enum values
private static final int LABEL_FLAGS_HAS_POPUP_HINT = 0x200; private static final int LABEL_FLAGS_HAS_POPUP_HINT = 0x200;
@ -580,8 +579,6 @@ public class Key implements Comparable<Key> {
return params.mLargeLetterSize; return params.mLargeLetterSize;
case LABEL_FLAGS_FOLLOW_KEY_LABEL_RATIO: case LABEL_FLAGS_FOLLOW_KEY_LABEL_RATIO:
return params.mLabelSize; return params.mLabelSize;
case LABEL_FLAGS_FOLLOW_KEY_LARGE_LABEL_RATIO:
return params.mLargeLabelSize;
case LABEL_FLAGS_FOLLOW_KEY_HINT_LABEL_RATIO: case LABEL_FLAGS_FOLLOW_KEY_HINT_LABEL_RATIO:
return params.mHintLabelSize; return params.mHintLabelSize;
default: // No follow key ratio flag specified. default: // No follow key ratio flag specified.

3
java/src/com/android/inputmethod/keyboard/internal/KeyDrawParams.java
View File

@ -26,7 +26,6 @@ public final class KeyDrawParams {
public int mLetterSize; public int mLetterSize;
public int mLabelSize; public int mLabelSize;
public int mLargeLetterSize; public int mLargeLetterSize;
public int mLargeLabelSize;
public int mHintLetterSize; public int mHintLetterSize;
public int mShiftedLetterHintSize; public int mShiftedLetterHintSize;
public int mHintLabelSize; public int mHintLabelSize;
@ -56,7 +55,6 @@ public final class KeyDrawParams {
mLetterSize = copyFrom.mLetterSize; mLetterSize = copyFrom.mLetterSize;
mLabelSize = copyFrom.mLabelSize; mLabelSize = copyFrom.mLabelSize;
mLargeLetterSize = copyFrom.mLargeLetterSize; mLargeLetterSize = copyFrom.mLargeLetterSize;
mLargeLabelSize = copyFrom.mLargeLabelSize;
mHintLetterSize = copyFrom.mHintLetterSize; mHintLetterSize = copyFrom.mHintLetterSize;
mShiftedLetterHintSize = copyFrom.mShiftedLetterHintSize; mShiftedLetterHintSize = copyFrom.mShiftedLetterHintSize;
mHintLabelSize = copyFrom.mHintLabelSize; mHintLabelSize = copyFrom.mHintLabelSize;
@ -92,7 +90,6 @@ public final class KeyDrawParams {
attr.mLetterSize, attr.mLetterRatio, mLetterSize); attr.mLetterSize, attr.mLetterRatio, mLetterSize);
mLabelSize = selectTextSizeFromDimensionOrRatio(keyHeight, mLabelSize = selectTextSizeFromDimensionOrRatio(keyHeight,
attr.mLabelSize, attr.mLabelRatio, mLabelSize); attr.mLabelSize, attr.mLabelRatio, mLabelSize);
mLargeLabelSize = selectTextSize(keyHeight, attr.mLargeLabelRatio, mLargeLabelSize);
mLargeLetterSize = selectTextSize(keyHeight, attr.mLargeLetterRatio, mLargeLetterSize); mLargeLetterSize = selectTextSize(keyHeight, attr.mLargeLetterRatio, mLargeLetterSize);
mHintLetterSize = selectTextSize(keyHeight, attr.mHintLetterRatio, mHintLetterSize); mHintLetterSize = selectTextSize(keyHeight, attr.mHintLetterRatio, mHintLetterSize);
mShiftedLetterHintSize = selectTextSize(keyHeight, mShiftedLetterHintSize = selectTextSize(keyHeight,

4
java/src/com/android/inputmethod/keyboard/internal/KeyVisualAttributes.java
View File

@ -31,7 +31,6 @@ public final class KeyVisualAttributes {
public final float mLabelRatio; public final float mLabelRatio;
public final int mLabelSize; public final int mLabelSize;
public final float mLargeLetterRatio; public final float mLargeLetterRatio;
public final float mLargeLabelRatio;
public final float mHintLetterRatio; public final float mHintLetterRatio;
public final float mShiftedLetterHintRatio; public final float mShiftedLetterHintRatio;
public final float mHintLabelRatio; public final float mHintLabelRatio;
@ -56,7 +55,6 @@ public final class KeyVisualAttributes {
R.styleable.Keyboard_Key_keyLetterSize, R.styleable.Keyboard_Key_keyLetterSize,
R.styleable.Keyboard_Key_keyLabelSize, R.styleable.Keyboard_Key_keyLabelSize,
R.styleable.Keyboard_Key_keyLargeLetterRatio, R.styleable.Keyboard_Key_keyLargeLetterRatio,
R.styleable.Keyboard_Key_keyLargeLabelRatio,
R.styleable.Keyboard_Key_keyHintLetterRatio, R.styleable.Keyboard_Key_keyHintLetterRatio,
R.styleable.Keyboard_Key_keyShiftedLetterHintRatio, R.styleable.Keyboard_Key_keyShiftedLetterHintRatio,
R.styleable.Keyboard_Key_keyHintLabelRatio, R.styleable.Keyboard_Key_keyHintLabelRatio,
@ -113,8 +111,6 @@ public final class KeyVisualAttributes {
R.styleable.Keyboard_Key_keyLabelSize); R.styleable.Keyboard_Key_keyLabelSize);
mLargeLetterRatio = ResourceUtils.getFraction(keyAttr, mLargeLetterRatio = ResourceUtils.getFraction(keyAttr,
R.styleable.Keyboard_Key_keyLargeLetterRatio); R.styleable.Keyboard_Key_keyLargeLetterRatio);
mLargeLabelRatio = ResourceUtils.getFraction(keyAttr,
R.styleable.Keyboard_Key_keyLargeLabelRatio);
mHintLetterRatio = ResourceUtils.getFraction(keyAttr, mHintLetterRatio = ResourceUtils.getFraction(keyAttr,
R.styleable.Keyboard_Key_keyHintLetterRatio); R.styleable.Keyboard_Key_keyHintLetterRatio);
mShiftedLetterHintRatio = ResourceUtils.getFraction(keyAttr, mShiftedLetterHintRatio = ResourceUtils.getFraction(keyAttr,