Rename keyboard_popup_keyboard.xml keyboard_key_preview.xml

Change-Id: I7c98a91c77f5ef46ee0b15783242024c0bd10503

12 files changed, 2 insertions, 4 deletions

diff --git a/java/res/layout/candidate_preview.xml b/java/res/layout/candidate_preview.xml
index fe2002d46..fe2002d46 100755..100644
--- a/java/res/layout/candidate_preview.xml
+++ b/java/res/layout/candidate_preview.xml
diff --git a/java/res/layout/candidates.xml b/java/res/layout/candidates.xml
index 478e20ba1..478e20ba1 100755..100644
--- a/java/res/layout/candidates.xml
+++ b/java/res/layout/candidates.xml
diff --git a/java/res/layout/input_basic.xml b/java/res/layout/input_basic.xml
index 168eba691..168eba691 100755..100644
--- a/java/res/layout/input_basic.xml
+++ b/java/res/layout/input_basic.xml
diff --git a/java/res/layout/input_basic_highcontrast.xml b/java/res/layout/input_basic_highcontrast.xml
index 19ff1db11..19ff1db11 100755..100644
--- a/java/res/layout/input_basic_highcontrast.xml
+++ b/java/res/layout/input_basic_highcontrast.xml
diff --git a/java/res/layout/input_gingerbread.xml b/java/res/layout/input_gingerbread.xml
index 8f59cae21..8f59cae21 100755..100644
--- a/java/res/layout/input_gingerbread.xml
+++ b/java/res/layout/input_gingerbread.xml
diff --git a/java/res/layout/input_stone_bold.xml b/java/res/layout/input_stone_bold.xml
index e3588bb22..e3588bb22 100755..100644
--- a/java/res/layout/input_stone_bold.xml
+++ b/java/res/layout/input_stone_bold.xml
diff --git a/java/res/layout/input_stone_normal.xml b/java/res/layout/input_stone_normal.xml
index fd7bf85fc..fd7bf85fc 100755..100644
--- a/java/res/layout/input_stone_normal.xml
+++ b/java/res/layout/input_stone_normal.xml
diff --git a/java/res/layout/input_stone_popup.xml b/java/res/layout/input_stone_popup.xml
index f159625f7..f159625f7 100755..100644
--- a/java/res/layout/input_stone_popup.xml
+++ b/java/res/layout/input_stone_popup.xml
diff --git a/java/res/layout/input_trans.xml b/java/res/layout/input_trans.xml
index 4c0979c04..4c0979c04 100755..100644
--- a/java/res/layout/input_trans.xml
+++ b/java/res/layout/input_trans.xml
diff --git a/java/res/layout/keyboard_key_preview.xml b/java/res/layout/key_preview.xml
index de03506ad..de03506ad 100644
--- a/java/res/layout/keyboard_key_preview.xml
+++ b/java/res/layout/key_preview.xml
diff --git a/java/res/layout/keyboard_popup_keyboard.xml b/java/res/layout/keyboard_popup.xml
index d271f0171..1005e7e11 100644
--- a/java/res/layout/keyboard_popup_keyboard.xml
+++ b/java/res/layout/keyboard_popup.xml
@@ -33,7 +33,5 @@
             android:background="@drawable/keyboard_dark_background"
 
             latin:keyBackground="@drawable/btn_keyboard_key_gingerbread_popup"
-            latin:keyPreviewLayout="@layout/keyboard_key_preview"
-            latin:popupLayout="@layout/keyboard_popup_keyboard"
             />
 </LinearLayout>
diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml
index d8272ec66..48f0d5e54 100644
--- a/java/res/values/styles.xml
+++ b/java/res/values/styles.xml
@@ -21,11 +21,11 @@
         <item name="keyBackground">@drawable/btn_keyboard_key</item>
         <item name="keyTextSize">@dimen/key_text_size</item>
         <item name="keyTextColor">#FFFFFFFF</item>
-        <item name="keyPreviewLayout">@layout/keyboard_key_preview</item>
+        <item name="keyPreviewLayout">@layout/key_preview</item>
         <item name="keyPreviewOffset">5dip</item>
         <item name="keyPreviewHeight">80dip</item>
         <item name="labelTextSize">14sp</item>
-        <item name="popupLayout">@layout/keyboard_popup_keyboard</item>
+        <item name="popupLayout">@layout/keyboard_popup</item>
         <item name="verticalCorrection">-10dip</item>
         <item name="miniKeyboardSlideAllowance">40dip</item>
         <item name="shadowColor">#BB000000</item>