Unicode 8.0 emoji changes to Google Keyboard.
Squashed commit of the following:
commit 1b924816665a3a2c48307dbdd1078f61dd3179f2
Author: Chieu Nguyen <cvnguyen@google.com>
Date: Fri Nov 6 18:12:58 2015 -0800
Fix Material icons for new tab.
Bug: 25369504
Bug: 16185905
Change-Id: I873eb9e8fc1259ac94a974c04a80a4f0d005f9c2
commit 956d5f86d2552d90d2c3240a85d5c1cddf05eda9
Author: Chieu Nguyen <cvnguyen@google.com>
Date: Fri Nov 6 17:16:10 2015 -0800
Remove extraneous TalkBack descriptions.
Bug: 25369504
Bug: 16185905
Change-Id: Iec4f0f46cf9dda169c5827168ef207e56d619096
commit 07357bdec69b5fc118c82401d59b61ad7b802c22
Author: Chieu Nguyen <cvnguyen@google.com>
Date: Fri Nov 6 16:01:34 2015 -0800
Better checking of whether to display new emoji.
Bug: 25369504
Bug: 16185905
Change-Id: I61f1b428e5a805f66eb4e9db346be8756fc84b8f
commit 666a92f17034f5a1948e70f40226ed995c72d81f
Author: Chieu Nguyen <cvnguyen@google.com>
Date: Fri Nov 6 12:54:53 2015 -0800
Fix shading on emoji category icons.
Bug: 25369504
Bug: 16185905
Change-Id: I217af3d97120e7910e9850de7ea331a461ae7e56
commit 2712432c0e7a1b90ebb7ed6bde8f87eec7bf1094
Author: Chieu Nguyen <cvnguyen@google.com>
Date: Thu Nov 5 19:06:57 2015 -0800
Add new emoji categories to Holo Blue.
Bug: 25369504
Bug: 16185905
Change-Id: Ie32af93e68e08b36a4a5861a06de511b2b190dca
commit 04c79b1f53912b263d7f7eb8b71ac802ed960a8a
Author: Chieu Nguyen <cvnguyen@google.com>
Date: Thu Nov 5 18:06:35 2015 -0800
Fix default category, remove xxxhdpi Holo icons.
Bug: 25369504
Bug: 16185905
Change-Id: I9bca795675297dceb93777d998e8f2935f7031a6
commit 15c0b578343db2baa873096891a69305398eb830
Merge: 77bc6fc 8604ce3
Author: Chieu Nguyen <cvnguyen@google.com>
Date: Fri Nov 6 00:59:08 2015 +0000
Merge changes into jb-ub-latinimegoogle
commit 77bc6fcfd760232757b5751993c0046f2a43626a
Merge: b0380a0 8604ce3
Author: Chieu Nguyen <cvnguyen@google.com>
Date: Fri Nov 6 00:59:04 2015 +0000
Merge "Remove Kosovo from flags (no glyph)." into
jb-ub-latinimegoogle
commit b0380a0744647039278ad6648b7a1bc94eeab623
Author: Chieu Nguyen <cvnguyen@google.com>
Date: Thu Nov 5 16:42:24 2015 -0800
Add icons for new emoji categories.
Bug: 25369504
Bug: 16185905
Change-Id: I1182e031994332b2e618406ad1cd467cb050766e
commit 8604ce3a34b65598101cac37a3ed3e8087fe38ca
Author: Chieu Nguyen <cvnguyen@google.com>
Date: Thu Nov 5 16:29:33 2015 -0800
Remove Kosovo from flags (no glyph).
Bug: 25369504
Bug: 16185905
Change-Id: I92c9ace19d3600cfa1f27678ada0cf45af42d8f5
commit e0489eab47d3a6d138bfa00a668f02bcb473cf88
Author: Chieu Nguyen <cvnguyen@google.com>
Date: Thu Nov 5 14:30:58 2015 -0800
Update emoji set to blacklist non-color glyphs.
Bug: 25369504
Bug: 16185905
Change-Id: I8b54217fa68da8ddaa1bbcd1845e0123ed106463
commit 9ffdcdff058d6b44cab70e4fb0bb301e39699483
Author: Chieu Nguyen <cvnguyen@google.com>
Date: Wed Nov 4 17:18:22 2015 -0800
Add Unicode 8.0 emoji to emoji palette.
Currently all emoji category tabs use the flower
icon. A future CL will update these once the
icons are finalized.
If glyphs do not exist for new emoji, the old
categories will be shown.
Bug: 25369504
Bug: 16185905
Change-Id: Ie3759bfc4c8469a17f3205b45609ce6ef7510121
Change-Id: Ia5a5879cea828ea4cb4c678765fe5d9e5ecbfcd2
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index d9e42f1..8ff5a87 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -2,7 +2,7 @@
<!--
/*
**
-** Copyright 2010, The Android Open Source Project
+** Copyright 2015, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
@@ -199,6 +199,16 @@
<attr name="iconEmojiCategory4Tab" format="reference" />
<attr name="iconEmojiCategory5Tab" format="reference" />
<attr name="iconEmojiCategory6Tab" format="reference" />
+ <attr name="iconEmojiCategory7Tab" format="reference" />
+ <attr name="iconEmojiCategory8Tab" format="reference" />
+ <attr name="iconEmojiCategory9Tab" format="reference" />
+ <attr name="iconEmojiCategory10Tab" format="reference" />
+ <attr name="iconEmojiCategory11Tab" format="reference" />
+ <attr name="iconEmojiCategory12Tab" format="reference" />
+ <attr name="iconEmojiCategory13Tab" format="reference" />
+ <attr name="iconEmojiCategory14Tab" format="reference" />
+ <attr name="iconEmojiCategory15Tab" format="reference" />
+ <attr name="iconEmojiCategory16Tab" format="reference" />
</declare-styleable>
<declare-styleable name="SuggestionStripView">
@@ -454,6 +464,16 @@
<enum name="emojiCategory4" value="14" />
<enum name="emojiCategory5" value="15" />
<enum name="emojiCategory6" value="16" />
+ <enum name="emojiCategory7" value="17" />
+ <enum name="emojiCategory8" value="18" />
+ <enum name="emojiCategory9" value="19" />
+ <enum name="emojiCategory10" value="20" />
+ <enum name="emojiCategory11" value="21" />
+ <enum name="emojiCategory12" value="22" />
+ <enum name="emojiCategory13" value="23" />
+ <enum name="emojiCategory14" value="24" />
+ <enum name="emojiCategory15" value="25" />
+ <enum name="emojiCategory16" value="26" />
</attr>
<!-- This should be aligned with Keyboard.themeId and
{@link com.android.inputmethod.keyboard.KeyboardTheme#THEME_ID_ICS} etc. -->
@@ -529,6 +549,16 @@
<enum name="emojiCategory4" value="14" />
<enum name="emojiCategory5" value="15" />
<enum name="emojiCategory6" value="16" />
+ <enum name="emojiCategory7" value="17" />
+ <enum name="emojiCategory8" value="18" />
+ <enum name="emojiCategory9" value="19" />
+ <enum name="emojiCategory10" value="20" />
+ <enum name="emojiCategory11" value="21" />
+ <enum name="emojiCategory12" value="22" />
+ <enum name="emojiCategory13" value="23" />
+ <enum name="emojiCategory14" value="24" />
+ <enum name="emojiCategory15" value="25" />
+ <enum name="emojiCategory16" value="26" />
</attr>
<attr name="elementKeyboard" format="reference"/>
<!-- Enable proximity characters correction. Disabled by default. -->