diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-10-17 01:41:00 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-10-17 01:41:00 -0700 |
| commit | 28af0d5a1af8c40142a8dbf58baf1b3498b8e73a (patch) | |
| tree | a935c1704d64656b765b177e8899d26b27a3d932 /java | |
| parent | 1b8af7593bdc5b1513776111cc9aaa9807fc1eef (diff) | |
| parent | 0d43ce28c7ccf50ea8b8739409e357f4ec1e6020 (diff) | |
| download | latinime-28af0d5a1af8c40142a8dbf58baf1b3498b8e73a.tar.gz latinime-28af0d5a1af8c40142a8dbf58baf1b3498b8e73a.tar.xz latinime-28af0d5a1af8c40142a8dbf58baf1b3498b8e73a.zip | |
am 0d43ce28: Merge "Fix keyboard layout"
* commit '0d43ce28c7ccf50ea8b8739409e357f4ec1e6020':
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> |