aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/drawable
diff options
context:
space:
mode:
Diffstat (limited to 'java/res/drawable')
-rw-r--r--java/res/drawable/btn_keyboard_key_functional_ics.xml4
-rw-r--r--java/res/drawable/btn_keyboard_key_functional_klp.xml4
-rw-r--r--java/res/drawable/btn_keyboard_key_functional_lxx_dark.xml (renamed from java/res/drawable/keyboard_key_feedback_gb.xml)14
-rw-r--r--java/res/drawable/btn_keyboard_key_ics.xml24
-rw-r--r--java/res/drawable/btn_keyboard_key_klp.xml24
-rw-r--r--java/res/drawable/btn_keyboard_key_lxx_dark.xml (renamed from java/res/drawable/btn_keyboard_key_gb.xml)26
-rw-r--r--java/res/drawable/btn_keyboard_key_popup_ics.xml2
-rw-r--r--java/res/drawable/btn_keyboard_key_popup_klp.xml2
-rw-r--r--java/res/drawable/btn_keyboard_spacebar_ics.xml (renamed from java/res/drawable/btn_keyboard_key_functional_gb.xml)5
-rw-r--r--java/res/drawable/btn_keyboard_spacebar_klp.xml21
-rw-r--r--java/res/drawable/btn_keyboard_spacebar_lxx_dark.xml (renamed from java/res/drawable/btn_keyboard_key_popup_gb.xml)6
-rw-r--r--java/res/drawable/btn_suggestion_lxx_dark.xml (renamed from java/res/drawable/btn_suggestion_gb.xml)4
-rw-r--r--java/res/drawable/ic_emoji_emoticons_holo_dark.xml32
-rw-r--r--java/res/drawable/ic_emoji_nature_holo_dark.xml (renamed from java/res/drawable/ic_emoji_nature_light.xml)8
-rw-r--r--java/res/drawable/ic_emoji_objects_holo_dark.xml (renamed from java/res/drawable/ic_emoji_places_light.xml)8
-rw-r--r--java/res/drawable/ic_emoji_people_holo_dark.xml (renamed from java/res/drawable/ic_emoji_objects_light.xml)8
-rw-r--r--java/res/drawable/ic_emoji_places_holo_dark.xml (renamed from java/res/drawable/ic_emoji_people_light.xml)8
-rw-r--r--java/res/drawable/ic_emoji_recent_light.xml32
-rw-r--r--java/res/drawable/ic_emoji_recents_holo_dark.xml32
-rw-r--r--java/res/drawable/ic_emoji_symbols_holo_dark.xml32
-rw-r--r--java/res/drawable/ic_emoji_symbols_light.xml32
-rw-r--r--java/res/drawable/keyboard_key_feedback_lxx_dark.xml36
-rw-r--r--java/res/drawable/transparent.xml30
23 files changed, 216 insertions, 178 deletions
diff --git a/java/res/drawable/btn_keyboard_key_functional_ics.xml b/java/res/drawable/btn_keyboard_key_functional_ics.xml
index 847ca72f4..846bccc49 100644
--- a/java/res/drawable/btn_keyboard_key_functional_ics.xml
+++ b/java/res/drawable/btn_keyboard_key_functional_ics.xml
@@ -17,6 +17,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Functional keys. -->
<item android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_dark_pressed_ics" />
- <item android:drawable="@drawable/btn_keyboard_key_dark_normal_holo" />
+ android:drawable="@drawable/btn_keyboard_key_pressed_ics_dark" />
+ <item android:drawable="@drawable/btn_keyboard_key_normal_holo_dark" />
</selector>
diff --git a/java/res/drawable/btn_keyboard_key_functional_klp.xml b/java/res/drawable/btn_keyboard_key_functional_klp.xml
index 0e17ed234..7b444f7c5 100644
--- a/java/res/drawable/btn_keyboard_key_functional_klp.xml
+++ b/java/res/drawable/btn_keyboard_key_functional_klp.xml
@@ -17,6 +17,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Functional keys. -->
<item android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_dark_pressed_klp" />
- <item android:drawable="@drawable/btn_keyboard_key_dark_normal_holo" />
+ android:drawable="@drawable/btn_keyboard_key_pressed_klp_dark" />
+ <item android:drawable="@drawable/btn_keyboard_key_normal_holo_dark" />
</selector>
diff --git a/java/res/drawable/keyboard_key_feedback_gb.xml b/java/res/drawable/btn_keyboard_key_functional_lxx_dark.xml
index 397e948d8..fd1dbb9f0 100644
--- a/java/res/drawable/keyboard_key_feedback_gb.xml
+++ b/java/res/drawable/btn_keyboard_key_functional_lxx_dark.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
+<!-- Copyright (C) 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.
@@ -14,11 +14,9 @@
limitations under the License.
-->
-<selector
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <item latin:state_has_morekeys="true"
- android:drawable="@drawable/keyboard_key_feedback_more_background" />
- <item android:drawable="@drawable/keyboard_key_feedback_background" />
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- Functional keys. -->
+ <item android:state_pressed="true"
+ android:drawable="@color/key_background_pressed_lxx_dark" />
+ <item android:drawable="@color/key_background_lxx_dark" />
</selector>
diff --git a/java/res/drawable/btn_keyboard_key_ics.xml b/java/res/drawable/btn_keyboard_key_ics.xml
index 259bb9ba5..0bb098d23 100644
--- a/java/res/drawable/btn_keyboard_key_ics.xml
+++ b/java/res/drawable/btn_keyboard_key_ics.xml
@@ -15,34 +15,28 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <!-- Functional keys. -->
- <item android:state_single="true" android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_dark_pressed_ics" />
- <item android:state_single="true"
- android:drawable="@drawable/btn_keyboard_key_dark_normal_holo" />
-
<!-- Action keys. -->
<item android:state_active="true" android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_dark_pressed_ics" />
+ android:drawable="@drawable/btn_keyboard_key_pressed_ics_dark" />
<item android:state_active="true"
- android:drawable="@drawable/btn_keyboard_key_dark_active_ics" />
+ android:drawable="@drawable/btn_keyboard_key_active_ics_dark" />
<!-- Toggle keys. Use checkable/checked state. -->
<item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_dark_pressed_on_ics" />
+ android:drawable="@drawable/btn_keyboard_key_pressed_on_ics_dark" />
<item android:state_checkable="true" android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_dark_pressed_off_ics" />
+ android:drawable="@drawable/btn_keyboard_key_pressed_off_ics_dark" />
<item android:state_checkable="true" android:state_checked="true"
- android:drawable="@drawable/btn_keyboard_key_dark_normal_on_ics" />
+ android:drawable="@drawable/btn_keyboard_key_normal_on_ics_dark" />
<item android:state_checkable="true"
- android:drawable="@drawable/btn_keyboard_key_dark_normal_off_holo" />
+ android:drawable="@drawable/btn_keyboard_key_normal_off_holo_dark" />
<!-- Empty background keys. -->
<item android:state_empty="true"
- android:drawable="@drawable/transparent" />
+ android:drawable="@android:color/transparent" />
<!-- Normal keys. -->
<item android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_light_pressed_ics" />
- <item android:drawable="@drawable/btn_keyboard_key_light_normal_holo" />
+ android:drawable="@drawable/btn_keyboard_key_pressed_ics_light" />
+ <item android:drawable="@drawable/btn_keyboard_key_normal_holo_light" />
</selector>
diff --git a/java/res/drawable/btn_keyboard_key_klp.xml b/java/res/drawable/btn_keyboard_key_klp.xml
index 16b5fa00b..2a202a179 100644
--- a/java/res/drawable/btn_keyboard_key_klp.xml
+++ b/java/res/drawable/btn_keyboard_key_klp.xml
@@ -15,34 +15,28 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <!-- Functional keys. -->
- <item android:state_single="true" android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_dark_pressed_klp" />
- <item android:state_single="true"
- android:drawable="@drawable/btn_keyboard_key_dark_normal_holo" />
-
<!-- Action keys. -->
<item android:state_active="true" android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_dark_pressed_klp" />
+ android:drawable="@drawable/btn_keyboard_key_pressed_klp_dark" />
<item android:state_active="true"
- android:drawable="@drawable/btn_keyboard_key_dark_active_klp" />
+ android:drawable="@drawable/btn_keyboard_key_active_klp_dark" />
<!-- Toggle keys. Use checkable/checked state. -->
<item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_dark_pressed_on_klp" />
+ android:drawable="@drawable/btn_keyboard_key_pressed_on_klp_dark" />
<item android:state_checkable="true" android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_dark_pressed_off_klp" />
+ android:drawable="@drawable/btn_keyboard_key_pressed_off_klp_dark" />
<item android:state_checkable="true" android:state_checked="true"
- android:drawable="@drawable/btn_keyboard_key_dark_normal_on_klp" />
+ android:drawable="@drawable/btn_keyboard_key_normal_on_klp_dark" />
<item android:state_checkable="true"
- android:drawable="@drawable/btn_keyboard_key_dark_normal_off_holo" />
+ android:drawable="@drawable/btn_keyboard_key_normal_off_holo_dark" />
<!-- Empty background keys. -->
<item android:state_empty="true"
- android:drawable="@drawable/transparent" />
+ android:drawable="@android:color/transparent" />
<!-- Normal keys. -->
<item android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_light_pressed_klp" />
- <item android:drawable="@drawable/btn_keyboard_key_light_normal_holo" />
+ android:drawable="@drawable/btn_keyboard_key_pressed_klp_light" />
+ <item android:drawable="@drawable/btn_keyboard_key_normal_holo_light" />
</selector>
diff --git a/java/res/drawable/btn_keyboard_key_gb.xml b/java/res/drawable/btn_keyboard_key_lxx_dark.xml
index 3fc253e85..bb1789ae3 100644
--- a/java/res/drawable/btn_keyboard_key_gb.xml
+++ b/java/res/drawable/btn_keyboard_key_lxx_dark.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
+<!-- Copyright (C) 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.
@@ -15,34 +15,28 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <!-- Functional keys. -->
- <item android:state_single="true" android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_dark_pressed" />
- <item android:state_single="true"
- android:drawable="@drawable/btn_keyboard_key_dark_normal" />
-
<!-- Action keys. -->
<item android:state_active="true" android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_dark_pressed" />
+ android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx_dark" />
<item android:state_active="true"
- android:drawable="@drawable/btn_keyboard_key_dark_normal" />
+ android:drawable="@drawable/btn_keyboard_key_active_lxx_dark" />
<!-- Toggle keys. Use checkable/checked state. -->
<item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_dark_pressed_on" />
+ android:drawable="@drawable/btn_keyboard_key_pressed_on_lxx_dark" />
<item android:state_checkable="true" android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_dark_pressed_off" />
+ android:drawable="@drawable/btn_keyboard_key_pressed_off_lxx_dark" />
<item android:state_checkable="true" android:state_checked="true"
- android:drawable="@drawable/btn_keyboard_key_dark_normal_on" />
+ android:drawable="@drawable/btn_keyboard_key_normal_on_lxx_dark" />
<item android:state_checkable="true"
- android:drawable="@drawable/btn_keyboard_key_dark_normal_off" />
+ android:drawable="@drawable/btn_keyboard_key_normal_off_lxx_dark" />
<!-- Empty background keys. -->
<item android:state_empty="true"
- android:drawable="@drawable/transparent" />
+ android:drawable="@color/key_background_lxx_dark" />
<!-- Normal keys. -->
<item android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_light_pressed" />
- <item android:drawable="@drawable/btn_keyboard_key_light_normal" />
+ android:drawable="@color/key_background_pressed_lxx_dark" />
+ <item android:drawable="@color/key_background_lxx_dark" />
</selector>
diff --git a/java/res/drawable/btn_keyboard_key_popup_ics.xml b/java/res/drawable/btn_keyboard_key_popup_ics.xml
index 31b613176..17d646b8f 100644
--- a/java/res/drawable/btn_keyboard_key_popup_ics.xml
+++ b/java/res/drawable/btn_keyboard_key_popup_ics.xml
@@ -17,5 +17,5 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/btn_keyboard_key_popup_selected_ics" />
- <item android:drawable="@drawable/transparent" />
+ <item android:drawable="@android:color/transparent" />
</selector>
diff --git a/java/res/drawable/btn_keyboard_key_popup_klp.xml b/java/res/drawable/btn_keyboard_key_popup_klp.xml
index 62cbca8ae..9dfc93ae8 100644
--- a/java/res/drawable/btn_keyboard_key_popup_klp.xml
+++ b/java/res/drawable/btn_keyboard_key_popup_klp.xml
@@ -17,5 +17,5 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/btn_keyboard_key_popup_selected_klp" />
- <item android:drawable="@drawable/transparent" />
+ <item android:drawable="@android:color/transparent" />
</selector>
diff --git a/java/res/drawable/btn_keyboard_key_functional_gb.xml b/java/res/drawable/btn_keyboard_spacebar_ics.xml
index 431359c20..229f7a965 100644
--- a/java/res/drawable/btn_keyboard_key_functional_gb.xml
+++ b/java/res/drawable/btn_keyboard_spacebar_ics.xml
@@ -15,8 +15,7 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <!-- Functional keys. -->
<item android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_dark_pressed" />
- <item android:drawable="@drawable/btn_keyboard_key_dark_normal" />
+ android:drawable="@drawable/btn_keyboard_key_pressed_ics_light" />
+ <item android:drawable="@drawable/btn_keyboard_key_normal_holo_light" />
</selector>
diff --git a/java/res/drawable/btn_keyboard_spacebar_klp.xml b/java/res/drawable/btn_keyboard_spacebar_klp.xml
new file mode 100644
index 000000000..9882f9a74
--- /dev/null
+++ b/java/res/drawable/btn_keyboard_spacebar_klp.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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.
+ 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_pressed="true"
+ android:drawable="@drawable/btn_keyboard_key_pressed_klp_light" />
+ <item android:drawable="@drawable/btn_keyboard_key_normal_holo_light" />
+</selector>
diff --git a/java/res/drawable/btn_keyboard_key_popup_gb.xml b/java/res/drawable/btn_keyboard_spacebar_lxx_dark.xml
index 9e3670d22..5c595d9ed 100644
--- a/java/res/drawable/btn_keyboard_key_popup_gb.xml
+++ b/java/res/drawable/btn_keyboard_spacebar_lxx_dark.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!-- Copyright (C) 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.
@@ -16,6 +16,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_light_popup_selected" />
- <item android:drawable="@drawable/transparent" />
+ android:drawable="@color/key_background_pressed_lxx_dark" />
+ <item android:drawable="@color/key_background_lxx_dark" />
</selector>
diff --git a/java/res/drawable/btn_suggestion_gb.xml b/java/res/drawable/btn_suggestion_lxx_dark.xml
index cde12fe55..84a91209e 100644
--- a/java/res/drawable/btn_suggestion_gb.xml
+++ b/java/res/drawable/btn_suggestion_lxx_dark.xml
@@ -2,7 +2,7 @@
<!--
/*
**
-** Copyright 2011, 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.
@@ -23,5 +23,5 @@
>
<item
android:state_pressed="true"
- android:drawable="@drawable/btn_suggestion_pressed" />
+ android:drawable="@color/suggested_word_background_selected_lxx_dark" />
</selector>
diff --git a/java/res/drawable/ic_emoji_emoticons_holo_dark.xml b/java/res/drawable/ic_emoji_emoticons_holo_dark.xml
new file mode 100644
index 000000000..59e23499e
--- /dev/null
+++ b/java/res/drawable/ic_emoji_emoticons_holo_dark.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** 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.
+** 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_emoticons_activated_holo_dark" />
+ <item
+ android:state_pressed="true"
+ android:drawable="@drawable/ic_emoji_emoticons_activated_holo_dark" />
+ <item
+ android:state_selected="true"
+ android:drawable="@drawable/ic_emoji_emoticons_activated_holo_dark" />
+ <item android:drawable="@drawable/ic_emoji_emoticons_normal_holo_dark" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_nature_light.xml b/java/res/drawable/ic_emoji_nature_holo_dark.xml
index 543409e03..b94629580 100644
--- a/java/res/drawable/ic_emoji_nature_light.xml
+++ b/java/res/drawable/ic_emoji_nature_holo_dark.xml
@@ -21,13 +21,13 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_focused="true"
- android:drawable="@drawable/ic_emoji_nature_light_activated" />
+ android:drawable="@drawable/ic_emoji_nature_activated_holo_dark" />
<item
android:state_pressed="true"
- android:drawable="@drawable/ic_emoji_nature_light_activated" />
+ android:drawable="@drawable/ic_emoji_nature_activated_holo_dark" />
<item
android:state_selected="true"
- android:drawable="@drawable/ic_emoji_nature_light_activated" />
+ android:drawable="@drawable/ic_emoji_nature_activated_holo_dark" />
<item
- android:drawable="@drawable/ic_emoji_nature_light_normal" />
+ android:drawable="@drawable/ic_emoji_nature_normal_holo_dark" />
</selector>
diff --git a/java/res/drawable/ic_emoji_places_light.xml b/java/res/drawable/ic_emoji_objects_holo_dark.xml
index 312cad9c3..266e81e0b 100644
--- a/java/res/drawable/ic_emoji_places_light.xml
+++ b/java/res/drawable/ic_emoji_objects_holo_dark.xml
@@ -21,12 +21,12 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_focused="true"
- android:drawable="@drawable/ic_emoji_places_light_activated" />
+ android:drawable="@drawable/ic_emoji_objects_activated_holo_dark" />
<item
android:state_pressed="true"
- android:drawable="@drawable/ic_emoji_places_light_activated" />
+ android:drawable="@drawable/ic_emoji_objects_activated_holo_dark" />
<item
android:state_selected="true"
- android:drawable="@drawable/ic_emoji_places_light_activated" />
- <item android:drawable="@drawable/ic_emoji_places_light_normal" />
+ android:drawable="@drawable/ic_emoji_objects_activated_holo_dark" />
+ <item android:drawable="@drawable/ic_emoji_objects_normal_holo_dark" />
</selector>
diff --git a/java/res/drawable/ic_emoji_objects_light.xml b/java/res/drawable/ic_emoji_people_holo_dark.xml
index 4096e695b..15955d261 100644
--- a/java/res/drawable/ic_emoji_objects_light.xml
+++ b/java/res/drawable/ic_emoji_people_holo_dark.xml
@@ -21,12 +21,12 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_focused="true"
- android:drawable="@drawable/ic_emoji_objects_light_activated" />
+ android:drawable="@drawable/ic_emoji_people_activated_holo_dark" />
<item
android:state_pressed="true"
- android:drawable="@drawable/ic_emoji_objects_light_activated" />
+ android:drawable="@drawable/ic_emoji_people_activated_holo_dark" />
<item
android:state_selected="true"
- android:drawable="@drawable/ic_emoji_objects_light_activated" />
- <item android:drawable="@drawable/ic_emoji_objects_light_normal" />
+ android:drawable="@drawable/ic_emoji_people_activated_holo_dark" />
+ <item android:drawable="@drawable/ic_emoji_people_normal_holo_dark" />
</selector>
diff --git a/java/res/drawable/ic_emoji_people_light.xml b/java/res/drawable/ic_emoji_places_holo_dark.xml
index ea9e406a4..260bbd843 100644
--- a/java/res/drawable/ic_emoji_people_light.xml
+++ b/java/res/drawable/ic_emoji_places_holo_dark.xml
@@ -21,12 +21,12 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_focused="true"
- android:drawable="@drawable/ic_emoji_people_light_activated" />
+ android:drawable="@drawable/ic_emoji_places_activated_holo_dark" />
<item
android:state_pressed="true"
- android:drawable="@drawable/ic_emoji_people_light_activated" />
+ android:drawable="@drawable/ic_emoji_places_activated_holo_dark" />
<item
android:state_selected="true"
- android:drawable="@drawable/ic_emoji_people_light_activated" />
- <item android:drawable="@drawable/ic_emoji_people_light_normal" />
+ android:drawable="@drawable/ic_emoji_places_activated_holo_dark" />
+ <item android:drawable="@drawable/ic_emoji_places_normal_holo_dark" />
</selector>
diff --git a/java/res/drawable/ic_emoji_recent_light.xml b/java/res/drawable/ic_emoji_recent_light.xml
deleted file mode 100644
index 8c2123f83..000000000
--- a/java/res/drawable/ic_emoji_recent_light.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** 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.
-** 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_recent_light_activated" />
- <item
- android:state_pressed="true"
- android:drawable="@drawable/ic_emoji_recent_light_activated" />
- <item
- android:state_selected="true"
- android:drawable="@drawable/ic_emoji_recent_light_activated" />
- <item android:drawable="@drawable/ic_emoji_recent_light_normal" />
-</selector>
diff --git a/java/res/drawable/ic_emoji_recents_holo_dark.xml b/java/res/drawable/ic_emoji_recents_holo_dark.xml
new file mode 100644
index 000000000..f14349f34
--- /dev/null
+++ b/java/res/drawable/ic_emoji_recents_holo_dark.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** 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.
+** 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_recents_activated_holo_dark" />
+ <item
+ android:state_pressed="true"
+ android:drawable="@drawable/ic_emoji_recents_activated_holo_dark" />
+ <item
+ android:state_selected="true"
+ android:drawable="@drawable/ic_emoji_recents_activated_holo_dark" />
+ <item android:drawable="@drawable/ic_emoji_recents_normal_holo_dark" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_symbols_holo_dark.xml b/java/res/drawable/ic_emoji_symbols_holo_dark.xml
new file mode 100644
index 000000000..831d6594b
--- /dev/null
+++ b/java/res/drawable/ic_emoji_symbols_holo_dark.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** 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.
+** 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_symbols_activated_holo_dark" />
+ <item
+ android:state_pressed="true"
+ android:drawable="@drawable/ic_emoji_symbols_activated_holo_dark" />
+ <item
+ android:state_selected="true"
+ android:drawable="@drawable/ic_emoji_symbols_activated_holo_dark" />
+ <item android:drawable="@drawable/ic_emoji_symbols_normal_holo_dark" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_symbols_light.xml b/java/res/drawable/ic_emoji_symbols_light.xml
deleted file mode 100644
index 79aaf0fc5..000000000
--- a/java/res/drawable/ic_emoji_symbols_light.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** 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.
-** 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_symbols_light_activated" />
- <item
- android:state_pressed="true"
- android:drawable="@drawable/ic_emoji_symbols_light_activated" />
- <item
- android:state_selected="true"
- android:drawable="@drawable/ic_emoji_symbols_light_activated" />
- <item android:drawable="@drawable/ic_emoji_symbols_light_normal" />
-</selector>
diff --git a/java/res/drawable/keyboard_key_feedback_lxx_dark.xml b/java/res/drawable/keyboard_key_feedback_lxx_dark.xml
new file mode 100644
index 000000000..ab1109bcc
--- /dev/null
+++ b/java/res/drawable/keyboard_key_feedback_lxx_dark.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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.
+ 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"
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+ <!-- Left edge -->
+ <item latin:state_left_edge="true" latin:state_has_morekeys="true"
+ android:drawable="@drawable/keyboard_key_feedback_more_background_lxx_dark" />
+ <item latin:state_left_edge="true"
+ android:drawable="@drawable/keyboard_key_feedback_background_lxx_dark" />
+
+ <!-- Right edge -->
+ <item latin:state_right_edge="true" latin:state_has_morekeys="true"
+ android:drawable="@drawable/keyboard_key_feedback_more_background_lxx_dark" />
+ <item latin:state_right_edge="true"
+ android:drawable="@drawable/keyboard_key_feedback_background_lxx_dark" />
+
+ <item latin:state_has_morekeys="true"
+ android:drawable="@drawable/keyboard_key_feedback_more_background_lxx_dark" />
+ <item android:drawable="@drawable/keyboard_key_feedback_background_lxx_dark" />
+</selector>
diff --git a/java/res/drawable/transparent.xml b/java/res/drawable/transparent.xml
deleted file mode 100644
index 855cf2ad5..000000000
--- a/java/res/drawable/transparent.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, 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.
-*/
--->
-
-<shape
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle"
->
- <solid
- android:color="@android:color/transparent" />
- <size
- android:width="50dp"
- android:height="40dp" />
-</shape>