aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2013-10-17 16:30:15 +0900
committerSatoshi Kataoka <satok@google.com>2013-10-17 16:37:26 +0900
commite2d531c0fd3396e0e14cb46ecfa03d7ffc568cd8 (patch)
treec600f496d55ce05dcc11295990b19763ed699498
parent36dd126ab41ad9d95ce6844be89a8e430b5f51ff (diff)
downloadlatinime-e2d531c0fd3396e0e14cb46ecfa03d7ffc568cd8.tar.gz
latinime-e2d531c0fd3396e0e14cb46ecfa03d7ffc568cd8.tar.xz
latinime-e2d531c0fd3396e0e14cb46ecfa03d7ffc568cd8.zip
Fix keyboard layout
- Show "..." on enter key if it has long-pressing emoji key - Show enter key on symbols shift keyboard Bug: 11262889 Bug: 11263464 Change-Id: If84d0cc621b12e1bf3a3102b1f09cbaedf92f007
-rw-r--r--java/res/xml-sw600dp/rows_symbols_shift.xml2
-rw-r--r--java/res/xml/key_styles_enter.xml3
-rw-r--r--java/res/xml/row_symbols_shift4.xml4
-rw-r--r--java/res/xml/rows_symbols_shift.xml3
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>