diff options
| author | Chieu Nguyen <cvnguyen@google.com> | 2015-11-11 11:03:02 -0800 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2015-11-11 13:58:15 -0800 |
| commit | 41396aa4197c576e31903b6e4d2e15e39a2fe0ff (patch) | |
| tree | 8dc9d926d3a6e25546009e8de31dc5d3779cab47 /java/res/drawable | |
| parent | 2ca6cea962662930677de4efac5a40479610a9d2 (diff) | |
| download | android_packages_inputmethods_LatinIME-41396aa4197c576e31903b6e4d2e15e39a2fe0ff.tar.gz android_packages_inputmethods_LatinIME-41396aa4197c576e31903b6e4d2e15e39a2fe0ff.tar.bz2 android_packages_inputmethods_LatinIME-41396aa4197c576e31903b6e4d2e15e39a2fe0ff.zip | |
Unicode 8.0 emoji additions to Google Keyboard.
Squashed commit of the following:
commit 8e86347b024e2460a17264fbcaa20cd6e5fd6018
Author: Chieu Nguyen <cvnguyen@google.com>
Date: Tue Nov 10 11:29:44 2015 -0800
Remove check for version code.
This was unnecessary and caused multi-codepoint
emoji to not show up on any device.
Bug: 25369504
Change-Id: Ia1e61c052444aaab824b18463c26b5a8066c65ed
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
commit 4a4a042072790b19048a14d2ddab655b1be31a6e
Author: Chieu Nguyen <cvnguyen@google.com>
Date: Sun Nov 1 18:38:20 2015 -0800
Add description strings for Unicode 8.0 new emoji.
Bug: 16185905
Bug: 25369504
Change-Id: I6048609ace715a23db5f82d47fefe4868ccb3d17
Change-Id: I30a043554b14531ab9cf89a1f663b6970d7d6863
Diffstat (limited to 'java/res/drawable')
| -rw-r--r-- | java/res/drawable/ic_emoji_activity_holo_dark.xml | 33 | ||||
| -rw-r--r-- | java/res/drawable/ic_emoji_activity_lxx_dark.xml | 33 | ||||
| -rw-r--r-- | java/res/drawable/ic_emoji_activity_lxx_light.xml | 33 | ||||
| -rw-r--r-- | java/res/drawable/ic_emoji_flag_holo_dark.xml | 33 | ||||
| -rw-r--r-- | java/res/drawable/ic_emoji_flag_lxx_dark.xml | 33 | ||||
| -rw-r--r-- | java/res/drawable/ic_emoji_flag_lxx_light.xml | 33 | ||||
| -rw-r--r-- | java/res/drawable/ic_emoji_food_holo_dark.xml | 33 | ||||
| -rw-r--r-- | java/res/drawable/ic_emoji_food_lxx_dark.xml | 33 | ||||
| -rw-r--r-- | java/res/drawable/ic_emoji_food_lxx_light.xml | 33 |
9 files changed, 297 insertions, 0 deletions
diff --git a/java/res/drawable/ic_emoji_activity_holo_dark.xml b/java/res/drawable/ic_emoji_activity_holo_dark.xml new file mode 100644 index 000000000..8eeb64019 --- /dev/null +++ b/java/res/drawable/ic_emoji_activity_holo_dark.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** 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. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:state_focused="true" + android:drawable="@drawable/ic_emoji_activity_activated_holo_dark" /> + <item + android:state_pressed="true" + android:drawable="@drawable/ic_emoji_activity_activated_holo_dark" /> + <item + android:state_selected="true" + android:drawable="@drawable/ic_emoji_activity_activated_holo_dark" /> + <item + android:drawable="@drawable/ic_emoji_activity_normal_holo_dark" /> +</selector> diff --git a/java/res/drawable/ic_emoji_activity_lxx_dark.xml b/java/res/drawable/ic_emoji_activity_lxx_dark.xml new file mode 100644 index 000000000..b916d4f9e --- /dev/null +++ b/java/res/drawable/ic_emoji_activity_lxx_dark.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** 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. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:state_focused="true" + android:drawable="@drawable/ic_emoji_activity_activated_lxx_dark" /> + <item + android:state_pressed="true" + android:drawable="@drawable/ic_emoji_activity_activated_lxx_dark" /> + <item + android:state_selected="true" + android:drawable="@drawable/ic_emoji_activity_activated_lxx_dark" /> + <item + android:drawable="@drawable/ic_emoji_activity_normal_lxx_dark" /> +</selector> diff --git a/java/res/drawable/ic_emoji_activity_lxx_light.xml b/java/res/drawable/ic_emoji_activity_lxx_light.xml new file mode 100644 index 000000000..801f8950a --- /dev/null +++ b/java/res/drawable/ic_emoji_activity_lxx_light.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** 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. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:state_focused="true" + android:drawable="@drawable/ic_emoji_activity_activated_lxx_light" /> + <item + android:state_pressed="true" + android:drawable="@drawable/ic_emoji_activity_activated_lxx_light" /> + <item + android:state_selected="true" + android:drawable="@drawable/ic_emoji_activity_activated_lxx_light" /> + <item + android:drawable="@drawable/ic_emoji_activity_normal_lxx_light" /> +</selector> diff --git a/java/res/drawable/ic_emoji_flag_holo_dark.xml b/java/res/drawable/ic_emoji_flag_holo_dark.xml new file mode 100644 index 000000000..c9857fe2f --- /dev/null +++ b/java/res/drawable/ic_emoji_flag_holo_dark.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** 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. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:state_focused="true" + android:drawable="@drawable/ic_emoji_flag_activated_holo_dark" /> + <item + android:state_pressed="true" + android:drawable="@drawable/ic_emoji_flag_activated_holo_dark" /> + <item + android:state_selected="true" + android:drawable="@drawable/ic_emoji_flag_activated_holo_dark" /> + <item + android:drawable="@drawable/ic_emoji_flag_normal_holo_dark" /> +</selector> diff --git a/java/res/drawable/ic_emoji_flag_lxx_dark.xml b/java/res/drawable/ic_emoji_flag_lxx_dark.xml new file mode 100644 index 000000000..8bd0fd745 --- /dev/null +++ b/java/res/drawable/ic_emoji_flag_lxx_dark.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** 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. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:state_focused="true" + android:drawable="@drawable/ic_emoji_flag_activated_lxx_dark" /> + <item + android:state_pressed="true" + android:drawable="@drawable/ic_emoji_flag_activated_lxx_dark" /> + <item + android:state_selected="true" + android:drawable="@drawable/ic_emoji_flag_activated_lxx_dark" /> + <item + android:drawable="@drawable/ic_emoji_flag_normal_lxx_dark" /> +</selector> diff --git a/java/res/drawable/ic_emoji_flag_lxx_light.xml b/java/res/drawable/ic_emoji_flag_lxx_light.xml new file mode 100644 index 000000000..3632cfe58 --- /dev/null +++ b/java/res/drawable/ic_emoji_flag_lxx_light.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** 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. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:state_focused="true" + android:drawable="@drawable/ic_emoji_flag_activated_lxx_light" /> + <item + android:state_pressed="true" + android:drawable="@drawable/ic_emoji_flag_activated_lxx_light" /> + <item + android:state_selected="true" + android:drawable="@drawable/ic_emoji_flag_activated_lxx_light" /> + <item + android:drawable="@drawable/ic_emoji_flag_normal_lxx_light" /> +</selector> diff --git a/java/res/drawable/ic_emoji_food_holo_dark.xml b/java/res/drawable/ic_emoji_food_holo_dark.xml new file mode 100644 index 000000000..2c6c0f2eb --- /dev/null +++ b/java/res/drawable/ic_emoji_food_holo_dark.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** 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. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:state_focused="true" + android:drawable="@drawable/ic_emoji_food_activated_holo_dark" /> + <item + android:state_pressed="true" + android:drawable="@drawable/ic_emoji_food_activated_holo_dark" /> + <item + android:state_selected="true" + android:drawable="@drawable/ic_emoji_food_activated_holo_dark" /> + <item + android:drawable="@drawable/ic_emoji_food_normal_holo_dark" /> +</selector> diff --git a/java/res/drawable/ic_emoji_food_lxx_dark.xml b/java/res/drawable/ic_emoji_food_lxx_dark.xml new file mode 100644 index 000000000..19d7d5700 --- /dev/null +++ b/java/res/drawable/ic_emoji_food_lxx_dark.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** 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. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:state_focused="true" + android:drawable="@drawable/ic_emoji_food_activated_lxx_dark" /> + <item + android:state_pressed="true" + android:drawable="@drawable/ic_emoji_food_activated_lxx_dark" /> + <item + android:state_selected="true" + android:drawable="@drawable/ic_emoji_food_activated_lxx_dark" /> + <item + android:drawable="@drawable/ic_emoji_food_normal_lxx_dark" /> +</selector> diff --git a/java/res/drawable/ic_emoji_food_lxx_light.xml b/java/res/drawable/ic_emoji_food_lxx_light.xml new file mode 100644 index 000000000..9da2c48fd --- /dev/null +++ b/java/res/drawable/ic_emoji_food_lxx_light.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** 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. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:state_focused="true" + android:drawable="@drawable/ic_emoji_food_activated_lxx_light" /> + <item + android:state_pressed="true" + android:drawable="@drawable/ic_emoji_food_activated_lxx_light" /> + <item + android:state_selected="true" + android:drawable="@drawable/ic_emoji_food_activated_lxx_light" /> + <item + android:drawable="@drawable/ic_emoji_food_normal_lxx_light" /> +</selector> |
