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

Merge "Rename suggestionsPaneViewStyle to moreSuggestionsViewStyle"

main
Tadashi G. Takaoka 2011-09-05 01:39:33 -07:00 committed by Android (Google) Code Review
parent 0e7bd388d2 0e2fa66144
commit 1d8ec1cb9f
9 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,10 +27,10 @@
<attr name="miniKeyboardPanelStyle" format="reference" />
<!-- Suggestions strip style -->
<attr name="suggestionsStripBackgroundStyle" format="reference" />
<attr name="suggestionsPaneViewStyle" format="reference" />
<attr name="suggestionsViewStyle" format="reference" />
<attr name="moreSuggestionsViewStyle" format="reference" />
<attr name="suggestionBackgroundStyle" format="reference" />
<attr name="suggestionPreviewBackgroundStyle" format="reference" />
<attr name="suggestionsViewStyle" format="reference" />
</declare-styleable>
<declare-styleable name="KeyboardView">

48
java/res/values/styles.xml
View File

@ -79,20 +79,9 @@
<item name="android:paddingLeft">@dimen/mini_keyboard_horizontal_edges_padding</item>
<item name="android:paddingRight">@dimen/mini_keyboard_horizontal_edges_padding</item>
</style>
<style
name="SuggestionsPaneViewStyle"
parent="MiniKeyboardView"
>
</style>
<style name="SuggestionsStripBackgroundStyle">
<item name="android:background">@drawable/keyboard_suggest_strip</item>
</style>
<style name="SuggestionBackgroundStyle">
<item name="android:background">@drawable/btn_suggestion</item>
</style>
<style name="SuggestionPreviewBackgroundStyle">
<item name="android:background">@drawable/suggestion_feedback_background</item>
</style>
<style
name="SuggestionsViewStyle"
parent="SuggestionsStripBackgroundStyle"
@ -104,6 +93,17 @@
<item name="suggestionsCountInStrip">@integer/suggestions_count_in_strip</item>
<item name="centerSuggestionPercentile">@integer/center_suggestion_percentile</item>
</style>
<style
name="MoreSuggestionsViewStyle"
parent="MiniKeyboardView"
>
</style>
<style name="SuggestionBackgroundStyle">
<item name="android:background">@drawable/btn_suggestion</item>
</style>
<style name="SuggestionPreviewBackgroundStyle">
<item name="android:background">@drawable/suggestion_feedback_background</item>
</style>
<!-- Theme "Basic high contrast" -->
<style
name="KeyboardView.HighContrast"
@ -232,19 +232,6 @@
<style name="SuggestionsStripBackgroundStyle.IceCreamSandwich">
<item name="android:background">@drawable/keyboard_suggest_strip_holo</item>
</style>
<style name="SuggestionBackgroundStyle.IceCreamSandwich">
<item name="android:background">@drawable/btn_suggestion_ics</item>
</style>
<style
name="SuggestionPreviewBackgroundStyle.IceCreamSandwich"
parent="MiniKeyboardPanelStyle.IceCreamSandwich"
>
</style>
<style
name="SuggestionsPaneViewStyle.IceCreamSandwich"
parent="MiniKeyboardView.IceCreamSandwich"
>
</style>
<style
name="SuggestionsViewStyle.IceCreamSandwich"
parent="SuggestionsStripBackgroundStyle.IceCreamSandwich"
@ -256,6 +243,19 @@
<item name="suggestionsCountInStrip">@integer/suggestions_count_in_strip</item>
<item name="centerSuggestionPercentile">@integer/center_suggestion_percentile</item>
</style>
<style
name="MoreSuggestionsViewStyle.IceCreamSandwich"
parent="MiniKeyboardView.IceCreamSandwich"
>
</style>
<style name="SuggestionBackgroundStyle.IceCreamSandwich">
<item name="android:background">@drawable/btn_suggestion_ics</item>
</style>
<style
name="SuggestionPreviewBackgroundStyle.IceCreamSandwich"
parent="MiniKeyboardPanelStyle.IceCreamSandwich"
>
</style>
<style name="MiniKeyboardAnimation">
<item name="android:windowEnterAnimation">@anim/mini_keyboard_fadein</item>
<item name="android:windowExitAnimation">@anim/mini_keyboard_fadeout</item>

4
java/res/values/themes-basic-highcontrast.xml
View File

@ -22,9 +22,9 @@
<item name="miniKeyboardViewStyle">@style/MiniKeyboardView</item>
<item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item>
<item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item>
<item name="suggestionsPaneViewStyle">@style/SuggestionsPaneViewStyle</item>
<item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item>
<item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item>
<item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item>
<item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item>
<item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item>
</style>
</resources>

4
java/res/values/themes-basic.xml
View File

@ -22,9 +22,9 @@
<item name="miniKeyboardViewStyle">@style/MiniKeyboardView</item>
<item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item>
<item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item>
<item name="suggestionsPaneViewStyle">@style/SuggestionsPaneViewStyle</item>
<item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item>
<item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item>
<item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item>
<item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item>
<item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item>
</style>
</resources>

4
java/res/values/themes-gingerbread.xml
View File

@ -22,9 +22,9 @@
<item name="miniKeyboardViewStyle">@style/MiniKeyboardView.Gingerbread</item>
<item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item>
<item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item>
<item name="suggestionsPaneViewStyle">@style/SuggestionsPaneViewStyle</item>
<item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item>
<item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item>
<item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item>
<item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item>
<item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item>
</style>
</resources>

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

@ -22,9 +22,9 @@
<item name="miniKeyboardViewStyle">@style/MiniKeyboardView.IceCreamSandwich</item>
<item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle.IceCreamSandwich</item>
<item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle.IceCreamSandwich</item>
<item name="suggestionsPaneViewStyle">@style/SuggestionsPaneViewStyle.IceCreamSandwich</item>
<item name="suggestionsViewStyle">@style/SuggestionsViewStyle.IceCreamSandwich</item>
<item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle.IceCreamSandwich</item>
<item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle.IceCreamSandwich</item>
<item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle.IceCreamSandwich</item>
<item name="suggestionsViewStyle">@style/SuggestionsViewStyle.IceCreamSandwich</item>
</style>
</resources>

4
java/res/values/themes-stone-bold.xml
View File

@ -22,9 +22,9 @@
<item name="miniKeyboardViewStyle">@style/MiniKeyboardView.Stone</item>
<item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item>
<item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item>
<item name="suggestionsPaneViewStyle">@style/SuggestionsPaneViewStyle</item>
<item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item>
<item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item>
<item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item>
<item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item>
<item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item>
</style>
</resources>

4
java/res/values/themes-stone.xml
View File

@ -22,9 +22,9 @@
<item name="miniKeyboardViewStyle">@style/MiniKeyboardView.Stone</item>
<item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item>
<item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item>
<item name="suggestionsPaneViewStyle">@style/SuggestionsPaneViewStyle</item>
<item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item>
<item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item>
<item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item>
<item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item>
<item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item>
</style>
</resources>

2
java/src/com/android/inputmethod/latin/MoreSuggestionsView.java
View File

@ -73,7 +73,7 @@ public class MoreSuggestionsView extends KeyboardView implements MoreKeysPanel {
};
public MoreSuggestionsView(Context context, AttributeSet attrs) {
this(context, attrs, R.attr.suggestionsPaneViewStyle);
this(context, attrs, R.attr.moreSuggestionsViewStyle);
}
public MoreSuggestionsView(Context context, AttributeSet attrs, int defStyle) {