aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-05-19 05:33:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-19 05:33:28 +0000
commit3bfacd445ec5a54d5b27ae0818abc342b466aa6d (patch)
treeb953d4a600625e9c93d8f9060d1d1c862da47c81 /java/res
parentb52055bfd167df67cf4ef155324c2e896c7a20cf (diff)
parent6ea0dab845e9b767d8d7d09c3690ad0f7076b24d (diff)
downloadlatinime-3bfacd445ec5a54d5b27ae0818abc342b466aa6d.tar.gz
latinime-3bfacd445ec5a54d5b27ae0818abc342b466aa6d.tar.xz
latinime-3bfacd445ec5a54d5b27ae0818abc342b466aa6d.zip
Merge "Remove Emoji delete key UX hack"
Diffstat (limited to 'java/res')
-rw-r--r--java/res/layout/emoji_palettes_view.xml1
-rw-r--r--java/res/values/colors.xml4
2 files changed, 0 insertions, 5 deletions
diff --git a/java/res/layout/emoji_palettes_view.xml b/java/res/layout/emoji_palettes_view.xml
index 8cff503e4..c0c346ef0 100644
--- a/java/res/layout/emoji_palettes_view.xml
+++ b/java/res/layout/emoji_palettes_view.xml
@@ -70,7 +70,6 @@
android:layout_width="0dip"
android:layout_weight="12.5"
android:layout_height="match_parent"
- android:background="@color/emoji_key_background_color"
android:src="@drawable/sym_keyboard_delete_holo_dark"
android:contentDescription="@string/spoken_description_delete" />
</LinearLayout>
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index 674f77da0..12cb71f2e 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -61,8 +61,4 @@
<color name="setup_welcome_video_margin_color">#FFCCCCCC</color>
<color name="emoji_category_page_id_background_holo">#FF000000</color>
<color name="emoji_category_page_id_foreground_holo">#80FFFFFF</color>
-
- <!-- TODO: Color which should be included in the theme -->
- <color name="emoji_key_background_color">#00000000</color>
- <color name="emoji_key_pressed_background_color">#30FFFFFF</color>
</resources>