Merge "Get rid of unnecessary layout style"
commit
751ea9df87
|
@ -22,11 +22,9 @@
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="horizontal"
|
android:orientation="vertical"
|
||||||
style="?attr/moreKeysKeyboardContainerStyle"
|
|
||||||
>
|
>
|
||||||
<com.android.inputmethod.keyboard.MoreKeysKeyboardView
|
<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:id="@+id/more_keys_keyboard_view"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
|
|
|
@ -22,8 +22,7 @@
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="horizontal"
|
android:orientation="vertical"
|
||||||
style="?attr/moreKeysKeyboardContainerStyle"
|
|
||||||
>
|
>
|
||||||
<com.android.inputmethod.latin.suggestions.MoreSuggestionsView
|
<com.android.inputmethod.latin.suggestions.MoreSuggestionsView
|
||||||
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
|
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
|
||||||
|
|
|
@ -32,8 +32,6 @@
|
||||||
<attr name="moreKeysKeyboardStyle" format="reference" />
|
<attr name="moreKeysKeyboardStyle" format="reference" />
|
||||||
<!-- MoreKeysKeyboardView style -->
|
<!-- MoreKeysKeyboardView style -->
|
||||||
<attr name="moreKeysKeyboardViewStyle" format="reference" />
|
<attr name="moreKeysKeyboardViewStyle" format="reference" />
|
||||||
<!-- MoreKeysKeyboardView container style -->
|
|
||||||
<attr name="moreKeysKeyboardContainerStyle" format="reference" />
|
|
||||||
<!-- Suggestions strip style -->
|
<!-- Suggestions strip style -->
|
||||||
<attr name="suggestionStripViewStyle" format="reference" />
|
<attr name="suggestionStripViewStyle" format="reference" />
|
||||||
<!-- Suggestion word style -->
|
<!-- Suggestion word style -->
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
<item name="emojiPalettesViewStyle">@style/EmojiPalettesView.GB</item>
|
<item name="emojiPalettesViewStyle">@style/EmojiPalettesView.GB</item>
|
||||||
<item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.GB</item>
|
<item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.GB</item>
|
||||||
<item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.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="suggestionStripViewStyle">@style/SuggestionStripView.GB</item>
|
||||||
<item name="suggestionWordStyle">@style/SuggestionWord.GB</item>
|
<item name="suggestionWordStyle">@style/SuggestionWord.GB</item>
|
||||||
</style>
|
</style>
|
||||||
|
@ -118,16 +117,11 @@
|
||||||
name="MoreKeysKeyboardView.GB"
|
name="MoreKeysKeyboardView.GB"
|
||||||
parent="KeyboardView.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="keyBackground">@drawable/btn_keyboard_key_popup_gb</item>
|
||||||
<item name="keyTypeface">normal</item>
|
<item name="keyTypeface">normal</item>
|
||||||
<item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_gb</item>
|
<item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_gb</item>
|
||||||
</style>
|
</style>
|
||||||
<style
|
|
||||||
name="MoreKeysKeyboardContainer.GB"
|
|
||||||
>
|
|
||||||
<item name="android:background">@drawable/keyboard_popup_panel_background_gb</item>
|
|
||||||
</style>
|
|
||||||
<style
|
<style
|
||||||
name="SuggestionStripView.GB"
|
name="SuggestionStripView.GB"
|
||||||
parent="SuggestionStripView"
|
parent="SuggestionStripView"
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
<item name="emojiPalettesViewStyle">@style/EmojiPalettesView.ICS</item>
|
<item name="emojiPalettesViewStyle">@style/EmojiPalettesView.ICS</item>
|
||||||
<item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.ICS</item>
|
<item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.ICS</item>
|
||||||
<item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.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="suggestionStripViewStyle">@style/SuggestionStripView.ICS</item>
|
||||||
<item name="suggestionWordStyle">@style/SuggestionWord.ICS</item>
|
<item name="suggestionWordStyle">@style/SuggestionWord.ICS</item>
|
||||||
</style>
|
</style>
|
||||||
|
@ -96,16 +95,11 @@
|
||||||
name="MoreKeysKeyboardView.ICS"
|
name="MoreKeysKeyboardView.ICS"
|
||||||
parent="KeyboardView.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="keyBackground">@drawable/btn_keyboard_key_popup_ics</item>
|
||||||
<item name="keyTypeface">normal</item>
|
<item name="keyTypeface">normal</item>
|
||||||
<item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_holo</item>
|
<item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_holo</item>
|
||||||
</style>
|
</style>
|
||||||
<style
|
|
||||||
name="MoreKeysKeyboardContainer.ICS"
|
|
||||||
>
|
|
||||||
<item name="android:background">@drawable/keyboard_popup_panel_background_ics</item>
|
|
||||||
</style>
|
|
||||||
<style
|
<style
|
||||||
name="SuggestionStripView.ICS"
|
name="SuggestionStripView.ICS"
|
||||||
parent="SuggestionStripView"
|
parent="SuggestionStripView"
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
<item name="emojiPalettesViewStyle">@style/EmojiPalettesView.KLP</item>
|
<item name="emojiPalettesViewStyle">@style/EmojiPalettesView.KLP</item>
|
||||||
<item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.KLP</item>
|
<item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.KLP</item>
|
||||||
<item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.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="suggestionStripViewStyle">@style/SuggestionStripView.KLP</item>
|
||||||
<item name="suggestionWordStyle">@style/SuggestionWord.KLP</item>
|
<item name="suggestionWordStyle">@style/SuggestionWord.KLP</item>
|
||||||
</style>
|
</style>
|
||||||
|
@ -96,16 +95,11 @@
|
||||||
name="MoreKeysKeyboardView.KLP"
|
name="MoreKeysKeyboardView.KLP"
|
||||||
parent="KeyboardView.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="keyBackground">@drawable/btn_keyboard_key_popup_klp</item>
|
||||||
<item name="keyTypeface">normal</item>
|
<item name="keyTypeface">normal</item>
|
||||||
<item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_holo</item>
|
<item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_holo</item>
|
||||||
</style>
|
</style>
|
||||||
<style
|
|
||||||
name="MoreKeysKeyboardContainer.KLP"
|
|
||||||
>
|
|
||||||
<item name="android:background">@drawable/keyboard_popup_panel_background_klp</item>
|
|
||||||
</style>
|
|
||||||
<style
|
<style
|
||||||
name="SuggestionStripView.KLP"
|
name="SuggestionStripView.KLP"
|
||||||
parent="SuggestionStripView"
|
parent="SuggestionStripView"
|
||||||
|
|
Loading…
Reference in New Issue