Merge "Get rid of unnecessary layout style"
diff --git a/java/res/layout/more_keys_keyboard.xml b/java/res/layout/more_keys_keyboard.xml
index 6637117..f3795af 100644
--- a/java/res/layout/more_keys_keyboard.xml
+++ b/java/res/layout/more_keys_keyboard.xml
@@ -22,11 +22,9 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- style="?attr/moreKeysKeyboardContainerStyle"
+ android:orientation="vertical"
>
<com.android.inputmethod.keyboard.MoreKeysKeyboardView
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
android:id="@+id/more_keys_keyboard_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
diff --git a/java/res/layout/more_suggestions.xml b/java/res/layout/more_suggestions.xml
index 8659f07..2643258 100644
--- a/java/res/layout/more_suggestions.xml
+++ b/java/res/layout/more_suggestions.xml
@@ -22,8 +22,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- style="?attr/moreKeysKeyboardContainerStyle"
+ android:orientation="vertical"
>
<com.android.inputmethod.latin.suggestions.MoreSuggestionsView
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index a7425f1..f2dc473 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -32,8 +32,6 @@
<attr name="moreKeysKeyboardStyle" format="reference" />
<!-- MoreKeysKeyboardView style -->
<attr name="moreKeysKeyboardViewStyle" format="reference" />
- <!-- MoreKeysKeyboardView container style -->
- <attr name="moreKeysKeyboardContainerStyle" format="reference" />
<!-- Suggestions strip style -->
<attr name="suggestionStripViewStyle" format="reference" />
<!-- Suggestion word style -->
diff --git a/java/res/values/themes-gb.xml b/java/res/values/themes-gb.xml
index f52695f..2932143 100644
--- a/java/res/values/themes-gb.xml
+++ b/java/res/values/themes-gb.xml
@@ -26,7 +26,6 @@
<item name="emojiPalettesViewStyle">@style/EmojiPalettesView.GB</item>
<item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.GB</item>
<item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.GB</item>
- <item name="moreKeysKeyboardContainerStyle">@style/MoreKeysKeyboardContainer.GB</item>
<item name="suggestionStripViewStyle">@style/SuggestionStripView.GB</item>
<item name="suggestionWordStyle">@style/SuggestionWord.GB</item>
</style>
@@ -118,17 +117,12 @@
name="MoreKeysKeyboardView.GB"
parent="KeyboardView.GB"
>
- <item name="android:background">@null</item>
+ <item name="android:background">@drawable/keyboard_popup_panel_background_gb</item>
<item name="keyBackground">@drawable/btn_keyboard_key_popup_gb</item>
<item name="keyTypeface">normal</item>
<item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_gb</item>
</style>
<style
- name="MoreKeysKeyboardContainer.GB"
- >
- <item name="android:background">@drawable/keyboard_popup_panel_background_gb</item>
- </style>
- <style
name="SuggestionStripView.GB"
parent="SuggestionStripView"
>
diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml
index 432ad51..e854cd1 100644
--- a/java/res/values/themes-ics.xml
+++ b/java/res/values/themes-ics.xml
@@ -26,7 +26,6 @@
<item name="emojiPalettesViewStyle">@style/EmojiPalettesView.ICS</item>
<item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.ICS</item>
<item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.ICS</item>
- <item name="moreKeysKeyboardContainerStyle">@style/MoreKeysKeyboardContainer.ICS</item>
<item name="suggestionStripViewStyle">@style/SuggestionStripView.ICS</item>
<item name="suggestionWordStyle">@style/SuggestionWord.ICS</item>
</style>
@@ -96,17 +95,12 @@
name="MoreKeysKeyboardView.ICS"
parent="KeyboardView.ICS"
>
- <item name="android:background">@null</item>
+ <item name="android:background">@drawable/keyboard_popup_panel_background_ics</item>
<item name="keyBackground">@drawable/btn_keyboard_key_popup_ics</item>
<item name="keyTypeface">normal</item>
<item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_holo</item>
</style>
<style
- name="MoreKeysKeyboardContainer.ICS"
- >
- <item name="android:background">@drawable/keyboard_popup_panel_background_ics</item>
- </style>
- <style
name="SuggestionStripView.ICS"
parent="SuggestionStripView"
>
diff --git a/java/res/values/themes-klp.xml b/java/res/values/themes-klp.xml
index a373001..c404b6a 100644
--- a/java/res/values/themes-klp.xml
+++ b/java/res/values/themes-klp.xml
@@ -26,7 +26,6 @@
<item name="emojiPalettesViewStyle">@style/EmojiPalettesView.KLP</item>
<item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.KLP</item>
<item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.KLP</item>
- <item name="moreKeysKeyboardContainerStyle">@style/MoreKeysKeyboardContainer.KLP</item>
<item name="suggestionStripViewStyle">@style/SuggestionStripView.KLP</item>
<item name="suggestionWordStyle">@style/SuggestionWord.KLP</item>
</style>
@@ -96,17 +95,12 @@
name="MoreKeysKeyboardView.KLP"
parent="KeyboardView.KLP"
>
- <item name="android:background">@null</item>
+ <item name="android:background">@drawable/keyboard_popup_panel_background_klp</item>
<item name="keyBackground">@drawable/btn_keyboard_key_popup_klp</item>
<item name="keyTypeface">normal</item>
<item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_holo</item>
</style>
<style
- name="MoreKeysKeyboardContainer.KLP"
- >
- <item name="android:background">@drawable/keyboard_popup_panel_background_klp</item>
- </style>
- <style
name="SuggestionStripView.KLP"
parent="SuggestionStripView"
>