am 4f73eaea: am fe5a49ed: Add popup layout for theme of gingerbread

Merge commit '4f73eaea3e83f87bda9f8569e5a3bab085bc7128'

* commit '4f73eaea3e83f87bda9f8569e5a3bab085bc7128':
  Add popup layout for theme of gingerbread

3 files changed, 23 insertions, 1 deletions

diff --git a/java/res/drawable/btn_keyboard_key_gingerbread_popup.xml b/java/res/drawable/btn_keyboard_key_gingerbread_popup.xml
new file mode 100644
index 000000000..9b6d23beb
--- /dev/null
+++ b/java/res/drawable/btn_keyboard_key_gingerbread_popup.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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_light_popup_selected" />
+    <item android:drawable="@drawable/btn_keyboard_key_light_popup_normal" />
+</selector>
diff --git a/java/res/layout/input_gingerbread.xml b/java/res/layout/input_gingerbread.xml
index 8f59cae21..912d38aa9 100755
--- a/java/res/layout/input_gingerbread.xml
+++ b/java/res/layout/input_gingerbread.xml
@@ -29,5 +29,6 @@
         android:textStyle="bold"
 
         latin:keyBackground="@drawable/btn_keyboard_key_gingerbread"
+        latin:popupLayout="@layout/input_gingerbread_popup"
         latin:keyTextStyle="bold"
         />
diff --git a/java/res/layout/input_gingerbread_popup.xml b/java/res/layout/input_gingerbread_popup.xml
index 0cc953edf..d0a4bcc2a 100755
--- a/java/res/layout/input_gingerbread_popup.xml
+++ b/java/res/layout/input_gingerbread_popup.xml
@@ -33,7 +33,7 @@
             android:layout_height="wrap_content"
             android:background="@drawable/keyboard_dark_background"
 
-            latin:keyBackground="@drawable/btn_keyboard_key_gingerbread"
+            latin:keyBackground="@drawable/btn_keyboard_key_gingerbread_popup"
             latin:popupLayout="@layout/input_gingerbread_popup"
         />
 </LinearLayout>