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

am 48ea5280: Merge "Consolidate keyOutputText with keyLabel attribute" 

* commit '48ea52800ac490b0c32c91b9982c7e01a455ffe5':
  Consolidate keyOutputText with keyLabel attribute
main
Tadashi G. Takaoka 2014-02-06 01:37:50 -08:00 committed by Android Git Automerger
parent 5e6a8dd6d9 48ea52800a
commit 32ca47a547
5 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,9 +276,6 @@
<flag name="altCodeWhileTyping" value="0x04" /> <flag name="altCodeWhileTyping" value="0x04" />
<flag name="enableLongPress" value="0x08" /> <flag name="enableLongPress" value="0x08" />
</attr> </attr>
<!-- TODO: Remove keyOutputText attribute and consolidate with keySpec. -->
<!-- The string of characters to output when this key is pressed. -->
<attr name="keyOutputText" format="string" />
<!-- TODO: Rename keyLabel to keySpec. --> <!-- TODO: Rename keyLabel to keySpec. -->
<!-- The label to display on the key. --> <!-- The label to display on the key. -->
<attr name="keyLabel" format="string" /> <attr name="keyLabel" format="string" />

3
java/res/xml-sw600dp/key_styles_common.xml
View File

@ -184,8 +184,7 @@
latin:parentStyle="baseForLayoutSwitchKeyStyle" /> latin:parentStyle="baseForLayoutSwitchKeyStyle" />
<key-style <key-style
latin:styleName="comKeyStyle" latin:styleName="comKeyStyle"
latin:keyLabel="!text/keylabel_for_popular_domain" latin:keyLabel="!text/keylabel_for_popular_domain|!text/keylabel_for_popular_domain"
latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase" latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase"
latin:keyOutputText="!text/keylabel_for_popular_domain"
latin:moreKeys="!text/more_keys_for_popular_domain" /> latin:moreKeys="!text/more_keys_for_popular_domain" />
</merge> </merge>

3
java/res/xml/key_styles_common.xml
View File

@ -184,9 +184,8 @@
latin:parentStyle="baseForToSymbolKeyStyle" /> latin:parentStyle="baseForToSymbolKeyStyle" />
<key-style <key-style
latin:styleName="comKeyStyle" latin:styleName="comKeyStyle"
latin:keyLabel="!text/keylabel_for_popular_domain" latin:keyLabel="!text/keylabel_for_popular_domain|!text/keylabel_for_popular_domain"
latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase" latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase"
latin:keyOutputText="!text/keylabel_for_popular_domain"
latin:moreKeys="!text/more_keys_for_popular_domain" latin:moreKeys="!text/more_keys_for_popular_domain"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
</merge> </merge>

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

@ -347,12 +347,8 @@ public class Key implements Comparable<Key> {
mHintLabel = StringUtils.toUpperCaseOfStringForLocale(style.getString(keyAttr, mHintLabel = StringUtils.toUpperCaseOfStringForLocale(style.getString(keyAttr,
R.styleable.Keyboard_Key_keyHintLabel), needsToUpperCase, locale); R.styleable.Keyboard_Key_keyHintLabel), needsToUpperCase, locale);
} }
final String outputTextInAttr = style.getString(
keyAttr, R.styleable.Keyboard_Key_keyOutputText);
final String rawOutputText = (outputTextInAttr != null) ? outputTextInAttr
: KeySpecParser.getOutputText(keySpec);
String outputText = StringUtils.toUpperCaseOfStringForLocale( String outputText = StringUtils.toUpperCaseOfStringForLocale(
rawOutputText, needsToUpperCase, locale); KeySpecParser.getOutputText(keySpec), needsToUpperCase, locale);
// Choose the first letter of the label as primary code if not specified. // Choose the first letter of the label as primary code if not specified.
if (code == CODE_UNSPECIFIED && TextUtils.isEmpty(outputText) if (code == CODE_UNSPECIFIED && TextUtils.isEmpty(outputText)
&& !TextUtils.isEmpty(mLabel)) { && !TextUtils.isEmpty(mLabel)) {

1
java/src/com/android/inputmethod/keyboard/internal/KeyStylesSet.java
View File

@ -138,7 +138,6 @@ public final class KeyStylesSet {
readString(keyAttr, R.styleable.Keyboard_Key_code); readString(keyAttr, R.styleable.Keyboard_Key_code);
readString(keyAttr, R.styleable.Keyboard_Key_altCode); readString(keyAttr, R.styleable.Keyboard_Key_altCode);
readString(keyAttr, R.styleable.Keyboard_Key_keyLabel); readString(keyAttr, R.styleable.Keyboard_Key_keyLabel);
readString(keyAttr, R.styleable.Keyboard_Key_keyOutputText);
readString(keyAttr, R.styleable.Keyboard_Key_keyHintLabel); readString(keyAttr, R.styleable.Keyboard_Key_keyHintLabel);
readStringArray(keyAttr, R.styleable.Keyboard_Key_moreKeys); readStringArray(keyAttr, R.styleable.Keyboard_Key_moreKeys);
readStringArray(keyAttr, R.styleable.Keyboard_Key_additionalMoreKeys); readStringArray(keyAttr, R.styleable.Keyboard_Key_additionalMoreKeys);