mirror of
https://gitlab.futo.org/keyboard/latinime.git
synced 2024-09-28 14:54:30 +01:00
Custom action label should be a part of keyboard identifier
Change-Id: Ia14cabc3d49fbdcb11dd00225d225fbb91cc4012
This commit is contained in:
parent
7a39bd4454
commit
5962312b07
@ -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>
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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" />
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user