diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-08-28 00:42:49 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-08-28 00:42:49 -0700 |
| commit | 472d038a5ec0ad5841d9f444493a0db81647bc48 (patch) | |
| tree | 83c99f53396be79e65f5484fed6734441aaa1362 /java/res | |
| parent | 5bd273f23e3230cf029a61d2d491c99c7c591345 (diff) | |
| parent | bd4068c59534d1981cfec54d916f8279ff51874e (diff) | |
| download | latinime-472d038a5ec0ad5841d9f444493a0db81647bc48.tar.gz latinime-472d038a5ec0ad5841d9f444493a0db81647bc48.tar.xz latinime-472d038a5ec0ad5841d9f444493a0db81647bc48.zip | |
am bd4068c5: Merge "Add recents keyboard"
* commit 'bd4068c59534d1981cfec54d916f8279ff51874e':
Add recents keyboard
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values-v18/emoji-categories.xml | 13 | ||||
| -rw-r--r-- | java/res/values-v19/emoji-categories.xml | 13 | ||||
| -rw-r--r-- | java/res/values/emoji-categories.xml | 9 |
3 files changed, 3 insertions, 32 deletions
diff --git a/java/res/values-v18/emoji-categories.xml b/java/res/values-v18/emoji-categories.xml index 17a2053d2..2ea08159b 100644 --- a/java/res/values-v18/emoji-categories.xml +++ b/java/res/values-v18/emoji-categories.xml @@ -17,19 +17,6 @@ <!-- Note: This emoji code point list is valid on JB-MR2 (API == 18). There is another emoji code point list for KLP and later under res/xml/values-v19. --> <resources> - <!-- Dummy codeArrays for recents emoji keyboard. - Do not remove these keys, because they are used as a template. --> - <array - name="emoji_recents" - format="string" - > - <item>52</item> - <item>45</item> - <item>43</item> - <item>45</item> - <item>4E</item> - <item>54</item> - </array> <array name="emoji_nature" format="string" diff --git a/java/res/values-v19/emoji-categories.xml b/java/res/values-v19/emoji-categories.xml index a6affc421..658bbfa83 100644 --- a/java/res/values-v19/emoji-categories.xml +++ b/java/res/values-v19/emoji-categories.xml @@ -17,19 +17,6 @@ <!-- Note: This emoji code point list is valid on KLP and later (API >= 19). There is another emoji code point list for JB-MR2 under res/xml/values and values-v18.--> <resources> - <!-- Dummy codeArrays for recents emoji keyboard. - Do not remove these keys, because they are used as a template. --> - <array - name="emoji_recents" - format="string" - > - <item>52</item> - <item>45</item> - <item>43</item> - <item>45</item> - <item>4E</item> - <item>54</item> - </array> <array name="emoji_nature" format="string" diff --git a/java/res/values/emoji-categories.xml b/java/res/values/emoji-categories.xml index 99d7b2389..8f3dead88 100644 --- a/java/res/values/emoji-categories.xml +++ b/java/res/values/emoji-categories.xml @@ -28,12 +28,9 @@ name="emoji_recents" format="string" > - <item>52</item> - <item>45</item> - <item>43</item> - <item>45</item> - <item>4E</item> - <item>54</item> + <!-- These code point should be aligned with {@link RecentsKeyboard#TEMPLATE_KEY_CODE_*. --> + <item>30</item> + <item>31</item> </array> <array name="emoji_nature" |