diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-05-07 07:19:52 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-05-07 07:19:52 +0000 |
| commit | 7255c8404af81053a37ddedc998c6d7e94dc040c (patch) | |
| tree | 5e17dc3221430f40d6927e751d6636b966bb6992 | |
| parent | 2b5b3b96dc4c677111f6334923b4393c5f8480b8 (diff) | |
| parent | 9d99a2edeeacc6af14e75126054072ccaeaba340 (diff) | |
| download | latinime-7255c8404af81053a37ddedc998c6d7e94dc040c.tar.gz latinime-7255c8404af81053a37ddedc998c6d7e94dc040c.tar.xz latinime-7255c8404af81053a37ddedc998c6d7e94dc040c.zip | |
am 9d99a2ed: Make KeyboardView style as a parent of SuggestionStripView style
* commit '9d99a2edeeacc6af14e75126054072ccaeaba340':
Make KeyboardView style as a parent of SuggestionStripView style
| -rw-r--r-- | java/res/values/themes-common.xml | 7 | ||||
| -rw-r--r-- | java/res/values/themes-ics.xml | 6 | ||||
| -rw-r--r-- | java/res/values/themes-klp.xml | 6 |
3 files changed, 11 insertions, 8 deletions
diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml index eb6cdd975..76abb10fb 100644 --- a/java/res/values/themes-common.xml +++ b/java/res/values/themes-common.xml @@ -120,12 +120,7 @@ name="MoreKeysKeyboardView" parent="MainKeyboardView" /> <style name="MoreKeysKeyboardContainer" /> - <style name="SuggestionStripView"> - <item name="suggestionsCountInStrip">@integer/config_suggestions_count_in_strip</item> - <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item> - <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item> - <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item> - </style> + <style name="SuggestionStripView" /> <style name="SuggestionWord"> <item name="android:minWidth">@dimen/config_suggestion_min_width</item> <item name="android:textSize">@dimen/config_suggestion_text_size</item> diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml index 720eda9ce..616dbd82c 100644 --- a/java/res/values/themes-ics.xml +++ b/java/res/values/themes-ics.xml @@ -109,8 +109,12 @@ </style> <style name="SuggestionStripView.ICS" - parent="SuggestionStripView" + parent="KeyboardView.ICS" > + <item name="suggestionsCountInStrip">@integer/config_suggestions_count_in_strip</item> + <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item> + <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item> + <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item> <item name="android:background">@drawable/keyboard_suggest_strip_holo</item> <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item> <item name="colorValidTypedWord">@color/typed_word_color_ics</item> diff --git a/java/res/values/themes-klp.xml b/java/res/values/themes-klp.xml index 830527171..9bb3d79a7 100644 --- a/java/res/values/themes-klp.xml +++ b/java/res/values/themes-klp.xml @@ -109,8 +109,12 @@ </style> <style name="SuggestionStripView.KLP" - parent="SuggestionStripView" + parent="KeyboardView.KLP" > + <item name="suggestionsCountInStrip">@integer/config_suggestions_count_in_strip</item> + <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item> + <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item> + <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item> <item name="android:background">@drawable/keyboard_suggest_strip_holo</item> <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item> <item name="colorValidTypedWord">@color/typed_word_color_klp</item> |