am 58e641c3: am 395d5012: Rename keyboard_popup_keyboard.xml keyboard_key_preview.xml

Merge commit '58e641c3fc8c13b6c88c806c5e47d9cf16311dd7' * commit '58e641c3fc8c13b6c88c806c5e47d9cf16311dd7': Rename keyboard_popup_keyboard.xml keyboard_key_preview.xml
2010-09-13 07:19:11 -07:00 · 2010-09-13 07:19:11 -07:00 · 3a6bb59ccb
parent 506b9e4ee6 58e641c3fc
commit 3a6bb59ccb
12 changed files with 2 additions and 4 deletions
--- a/java/res/layout/candidate_preview.xml
+++ b/java/res/layout/candidate_preview.xml
--- a/java/res/layout/candidates.xml
+++ b/java/res/layout/candidates.xml
--- a/java/res/layout/input_basic.xml
+++ b/java/res/layout/input_basic.xml
--- a/java/res/layout/input_basic_highcontrast.xml
+++ b/java/res/layout/input_basic_highcontrast.xml
--- a/java/res/layout/input_gingerbread.xml
+++ b/java/res/layout/input_gingerbread.xml
--- a/java/res/layout/input_stone_bold.xml
+++ b/java/res/layout/input_stone_bold.xml
--- a/java/res/layout/input_stone_normal.xml
+++ b/java/res/layout/input_stone_normal.xml
--- a/java/res/layout/input_stone_popup.xml
+++ b/java/res/layout/input_stone_popup.xml
--- a/java/res/layout/input_trans.xml
+++ b/java/res/layout/input_trans.xml
--- a/java/res/layout/keyboard_key_preview.xml
+++ b/java/res/layout/keyboard_key_preview.xml
--- a/java/res/layout/keyboard_popup_keyboard.xml
+++ b/java/res/layout/keyboard_popup_keyboard.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>
--- 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>