From 395d501252d6a2bac53403159bd545a47e2f01d6 Mon Sep 17 00:00:00 2001
From: satok <satok@google.com>
Date: Mon, 13 Sep 2010 21:54:15 +0900
Subject: [PATCH] Rename keyboard_popup_keyboard.xml keyboard_key_preview.xml

Change-Id: I7c98a91c77f5ef46ee0b15783242024c0bd10503
---
 java/res/layout/candidate_preview.xml                         | 0
 java/res/layout/candidates.xml                                | 0
 java/res/layout/input_basic.xml                               | 0
 java/res/layout/input_basic_highcontrast.xml                  | 0
 java/res/layout/input_gingerbread.xml                         | 0
 java/res/layout/input_stone_bold.xml                          | 0
 java/res/layout/input_stone_normal.xml                        | 0
 java/res/layout/input_stone_popup.xml                         | 0
 java/res/layout/input_trans.xml                               | 0
 java/res/layout/{keyboard_key_preview.xml => key_preview.xml} | 0
 .../{keyboard_popup_keyboard.xml => keyboard_popup.xml}       | 2 --
 java/res/values/styles.xml                                    | 4 ++--
 12 files changed, 2 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 java/res/layout/candidate_preview.xml
 mode change 100755 => 100644 java/res/layout/candidates.xml
 mode change 100755 => 100644 java/res/layout/input_basic.xml
 mode change 100755 => 100644 java/res/layout/input_basic_highcontrast.xml
 mode change 100755 => 100644 java/res/layout/input_gingerbread.xml
 mode change 100755 => 100644 java/res/layout/input_stone_bold.xml
 mode change 100755 => 100644 java/res/layout/input_stone_normal.xml
 mode change 100755 => 100644 java/res/layout/input_stone_popup.xml
 mode change 100755 => 100644 java/res/layout/input_trans.xml
 rename java/res/layout/{keyboard_key_preview.xml => key_preview.xml} (100%)
 rename java/res/layout/{keyboard_popup_keyboard.xml => keyboard_popup.xml} (91%)

diff --git a/java/res/layout/candidate_preview.xml b/java/res/layout/candidate_preview.xml
old mode 100755
new mode 100644
diff --git a/java/res/layout/candidates.xml b/java/res/layout/candidates.xml
old mode 100755
new mode 100644
diff --git a/java/res/layout/input_basic.xml b/java/res/layout/input_basic.xml
old mode 100755
new mode 100644
diff --git a/java/res/layout/input_basic_highcontrast.xml b/java/res/layout/input_basic_highcontrast.xml
old mode 100755
new mode 100644
diff --git a/java/res/layout/input_gingerbread.xml b/java/res/layout/input_gingerbread.xml
old mode 100755
new mode 100644
diff --git a/java/res/layout/input_stone_bold.xml b/java/res/layout/input_stone_bold.xml
old mode 100755
new mode 100644
diff --git a/java/res/layout/input_stone_normal.xml b/java/res/layout/input_stone_normal.xml
old mode 100755
new mode 100644
diff --git a/java/res/layout/input_stone_popup.xml b/java/res/layout/input_stone_popup.xml
old mode 100755
new mode 100644
diff --git a/java/res/layout/input_trans.xml b/java/res/layout/input_trans.xml
old mode 100755
new mode 100644
diff --git a/java/res/layout/keyboard_key_preview.xml b/java/res/layout/key_preview.xml
similarity index 100%
rename from java/res/layout/keyboard_key_preview.xml
rename to java/res/layout/key_preview.xml
diff --git a/java/res/layout/keyboard_popup_keyboard.xml b/java/res/layout/keyboard_popup.xml
similarity index 91%
rename from java/res/layout/keyboard_popup_keyboard.xml
rename to 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>