am b214c8ac: Merge "Reuse KLP more keys key background for LXX"

* commit 'b214c8ac7901ef935713b0055365e180ae1d4d23':
  Reuse KLP more keys key background for LXX

6 files changed, 2 insertions, 22 deletions

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
deleted file mode 100644
index 10f8e97e4..000000000
--- a/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png
+++ /dev/null
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
deleted file mode 100644
index ee0aae28b..000000000
--- a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png
+++ /dev/null
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
deleted file mode 100644
index 891d00024..000000000
--- a/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png
+++ /dev/null
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
deleted file mode 100644
index 0cbb2ec84..000000000
--- a/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png
+++ /dev/null
diff --git a/java/res/drawable/btn_keyboard_key_popup_lxx_dark.xml b/java/res/drawable/btn_keyboard_key_popup_lxx_dark.xml
deleted file mode 100644
index dee645712..000000000
--- a/java/res/drawable/btn_keyboard_key_popup_lxx_dark.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_dark" />
-    <item android:drawable="@android:color/transparent" />
-</selector>
diff --git a/java/res/values/themes-lxx-dark.xml b/java/res/values/themes-lxx-dark.xml
index 7fb122a79..98c045def 100644
--- a/java/res/values/themes-lxx-dark.xml
+++ b/java/res/values/themes-lxx-dark.xml
@@ -122,7 +122,8 @@
         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>
+        <!-- Reuse KLP key background -->
+        <item name="keyBackground">@drawable/btn_keyboard_key_popup_klp</item>
         <item name="keyTypeface">normal</item>
         <item name="verticalCorrection">@dimen/config_more_keys_keyboard_vertical_correction_holo</item>
     </style>