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

am 5962312b: Custom action label should be a part of keyboard identifier 

* commit '5962312b0724d8546ef76e3cd065b7baf578822f':
  Custom action label should be a part of keyboard identifier
main
Tadashi G. Takaoka 2012-02-08 06:48:59 -08:00 committed by Android Git Automerger
parent cc9400555c 5962312b07
commit 69b81e3dd3
7 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/res/values/keycodes.xml
View File

@ -21,7 +21,7 @@
<resources>
<!-- These code should be aligned with Keyboard.CODE_*. -->
<integer name="key_tab">9</integer>
<integer name="key_return">10</integer>
<integer name="key_enter">10</integer>
<integer name="key_space">32</integer>
<integer name="key_shift">-1</integer>
<integer name="key_switch_alpha_symbol">-2</integer>

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

@ -111,6 +111,7 @@
latin:code="@integer/key_shortcut"
latin:keyIcon="iconShortcutKey"
latin:keyIconDisabled="iconDisabledShortcutKey"
latin:keyLabelFlags="preserveCase"
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
latin:parentStyle="f2PopupStyle" />
<key-style

1
java/res/xml-sw768dp/key_styles_common.xml
View File

@ -93,6 +93,7 @@
latin:code="@integer/key_shortcut"
latin:keyIcon="iconShortcutKey"
latin:keyIconDisabled="iconDisabledShortcutKey"
latin:keyLabelFlags="preserveCase"
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
latin:backgroundType="functional" />
<key-style

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

@ -110,6 +110,7 @@
latin:code="@integer/key_shortcut"
latin:keyIcon="iconShortcutKey"
latin:keyIconDisabled="iconDisabledShortcutKey"
latin:keyLabelFlags="preserveCase"
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
latin:altCode="@integer/key_space"
latin:parentStyle="f1PopupStyle" />

2
java/res/xml/key_styles_enter_phone.xml
View File

@ -24,7 +24,7 @@
<!-- Enter key style -->
<key-style
latin:styleName="defaultEnterKeyStyle"
latin:code="@integer/key_return"
latin:code="@integer/key_enter"
latin:keyIcon="iconReturnKey"
latin:keyLabelFlags="autoXScale|preserveCase"
latin:keyActionFlags="noKeyPreview"

2
java/res/xml/key_styles_enter_tablet.xml
View File

@ -24,7 +24,7 @@
<!-- Enter key style -->
<key-style
latin:styleName="defaultEnterKeyStyle"
latin:code="@integer/key_return"
latin:code="@integer/key_enter"
latin:keyIcon="iconReturnKey"
latin:keyLabelFlags="autoXScale|preserveCase"
latin:keyActionFlags="noKeyPreview"

2
java/src/com/android/inputmethod/keyboard/KeyboardId.java
View File

@ -102,6 +102,7 @@ public class KeyboardId {
id.mHasShortcutKey,
id.isMultiLine(),
id.imeAction(),
id.mCustomActionLabel,
id.mLocale
});
}
@ -121,6 +122,7 @@ public class KeyboardId {
&& other.mHasShortcutKey == this.mHasShortcutKey
&& other.isMultiLine() == this.isMultiLine()
&& other.imeAction() == this.imeAction()
&& TextUtils.equals(other.mCustomActionLabel, this.mCustomActionLabel)
&& other.mLocale.equals(this.mLocale);
}