From 04e2a494e2bcdf50b6e6bb8ba0e2b25efd91fd35 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Mon, 19 May 2014 10:27:36 +0900
Subject: Rename LXX theme to LXX_Dark

Bug: 14419121
Change-Id: I3d73c51d339eafec26871a659575d8b7b8cc441c
---
 java/res/color/emoji_tab_label_color_lxx.xml       |  33 -----
 java/res/color/emoji_tab_label_color_lxx_dark.xml  |  33 +++++
 .../btn_keyboard_key_dark_normal_off_lxx.9.png     | Bin 135 -> 0 bytes
 ...btn_keyboard_key_dark_normal_off_lxx_dark.9.png | Bin 0 -> 135 bytes
 .../btn_keyboard_key_dark_normal_on_lxx.9.png      | Bin 130 -> 0 bytes
 .../btn_keyboard_key_dark_normal_on_lxx_dark.9.png | Bin 0 -> 130 bytes
 .../btn_keyboard_key_dark_pressed_off_lxx.9.png    | Bin 138 -> 0 bytes
 ...tn_keyboard_key_dark_pressed_off_lxx_dark.9.png | Bin 0 -> 138 bytes
 .../btn_keyboard_key_dark_pressed_on_lxx.9.png     | Bin 130 -> 0 bytes
 ...btn_keyboard_key_dark_pressed_on_lxx_dark.9.png | Bin 0 -> 130 bytes
 .../btn_keyboard_key_popup_selected_lxx.9.png      | Bin 272 -> 0 bytes
 .../btn_keyboard_key_popup_selected_lxx_dark.9.png | Bin 0 -> 272 bytes
 .../keyboard_key_feedback_background_lxx.9.png     | Bin 2147 -> 0 bytes
 ...keyboard_key_feedback_background_lxx_dark.9.png | Bin 0 -> 2147 bytes
 ...keyboard_key_feedback_left_background_lxx.9.png | Bin 2105 -> 0 bytes
 ...ard_key_feedback_left_background_lxx_dark.9.png | Bin 0 -> 2105 bytes
 ...ard_key_feedback_left_more_background_lxx.9.png | Bin 2164 -> 0 bytes
 ...ey_feedback_left_more_background_lxx_dark.9.png | Bin 0 -> 2164 bytes
 ...keyboard_key_feedback_more_background_lxx.9.png | Bin 2225 -> 0 bytes
 ...ard_key_feedback_more_background_lxx_dark.9.png | Bin 0 -> 2225 bytes
 ...eyboard_key_feedback_right_background_lxx.9.png | Bin 2061 -> 0 bytes
 ...rd_key_feedback_right_background_lxx_dark.9.png | Bin 0 -> 2061 bytes
 ...rd_key_feedback_right_more_background_lxx.9.png | Bin 2133 -> 0 bytes
 ...y_feedback_right_more_background_lxx_dark.9.png | Bin 0 -> 2133 bytes
 .../keyboard_popup_panel_background_lxx.9.png      | Bin 871 -> 0 bytes
 .../keyboard_popup_panel_background_lxx_dark.9.png | Bin 0 -> 871 bytes
 .../btn_keyboard_key_dark_normal_off_lxx.9.png     | Bin 120 -> 0 bytes
 ...btn_keyboard_key_dark_normal_off_lxx_dark.9.png | Bin 0 -> 120 bytes
 .../btn_keyboard_key_dark_normal_on_lxx.9.png      | Bin 114 -> 0 bytes
 .../btn_keyboard_key_dark_normal_on_lxx_dark.9.png | Bin 0 -> 114 bytes
 .../btn_keyboard_key_dark_pressed_off_lxx.9.png    | Bin 124 -> 0 bytes
 ...tn_keyboard_key_dark_pressed_off_lxx_dark.9.png | Bin 0 -> 124 bytes
 .../btn_keyboard_key_dark_pressed_on_lxx.9.png     | Bin 114 -> 0 bytes
 ...btn_keyboard_key_dark_pressed_on_lxx_dark.9.png | Bin 0 -> 114 bytes
 .../btn_keyboard_key_popup_selected_lxx.9.png      | Bin 222 -> 0 bytes
 .../btn_keyboard_key_popup_selected_lxx_dark.9.png | Bin 0 -> 222 bytes
 .../keyboard_key_feedback_background_lxx.9.png     | Bin 1353 -> 0 bytes
 ...keyboard_key_feedback_background_lxx_dark.9.png | Bin 0 -> 1353 bytes
 ...keyboard_key_feedback_left_background_lxx.9.png | Bin 1305 -> 0 bytes
 ...ard_key_feedback_left_background_lxx_dark.9.png | Bin 0 -> 1305 bytes
 ...ard_key_feedback_left_more_background_lxx.9.png | Bin 1425 -> 0 bytes
 ...ey_feedback_left_more_background_lxx_dark.9.png | Bin 0 -> 1425 bytes
 ...keyboard_key_feedback_more_background_lxx.9.png | Bin 1454 -> 0 bytes
 ...ard_key_feedback_more_background_lxx_dark.9.png | Bin 0 -> 1454 bytes
 ...eyboard_key_feedback_right_background_lxx.9.png | Bin 1314 -> 0 bytes
 ...rd_key_feedback_right_background_lxx_dark.9.png | Bin 0 -> 1314 bytes
 ...rd_key_feedback_right_more_background_lxx.9.png | Bin 1427 -> 0 bytes
 ...y_feedback_right_more_background_lxx_dark.9.png | Bin 0 -> 1427 bytes
 .../keyboard_popup_panel_background_lxx.9.png      | Bin 589 -> 0 bytes
 .../keyboard_popup_panel_background_lxx_dark.9.png | Bin 0 -> 589 bytes
 .../btn_keyboard_key_dark_normal_off_lxx.9.png     | Bin 153 -> 0 bytes
 ...btn_keyboard_key_dark_normal_off_lxx_dark.9.png | Bin 0 -> 153 bytes
 .../btn_keyboard_key_dark_normal_on_lxx.9.png      | Bin 149 -> 0 bytes
 .../btn_keyboard_key_dark_normal_on_lxx_dark.9.png | Bin 0 -> 149 bytes
 .../btn_keyboard_key_dark_pressed_off_lxx.9.png    | Bin 159 -> 0 bytes
 ...tn_keyboard_key_dark_pressed_off_lxx_dark.9.png | Bin 0 -> 159 bytes
 .../btn_keyboard_key_dark_pressed_on_lxx.9.png     | Bin 149 -> 0 bytes
 ...btn_keyboard_key_dark_pressed_on_lxx_dark.9.png | Bin 0 -> 149 bytes
 .../btn_keyboard_key_popup_selected_lxx.9.png      | Bin 323 -> 0 bytes
 .../btn_keyboard_key_popup_selected_lxx_dark.9.png | Bin 0 -> 323 bytes
 .../keyboard_key_feedback_background_lxx.9.png     | Bin 3316 -> 0 bytes
 ...keyboard_key_feedback_background_lxx_dark.9.png | Bin 0 -> 3316 bytes
 ...keyboard_key_feedback_left_background_lxx.9.png | Bin 3169 -> 0 bytes
 ...ard_key_feedback_left_background_lxx_dark.9.png | Bin 0 -> 3169 bytes
 ...ard_key_feedback_left_more_background_lxx.9.png | Bin 3374 -> 0 bytes
 ...ey_feedback_left_more_background_lxx_dark.9.png | Bin 0 -> 3374 bytes
 ...keyboard_key_feedback_more_background_lxx.9.png | Bin 3525 -> 0 bytes
 ...ard_key_feedback_more_background_lxx_dark.9.png | Bin 0 -> 3525 bytes
 ...eyboard_key_feedback_right_background_lxx.9.png | Bin 3218 -> 0 bytes
 ...rd_key_feedback_right_background_lxx_dark.9.png | Bin 0 -> 3218 bytes
 ...rd_key_feedback_right_more_background_lxx.9.png | Bin 3424 -> 0 bytes
 ...y_feedback_right_more_background_lxx_dark.9.png | Bin 0 -> 3424 bytes
 .../keyboard_popup_panel_background_lxx.9.png      | Bin 1246 -> 0 bytes
 .../keyboard_popup_panel_background_lxx_dark.9.png | Bin 0 -> 1246 bytes
 .../btn_keyboard_key_dark_normal_off_lxx.9.png     | Bin 180 -> 0 bytes
 ...btn_keyboard_key_dark_normal_off_lxx_dark.9.png | Bin 0 -> 180 bytes
 .../btn_keyboard_key_dark_normal_on_lxx.9.png      | Bin 182 -> 0 bytes
 .../btn_keyboard_key_dark_normal_on_lxx_dark.9.png | Bin 0 -> 182 bytes
 .../btn_keyboard_key_dark_pressed_off_lxx.9.png    | Bin 186 -> 0 bytes
 ...tn_keyboard_key_dark_pressed_off_lxx_dark.9.png | Bin 0 -> 186 bytes
 .../btn_keyboard_key_dark_pressed_on_lxx.9.png     | Bin 182 -> 0 bytes
 ...btn_keyboard_key_dark_pressed_on_lxx_dark.9.png | Bin 0 -> 182 bytes
 .../btn_keyboard_key_popup_selected_lxx.9.png      | Bin 1261 -> 0 bytes
 .../btn_keyboard_key_popup_selected_lxx_dark.9.png | Bin 0 -> 1261 bytes
 .../keyboard_key_feedback_background_lxx.9.png     | Bin 5251 -> 0 bytes
 ...keyboard_key_feedback_background_lxx_dark.9.png | Bin 0 -> 5251 bytes
 ...keyboard_key_feedback_left_background_lxx.9.png | Bin 5862 -> 0 bytes
 ...ard_key_feedback_left_background_lxx_dark.9.png | Bin 0 -> 5862 bytes
 ...ard_key_feedback_left_more_background_lxx.9.png | Bin 5920 -> 0 bytes
 ...ey_feedback_left_more_background_lxx_dark.9.png | Bin 0 -> 5920 bytes
 ...keyboard_key_feedback_more_background_lxx.9.png | Bin 5450 -> 0 bytes
 ...ard_key_feedback_more_background_lxx_dark.9.png | Bin 0 -> 5450 bytes
 ...eyboard_key_feedback_right_background_lxx.9.png | Bin 5981 -> 0 bytes
 ...rd_key_feedback_right_background_lxx_dark.9.png | Bin 0 -> 5981 bytes
 ...rd_key_feedback_right_more_background_lxx.9.png | Bin 6060 -> 0 bytes
 ...y_feedback_right_more_background_lxx_dark.9.png | Bin 0 -> 6060 bytes
 .../keyboard_popup_panel_background_lxx.9.png      | Bin 2732 -> 0 bytes
 .../keyboard_popup_panel_background_lxx_dark.9.png | Bin 0 -> 2732 bytes
 .../drawable/btn_keyboard_key_functional_lxx.xml   |  22 ----
 .../btn_keyboard_key_functional_lxx_dark.xml       |  22 ++++
 java/res/drawable/btn_keyboard_key_lxx.xml         |  42 -------
 java/res/drawable/btn_keyboard_key_lxx_dark.xml    |  42 +++++++
 java/res/drawable/btn_keyboard_key_popup_lxx.xml   |  21 ----
 .../drawable/btn_keyboard_key_popup_lxx_dark.xml   |  21 ++++
 java/res/drawable/btn_keyboard_spacebar_lxx.xml    |  21 ----
 .../drawable/btn_keyboard_spacebar_lxx_dark.xml    |  21 ++++
 java/res/drawable/btn_suggestion_lxx.xml           |  27 -----
 java/res/drawable/btn_suggestion_lxx_dark.xml      |  27 +++++
 java/res/drawable/keyboard_key_feedback_lxx.xml    |  36 ------
 .../drawable/keyboard_key_feedback_lxx_dark.xml    |  36 ++++++
 java/res/values/colors.xml                         |  24 ++--
 java/res/values/keyboard-icons-lxx-dark.xml        |  47 ++++++++
 java/res/values/keyboard-icons-lxx.xml             |  47 --------
 java/res/values/themes-lxx-dark.xml                | 134 +++++++++++++++++++++
 java/res/values/themes-lxx.xml                     | 134 ---------------------
 .../inputmethod/keyboard/KeyboardTheme.java        |   6 +-
 116 files changed, 399 insertions(+), 397 deletions(-)
 delete mode 100644 java/res/color/emoji_tab_label_color_lxx.xml
 create mode 100644 java/res/color/emoji_tab_label_color_lxx_dark.xml
 delete mode 100644 java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_lxx.9.png
 create mode 100644 java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_lxx_dark.9.png
 delete mode 100644 java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_lxx.9.png
 create mode 100644 java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_lxx_dark.9.png
 delete mode 100644 java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_lxx.9.png
 create mode 100644 java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_lxx_dark.9.png
 delete mode 100644 java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_lxx.9.png
 create mode 100644 java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_lxx_dark.9.png
 delete mode 100644 java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx.9.png
 create mode 100644 java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png
 delete mode 100644 java/res/drawable-hdpi/keyboard_key_feedback_background_lxx.9.png
 create mode 100644 java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-hdpi/keyboard_key_feedback_left_background_lxx.9.png
 create mode 100644 java/res/drawable-hdpi/keyboard_key_feedback_left_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_lxx.9.png
 create mode 100644 java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx.9.png
 create mode 100644 java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-hdpi/keyboard_key_feedback_right_background_lxx.9.png
 create mode 100644 java/res/drawable-hdpi/keyboard_key_feedback_right_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_lxx.9.png
 create mode 100644 java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-hdpi/keyboard_popup_panel_background_lxx.9.png
 create mode 100644 java/res/drawable-hdpi/keyboard_popup_panel_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_lxx.9.png
 create mode 100644 java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_lxx_dark.9.png
 delete mode 100644 java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_lxx.9.png
 create mode 100644 java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_lxx_dark.9.png
 delete mode 100644 java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_lxx.9.png
 create mode 100644 java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_lxx_dark.9.png
 delete mode 100644 java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_lxx.9.png
 create mode 100644 java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_lxx_dark.9.png
 delete mode 100644 java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx.9.png
 create mode 100644 java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png
 delete mode 100644 java/res/drawable-mdpi/keyboard_key_feedback_background_lxx.9.png
 create mode 100644 java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-mdpi/keyboard_key_feedback_left_background_lxx.9.png
 create mode 100644 java/res/drawable-mdpi/keyboard_key_feedback_left_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_lxx.9.png
 create mode 100644 java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx.9.png
 create mode 100644 java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-mdpi/keyboard_key_feedback_right_background_lxx.9.png
 create mode 100644 java/res/drawable-mdpi/keyboard_key_feedback_right_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_lxx.9.png
 create mode 100644 java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-mdpi/keyboard_popup_panel_background_lxx.9.png
 create mode 100644 java/res/drawable-mdpi/keyboard_popup_panel_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off_lxx.9.png
 create mode 100644 java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_lxx.9.png
 create mode 100644 java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_lxx.9.png
 create mode 100644 java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_lxx.9.png
 create mode 100644 java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx.9.png
 create mode 100644 java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx.9.png
 create mode 100644 java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xhdpi/keyboard_key_feedback_left_background_lxx.9.png
 create mode 100644 java/res/drawable-xhdpi/keyboard_key_feedback_left_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_lxx.9.png
 create mode 100644 java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx.9.png
 create mode 100644 java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xhdpi/keyboard_key_feedback_right_background_lxx.9.png
 create mode 100644 java/res/drawable-xhdpi/keyboard_key_feedback_right_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_lxx.9.png
 create mode 100644 java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xhdpi/keyboard_popup_panel_background_lxx.9.png
 create mode 100644 java/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_off_lxx.9.png
 create mode 100644 java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_off_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_lxx.9.png
 create mode 100644 java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_lxx.9.png
 create mode 100644 java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_lxx.9.png
 create mode 100644 java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx.9.png
 create mode 100644 java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx.9.png
 create mode 100644 java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_lxx.9.png
 create mode 100644 java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_lxx.9.png
 create mode 100644 java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx.9.png
 create mode 100644 java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_lxx.9.png
 create mode 100644 java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_lxx.9.png
 create mode 100644 java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx.9.png
 create mode 100644 java/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_dark.9.png
 delete mode 100644 java/res/drawable/btn_keyboard_key_functional_lxx.xml
 create mode 100644 java/res/drawable/btn_keyboard_key_functional_lxx_dark.xml
 delete mode 100644 java/res/drawable/btn_keyboard_key_lxx.xml
 create mode 100644 java/res/drawable/btn_keyboard_key_lxx_dark.xml
 delete mode 100644 java/res/drawable/btn_keyboard_key_popup_lxx.xml
 create mode 100644 java/res/drawable/btn_keyboard_key_popup_lxx_dark.xml
 delete mode 100644 java/res/drawable/btn_keyboard_spacebar_lxx.xml
 create mode 100644 java/res/drawable/btn_keyboard_spacebar_lxx_dark.xml
 delete mode 100644 java/res/drawable/btn_suggestion_lxx.xml
 create mode 100644 java/res/drawable/btn_suggestion_lxx_dark.xml
 delete mode 100644 java/res/drawable/keyboard_key_feedback_lxx.xml
 create mode 100644 java/res/drawable/keyboard_key_feedback_lxx_dark.xml
 create mode 100644 java/res/values/keyboard-icons-lxx-dark.xml
 delete mode 100644 java/res/values/keyboard-icons-lxx.xml
 create mode 100644 java/res/values/themes-lxx-dark.xml
 delete mode 100644 java/res/values/themes-lxx.xml

(limited to 'java')

diff --git a/java/res/color/emoji_tab_label_color_lxx.xml b/java/res/color/emoji_tab_label_color_lxx.xml
deleted file mode 100644
index c2710d365..000000000
--- a/java/res/color/emoji_tab_label_color_lxx.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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:color="@color/key_text_color_holo" />
-    <item
-        android:state_pressed="true"
-        android:color="@color/key_text_color_holo" />
-    <item
-        android:state_selected="true"
-        android:color="@color/key_text_color_holo" />
-    <item
-        android:color="@color/key_text_inactive_color_lxx" />
-</selector>
diff --git a/java/res/color/emoji_tab_label_color_lxx_dark.xml b/java/res/color/emoji_tab_label_color_lxx_dark.xml
new file mode 100644
index 000000000..090f83e6a
--- /dev/null
+++ b/java/res/color/emoji_tab_label_color_lxx_dark.xml
@@ -0,0 +1,33 @@
+<?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:color="@color/key_text_color_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:color="@color/key_text_color_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:color="@color/key_text_color_lxx_dark" />
+    <item
+        android:color="@color/key_text_inactive_color_lxx_dark" />
+</selector>
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_lxx.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_lxx.9.png
deleted file mode 100644
index 44308bfd8..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_lxx_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_lxx_dark.9.png
new file mode 100644
index 000000000..44308bfd8
Binary files /dev/null and b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_lxx_dark.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_lxx.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_lxx.9.png
deleted file mode 100644
index 674783d7d..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_lxx_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_lxx_dark.9.png
new file mode 100644
index 000000000..674783d7d
Binary files /dev/null and b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_lxx_dark.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_lxx.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_lxx.9.png
deleted file mode 100644
index 96b625bd6..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_lxx_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_lxx_dark.9.png
new file mode 100644
index 000000000..96b625bd6
Binary files /dev/null and b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_lxx_dark.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_lxx.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_lxx.9.png
deleted file mode 100644
index 20e53c2e5..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_lxx_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_lxx_dark.9.png
new file mode 100644
index 000000000..20e53c2e5
Binary files /dev/null and b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_lxx_dark.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx.9.png b/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx.9.png
deleted file mode 100644
index 10f8e97e4..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png
new file mode 100644
index 000000000..10f8e97e4
Binary files /dev/null and b/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx.9.png
deleted file mode 100644
index be394151a..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_dark.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_dark.9.png
new file mode 100644
index 000000000..be394151a
Binary files /dev/null and b/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_left_background_lxx.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_left_background_lxx.9.png
deleted file mode 100644
index 9fa6d0003..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_left_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_left_background_lxx_dark.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_left_background_lxx_dark.9.png
new file mode 100644
index 000000000..9fa6d0003
Binary files /dev/null and b/java/res/drawable-hdpi/keyboard_key_feedback_left_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_lxx.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_lxx.9.png
deleted file mode 100644
index c73269b7e..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_lxx_dark.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_lxx_dark.9.png
new file mode 100644
index 000000000..c73269b7e
Binary files /dev/null and b/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx.9.png
deleted file mode 100644
index fffd4021e..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_dark.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_dark.9.png
new file mode 100644
index 000000000..fffd4021e
Binary files /dev/null and b/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_right_background_lxx.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_right_background_lxx.9.png
deleted file mode 100644
index 61c23c19b..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_right_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_right_background_lxx_dark.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_right_background_lxx_dark.9.png
new file mode 100644
index 000000000..61c23c19b
Binary files /dev/null and b/java/res/drawable-hdpi/keyboard_key_feedback_right_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_lxx.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_lxx.9.png
deleted file mode 100644
index 827d74363..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_lxx_dark.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_lxx_dark.9.png
new file mode 100644
index 000000000..827d74363
Binary files /dev/null and b/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_popup_panel_background_lxx.9.png b/java/res/drawable-hdpi/keyboard_popup_panel_background_lxx.9.png
deleted file mode 100644
index f9dd3b8b1..000000000
Binary files a/java/res/drawable-hdpi/keyboard_popup_panel_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_popup_panel_background_lxx_dark.9.png b/java/res/drawable-hdpi/keyboard_popup_panel_background_lxx_dark.9.png
new file mode 100644
index 000000000..f9dd3b8b1
Binary files /dev/null and b/java/res/drawable-hdpi/keyboard_popup_panel_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_lxx.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_lxx.9.png
deleted file mode 100644
index 837df83ce..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_lxx_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_lxx_dark.9.png
new file mode 100644
index 000000000..837df83ce
Binary files /dev/null and b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_lxx_dark.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_lxx.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_lxx.9.png
deleted file mode 100644
index 977265214..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_lxx_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_lxx_dark.9.png
new file mode 100644
index 000000000..977265214
Binary files /dev/null and b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_lxx_dark.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_lxx.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_lxx.9.png
deleted file mode 100644
index d21363316..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_lxx_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_lxx_dark.9.png
new file mode 100644
index 000000000..d21363316
Binary files /dev/null and b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_lxx_dark.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_lxx.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_lxx.9.png
deleted file mode 100644
index 6d20c540b..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_lxx_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_lxx_dark.9.png
new file mode 100644
index 000000000..6d20c540b
Binary files /dev/null and b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_lxx_dark.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx.9.png b/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx.9.png
deleted file mode 100644
index ee0aae28b..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png
new file mode 100644
index 000000000..ee0aae28b
Binary files /dev/null and b/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx.9.png
deleted file mode 100644
index 625490b1f..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_dark.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_dark.9.png
new file mode 100644
index 000000000..625490b1f
Binary files /dev/null and b/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_left_background_lxx.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_left_background_lxx.9.png
deleted file mode 100644
index 427c87061..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_left_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_left_background_lxx_dark.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_left_background_lxx_dark.9.png
new file mode 100644
index 000000000..427c87061
Binary files /dev/null and b/java/res/drawable-mdpi/keyboard_key_feedback_left_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_lxx.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_lxx.9.png
deleted file mode 100644
index ea757296d..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_lxx_dark.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_lxx_dark.9.png
new file mode 100644
index 000000000..ea757296d
Binary files /dev/null and b/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx.9.png
deleted file mode 100644
index 1911c429f..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_dark.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_dark.9.png
new file mode 100644
index 000000000..1911c429f
Binary files /dev/null and b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_right_background_lxx.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_right_background_lxx.9.png
deleted file mode 100644
index cdef116d2..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_right_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_right_background_lxx_dark.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_right_background_lxx_dark.9.png
new file mode 100644
index 000000000..cdef116d2
Binary files /dev/null and b/java/res/drawable-mdpi/keyboard_key_feedback_right_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_lxx.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_lxx.9.png
deleted file mode 100644
index dea5d076c..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_lxx_dark.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_lxx_dark.9.png
new file mode 100644
index 000000000..dea5d076c
Binary files /dev/null and b/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-mdpi/keyboard_popup_panel_background_lxx.9.png b/java/res/drawable-mdpi/keyboard_popup_panel_background_lxx.9.png
deleted file mode 100644
index 896505518..000000000
Binary files a/java/res/drawable-mdpi/keyboard_popup_panel_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_popup_panel_background_lxx_dark.9.png b/java/res/drawable-mdpi/keyboard_popup_panel_background_lxx_dark.9.png
new file mode 100644
index 000000000..896505518
Binary files /dev/null and b/java/res/drawable-mdpi/keyboard_popup_panel_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off_lxx.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off_lxx.9.png
deleted file mode 100644
index eeb447cc3..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off_lxx_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off_lxx_dark.9.png
new file mode 100644
index 000000000..eeb447cc3
Binary files /dev/null and b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off_lxx_dark.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_lxx.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_lxx.9.png
deleted file mode 100644
index 624ba8c27..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_lxx_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_lxx_dark.9.png
new file mode 100644
index 000000000..624ba8c27
Binary files /dev/null and b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_lxx_dark.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_lxx.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_lxx.9.png
deleted file mode 100644
index 2bc16cfeb..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_lxx_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_lxx_dark.9.png
new file mode 100644
index 000000000..2bc16cfeb
Binary files /dev/null and b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_lxx_dark.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_lxx.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_lxx.9.png
deleted file mode 100644
index 80dedd228..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_lxx_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_lxx_dark.9.png
new file mode 100644
index 000000000..80dedd228
Binary files /dev/null and b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_lxx_dark.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx.9.png
deleted file mode 100644
index 891d00024..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png
new file mode 100644
index 000000000..891d00024
Binary files /dev/null and b/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx.9.png
deleted file mode 100644
index c211d89c8..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_dark.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_dark.9.png
new file mode 100644
index 000000000..c211d89c8
Binary files /dev/null and b/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_lxx.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_lxx.9.png
deleted file mode 100644
index 543bc763e..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_lxx_dark.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_lxx_dark.9.png
new file mode 100644
index 000000000..543bc763e
Binary files /dev/null and b/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_lxx.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_lxx.9.png
deleted file mode 100644
index ec42aadb6..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_lxx_dark.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_lxx_dark.9.png
new file mode 100644
index 000000000..ec42aadb6
Binary files /dev/null and b/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx.9.png
deleted file mode 100644
index 319e9d7cf..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png
new file mode 100644
index 000000000..319e9d7cf
Binary files /dev/null and b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_lxx.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_lxx.9.png
deleted file mode 100644
index 052032be7..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_lxx_dark.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_lxx_dark.9.png
new file mode 100644
index 000000000..052032be7
Binary files /dev/null and b/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_lxx.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_lxx.9.png
deleted file mode 100644
index c7e9d1c9e..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_lxx_dark.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_lxx_dark.9.png
new file mode 100644
index 000000000..c7e9d1c9e
Binary files /dev/null and b/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-xhdpi/keyboard_popup_panel_background_lxx.9.png b/java/res/drawable-xhdpi/keyboard_popup_panel_background_lxx.9.png
deleted file mode 100644
index 36df715b6..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_popup_panel_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_dark.9.png b/java/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_dark.9.png
new file mode 100644
index 000000000..36df715b6
Binary files /dev/null and b/java/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_off_lxx.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_off_lxx.9.png
deleted file mode 100644
index 97b049eb0..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_off_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_off_lxx_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_off_lxx_dark.9.png
new file mode 100644
index 000000000..97b049eb0
Binary files /dev/null and b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_off_lxx_dark.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_lxx.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_lxx.9.png
deleted file mode 100644
index 2e8149709..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_lxx_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_lxx_dark.9.png
new file mode 100644
index 000000000..2e8149709
Binary files /dev/null and b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_lxx_dark.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_lxx.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_lxx.9.png
deleted file mode 100644
index d844b1713..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_lxx_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_lxx_dark.9.png
new file mode 100644
index 000000000..d844b1713
Binary files /dev/null and b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_lxx_dark.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_lxx.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_lxx.9.png
deleted file mode 100644
index 9661f4a6e..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_lxx_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_lxx_dark.9.png
new file mode 100644
index 000000000..9661f4a6e
Binary files /dev/null and b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_lxx_dark.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx.9.png
deleted file mode 100644
index 0cbb2ec84..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png
new file mode 100644
index 000000000..0cbb2ec84
Binary files /dev/null and b/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx.9.png
deleted file mode 100644
index fd2f9e514..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_dark.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_dark.9.png
new file mode 100644
index 000000000..fd2f9e514
Binary files /dev/null and b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_lxx.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_lxx.9.png
deleted file mode 100644
index 3ab79007e..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_lxx_dark.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_lxx_dark.9.png
new file mode 100644
index 000000000..3ab79007e
Binary files /dev/null and b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_lxx.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_lxx.9.png
deleted file mode 100644
index 99543a1e0..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_lxx_dark.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_lxx_dark.9.png
new file mode 100644
index 000000000..99543a1e0
Binary files /dev/null and b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx.9.png
deleted file mode 100644
index 121411a06..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png
new file mode 100644
index 000000000..121411a06
Binary files /dev/null and b/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_lxx.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_lxx.9.png
deleted file mode 100644
index e9e379287..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_lxx_dark.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_lxx_dark.9.png
new file mode 100644
index 000000000..e9e379287
Binary files /dev/null and b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_lxx.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_lxx.9.png
deleted file mode 100644
index 6c1143aeb..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_lxx_dark.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_lxx_dark.9.png
new file mode 100644
index 000000000..6c1143aeb
Binary files /dev/null and b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_lxx_dark.9.png differ
diff --git a/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx.9.png b/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx.9.png
deleted file mode 100644
index 91d5d7f90..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_dark.9.png b/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_dark.9.png
new file mode 100644
index 000000000..91d5d7f90
Binary files /dev/null and b/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_dark.9.png differ
diff --git a/java/res/drawable/btn_keyboard_key_functional_lxx.xml b/java/res/drawable/btn_keyboard_key_functional_lxx.xml
deleted file mode 100644
index fc6f98d01..000000000
--- a/java/res/drawable/btn_keyboard_key_functional_lxx.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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">
-    <!-- Functional keys. -->
-    <item android:state_pressed="true"
-          android:drawable="@color/key_background_pressed_lxx" />
-    <item android:drawable="@color/key_background_lxx" />
-</selector>
diff --git a/java/res/drawable/btn_keyboard_key_functional_lxx_dark.xml b/java/res/drawable/btn_keyboard_key_functional_lxx_dark.xml
new file mode 100644
index 000000000..fd1dbb9f0
--- /dev/null
+++ b/java/res/drawable/btn_keyboard_key_functional_lxx_dark.xml
@@ -0,0 +1,22 @@
+<?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">
+    <!-- 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_lxx.xml b/java/res/drawable/btn_keyboard_key_lxx.xml
deleted file mode 100644
index fc19a0bbd..000000000
--- a/java/res/drawable/btn_keyboard_key_lxx.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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">
-    <!-- Action keys. -->
-    <item android:state_active="true" android:state_pressed="true"
-          android:drawable="@color/key_background_pressed_lxx" />
-    <item android:state_active="true"
-          android:drawable="@color/key_background_lxx" />
-
-    <!-- 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_lxx" />
-    <item android:state_checkable="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_dark_pressed_off_lxx" />
-    <item android:state_checkable="true" android:state_checked="true"
-          android:drawable="@drawable/btn_keyboard_key_dark_normal_on_lxx" />
-    <item android:state_checkable="true"
-          android:drawable="@drawable/btn_keyboard_key_dark_normal_off_lxx" />
-
-    <!-- Empty background keys. -->
-    <item android:state_empty="true"
-          android:drawable="@color/key_background_lxx" />
-
-    <!-- Normal keys. -->
-    <item android:state_pressed="true"
-          android:drawable="@color/key_background_pressed_lxx" />
-    <item android:drawable="@color/key_background_lxx" />
-</selector>
diff --git a/java/res/drawable/btn_keyboard_key_lxx_dark.xml b/java/res/drawable/btn_keyboard_key_lxx_dark.xml
new file mode 100644
index 000000000..be98ab5ee
--- /dev/null
+++ b/java/res/drawable/btn_keyboard_key_lxx_dark.xml
@@ -0,0 +1,42 @@
+<?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">
+    <!-- Action keys. -->
+    <item android:state_active="true" android:state_pressed="true"
+          android:drawable="@color/key_background_pressed_lxx_dark" />
+    <item android:state_active="true"
+          android:drawable="@color/key_background_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_lxx_dark" />
+    <item android:state_checkable="true" android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_dark_pressed_off_lxx_dark" />
+    <item android:state_checkable="true" android:state_checked="true"
+          android:drawable="@drawable/btn_keyboard_key_dark_normal_on_lxx_dark" />
+    <item android:state_checkable="true"
+          android:drawable="@drawable/btn_keyboard_key_dark_normal_off_lxx_dark" />
+
+    <!-- Empty background keys. -->
+    <item android:state_empty="true"
+          android:drawable="@color/key_background_lxx_dark" />
+
+    <!-- Normal 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_popup_lxx.xml b/java/res/drawable/btn_keyboard_key_popup_lxx.xml
deleted file mode 100644
index 7daebc8d3..000000000
--- a/java/res/drawable/btn_keyboard_key_popup_lxx.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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">
-    <item android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_popup_selected_lxx" />
-    <item android:drawable="@android:color/transparent" />
-</selector>
diff --git a/java/res/drawable/btn_keyboard_key_popup_lxx_dark.xml b/java/res/drawable/btn_keyboard_key_popup_lxx_dark.xml
new file mode 100644
index 000000000..dee645712
--- /dev/null
+++ b/java/res/drawable/btn_keyboard_key_popup_lxx_dark.xml
@@ -0,0 +1,21 @@
+<?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">
+    <item android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_popup_selected_lxx_dark" />
+    <item android:drawable="@android:color/transparent" />
+</selector>
diff --git a/java/res/drawable/btn_keyboard_spacebar_lxx.xml b/java/res/drawable/btn_keyboard_spacebar_lxx.xml
deleted file mode 100644
index 10d04a8cc..000000000
--- a/java/res/drawable/btn_keyboard_spacebar_lxx.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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">
-    <item android:state_pressed="true"
-          android:drawable="@color/key_background_pressed_lxx" />
-    <item android:drawable="@color/key_background_lxx" />
-</selector>
diff --git a/java/res/drawable/btn_keyboard_spacebar_lxx_dark.xml b/java/res/drawable/btn_keyboard_spacebar_lxx_dark.xml
new file mode 100644
index 000000000..5c595d9ed
--- /dev/null
+++ b/java/res/drawable/btn_keyboard_spacebar_lxx_dark.xml
@@ -0,0 +1,21 @@
+<?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">
+    <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_suggestion_lxx.xml b/java/res/drawable/btn_suggestion_lxx.xml
deleted file mode 100644
index c73e1f772..000000000
--- a/java/res/drawable/btn_suggestion_lxx.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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_pressed="true"
-        android:drawable="@color/suggested_word_background_selected_lxx" />
-</selector>
diff --git a/java/res/drawable/btn_suggestion_lxx_dark.xml b/java/res/drawable/btn_suggestion_lxx_dark.xml
new file mode 100644
index 000000000..84a91209e
--- /dev/null
+++ b/java/res/drawable/btn_suggestion_lxx_dark.xml
@@ -0,0 +1,27 @@
+<?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_pressed="true"
+        android:drawable="@color/suggested_word_background_selected_lxx_dark" />
+</selector>
diff --git a/java/res/drawable/keyboard_key_feedback_lxx.xml b/java/res/drawable/keyboard_key_feedback_lxx.xml
deleted file mode 100644
index 2abbc909d..000000000
--- a/java/res/drawable/keyboard_key_feedback_lxx.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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_left_more_background_lxx" />
-    <item latin:state_left_edge="true"
-          android:drawable="@drawable/keyboard_key_feedback_left_background_lxx" />
-
-    <!-- Right edge -->
-    <item latin:state_right_edge="true" latin:state_has_morekeys="true"
-          android:drawable="@drawable/keyboard_key_feedback_right_more_background_lxx" />
-    <item latin:state_right_edge="true"
-          android:drawable="@drawable/keyboard_key_feedback_right_background_lxx" />
-
-    <item latin:state_has_morekeys="true"
-          android:drawable="@drawable/keyboard_key_feedback_more_background_lxx" />
-    <item android:drawable="@drawable/keyboard_key_feedback_background_lxx" />
-</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..e624a8ba8
--- /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_left_more_background_lxx_dark" />
+    <item latin:state_left_edge="true"
+          android:drawable="@drawable/keyboard_key_feedback_left_background_lxx_dark" />
+
+    <!-- Right edge -->
+    <item latin:state_right_edge="true" latin:state_has_morekeys="true"
+          android:drawable="@drawable/keyboard_key_feedback_right_more_background_lxx_dark" />
+    <item latin:state_right_edge="true"
+          android:drawable="@drawable/keyboard_key_feedback_right_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/values/colors.xml b/java/res/values/colors.xml
index 60b5cdfae..3052880c1 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -40,17 +40,19 @@
     <color name="suggested_word_color_klp">#B2F0F0F0</color>
     <color name="highlight_translucent_color_klp">#99E0E0E0</color>
     <!-- Color resources for LXX theme. Base color = F0F0F0 -->
-    <color name="key_text_inactive_color_lxx">#808184</color>
-    <color name="key_hint_letter_color_lxx">#808184</color>
-    <color name="highlight_color_lxx">#7FCAC3</color>
-    <color name="typed_word_color_lxx">#D87FCAC3</color>
-    <color name="suggested_word_color_lxx">#B27FCAC3</color>
-    <color name="highlight_translucent_color_lxx">#997FCAC3</color>
-    <color name="keyboard_background_lxx">#384248</color>
-    <color name="key_background_lxx">#384248</color>
-    <color name="key_background_pressed_lxx">#546872</color>
-    <color name="suggestions_strip_background_lxx">#263238</color>
-    <color name="suggested_word_background_selected_lxx">#384248</color>
+    <color name="key_text_color_lxx_dark">#FFFFFF</color>
+    <color name="key_text_inactive_color_lxx_dark">#808184</color>
+    <color name="key_hint_letter_color_lxx_dark">#808184</color>
+    <color name="highlight_color_lxx_dark">#7FCAC3</color>
+    <color name="typed_word_color_lxx_dark">#D87FCAC3</color>
+    <color name="suggested_word_color_lxx_dark">#B27FCAC3</color>
+    <color name="highlight_translucent_color_lxx_dark">#997FCAC3</color>
+    <color name="keyboard_background_lxx_dark">#384248</color>
+    <color name="key_background_lxx_dark">#384248</color>
+    <color name="key_background_pressed_lxx_dark">#546872</color>
+    <color name="suggestions_strip_background_lxx_dark">#263238</color>
+    <color name="suggested_word_background_selected_lxx_dark">#384248</color>
+    <color name="gesture_floating_preview_color_lxx_dark">#C0000000</color>
     <!-- Color resources for setup wizard and tutorial -->
     <color name="setup_background">#FFEBEBEB</color>
     <color name="setup_text_dark">#FF707070</color>
diff --git a/java/res/values/keyboard-icons-lxx-dark.xml b/java/res/values/keyboard-icons-lxx-dark.xml
new file mode 100644
index 000000000..b6e0b4fb9
--- /dev/null
+++ b/java/res/values/keyboard-icons-lxx-dark.xml
@@ -0,0 +1,47 @@
+<?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.
+*/
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <style name="KeyboardIcons.LXX_Dark">
+        <!-- Keyboard icons -->
+        <!-- TODO: Update those icons for LXX theme. -->
+        <item name="iconShiftKey">@drawable/sym_keyboard_shift_holo_dark</item>
+        <item name="iconDeleteKey">@drawable/sym_keyboard_delete_lxx_dark</item>
+        <item name="iconSettingsKey">@drawable/sym_keyboard_settings_lxx_dark</item>
+        <item name="iconSpaceKey">@drawable/sym_keyboard_spacebar_lxx_dark</item>
+        <item name="iconEnterKey">@drawable/sym_keyboard_return_holo_dark</item>
+        <item name="iconGoKey">@drawable/sym_keyboard_go_lxx_dark</item>
+        <item name="iconSearchKey">@drawable/sym_keyboard_search_lxx_dark</item>
+        <item name="iconSendKey">@drawable/sym_keyboard_send_lxx_dark</item>
+        <item name="iconNextKey">@drawable/sym_keyboard_next_lxx_dark</item>
+        <item name="iconDoneKey">@drawable/sym_keyboard_done_lxx_dark</item>
+        <item name="iconPreviousKey">@drawable/sym_keyboard_previous_lxx_dark</item>
+        <item name="iconTabKey">@drawable/sym_keyboard_tab_holo_dark</item>
+        <item name="iconShortcutKey">@drawable/sym_keyboard_voice_lxx_dark</item>
+        <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space_holo_dark</item>
+        <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_holo_dark</item>
+        <item name="iconShortcutKeyDisabled">@drawable/sym_keyboard_voice_off_lxx_dark</item>
+        <item name="iconTabKeyPreview">@drawable/sym_keyboard_feedback_tab</item>
+        <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch_lxx_dark</item>
+        <item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_holo_dark</item>
+        <item name="iconZwjKey">@drawable/sym_keyboard_zwj_holo_dark</item>
+        <item name="iconEmojiKey">@drawable/sym_keyboard_smiley_lxx_dark</item>
+    </style>
+</resources>
diff --git a/java/res/values/keyboard-icons-lxx.xml b/java/res/values/keyboard-icons-lxx.xml
deleted file mode 100644
index 56d660475..000000000
--- a/java/res/values/keyboard-icons-lxx.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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.
-*/
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style name="KeyboardIcons.LXX">
-        <!-- Keyboard icons -->
-        <!-- TODO: Update those icons for LXX theme. -->
-        <item name="iconShiftKey">@drawable/sym_keyboard_shift_holo_dark</item>
-        <item name="iconDeleteKey">@drawable/sym_keyboard_delete_lxx_dark</item>
-        <item name="iconSettingsKey">@drawable/sym_keyboard_settings_lxx_dark</item>
-        <item name="iconSpaceKey">@drawable/sym_keyboard_spacebar_lxx_dark</item>
-        <item name="iconEnterKey">@drawable/sym_keyboard_return_holo_dark</item>
-        <item name="iconGoKey">@drawable/sym_keyboard_go_lxx_dark</item>
-        <item name="iconSearchKey">@drawable/sym_keyboard_search_lxx_dark</item>
-        <item name="iconSendKey">@drawable/sym_keyboard_send_lxx_dark</item>
-        <item name="iconNextKey">@drawable/sym_keyboard_next_lxx_dark</item>
-        <item name="iconDoneKey">@drawable/sym_keyboard_done_lxx_dark</item>
-        <item name="iconPreviousKey">@drawable/sym_keyboard_previous_lxx_dark</item>
-        <item name="iconTabKey">@drawable/sym_keyboard_tab_holo_dark</item>
-        <item name="iconShortcutKey">@drawable/sym_keyboard_voice_lxx_dark</item>
-        <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space_holo_dark</item>
-        <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_holo_dark</item>
-        <item name="iconShortcutKeyDisabled">@drawable/sym_keyboard_voice_off_lxx_dark</item>
-        <item name="iconTabKeyPreview">@drawable/sym_keyboard_feedback_tab</item>
-        <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch_lxx_dark</item>
-        <item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_holo_dark</item>
-        <item name="iconZwjKey">@drawable/sym_keyboard_zwj_holo_dark</item>
-        <item name="iconEmojiKey">@drawable/sym_keyboard_smiley_lxx_dark</item>
-    </style>
-</resources>
diff --git a/java/res/values/themes-lxx-dark.xml b/java/res/values/themes-lxx-dark.xml
new file mode 100644
index 000000000..ace5fe9c6
--- /dev/null
+++ b/java/res/values/themes-lxx-dark.xml
@@ -0,0 +1,134 @@
+<?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.
+*/
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <style name="KeyboardTheme.LXX_Dark" parent="KeyboardIcons.LXX_Dark">
+        <item name="keyboardStyle">@style/Keyboard.LXX_Dark</item>
+        <item name="keyboardViewStyle">@style/KeyboardView.LXX_Dark</item>
+        <item name="mainKeyboardViewStyle">@style/MainKeyboardView.LXX_Dark</item>
+        <item name="keyPreviewTextViewStyle">@style/KeyPreviewTextView.LXX_Dark</item>
+        <item name="emojiPalettesViewStyle">@style/EmojiPalettesView.LXX_Dark</item>
+        <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.LXX_Dark</item>
+        <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.LXX_Dark</item>
+        <item name="suggestionStripViewStyle">@style/SuggestionStripView.LXX_Dark</item>
+        <item name="suggestionWordStyle">@style/SuggestionWord.LXX_Dark</item>
+    </style>
+    <style
+        name="Keyboard.LXX_Dark"
+        parent="Keyboard"
+    >
+        <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] -->
+        <item name="themeId">3</item>
+        <item name="keyboardTopPadding">@fraction/config_keyboard_top_padding_holo</item>
+        <item name="keyboardBottomPadding">@fraction/config_keyboard_bottom_padding_holo</item>
+        <item name="horizontalGap">@fraction/config_key_horizontal_gap_holo</item>
+        <item name="verticalGap">@fraction/config_key_vertical_gap_holo</item>
+        <item name="touchPositionCorrectionData">@array/touch_position_correction_data_holo</item>
+    </style>
+    <style
+        name="KeyboardView.LXX_Dark"
+        parent="KeyboardView"
+    >
+        <item name="android:background">@color/keyboard_background_lxx_dark</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_lxx_dark</item>
+        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_dark</item>
+        <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_lxx_dark</item>
+        <item name="spacebarIconWidthRatio">0.9</item>
+        <item name="keyTypeface">normal</item>
+        <item name="keyTextColor">@color/key_text_color_lxx_dark</item>
+        <item name="keyTextInactivatedColor">@color/key_text_inactive_color_lxx_dark</item>
+        <item name="functionalTextColor">@color/key_hint_letter_color_lxx_dark</item>
+        <item name="keyHintLetterColor">@color/key_hint_letter_color_lxx_dark</item>
+        <item name="keyHintLabelColor">@color/key_text_inactive_color_lxx_dark</item>
+        <item name="keyShiftedLetterHintInactivatedColor">@color/key_text_inactive_color_lxx_dark</item>
+        <item name="keyShiftedLetterHintActivatedColor">@color/key_text_color_lxx_dark</item>
+        <item name="keyPreviewTextColor">@color/key_text_color_lxx_dark</item>
+        <!-- A negative value to disable key text shadow layer. -->
+        <item name="keyTextShadowRadius">-1.0</item>
+    </style>
+    <style
+        name="MainKeyboardView.LXX_Dark"
+        parent="KeyboardView.LXX_Dark"
+    >
+        <item name="keyPreviewOffset">@dimen/config_key_preview_offset_holo</item>
+        <item name="gestureFloatingPreviewTextColor">@color/highlight_color_lxx_dark</item>
+        <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_lxx_dark</item>
+        <item name="gestureTrailColor">@color/highlight_color_lxx_dark</item>
+        <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_lxx_dark</item>
+        <item name="languageOnSpacebarTextColor">@color/key_text_inactive_color_lxx_dark</item>
+        <!-- A negative value to disable text shadow layer. -->
+        <item name="languageOnSpacebarTextShadowRadius">-1.0</item>
+    </style>
+    <style
+        name="KeyPreviewTextView.LXX_Dark"
+        parent="KeyPreviewTextView"
+    >
+        <item name="android:background">@drawable/keyboard_key_feedback_lxx_dark</item>
+    </style>
+    <!-- Though {@link EmojiPalettesView} doesn't extend {@link KeyboardView}, some views inside it,
+         for instance delete button, need themed {@link KeyboardView} attributes. -->
+    <style
+        name="EmojiPalettesView.LXX_Dark"
+        parent="MainKeyboardView.LXX_Dark"
+    >
+        <item name="emojiTabLabelColor">@color/emoji_tab_label_color_lxx_dark</item>
+    </style>
+    <style
+        name="MoreKeysKeyboard.LXX_Dark"
+        parent="Keyboard.LXX_Dark"
+    >
+        <item name="keyboardTopPadding">0%p</item>
+        <item name="keyboardBottomPadding">0%p</item>
+        <item name="horizontalGap">0%p</item>
+        <item name="touchPositionCorrectionData">@null</item>
+    </style>
+    <style
+        name="MoreKeysKeyboardView.LXX_Dark"
+        parent="KeyboardView.LXX_Dark"
+    >
+        <item name="android:background">@drawable/keyboard_popup_panel_background_lxx_dark</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_popup_lxx_dark</item>
+        <item name="keyTypeface">normal</item>
+        <item name="verticalCorrection">@dimen/config_more_keys_keyboard_vertical_correction_holo</item>
+    </style>
+    <style
+        name="SuggestionStripView.LXX_Dark"
+        parent="KeyboardView.LXX_Dark"
+    >
+        <item name="suggestionsCountInStrip">@integer/config_suggestions_count_in_strip</item>
+        <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>
+        <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
+        <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
+        <item name="android:background">@color/suggestions_strip_background_lxx_dark</item>
+        <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
+        <item name="colorValidTypedWord">@color/typed_word_color_lxx_dark</item>
+        <item name="colorTypedWord">@color/typed_word_color_lxx_dark</item>
+        <item name="colorAutoCorrect">@color/highlight_color_lxx_dark</item>
+        <item name="colorSuggested">@color/suggested_word_color_lxx_dark</item>
+        <item name="alphaObsoleted">70%</item>
+    </style>
+    <style
+        name="SuggestionWord.LXX_Dark"
+        parent="SuggestionWord"
+    >
+        <item name="android:background">@drawable/btn_suggestion_lxx_dark</item>
+        <item name="android:textColor">@color/highlight_color_lxx_dark</item>
+    </style>
+</resources>
diff --git a/java/res/values/themes-lxx.xml b/java/res/values/themes-lxx.xml
deleted file mode 100644
index 8016e76b2..000000000
--- a/java/res/values/themes-lxx.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?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.
-*/
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style name="KeyboardTheme.LXX" parent="KeyboardIcons.LXX">
-        <item name="keyboardStyle">@style/Keyboard.LXX</item>
-        <item name="keyboardViewStyle">@style/KeyboardView.LXX</item>
-        <item name="mainKeyboardViewStyle">@style/MainKeyboardView.LXX</item>
-        <item name="keyPreviewTextViewStyle">@style/KeyPreviewTextView.LXX</item>
-        <item name="emojiPalettesViewStyle">@style/EmojiPalettesView.LXX</item>
-        <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.LXX</item>
-        <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.LXX</item>
-        <item name="suggestionStripViewStyle">@style/SuggestionStripView.LXX</item>
-        <item name="suggestionWordStyle">@style/SuggestionWord.LXX</item>
-    </style>
-    <style
-        name="Keyboard.LXX"
-        parent="Keyboard"
-    >
-        <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] -->
-        <item name="themeId">3</item>
-        <item name="keyboardTopPadding">@fraction/config_keyboard_top_padding_holo</item>
-        <item name="keyboardBottomPadding">@fraction/config_keyboard_bottom_padding_holo</item>
-        <item name="horizontalGap">@fraction/config_key_horizontal_gap_holo</item>
-        <item name="verticalGap">@fraction/config_key_vertical_gap_holo</item>
-        <item name="touchPositionCorrectionData">@array/touch_position_correction_data_holo</item>
-    </style>
-    <style
-        name="KeyboardView.LXX"
-        parent="KeyboardView"
-    >
-        <item name="android:background">@color/keyboard_background_lxx</item>
-        <item name="keyBackground">@drawable/btn_keyboard_key_lxx</item>
-        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx</item>
-        <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_lxx</item>
-        <item name="spacebarIconWidthRatio">0.9</item>
-        <item name="keyTypeface">normal</item>
-        <item name="keyTextColor">@color/key_text_color_holo</item>
-        <item name="keyTextInactivatedColor">@color/key_text_inactive_color_lxx</item>
-        <item name="functionalTextColor">@color/key_hint_letter_color_lxx</item>
-        <item name="keyHintLetterColor">@color/key_hint_letter_color_lxx</item>
-        <item name="keyHintLabelColor">@color/key_text_inactive_color_lxx</item>
-        <item name="keyShiftedLetterHintInactivatedColor">@color/key_text_inactive_color_lxx</item>
-        <item name="keyShiftedLetterHintActivatedColor">@color/key_text_color_holo</item>
-        <item name="keyPreviewTextColor">@color/key_text_color_holo</item>
-        <!-- A negative value to disable key text shadow layer. -->
-        <item name="keyTextShadowRadius">-1.0</item>
-    </style>
-    <style
-        name="MainKeyboardView.LXX"
-        parent="KeyboardView.LXX"
-    >
-        <item name="keyPreviewOffset">@dimen/config_key_preview_offset_holo</item>
-        <item name="gestureFloatingPreviewTextColor">@color/highlight_color_lxx</item>
-        <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_holo</item>
-        <item name="gestureTrailColor">@color/highlight_color_lxx</item>
-        <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_lxx</item>
-        <item name="languageOnSpacebarTextColor">@color/key_text_inactive_color_lxx</item>
-        <!-- A negative value to disable text shadow layer. -->
-        <item name="languageOnSpacebarTextShadowRadius">-1.0</item>
-    </style>
-    <style
-        name="KeyPreviewTextView.LXX"
-        parent="KeyPreviewTextView"
-    >
-        <item name="android:background">@drawable/keyboard_key_feedback_lxx</item>
-    </style>
-    <!-- Though {@link EmojiPalettesView} doesn't extend {@link KeyboardView}, some views inside it,
-         for instance delete button, need themed {@link KeyboardView} attributes. -->
-    <style
-        name="EmojiPalettesView.LXX"
-        parent="MainKeyboardView.LXX"
-    >
-        <item name="emojiTabLabelColor">@color/emoji_tab_label_color_lxx</item>
-    </style>
-    <style
-        name="MoreKeysKeyboard.LXX"
-        parent="Keyboard.LXX"
-    >
-        <item name="keyboardTopPadding">0%p</item>
-        <item name="keyboardBottomPadding">0%p</item>
-        <item name="horizontalGap">0%p</item>
-        <item name="touchPositionCorrectionData">@null</item>
-    </style>
-    <style
-        name="MoreKeysKeyboardView.LXX"
-        parent="KeyboardView.LXX"
-    >
-        <item name="android:background">@drawable/keyboard_popup_panel_background_lxx</item>
-        <item name="keyBackground">@drawable/btn_keyboard_key_popup_lxx</item>
-        <item name="keyTypeface">normal</item>
-        <item name="verticalCorrection">@dimen/config_more_keys_keyboard_vertical_correction_holo</item>
-    </style>
-    <style
-        name="SuggestionStripView.LXX"
-        parent="KeyboardView.LXX"
-    >
-        <item name="suggestionsCountInStrip">@integer/config_suggestions_count_in_strip</item>
-        <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>
-        <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
-        <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
-        <item name="android:background">@color/suggestions_strip_background_lxx</item>
-        <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
-        <item name="colorValidTypedWord">@color/typed_word_color_lxx</item>
-        <item name="colorTypedWord">@color/typed_word_color_lxx</item>
-        <item name="colorAutoCorrect">@color/highlight_color_lxx</item>
-        <item name="colorSuggested">@color/suggested_word_color_lxx</item>
-        <item name="alphaObsoleted">70%</item>
-    </style>
-    <style
-        name="SuggestionWord.LXX"
-        parent="SuggestionWord"
-    >
-        <item name="android:background">@drawable/btn_suggestion_lxx</item>
-        <item name="android:textColor">@color/highlight_color_lxx</item>
-    </style>
-</resources>
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java b/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java
index 0c0c16229..1f14aa2e3 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java
@@ -34,7 +34,7 @@ public final class KeyboardTheme {
 
     static final int THEME_ID_ICS = 0;
     static final int THEME_ID_KLP = 2;
-    static final int THEME_ID_LXX = 3;
+    static final int THEME_ID_LXX_DARK = 3;
     static final int DEFAULT_THEME_ID = THEME_ID_KLP;
 
     private static final KeyboardTheme[] KEYBOARD_THEMES = {
@@ -42,7 +42,7 @@ public final class KeyboardTheme {
                 VERSION_CODES.BASE),
         new KeyboardTheme(THEME_ID_KLP, R.style.KeyboardTheme_KLP,
                 VERSION_CODES.ICE_CREAM_SANDWICH),
-        new KeyboardTheme(THEME_ID_LXX, R.style.KeyboardTheme_LXX,
+        new KeyboardTheme(THEME_ID_LXX_DARK, R.style.KeyboardTheme_LXX_Dark,
                 // TODO: Update this constant once the *next* version becomes available.
                 VERSION_CODES.CUR_DEVELOPMENT),
     };
@@ -88,7 +88,7 @@ public final class KeyboardTheme {
             return 5;
         case THEME_ID_KLP:
             return 9;
-        case THEME_ID_LXX:
+        case THEME_ID_LXX_DARK:
             return 10;
         default: // Invalid theme
             return -1;
-- 
cgit v1.2.3-83-g751a