From 4deb824f3a91e2e157a3a0334e46b9bba394bc1a Mon Sep 17 00:00:00 2001 From: Satoshi Kataoka Date: Mon, 7 Oct 2013 15:21:23 +0900 Subject: [PATCH] Add navigateEmoji Bug: 11074625 Change-Id: I1ef6b81ef923684b502c24fddb4ced8fe1691733 --- java/res/values/attrs.xml | 1 + java/res/xml/key_styles_enter.xml | 96 ++++++++++++++++++- .../keyboard/internal/KeyboardTextsSet.java | 2 + .../res/values/donottranslate-more-keys.xml | 1 + 4 files changed, 99 insertions(+), 1 deletion(-) diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 31945d020..e5fe56448 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -413,6 +413,7 @@ + diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml index 5976e95db..68c0a2350 100644 --- a/java/res/xml/key_styles_enter.xml +++ b/java/res/xml/key_styles_enter.xml @@ -23,9 +23,11 @@ > + @@ -42,6 +45,7 @@ @@ -59,6 +64,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java index 684cf632b..d219e8195 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java @@ -251,6 +251,7 @@ public final class KeyboardTextsSet { /* 146 */ "more_keys_for_single_quote", /* 147 */ "more_keys_for_double_quote", /* 148 */ "more_keys_for_tablet_double_quote", + /* 149 */ "emoji_key_as_more_key", }; private static final String EMPTY = ""; @@ -439,6 +440,7 @@ public final class KeyboardTextsSet { /* 146 */ "!fixedColumnOrder!5,!text/single_quotes,!text/single_angle_quotes", /* 147 */ "!fixedColumnOrder!5,!text/double_quotes,!text/double_angle_quotes", /* 148 */ "!fixedColumnOrder!6,!text/double_quotes,!text/single_quotes,!text/double_angle_quotes,!text/single_angle_quotes", + /* 149 */ "!icon/emoji_key|!code/key_emoji", }; /* Language af: Afrikaans */ diff --git a/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml index 44aa64cbe..39ecfab22 100644 --- a/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml +++ b/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml @@ -246,4 +246,5 @@ !fixedColumnOrder!5,!text/single_quotes,!text/single_angle_quotes !fixedColumnOrder!5,!text/double_quotes,!text/double_angle_quotes !fixedColumnOrder!6,!text/double_quotes,!text/single_quotes,!text/double_angle_quotes,!text/single_angle_quotes + !icon/emoji_key|!code/key_emoji