diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-06-04 19:23:31 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-06-04 19:23:31 -0700 |
| commit | e10f4b6b778298ecc78c1be53c0c1002be1f5f6c (patch) | |
| tree | 2fd942da022b8298997f02a5030f6bacc42d9d81 /java/res/xml-sw600dp | |
| parent | 34a9e8bdfb101f2069a8a8156d10313a662b21db (diff) | |
| parent | 0bfc2bc419e7e758c6ce17b5fb959687f583551a (diff) | |
| download | latinime-e10f4b6b778298ecc78c1be53c0c1002be1f5f6c.tar.gz latinime-e10f4b6b778298ecc78c1be53c0c1002be1f5f6c.tar.xz latinime-e10f4b6b778298ecc78c1be53c0c1002be1f5f6c.zip | |
am 0bfc2bc4: Merge "Add CODE_CAPSLOCK for long press shift key"
* commit '0bfc2bc419e7e758c6ce17b5fb959687f583551a':
Add CODE_CAPSLOCK for long press shift key
Diffstat (limited to 'java/res/xml-sw600dp')
| -rw-r--r-- | java/res/xml-sw600dp/key_styles_common.xml | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml index 6b06ce77a..a2d2fd827 100644 --- a/java/res/xml-sw600dp/key_styles_common.xml +++ b/java/res/xml-sw600dp/key_styles_common.xml @@ -36,34 +36,38 @@ </default> </switch> <!-- Functional key styles --> + <!-- Base style for shift key. A single space is used for dummy label in moreKeys. --> + <key-style + latin:styleName="baseForShiftKeyStyle" + latin:code="!code/key_shift" + latin:keyActionFlags="noKeyPreview" + latin:keyLabelFlags="preserveCase" + latin:moreKeys="!noPanelAutoMoreKey!, |!code/key_capslock" /> <switch> <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetAutomaticShifted" > <key-style latin:styleName="shiftKeyStyle" - latin:code="!code/key_shift" latin:keyIcon="!icon/shift_key_shifted" - latin:keyActionFlags="noKeyPreview" - latin:backgroundType="stickyOff" /> + latin:backgroundType="stickyOff" + latin:parentStyle="baseForShiftKeyStyle" /> </case> <case latin:keyboardLayoutSetElement="alphabetShiftLocked|alphabetShiftLockShifted" > <key-style latin:styleName="shiftKeyStyle" - latin:code="!code/key_shift" latin:keyIcon="!icon/shift_key_shifted" - latin:keyActionFlags="noKeyPreview" - latin:backgroundType="stickyOn" /> + latin:backgroundType="stickyOn" + latin:parentStyle="baseForShiftKeyStyle" /> </case> <default> <key-style latin:styleName="shiftKeyStyle" - latin:code="!code/key_shift" latin:keyIcon="!icon/shift_key" - latin:keyActionFlags="noKeyPreview" - latin:backgroundType="stickyOff" /> + latin:backgroundType="stickyOff" + latin:parentStyle="baseForShiftKeyStyle" /> </default> </switch> <key-style |