From c10757e8e83d46d06c94f8420d8154f88fc2c8a0 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Mon, 11 Nov 2013 16:20:07 +0900
Subject: [PATCH] Rename KLP theme related resources

Bug: 11622614
Change-Id: I4e390aa263349d730b47502d84e4d528e7f5ce71
---
 ...=> btn_keyboard_key_dark_active_klp.9.png} | Bin
 ...btn_keyboard_key_dark_normal_on_klp.9.png} | Bin
 ...> btn_keyboard_key_dark_pressed_klp.9.png} | Bin
 ...n_keyboard_key_dark_pressed_off_klp.9.png} | Bin
 ...tn_keyboard_key_dark_pressed_on_klp.9.png} | Bin
 ... btn_keyboard_key_light_pressed_klp.9.png} | Bin
 ...btn_keyboard_key_popup_selected_klp.9.png} | Bin
 ...eyboard_key_feedback_background_klp.9.png} | Bin
 ...rd_key_feedback_left_background_klp.9.png} | Bin
 ...y_feedback_left_more_background_klp.9.png} | Bin
 ...rd_key_feedback_more_background_klp.9.png} | Bin
 ...d_key_feedback_right_background_klp.9.png} | Bin
 ..._feedback_right_more_background_klp.9.png} | Bin
 ...keyboard_popup_panel_background_klp.9.png} | Bin
 ...=> btn_keyboard_key_dark_active_klp.9.png} | Bin
 ...btn_keyboard_key_dark_normal_on_klp.9.png} | Bin
 ...> btn_keyboard_key_dark_pressed_klp.9.png} | Bin
 ...n_keyboard_key_dark_pressed_off_klp.9.png} | Bin
 ...tn_keyboard_key_dark_pressed_on_klp.9.png} | Bin
 ... btn_keyboard_key_light_pressed_klp.9.png} | Bin
 ...btn_keyboard_key_popup_selected_klp.9.png} | Bin
 ...eyboard_key_feedback_background_klp.9.png} | Bin
 ...rd_key_feedback_left_background_klp.9.png} | Bin
 ...y_feedback_left_more_background_klp.9.png} | Bin
 ...rd_key_feedback_more_background_klp.9.png} | Bin
 ...d_key_feedback_right_background_klp.9.png} | Bin
 ..._feedback_right_more_background_klp.9.png} | Bin
 ...keyboard_popup_panel_background_klp.9.png} | Bin
 ...=> btn_keyboard_key_dark_active_klp.9.png} | Bin
 ...btn_keyboard_key_dark_normal_on_klp.9.png} | Bin
 ...> btn_keyboard_key_dark_pressed_klp.9.png} | Bin
 ...n_keyboard_key_dark_pressed_off_klp.9.png} | Bin
 ...tn_keyboard_key_dark_pressed_on_klp.9.png} | Bin
 ... btn_keyboard_key_light_pressed_klp.9.png} | Bin
 ...btn_keyboard_key_popup_selected_klp.9.png} | Bin
 ...eyboard_key_feedback_background_klp.9.png} | Bin
 ...rd_key_feedback_left_background_klp.9.png} | Bin
 ...y_feedback_left_more_background_klp.9.png} | Bin
 ...rd_key_feedback_more_background_klp.9.png} | Bin
 ...d_key_feedback_right_background_klp.9.png} | Bin
 ..._feedback_right_more_background_klp.9.png} | Bin
 ...keyboard_popup_panel_background_klp.9.png} | Bin
 ...=> btn_keyboard_key_dark_active_klp.9.png} | Bin
 ...btn_keyboard_key_dark_normal_on_klp.9.png} | Bin
 ...> btn_keyboard_key_dark_pressed_klp.9.png} | Bin
 ...n_keyboard_key_dark_pressed_off_klp.9.png} | Bin
 ...tn_keyboard_key_dark_pressed_on_klp.9.png} | Bin
 ... btn_keyboard_key_light_pressed_klp.9.png} | Bin
 ...btn_keyboard_key_popup_selected_klp.9.png} | Bin
 ...eyboard_key_feedback_background_klp.9.png} | Bin
 ...rd_key_feedback_left_background_klp.9.png} | Bin
 ...y_feedback_left_more_background_klp.9.png} | Bin
 ...rd_key_feedback_more_background_klp.9.png} | Bin
 ...d_key_feedback_right_background_klp.9.png} | Bin
 ..._feedback_right_more_background_klp.9.png} | Bin
 ...keyboard_popup_panel_background_klp.9.png} | Bin
 ...ml => btn_keyboard_key_functional_klp.xml} |   2 +-
 ...d_key_ics.xml => btn_keyboard_key_klp.xml} |  16 ++--
 ...ics.xml => btn_keyboard_key_popup_klp.xml} |   4 +-
 ...gestion_ics.xml => btn_suggestion_klp.xml} |   4 +-
 ..._ics.xml => keyboard_key_feedback_klp.xml} |  14 ++--
 ...ey_preview_ics.xml => key_preview_klp.xml} |   4 +-
 java/res/values/colors.xml                    |   8 +-
 java/res/values/themes-common.xml             |   2 +-
 .../values/{themes-ics.xml => themes-klp.xml} |  74 +++++++++---------
 .../keyboard/KeyboardSwitcher.java            |   2 +-
 66 files changed, 65 insertions(+), 65 deletions(-)
 rename java/res/drawable-hdpi/{btn_keyboard_key_dark_active_holo.9.png => btn_keyboard_key_dark_active_klp.9.png} (100%)
 rename java/res/drawable-hdpi/{btn_keyboard_key_dark_normal_on_holo.9.png => btn_keyboard_key_dark_normal_on_klp.9.png} (100%)
 rename java/res/drawable-hdpi/{btn_keyboard_key_dark_pressed_holo.9.png => btn_keyboard_key_dark_pressed_klp.9.png} (100%)
 rename java/res/drawable-hdpi/{btn_keyboard_key_dark_pressed_off_holo.9.png => btn_keyboard_key_dark_pressed_off_klp.9.png} (100%)
 rename java/res/drawable-hdpi/{btn_keyboard_key_dark_pressed_on_holo.9.png => btn_keyboard_key_dark_pressed_on_klp.9.png} (100%)
 rename java/res/drawable-hdpi/{btn_keyboard_key_light_pressed_holo.9.png => btn_keyboard_key_light_pressed_klp.9.png} (100%)
 rename java/res/drawable-hdpi/{btn_keyboard_key_popup_selected_holo.9.png => btn_keyboard_key_popup_selected_klp.9.png} (100%)
 rename java/res/drawable-hdpi/{keyboard_key_feedback_background_holo.9.png => keyboard_key_feedback_background_klp.9.png} (100%)
 rename java/res/drawable-hdpi/{keyboard_key_feedback_left_background_holo.9.png => keyboard_key_feedback_left_background_klp.9.png} (100%)
 rename java/res/drawable-hdpi/{keyboard_key_feedback_left_more_background_holo.9.png => keyboard_key_feedback_left_more_background_klp.9.png} (100%)
 rename java/res/drawable-hdpi/{keyboard_key_feedback_more_background_holo.9.png => keyboard_key_feedback_more_background_klp.9.png} (100%)
 rename java/res/drawable-hdpi/{keyboard_key_feedback_right_background_holo.9.png => keyboard_key_feedback_right_background_klp.9.png} (100%)
 rename java/res/drawable-hdpi/{keyboard_key_feedback_right_more_background_holo.9.png => keyboard_key_feedback_right_more_background_klp.9.png} (100%)
 rename java/res/drawable-hdpi/{keyboard_popup_panel_background_holo.9.png => keyboard_popup_panel_background_klp.9.png} (100%)
 rename java/res/drawable-mdpi/{btn_keyboard_key_dark_active_holo.9.png => btn_keyboard_key_dark_active_klp.9.png} (100%)
 rename java/res/drawable-mdpi/{btn_keyboard_key_dark_normal_on_holo.9.png => btn_keyboard_key_dark_normal_on_klp.9.png} (100%)
 rename java/res/drawable-mdpi/{btn_keyboard_key_dark_pressed_holo.9.png => btn_keyboard_key_dark_pressed_klp.9.png} (100%)
 rename java/res/drawable-mdpi/{btn_keyboard_key_dark_pressed_off_holo.9.png => btn_keyboard_key_dark_pressed_off_klp.9.png} (100%)
 rename java/res/drawable-mdpi/{btn_keyboard_key_dark_pressed_on_holo.9.png => btn_keyboard_key_dark_pressed_on_klp.9.png} (100%)
 rename java/res/drawable-mdpi/{btn_keyboard_key_light_pressed_holo.9.png => btn_keyboard_key_light_pressed_klp.9.png} (100%)
 rename java/res/drawable-mdpi/{btn_keyboard_key_popup_selected_holo.9.png => btn_keyboard_key_popup_selected_klp.9.png} (100%)
 rename java/res/drawable-mdpi/{keyboard_key_feedback_background_holo.9.png => keyboard_key_feedback_background_klp.9.png} (100%)
 rename java/res/drawable-mdpi/{keyboard_key_feedback_left_background_holo.9.png => keyboard_key_feedback_left_background_klp.9.png} (100%)
 rename java/res/drawable-mdpi/{keyboard_key_feedback_left_more_background_holo.9.png => keyboard_key_feedback_left_more_background_klp.9.png} (100%)
 rename java/res/drawable-mdpi/{keyboard_key_feedback_more_background_holo.9.png => keyboard_key_feedback_more_background_klp.9.png} (100%)
 rename java/res/drawable-mdpi/{keyboard_key_feedback_right_background_holo.9.png => keyboard_key_feedback_right_background_klp.9.png} (100%)
 rename java/res/drawable-mdpi/{keyboard_key_feedback_right_more_background_holo.9.png => keyboard_key_feedback_right_more_background_klp.9.png} (100%)
 rename java/res/drawable-mdpi/{keyboard_popup_panel_background_holo.9.png => keyboard_popup_panel_background_klp.9.png} (100%)
 rename java/res/drawable-xhdpi/{btn_keyboard_key_dark_active_holo.9.png => btn_keyboard_key_dark_active_klp.9.png} (100%)
 rename java/res/drawable-xhdpi/{btn_keyboard_key_dark_normal_on_holo.9.png => btn_keyboard_key_dark_normal_on_klp.9.png} (100%)
 rename java/res/drawable-xhdpi/{btn_keyboard_key_dark_pressed_holo.9.png => btn_keyboard_key_dark_pressed_klp.9.png} (100%)
 rename java/res/drawable-xhdpi/{btn_keyboard_key_dark_pressed_off_holo.9.png => btn_keyboard_key_dark_pressed_off_klp.9.png} (100%)
 rename java/res/drawable-xhdpi/{btn_keyboard_key_dark_pressed_on_holo.9.png => btn_keyboard_key_dark_pressed_on_klp.9.png} (100%)
 rename java/res/drawable-xhdpi/{btn_keyboard_key_light_pressed_holo.9.png => btn_keyboard_key_light_pressed_klp.9.png} (100%)
 rename java/res/drawable-xhdpi/{btn_keyboard_key_popup_selected_holo.9.png => btn_keyboard_key_popup_selected_klp.9.png} (100%)
 rename java/res/drawable-xhdpi/{keyboard_key_feedback_background_holo.9.png => keyboard_key_feedback_background_klp.9.png} (100%)
 rename java/res/drawable-xhdpi/{keyboard_key_feedback_left_background_holo.9.png => keyboard_key_feedback_left_background_klp.9.png} (100%)
 rename java/res/drawable-xhdpi/{keyboard_key_feedback_left_more_background_holo.9.png => keyboard_key_feedback_left_more_background_klp.9.png} (100%)
 rename java/res/drawable-xhdpi/{keyboard_key_feedback_more_background_holo.9.png => keyboard_key_feedback_more_background_klp.9.png} (100%)
 rename java/res/drawable-xhdpi/{keyboard_key_feedback_right_background_holo.9.png => keyboard_key_feedback_right_background_klp.9.png} (100%)
 rename java/res/drawable-xhdpi/{keyboard_key_feedback_right_more_background_holo.9.png => keyboard_key_feedback_right_more_background_klp.9.png} (100%)
 rename java/res/drawable-xhdpi/{keyboard_popup_panel_background_holo.9.png => keyboard_popup_panel_background_klp.9.png} (100%)
 rename java/res/drawable-xxhdpi/{btn_keyboard_key_dark_active_holo.9.png => btn_keyboard_key_dark_active_klp.9.png} (100%)
 rename java/res/drawable-xxhdpi/{btn_keyboard_key_dark_normal_on_holo.9.png => btn_keyboard_key_dark_normal_on_klp.9.png} (100%)
 rename java/res/drawable-xxhdpi/{btn_keyboard_key_dark_pressed_holo.9.png => btn_keyboard_key_dark_pressed_klp.9.png} (100%)
 rename java/res/drawable-xxhdpi/{btn_keyboard_key_dark_pressed_off_holo.9.png => btn_keyboard_key_dark_pressed_off_klp.9.png} (100%)
 rename java/res/drawable-xxhdpi/{btn_keyboard_key_dark_pressed_on_holo.9.png => btn_keyboard_key_dark_pressed_on_klp.9.png} (100%)
 rename java/res/drawable-xxhdpi/{btn_keyboard_key_light_pressed_holo.9.png => btn_keyboard_key_light_pressed_klp.9.png} (100%)
 rename java/res/drawable-xxhdpi/{btn_keyboard_key_popup_selected_holo.9.png => btn_keyboard_key_popup_selected_klp.9.png} (100%)
 rename java/res/drawable-xxhdpi/{keyboard_key_feedback_background_holo.9.png => keyboard_key_feedback_background_klp.9.png} (100%)
 rename java/res/drawable-xxhdpi/{keyboard_key_feedback_left_background_holo.9.png => keyboard_key_feedback_left_background_klp.9.png} (100%)
 rename java/res/drawable-xxhdpi/{keyboard_key_feedback_left_more_background_holo.9.png => keyboard_key_feedback_left_more_background_klp.9.png} (100%)
 rename java/res/drawable-xxhdpi/{keyboard_key_feedback_more_background_holo.9.png => keyboard_key_feedback_more_background_klp.9.png} (100%)
 rename java/res/drawable-xxhdpi/{keyboard_key_feedback_right_background_holo.9.png => keyboard_key_feedback_right_background_klp.9.png} (100%)
 rename java/res/drawable-xxhdpi/{keyboard_key_feedback_right_more_background_holo.9.png => keyboard_key_feedback_right_more_background_klp.9.png} (100%)
 rename java/res/drawable-xxhdpi/{keyboard_popup_panel_background_holo.9.png => keyboard_popup_panel_background_klp.9.png} (100%)
 rename java/res/drawable/{btn_keyboard_key_functional_ics.xml => btn_keyboard_key_functional_klp.xml} (98%)
 rename java/res/drawable/{btn_keyboard_key_ics.xml => btn_keyboard_key_klp.xml} (93%)
 rename java/res/drawable/{btn_keyboard_key_popup_ics.xml => btn_keyboard_key_popup_klp.xml} (92%)
 rename java/res/drawable/{btn_suggestion_ics.xml => btn_suggestion_klp.xml} (92%)
 rename java/res/drawable/{keyboard_key_feedback_ics.xml => keyboard_key_feedback_klp.xml} (88%)
 rename java/res/layout/{key_preview_ics.xml => key_preview_klp.xml} (88%)
 rename java/res/values/{themes-ics.xml => themes-klp.xml} (77%)

diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_active_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_active_klp.9.png
similarity index 100%
rename from java/res/drawable-hdpi/btn_keyboard_key_dark_active_holo.9.png
rename to java/res/drawable-hdpi/btn_keyboard_key_dark_active_klp.9.png
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_klp.9.png
similarity index 100%
rename from java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_holo.9.png
rename to java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_klp.9.png
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_klp.9.png
similarity index 100%
rename from java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_holo.9.png
rename to java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_klp.9.png
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_klp.9.png
similarity index 100%
rename from java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
rename to java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_klp.9.png
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_klp.9.png
similarity index 100%
rename from java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
rename to java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_klp.9.png
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_light_pressed_klp.9.png
similarity index 100%
rename from java/res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png
rename to java/res/drawable-hdpi/btn_keyboard_key_light_pressed_klp.9.png
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_klp.9.png
similarity index 100%
rename from java/res/drawable-hdpi/btn_keyboard_key_popup_selected_holo.9.png
rename to java/res/drawable-hdpi/btn_keyboard_key_popup_selected_klp.9.png
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_background_holo.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_background_klp.9.png
similarity index 100%
rename from java/res/drawable-hdpi/keyboard_key_feedback_background_holo.9.png
rename to java/res/drawable-hdpi/keyboard_key_feedback_background_klp.9.png
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_left_background_holo.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_left_background_klp.9.png
similarity index 100%
rename from java/res/drawable-hdpi/keyboard_key_feedback_left_background_holo.9.png
rename to java/res/drawable-hdpi/keyboard_key_feedback_left_background_klp.9.png
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_holo.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_klp.9.png
similarity index 100%
rename from java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_holo.9.png
rename to java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_klp.9.png
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_holo.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_more_background_klp.9.png
similarity index 100%
rename from java/res/drawable-hdpi/keyboard_key_feedback_more_background_holo.9.png
rename to java/res/drawable-hdpi/keyboard_key_feedback_more_background_klp.9.png
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_right_background_holo.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_right_background_klp.9.png
similarity index 100%
rename from java/res/drawable-hdpi/keyboard_key_feedback_right_background_holo.9.png
rename to java/res/drawable-hdpi/keyboard_key_feedback_right_background_klp.9.png
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_holo.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_klp.9.png
similarity index 100%
rename from java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_holo.9.png
rename to java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_klp.9.png
diff --git a/java/res/drawable-hdpi/keyboard_popup_panel_background_holo.9.png b/java/res/drawable-hdpi/keyboard_popup_panel_background_klp.9.png
similarity index 100%
rename from java/res/drawable-hdpi/keyboard_popup_panel_background_holo.9.png
rename to java/res/drawable-hdpi/keyboard_popup_panel_background_klp.9.png
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_active_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_active_klp.9.png
similarity index 100%
rename from java/res/drawable-mdpi/btn_keyboard_key_dark_active_holo.9.png
rename to java/res/drawable-mdpi/btn_keyboard_key_dark_active_klp.9.png
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_klp.9.png
similarity index 100%
rename from java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png
rename to java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_klp.9.png
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_klp.9.png
similarity index 100%
rename from java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png
rename to java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_klp.9.png
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_klp.9.png
similarity index 100%
rename from java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
rename to java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_klp.9.png
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_klp.9.png
similarity index 100%
rename from java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
rename to java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_klp.9.png
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_light_pressed_klp.9.png
similarity index 100%
rename from java/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png
rename to java/res/drawable-mdpi/btn_keyboard_key_light_pressed_klp.9.png
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_klp.9.png
similarity index 100%
rename from java/res/drawable-mdpi/btn_keyboard_key_popup_selected_holo.9.png
rename to java/res/drawable-mdpi/btn_keyboard_key_popup_selected_klp.9.png
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_background_holo.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_background_klp.9.png
similarity index 100%
rename from java/res/drawable-mdpi/keyboard_key_feedback_background_holo.9.png
rename to java/res/drawable-mdpi/keyboard_key_feedback_background_klp.9.png
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_left_background_holo.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_left_background_klp.9.png
similarity index 100%
rename from java/res/drawable-mdpi/keyboard_key_feedback_left_background_holo.9.png
rename to java/res/drawable-mdpi/keyboard_key_feedback_left_background_klp.9.png
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_holo.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_klp.9.png
similarity index 100%
rename from java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_holo.9.png
rename to java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_klp.9.png
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_holo.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_klp.9.png
similarity index 100%
rename from java/res/drawable-mdpi/keyboard_key_feedback_more_background_holo.9.png
rename to java/res/drawable-mdpi/keyboard_key_feedback_more_background_klp.9.png
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_right_background_holo.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_right_background_klp.9.png
similarity index 100%
rename from java/res/drawable-mdpi/keyboard_key_feedback_right_background_holo.9.png
rename to java/res/drawable-mdpi/keyboard_key_feedback_right_background_klp.9.png
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_holo.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_klp.9.png
similarity index 100%
rename from java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_holo.9.png
rename to java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_klp.9.png
diff --git a/java/res/drawable-mdpi/keyboard_popup_panel_background_holo.9.png b/java/res/drawable-mdpi/keyboard_popup_panel_background_klp.9.png
similarity index 100%
rename from java/res/drawable-mdpi/keyboard_popup_panel_background_holo.9.png
rename to java/res/drawable-mdpi/keyboard_popup_panel_background_klp.9.png
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_active_holo.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_active_klp.9.png
similarity index 100%
rename from java/res/drawable-xhdpi/btn_keyboard_key_dark_active_holo.9.png
rename to java/res/drawable-xhdpi/btn_keyboard_key_dark_active_klp.9.png
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_holo.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_klp.9.png
similarity index 100%
rename from java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_holo.9.png
rename to java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_klp.9.png
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_holo.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_klp.9.png
similarity index 100%
rename from java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_holo.9.png
rename to java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_klp.9.png
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_klp.9.png
similarity index 100%
rename from java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
rename to java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_klp.9.png
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_holo.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_klp.9.png
similarity index 100%
rename from java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
rename to java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_klp.9.png
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_light_pressed_holo.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_light_pressed_klp.9.png
similarity index 100%
rename from java/res/drawable-xhdpi/btn_keyboard_key_light_pressed_holo.9.png
rename to java/res/drawable-xhdpi/btn_keyboard_key_light_pressed_klp.9.png
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_holo.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_klp.9.png
similarity index 100%
rename from java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_holo.9.png
rename to java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_klp.9.png
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_background_holo.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_background_klp.9.png
similarity index 100%
rename from java/res/drawable-xhdpi/keyboard_key_feedback_background_holo.9.png
rename to java/res/drawable-xhdpi/keyboard_key_feedback_background_klp.9.png
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_holo.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_klp.9.png
similarity index 100%
rename from java/res/drawable-xhdpi/keyboard_key_feedback_left_background_holo.9.png
rename to java/res/drawable-xhdpi/keyboard_key_feedback_left_background_klp.9.png
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_holo.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_klp.9.png
similarity index 100%
rename from java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_holo.9.png
rename to java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_klp.9.png
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_holo.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_klp.9.png
similarity index 100%
rename from java/res/drawable-xhdpi/keyboard_key_feedback_more_background_holo.9.png
rename to java/res/drawable-xhdpi/keyboard_key_feedback_more_background_klp.9.png
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_holo.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_klp.9.png
similarity index 100%
rename from java/res/drawable-xhdpi/keyboard_key_feedback_right_background_holo.9.png
rename to java/res/drawable-xhdpi/keyboard_key_feedback_right_background_klp.9.png
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_holo.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_klp.9.png
similarity index 100%
rename from java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_holo.9.png
rename to java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_klp.9.png
diff --git a/java/res/drawable-xhdpi/keyboard_popup_panel_background_holo.9.png b/java/res/drawable-xhdpi/keyboard_popup_panel_background_klp.9.png
similarity index 100%
rename from java/res/drawable-xhdpi/keyboard_popup_panel_background_holo.9.png
rename to java/res/drawable-xhdpi/keyboard_popup_panel_background_klp.9.png
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_active_holo.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_active_klp.9.png
similarity index 100%
rename from java/res/drawable-xxhdpi/btn_keyboard_key_dark_active_holo.9.png
rename to java/res/drawable-xxhdpi/btn_keyboard_key_dark_active_klp.9.png
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_holo.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_klp.9.png
similarity index 100%
rename from java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_holo.9.png
rename to java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_klp.9.png
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_holo.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_klp.9.png
similarity index 100%
rename from java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_holo.9.png
rename to java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_klp.9.png
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_klp.9.png
similarity index 100%
rename from java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
rename to java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_klp.9.png
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_holo.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_klp.9.png
similarity index 100%
rename from java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
rename to java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_klp.9.png
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_light_pressed_holo.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_light_pressed_klp.9.png
similarity index 100%
rename from java/res/drawable-xxhdpi/btn_keyboard_key_light_pressed_holo.9.png
rename to java/res/drawable-xxhdpi/btn_keyboard_key_light_pressed_klp.9.png
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_holo.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_klp.9.png
similarity index 100%
rename from java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_holo.9.png
rename to java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_klp.9.png
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_holo.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_klp.9.png
similarity index 100%
rename from java/res/drawable-xxhdpi/keyboard_key_feedback_background_holo.9.png
rename to java/res/drawable-xxhdpi/keyboard_key_feedback_background_klp.9.png
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_holo.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_klp.9.png
similarity index 100%
rename from java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_holo.9.png
rename to java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_klp.9.png
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_holo.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_klp.9.png
similarity index 100%
rename from java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_holo.9.png
rename to java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_klp.9.png
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_holo.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_klp.9.png
similarity index 100%
rename from java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_holo.9.png
rename to java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_klp.9.png
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_holo.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_klp.9.png
similarity index 100%
rename from java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_holo.9.png
rename to java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_klp.9.png
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_holo.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_klp.9.png
similarity index 100%
rename from java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_holo.9.png
rename to java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_klp.9.png
diff --git a/java/res/drawable-xxhdpi/keyboard_popup_panel_background_holo.9.png b/java/res/drawable-xxhdpi/keyboard_popup_panel_background_klp.9.png
similarity index 100%
rename from java/res/drawable-xxhdpi/keyboard_popup_panel_background_holo.9.png
rename to java/res/drawable-xxhdpi/keyboard_popup_panel_background_klp.9.png
diff --git a/java/res/drawable/btn_keyboard_key_functional_ics.xml b/java/res/drawable/btn_keyboard_key_functional_klp.xml
similarity index 98%
rename from java/res/drawable/btn_keyboard_key_functional_ics.xml
rename to java/res/drawable/btn_keyboard_key_functional_klp.xml
index 5dcde5fa9..0e17ed234 100644
--- a/java/res/drawable/btn_keyboard_key_functional_ics.xml
+++ b/java/res/drawable/btn_keyboard_key_functional_klp.xml
@@ -17,6 +17,6 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Functional keys. -->
     <item android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_dark_pressed_holo" />
+          android:drawable="@drawable/btn_keyboard_key_dark_pressed_klp" />
     <item android:drawable="@drawable/btn_keyboard_key_dark_normal_holo" />
 </selector>
diff --git a/java/res/drawable/btn_keyboard_key_ics.xml b/java/res/drawable/btn_keyboard_key_klp.xml
similarity index 93%
rename from java/res/drawable/btn_keyboard_key_ics.xml
rename to java/res/drawable/btn_keyboard_key_klp.xml
index 0c86e163e..16b5fa00b 100644
--- a/java/res/drawable/btn_keyboard_key_ics.xml
+++ b/java/res/drawable/btn_keyboard_key_klp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!-- Copyright (C) 2013 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -17,23 +17,23 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Functional keys. -->
     <item android:state_single="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_dark_pressed_holo" />
+          android:drawable="@drawable/btn_keyboard_key_dark_pressed_klp" />
     <item android:state_single="true"
           android:drawable="@drawable/btn_keyboard_key_dark_normal_holo" />
 
     <!-- Action keys. -->
     <item android:state_active="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_dark_pressed_holo" />
+          android:drawable="@drawable/btn_keyboard_key_dark_pressed_klp" />
     <item android:state_active="true"
-          android:drawable="@drawable/btn_keyboard_key_dark_active_holo" />
+          android:drawable="@drawable/btn_keyboard_key_dark_active_klp" />
 
     <!-- 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_holo" />
+          android:drawable="@drawable/btn_keyboard_key_dark_pressed_on_klp" />
     <item android:state_checkable="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_dark_pressed_off_holo" />
+          android:drawable="@drawable/btn_keyboard_key_dark_pressed_off_klp" />
     <item android:state_checkable="true" android:state_checked="true"
-          android:drawable="@drawable/btn_keyboard_key_dark_normal_on_holo" />
+          android:drawable="@drawable/btn_keyboard_key_dark_normal_on_klp" />
     <item android:state_checkable="true"
           android:drawable="@drawable/btn_keyboard_key_dark_normal_off_holo" />
 
@@ -43,6 +43,6 @@
 
     <!-- Normal keys. -->
     <item android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_light_pressed_holo" />
+          android:drawable="@drawable/btn_keyboard_key_light_pressed_klp" />
     <item android:drawable="@drawable/btn_keyboard_key_light_normal_holo" />
 </selector>
diff --git a/java/res/drawable/btn_keyboard_key_popup_ics.xml b/java/res/drawable/btn_keyboard_key_popup_klp.xml
similarity index 92%
rename from java/res/drawable/btn_keyboard_key_popup_ics.xml
rename to java/res/drawable/btn_keyboard_key_popup_klp.xml
index b99679ba1..62cbca8ae 100644
--- a/java/res/drawable/btn_keyboard_key_popup_ics.xml
+++ b/java/res/drawable/btn_keyboard_key_popup_klp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!-- Copyright (C) 2013 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,6 +16,6 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_popup_selected_holo" />
+          android:drawable="@drawable/btn_keyboard_key_popup_selected_klp" />
     <item android:drawable="@drawable/transparent" />
 </selector>
diff --git a/java/res/drawable/btn_suggestion_ics.xml b/java/res/drawable/btn_suggestion_klp.xml
similarity index 92%
rename from java/res/drawable/btn_suggestion_ics.xml
rename to java/res/drawable/btn_suggestion_klp.xml
index e4257e327..471165bdf 100644
--- a/java/res/drawable/btn_suggestion_ics.xml
+++ b/java/res/drawable/btn_suggestion_klp.xml
@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2011, The Android Open Source Project
+** Copyright 2013, The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
@@ -23,5 +23,5 @@
 >
     <item
         android:state_pressed="true"
-        android:drawable="@drawable/btn_keyboard_key_popup_selected_holo" />
+        android:drawable="@drawable/btn_keyboard_key_popup_selected_klp" />
 </selector>
diff --git a/java/res/drawable/keyboard_key_feedback_ics.xml b/java/res/drawable/keyboard_key_feedback_klp.xml
similarity index 88%
rename from java/res/drawable/keyboard_key_feedback_ics.xml
rename to java/res/drawable/keyboard_key_feedback_klp.xml
index 3c8850e6c..a38655641 100644
--- a/java/res/drawable/keyboard_key_feedback_ics.xml
+++ b/java/res/drawable/keyboard_key_feedback_klp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!-- Copyright (C) 2013 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -20,17 +20,17 @@
 >
     <!-- Left edge -->
     <item latin:state_left_edge="true" latin:state_has_morekeys="true"
-          android:drawable="@drawable/keyboard_key_feedback_left_more_background_holo" />
+          android:drawable="@drawable/keyboard_key_feedback_left_more_background_klp" />
     <item latin:state_left_edge="true"
-          android:drawable="@drawable/keyboard_key_feedback_left_background_holo" />
+          android:drawable="@drawable/keyboard_key_feedback_left_background_klp" />
 
     <!-- Right edge -->
     <item latin:state_right_edge="true" latin:state_has_morekeys="true"
-          android:drawable="@drawable/keyboard_key_feedback_right_more_background_holo" />
+          android:drawable="@drawable/keyboard_key_feedback_right_more_background_klp" />
     <item latin:state_right_edge="true"
-          android:drawable="@drawable/keyboard_key_feedback_right_background_holo" />
+          android:drawable="@drawable/keyboard_key_feedback_right_background_klp" />
 
     <item latin:state_has_morekeys="true"
-          android:drawable="@drawable/keyboard_key_feedback_more_background_holo" />
-    <item android:drawable="@drawable/keyboard_key_feedback_background_holo" />
+          android:drawable="@drawable/keyboard_key_feedback_more_background_klp" />
+    <item android:drawable="@drawable/keyboard_key_feedback_background_klp" />
 </selector>
diff --git a/java/res/layout/key_preview_ics.xml b/java/res/layout/key_preview_klp.xml
similarity index 88%
rename from java/res/layout/key_preview_ics.xml
rename to java/res/layout/key_preview_klp.xml
index 222e8846c..160aeb9a9 100644
--- a/java/res/layout/key_preview_ics.xml
+++ b/java/res/layout/key_preview_klp.xml
@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2012, The Android Open Source Project
+** Copyright 2013, The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/keyboard_key_feedback_ics"
+    android:background="@drawable/keyboard_key_feedback_klp"
     android:minWidth="32dp"
     android:gravity="center"
 />
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index 60a8c2909..93f25a7f6 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -49,10 +49,10 @@
     <color name="spacebar_text_shadow_color_holo">#80000000</color>
     <color name="gesture_floating_preview_color_holo">#C0000000</color>
     <!-- Color resources for KLP theme. Base color = F0F0F0 -->
-    <color name="highlight_color_holo">#FFF0F0F0</color>
-    <color name="typed_word_color_holo">#D8F0F0F0</color>
-    <color name="suggested_word_color_holo">#B2F0F0F0</color>
-    <color name="highlight_translucent_color_holo">#99E0E0E0</color>
+    <color name="highlight_color_klp">#FFF0F0F0</color>
+    <color name="typed_word_color_klp">#D8F0F0F0</color>
+    <color name="suggested_word_color_klp">#B2F0F0F0</color>
+    <color name="highlight_translucent_color_klp">#99E0E0E0</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/themes-common.xml b/java/res/values/themes-common.xml
index 787bd6e35..298936d9c 100644
--- a/java/res/values/themes-common.xml
+++ b/java/res/values/themes-common.xml
@@ -30,7 +30,7 @@
         <item name="maxMoreKeysColumn">@integer/config_max_more_keys_column</item>
     </style>
     <style name="KeyboardView">
-        <item name="keyBackground">@drawable/btn_keyboard_key_ics</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_klp</item>
         <item name="keyLetterSize">@fraction/key_letter_ratio</item>
         <item name="keyLargeLetterRatio">@fraction/key_large_letter_ratio</item>
         <item name="keyLabelSize">@fraction/key_label_ratio</item>
diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-klp.xml
similarity index 77%
rename from java/res/values/themes-ics.xml
rename to java/res/values/themes-klp.xml
index 985c082cf..a3730019d 100644
--- a/java/res/values/themes-ics.xml
+++ b/java/res/values/themes-klp.xml
@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2011, The Android Open Source Project
+** Copyright 2013, The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
@@ -19,19 +19,19 @@
 -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style name="KeyboardTheme.ICS" parent="KeyboardIcons.Holo">
-        <item name="keyboardStyle">@style/Keyboard.ICS</item>
-        <item name="keyboardViewStyle">@style/KeyboardView.ICS</item>
-        <item name="mainKeyboardViewStyle">@style/MainKeyboardView.ICS</item>
-        <item name="emojiPalettesViewStyle">@style/EmojiPalettesView.ICS</item>
-        <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.ICS</item>
-        <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.ICS</item>
-        <item name="moreKeysKeyboardContainerStyle">@style/MoreKeysKeyboardContainer.ICS</item>
-        <item name="suggestionStripViewStyle">@style/SuggestionStripView.ICS</item>
-        <item name="suggestionWordStyle">@style/SuggestionWord.ICS</item>
+    <style name="KeyboardTheme.KLP" parent="KeyboardIcons.Holo">
+        <item name="keyboardStyle">@style/Keyboard.KLP</item>
+        <item name="keyboardViewStyle">@style/KeyboardView.KLP</item>
+        <item name="mainKeyboardViewStyle">@style/MainKeyboardView.KLP</item>
+        <item name="emojiPalettesViewStyle">@style/EmojiPalettesView.KLP</item>
+        <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.KLP</item>
+        <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.KLP</item>
+        <item name="moreKeysKeyboardContainerStyle">@style/MoreKeysKeyboardContainer.KLP</item>
+        <item name="suggestionStripViewStyle">@style/SuggestionStripView.KLP</item>
+        <item name="suggestionWordStyle">@style/SuggestionWord.KLP</item>
     </style>
     <style
-        name="Keyboard.ICS"
+        name="Keyboard.KLP"
         parent="Keyboard"
     >
         <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] -->
@@ -43,11 +43,11 @@
         <item name="touchPositionCorrectionData">@array/touch_position_correction_data_holo</item>
     </style>
     <style
-        name="KeyboardView.ICS"
+        name="KeyboardView.KLP"
         parent="KeyboardView"
     >
         <item name="android:background">@drawable/keyboard_background_holo</item>
-        <item name="keyBackground">@drawable/btn_keyboard_key_ics</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_klp</item>
         <item name="keyTypeface">bold</item>
         <item name="keyTextColor">@color/key_text_color_holo</item>
         <item name="keyTextInactivatedColor">@color/key_text_inactivated_color_holo</item>
@@ -60,15 +60,15 @@
         <item name="keyTextShadowRadius">0.0</item>
     </style>
     <style
-        name="MainKeyboardView.ICS"
-        parent="KeyboardView.ICS"
+        name="MainKeyboardView.KLP"
+        parent="KeyboardView.KLP"
     >
-        <item name="keyPreviewLayout">@layout/key_preview_ics</item>
+        <item name="keyPreviewLayout">@layout/key_preview_klp</item>
         <item name="keyPreviewOffset">@dimen/key_preview_offset_holo</item>
-        <item name="gestureFloatingPreviewTextColor">@color/highlight_color_holo</item>
+        <item name="gestureFloatingPreviewTextColor">@color/highlight_color_klp</item>
         <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_holo</item>
-        <item name="gestureTrailColor">@color/highlight_color_holo</item>
-        <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_holo</item>
+        <item name="gestureTrailColor">@color/highlight_color_klp</item>
+        <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_klp</item>
         <item name="autoCorrectionSpacebarLedEnabled">false</item>
         <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_holo</item>
         <item name="spacebarTextColor">@color/spacebar_text_color_holo</item>
@@ -77,15 +77,15 @@
     <!-- Though {@link EmojiPalettesView} doesn't extend {@link KeyboardView}, some views inside it,
          for instance delete button, need themed {@link KeyboardView} attributes. -->
     <style
-        name="EmojiPalettesView.ICS"
-        parent="KeyboardView.ICS"
+        name="EmojiPalettesView.KLP"
+        parent="KeyboardView.KLP"
     >
-        <item name="keyBackgroundEmojiFunctional">@drawable/btn_keyboard_key_functional_ics</item>
+        <item name="keyBackgroundEmojiFunctional">@drawable/btn_keyboard_key_functional_klp</item>
         <item name="emojiTabLabelColor">@color/emoji_tab_label_color_holo</item>
     </style>
     <style
-        name="MoreKeysKeyboard.ICS"
-        parent="Keyboard.ICS"
+        name="MoreKeysKeyboard.KLP"
+        parent="Keyboard.KLP"
     >
         <item name="keyboardTopPadding">0%p</item>
         <item name="keyboardBottomPadding">0%p</item>
@@ -93,32 +93,32 @@
         <item name="touchPositionCorrectionData">@null</item>
     </style>
     <style
-        name="MoreKeysKeyboardView.ICS"
-        parent="KeyboardView.ICS"
+        name="MoreKeysKeyboardView.KLP"
+        parent="KeyboardView.KLP"
     >
         <item name="android:background">@null</item>
-        <item name="keyBackground">@drawable/btn_keyboard_key_popup_ics</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_popup_klp</item>
         <item name="keyTypeface">normal</item>
         <item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_holo</item>
     </style>
     <style
-        name="MoreKeysKeyboardContainer.ICS"
+        name="MoreKeysKeyboardContainer.KLP"
     >
-        <item name="android:background">@drawable/keyboard_popup_panel_background_holo</item>
+        <item name="android:background">@drawable/keyboard_popup_panel_background_klp</item>
     </style>
     <style
-        name="SuggestionStripView.ICS"
+        name="SuggestionStripView.KLP"
         parent="SuggestionStripView"
     >
         <item name="android:background">@drawable/keyboard_suggest_strip_holo</item>
         <item name="suggestionStripOption">autoCorrectBold|validTypedWordBold</item>
-        <item name="colorValidTypedWord">@color/typed_word_color_holo</item>
-        <item name="colorTypedWord">@color/typed_word_color_holo</item>
-        <item name="colorAutoCorrect">@color/highlight_color_holo</item>
-        <item name="colorSuggested">@color/suggested_word_color_holo</item>
+        <item name="colorValidTypedWord">@color/typed_word_color_klp</item>
+        <item name="colorTypedWord">@color/typed_word_color_klp</item>
+        <item name="colorAutoCorrect">@color/highlight_color_klp</item>
+        <item name="colorSuggested">@color/suggested_word_color_klp</item>
         <item name="alphaObsoleted">70%</item>
     </style>
-    <style name="SuggestionWord.ICS">
-        <item name="android:background">@drawable/btn_suggestion_ics</item>
+    <style name="SuggestionWord.KLP">
+        <item name="android:background">@drawable/btn_suggestion_klp</item>
     </style>
 </resources>
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index b7521b998..ef1b9d53f 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -58,7 +58,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
     }
 
     private static final KeyboardTheme[] KEYBOARD_THEMES = {
-        new KeyboardTheme(0, R.style.KeyboardTheme_ICS),
+        new KeyboardTheme(0, R.style.KeyboardTheme_KLP),
         new KeyboardTheme(1, R.style.KeyboardTheme_GB),
     };