aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/res/values/attrs.xml6
-rw-r--r--java/res/values/styles.xml48
-rw-r--r--java/res/values/themes-basic-highcontrast.xml4
-rw-r--r--java/res/values/themes-basic.xml4
-rw-r--r--java/res/values/themes-gingerbread.xml4
-rw-r--r--java/res/values/themes-ics.xml4
-rw-r--r--java/res/values/themes-stone-bold.xml6
-rw-r--r--java/res/values/themes-stone.xml4
-rw-r--r--java/src/com/android/inputmethod/latin/MoreSuggestionsView.java2
9 files changed, 41 insertions, 41 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index fa6b2eb39..2af2554a0 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -27,11 +27,11 @@
<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>
<declare-styleable name="KeyboardView">
<!-- Image for the key. This image needs to be a StateListDrawable, with the following
diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml
index 17b3d14ab..45b98ca4c 100644
--- a/java/res/values/styles.xml
+++ b/java/res/values/styles.xml
@@ -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>
diff --git a/java/res/values/themes-basic-highcontrast.xml b/java/res/values/themes-basic-highcontrast.xml
index ee4109326..a45fa5239 100644
--- a/java/res/values/themes-basic-highcontrast.xml
+++ b/java/res/values/themes-basic-highcontrast.xml
@@ -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>
diff --git a/java/res/values/themes-basic.xml b/java/res/values/themes-basic.xml
index ff7f9ed35..4f754844f 100644
--- a/java/res/values/themes-basic.xml
+++ b/java/res/values/themes-basic.xml
@@ -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>
diff --git a/java/res/values/themes-gingerbread.xml b/java/res/values/themes-gingerbread.xml
index af91c3bed..f3a74f33e 100644
--- a/java/res/values/themes-gingerbread.xml
+++ b/java/res/values/themes-gingerbread.xml
@@ -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>
diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml
index 341afcc53..4b5ae6d20 100644
--- a/java/res/values/themes-ics.xml
+++ b/java/res/values/themes-ics.xml
@@ -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>
diff --git a/java/res/values/themes-stone-bold.xml b/java/res/values/themes-stone-bold.xml
index 915f2263e..3cff0f123 100644
--- a/java/res/values/themes-stone-bold.xml
+++ b/java/res/values/themes-stone-bold.xml
@@ -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="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item>
- <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</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>
</style>
</resources>
diff --git a/java/res/values/themes-stone.xml b/java/res/values/themes-stone.xml
index 6d5b9dbae..785f4107f 100644
--- a/java/res/values/themes-stone.xml
+++ b/java/res/values/themes-stone.xml
@@ -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>
diff --git a/java/src/com/android/inputmethod/latin/MoreSuggestionsView.java b/java/src/com/android/inputmethod/latin/MoreSuggestionsView.java
index 9fd90241b..0f8192bbb 100644
--- a/java/src/com/android/inputmethod/latin/MoreSuggestionsView.java
+++ b/java/src/com/android/inputmethod/latin/MoreSuggestionsView.java
@@ -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) {
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-05-06 21:00:54 +0000