Revert "Unicode 8.0 emoji changes to Google Keyboard." am: e1d5012683 am: 1ce99504c5

am: 25dcdc2b15

* commit '25dcdc2b15bafc912ebc281f22deab6538d4a1fb':
  Revert "Unicode 8.0 emoji changes to Google Keyboard."

java/res/drawable/ic_emoji_activity_holo_dark.xml

@@ -1,33 +0,0 @@
-<?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>

java/res/drawable/ic_emoji_activity_lxx_dark.xml

@@ -1,33 +0,0 @@
-<?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>

java/res/drawable/ic_emoji_activity_lxx_light.xml

@@ -1,33 +0,0 @@
-<?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>

java/res/drawable/ic_emoji_flag_holo_dark.xml

@@ -1,33 +0,0 @@
-<?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>

java/res/drawable/ic_emoji_flag_lxx_dark.xml

@@ -1,33 +0,0 @@
-<?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>

java/res/drawable/ic_emoji_flag_lxx_light.xml

@@ -1,33 +0,0 @@
-<?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>

java/res/drawable/ic_emoji_food_holo_dark.xml

@@ -1,33 +0,0 @@
-<?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>

java/res/drawable/ic_emoji_food_lxx_dark.xml

@@ -1,33 +0,0 @@
-<?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>

java/res/drawable/ic_emoji_food_lxx_light.xml

@@ -1,33 +0,0 @@
-<?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>

java/res/values/attrs.xml

@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2015, The Android Open Source Project
+** Copyright 2010, 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,16 +199,6 @@
         <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">
@@ -464,16 +454,6 @@
             <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. -->
@@ -549,16 +529,6 @@
             <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. -->

java/res/values/strings-talkback-descriptions.xml

@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2015, The Android Open Source Project
+** Copyright 2014, 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.
@@ -127,18 +127,6 @@
     <string name="spoken_descrption_emoji_category_places">Places</string>
     <!-- Description of the emoji category icon of Symbols. -->
     <string name="spoken_descrption_emoji_category_symbols">Symbols</string>
-    <!-- Description of the emoji category icon of Flags. -->
-    <string name="spoken_descrption_emoji_category_flags">Flags</string>
-    <!-- Description of the emoji category icon of Smiley & People. -->
-    <string name="spoken_descrption_emoji_category_eight_smiley_people">Smiley &amp; People</string>
-    <!-- Description of the emoji category icon of Animals & Nature. -->
-    <string name="spoken_descrption_emoji_category_eight_animals_nature">Animals &amp; Nature</string>
-    <!-- Description of the emoji category icon of Food & Drink. -->
-    <string name="spoken_descrption_emoji_category_eight_food_drink">Food &amp; Drink</string>
-    <!-- Description of the emoji category icon of Travel & Places. -->
-    <string name="spoken_descrption_emoji_category_eight_travel_places">Travel &amp; Places</string>
-    <!-- Description of the emoji category icon of Activity. -->
-    <string name="spoken_descrption_emoji_category_eight_activity">Activity</string>
     <!-- Description of the emoji category icon of Emoticons. -->
     <string name="spoken_descrption_emoji_category_emoticons">Emoticons</string>
 

java/res/values/themes-ics.xml

@@ -93,16 +93,6 @@
         <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_places_holo_dark</item>
         <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_symbols_holo_dark</item>
         <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_emoticons_holo_dark</item>
-        <item name="iconEmojiCategory7Tab">@drawable/ic_emoji_flag_holo_dark</item>
-        <item name="iconEmojiCategory8Tab">@drawable/ic_emoji_people_holo_dark</item>
-        <item name="iconEmojiCategory9Tab">@drawable/ic_emoji_nature_holo_dark</item>
-        <item name="iconEmojiCategory10Tab">@drawable/ic_emoji_food_holo_dark</item>
-        <item name="iconEmojiCategory11Tab">@drawable/ic_emoji_places_holo_dark</item>
-        <item name="iconEmojiCategory12Tab">@drawable/ic_emoji_activity_holo_dark</item>
-        <item name="iconEmojiCategory13Tab">@drawable/ic_emoji_objects_holo_dark</item>
-        <item name="iconEmojiCategory14Tab">@drawable/ic_emoji_symbols_holo_dark</item>
-        <item name="iconEmojiCategory15Tab">@drawable/ic_emoji_flag_holo_dark</item>
-        <item name="iconEmojiCategory16Tab">@drawable/ic_emoji_people_holo_dark</item>
     </style>
     <style
         name="MoreKeysKeyboard.ICS"

java/res/values/themes-klp.xml

@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2015, The Android Open Source Project
+** Copyright 2013, 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.
@@ -93,16 +93,6 @@
         <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_places_holo_dark</item>
         <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_symbols_holo_dark</item>
         <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_emoticons_holo_dark</item>
-        <item name="iconEmojiCategory7Tab">@drawable/ic_emoji_flag_holo_dark</item>
-        <item name="iconEmojiCategory8Tab">@drawable/ic_emoji_people_holo_dark</item>
-        <item name="iconEmojiCategory9Tab">@drawable/ic_emoji_nature_holo_dark</item>
-        <item name="iconEmojiCategory10Tab">@drawable/ic_emoji_food_holo_dark</item>
-        <item name="iconEmojiCategory11Tab">@drawable/ic_emoji_places_holo_dark</item>
-        <item name="iconEmojiCategory12Tab">@drawable/ic_emoji_activity_holo_dark</item>
-        <item name="iconEmojiCategory13Tab">@drawable/ic_emoji_objects_holo_dark</item>
-        <item name="iconEmojiCategory14Tab">@drawable/ic_emoji_symbols_holo_dark</item>
-        <item name="iconEmojiCategory15Tab">@drawable/ic_emoji_flag_holo_dark</item>
-        <item name="iconEmojiCategory16Tab">@drawable/ic_emoji_people_holo_dark</item>
     </style>
     <style
         name="MoreKeysKeyboard.KLP"

java/res/values/themes-lxx-dark.xml

@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2015, The Android Open Source Project
+** Copyright 2014, 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.
@@ -91,16 +91,6 @@
         <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_places_lxx_dark</item>
         <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_symbols_lxx_dark</item>
         <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_emoticons_lxx_dark</item>
-        <item name="iconEmojiCategory7Tab">@drawable/ic_emoji_flag_lxx_dark</item>
-        <item name="iconEmojiCategory8Tab">@drawable/ic_emoji_people_lxx_dark</item>
-        <item name="iconEmojiCategory9Tab">@drawable/ic_emoji_nature_lxx_dark</item>
-        <item name="iconEmojiCategory10Tab">@drawable/ic_emoji_food_lxx_dark</item>
-        <item name="iconEmojiCategory11Tab">@drawable/ic_emoji_places_lxx_dark</item>
-        <item name="iconEmojiCategory12Tab">@drawable/ic_emoji_activity_lxx_dark</item>
-        <item name="iconEmojiCategory13Tab">@drawable/ic_emoji_objects_lxx_dark</item>
-        <item name="iconEmojiCategory14Tab">@drawable/ic_emoji_symbols_lxx_dark</item>
-        <item name="iconEmojiCategory15Tab">@drawable/ic_emoji_flag_lxx_dark</item>
-        <item name="iconEmojiCategory16Tab">@drawable/ic_emoji_people_lxx_dark</item>
     </style>
     <style
         name="MoreKeysKeyboard.LXX_Dark"

java/res/values/themes-lxx-light.xml

@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2015, The Android Open Source Project
+** Copyright 2014, 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.
@@ -91,16 +91,6 @@
         <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_places_lxx_light</item>
         <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_symbols_lxx_light</item>
         <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_emoticons_lxx_light</item>
-        <item name="iconEmojiCategory7Tab">@drawable/ic_emoji_flag_lxx_light</item>
-        <item name="iconEmojiCategory8Tab">@drawable/ic_emoji_people_lxx_light</item>
-        <item name="iconEmojiCategory9Tab">@drawable/ic_emoji_nature_lxx_light</item>
-        <item name="iconEmojiCategory10Tab">@drawable/ic_emoji_food_lxx_light</item>
-        <item name="iconEmojiCategory11Tab">@drawable/ic_emoji_places_lxx_light</item>
-        <item name="iconEmojiCategory12Tab">@drawable/ic_emoji_activity_lxx_light</item>
-        <item name="iconEmojiCategory13Tab">@drawable/ic_emoji_objects_lxx_light</item>
-        <item name="iconEmojiCategory14Tab">@drawable/ic_emoji_symbols_lxx_light</item>
-        <item name="iconEmojiCategory15Tab">@drawable/ic_emoji_flag_lxx_light</item>
-        <item name="iconEmojiCategory16Tab">@drawable/ic_emoji_people_lxx_light</item>
     </style>
     <style
         name="MoreKeysKeyboard.LXX_Light"