diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-10-17 17:44:47 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-10-17 17:44:47 -0700 |
| commit | b4b0a0507a3bde504623611bec31b110086ab416 (patch) | |
| tree | a10a2b620f7d5fb60904590b2a565d03557955ac /java | |
| parent | dcc33ab0fc246ba89b4322b07146099d2998a3cc (diff) | |
| parent | 2e7f360a04f2a840fa083dde299d10e213de7bbb (diff) | |
| download | latinime-b4b0a0507a3bde504623611bec31b110086ab416.tar.gz latinime-b4b0a0507a3bde504623611bec31b110086ab416.tar.xz latinime-b4b0a0507a3bde504623611bec31b110086ab416.zip | |
am 2e7f360a: Merge "Do not merge. Fix keyboard layout" into klp-dev
* commit '2e7f360a04f2a840fa083dde299d10e213de7bbb':
Do not merge. Fix keyboard layout
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/xml-sw600dp/rows_symbols_shift.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/key_styles_enter.xml | 3 | ||||
| -rw-r--r-- | java/res/xml/row_symbols_shift4.xml | 4 | ||||
| -rw-r--r-- | java/res/xml/rows_symbols_shift.xml | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/java/res/xml-sw600dp/rows_symbols_shift.xml b/java/res/xml-sw600dp/rows_symbols_shift.xml index aad047ff6..92299f65d 100644 --- a/java/res/xml-sw600dp/rows_symbols_shift.xml +++ b/java/res/xml-sw600dp/rows_symbols_shift.xml @@ -70,5 +70,7 @@ latin:keyWidth="10%p" /> <include latin:keyboardLayout="@xml/row_symbols_shift4" /> + <include + latin:keyboardLayout="@xml/key_f2" /> </Row> </merge> diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml index 568c60270..083e6a67d 100644 --- a/java/res/xml/key_styles_enter.xml +++ b/java/res/xml/key_styles_enter.xml @@ -190,6 +190,7 @@ > <key-style latin:styleName="navigateMoreKeysStyle" + latin:keyLabelFlags="hasPopupHint|preserveCase" latin:moreKeys="!text/emoji_key_as_more_key" /> </case> <case @@ -207,6 +208,7 @@ > <key-style latin:styleName="navigateMoreKeysStyle" + latin:keyLabelFlags="hasPopupHint|preserveCase" latin:moreKeys="!text/emoji_key_as_more_key" /> </case> <case @@ -242,6 +244,7 @@ > <key-style latin:styleName="navigateMoreKeysStyle" + latin:keyLabelFlags="hasPopupHint|preserveCase" latin:moreKeys="!text/emoji_key_as_more_key" /> </case> <default> diff --git a/java/res/xml/row_symbols_shift4.xml b/java/res/xml/row_symbols_shift4.xml index 72d24a321..0909374f4 100644 --- a/java/res/xml/row_symbols_shift4.xml +++ b/java/res/xml/row_symbols_shift4.xml @@ -23,8 +23,4 @@ <include latin:keyboardLayout="@xml/key_space_symbols" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> - - <include - latin:keyboardLayout="@xml/key_f2" /> - </merge> diff --git a/java/res/xml/rows_symbols_shift.xml b/java/res/xml/rows_symbols_shift.xml index 45ada2a61..c4bdb9f38 100644 --- a/java/res/xml/rows_symbols_shift.xml +++ b/java/res/xml/rows_symbols_shift.xml @@ -60,5 +60,8 @@ latin:keyWidth="15%p" /> <include latin:keyboardLayout="@xml/row_symbols_shift4" /> + <Key + latin:keyStyle="enterKeyStyle" + latin:keyWidth="fillRight" /> </Row> </merge> |