diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-01-15 09:37:32 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-01-15 09:37:32 -0800 |
| commit | e988562ad69132295eee99549a1c408c28c5bf86 (patch) | |
| tree | a6d6e7ee989afa5c644d300f8b9d487721f00057 /java/res | |
| parent | 9e1269417020734e6996c9ad2b9b672f437f9a6a (diff) | |
| parent | 34b8856077220cfaa475a13d383bcc69ef470af4 (diff) | |
| download | latinime-e988562ad69132295eee99549a1c408c28c5bf86.tar.gz latinime-e988562ad69132295eee99549a1c408c28c5bf86.tar.xz latinime-e988562ad69132295eee99549a1c408c28c5bf86.zip | |
am 34b88560: Merge "Distinguish action-enter/shift-enter/enter"
* commit '34b8856077220cfaa475a13d383bcc69ef470af4':
Distinguish action-enter/shift-enter/enter
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/xml/key_styles_common.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/key_styles_enter.xml | 22 |
2 files changed, 14 insertions, 10 deletions
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index 91ebac1da..0834adf20 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -71,7 +71,7 @@ > <key-style latin:styleName="enterKeyStyle" - latin:parentStyle="defaultEnterKeyStyle" /> + latin:parentStyle="shiftEnterKeyStyle" /> </case> <!-- Smiley in textShortMessage field. Overrides common enter key style. --> diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml index 3788ca8ba..61a515bad 100644 --- a/java/res/xml/key_styles_enter.xml +++ b/java/res/xml/key_styles_enter.xml @@ -99,7 +99,11 @@ latin:backgroundType="functional" latin:parentStyle="navigateMoreKeysStyle" /> <key-style - latin:styleName="defaultActionKeyStyle" + latin:styleName="shiftEnterKeyStyle" + latin:code="!code/key_shift_enter" + latin:parentStyle="defaultEnterKeyStyle" /> + <key-style + latin:styleName="defaultActionEnterKeyStyle" latin:code="!code/key_action_enter" latin:keyIcon="!icon/undefined" latin:backgroundType="action" @@ -112,7 +116,7 @@ > <key-style latin:styleName="enterKeyStyle" - latin:parentStyle="defaultEnterKeyStyle" /> + latin:parentStyle="shiftEnterKeyStyle" /> </case> <case latin:imeAction="actionGo" @@ -120,7 +124,7 @@ <key-style latin:styleName="enterKeyStyle" latin:keyLabel="!text/label_go_key" - latin:parentStyle="defaultActionKeyStyle" /> + latin:parentStyle="defaultActionEnterKeyStyle" /> </case> <case latin:imeAction="actionNext" @@ -128,7 +132,7 @@ <key-style latin:styleName="enterKeyStyle" latin:keyLabel="!text/label_next_key" - latin:parentStyle="defaultActionKeyStyle" /> + latin:parentStyle="defaultActionEnterKeyStyle" /> </case> <case latin:imeAction="actionPrevious" @@ -136,7 +140,7 @@ <key-style latin:styleName="enterKeyStyle" latin:keyLabel="!text/label_previous_key" - latin:parentStyle="defaultActionKeyStyle" /> + latin:parentStyle="defaultActionEnterKeyStyle" /> </case> <case latin:imeAction="actionDone" @@ -144,7 +148,7 @@ <key-style latin:styleName="enterKeyStyle" latin:keyLabel="!text/label_done_key" - latin:parentStyle="defaultActionKeyStyle" /> + latin:parentStyle="defaultActionEnterKeyStyle" /> </case> <case latin:imeAction="actionSend" @@ -152,7 +156,7 @@ <key-style latin:styleName="enterKeyStyle" latin:keyLabel="!text/label_send_key" - latin:parentStyle="defaultActionKeyStyle" /> + latin:parentStyle="defaultActionEnterKeyStyle" /> </case> <case latin:imeAction="actionSearch" @@ -160,7 +164,7 @@ <key-style latin:styleName="enterKeyStyle" latin:keyIcon="!icon/search_key" - latin:parentStyle="defaultActionKeyStyle" /> + latin:parentStyle="defaultActionEnterKeyStyle" /> </case> <case latin:imeAction="actionCustomLabel" @@ -168,7 +172,7 @@ <key-style latin:styleName="enterKeyStyle" latin:keyLabelFlags="fromCustomActionLabel" - latin:parentStyle="defaultActionKeyStyle" /> + latin:parentStyle="defaultActionEnterKeyStyle" /> </case> <!-- imeAction is either actionNone or actionUnspecified. --> <default> |