nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 751ea9df: Merge "Get rid of unnecessary layout style" 

* commit '751ea9df87d18b30e82c99fc5b3aafd0f6ce8232':
  Get rid of unnecessary layout style
main
Tadashi G. Takaoka 2013-11-18 23:52:48 -08:00 committed by Android Git Automerger
parent 1f5bc05c94 751ea9df87
commit fea8e30141
6 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/res/layout/more_keys_keyboard.xml
View File

@ -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" />

3
java/res/layout/more_suggestions.xml
View File

@ -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"

2
java/res/values/attrs.xml
View File

@ -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 -->

8
java/res/values/themes-gb.xml
View File

@ -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,16 +117,11 @@
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"

8
java/res/values/themes-ics.xml
View File

@ -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,16 +95,11 @@
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"

8
java/res/values/themes-klp.xml
View File

@ -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,16 +95,11 @@
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"