diff options
Diffstat (limited to 'java/res')
-rw-r--r-- | java/res/layout/input_view.xml | 6 | ||||
-rw-r--r-- | java/res/values/attrs.xml | 6 | ||||
-rw-r--r-- | java/res/values/styles.xml | 4 | ||||
-rw-r--r-- | java/res/values/themes-basic-highcontrast.xml | 2 | ||||
-rw-r--r-- | java/res/values/themes-basic.xml | 2 | ||||
-rw-r--r-- | java/res/values/themes-gingerbread.xml | 2 | ||||
-rw-r--r-- | java/res/values/themes-ics.xml | 2 | ||||
-rw-r--r-- | java/res/values/themes-stone-bold.xml | 2 | ||||
-rw-r--r-- | java/res/values/themes-stone.xml | 2 |
9 files changed, 14 insertions, 14 deletions
diff --git a/java/res/layout/input_view.xml b/java/res/layout/input_view.xml index 99f8e27c5..40eff3839 100644 --- a/java/res/layout/input_view.xml +++ b/java/res/layout/input_view.xml @@ -43,13 +43,13 @@ android:layout_width="@dimen/suggestions_strip_padding" android:layout_height="@dimen/suggestions_strip_height" style="?attr/suggestionsStripBackgroundStyle" /> - <com.android.inputmethod.latin.suggestions.SuggestionsView - android:id="@+id/suggestions_view" + <com.android.inputmethod.latin.suggestions.SuggestionStripView + android:id="@+id/suggestion_strip_view" android:layout_weight="1.0" android:layout_width="0dp" android:layout_height="@dimen/suggestions_strip_height" android:gravity="center_vertical" - style="?attr/suggestionsViewStyle" /> + style="?attr/suggestionStripViewStyle" /> <View android:layout_width="@dimen/suggestions_strip_padding" android:layout_height="@dimen/suggestions_strip_height" diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 4589444ee..1d52e46bb 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -29,7 +29,7 @@ <attr name="moreKeysKeyboardPanelStyle" format="reference" /> <!-- Suggestions strip style --> <attr name="suggestionsStripBackgroundStyle" format="reference" /> - <attr name="suggestionsViewStyle" format="reference" /> + <attr name="suggestionStripViewStyle" format="reference" /> <attr name="moreSuggestionsViewStyle" format="reference" /> <attr name="suggestionBackgroundStyle" format="reference" /> <attr name="suggestionPreviewBackgroundStyle" format="reference" /> @@ -155,9 +155,9 @@ <attr name="showMoreKeysKeyboardAtTouchedPoint" format="boolean" /> </declare-styleable> - <declare-styleable name="SuggestionsView"> + <declare-styleable name="SuggestionStripView"> <attr name="suggestionStripOption" format="integer"> - <!-- This should be aligned with SuggestionsViewParams.AUTO_CORRECT_* and etc. --> + <!-- This should be aligned with SuggestionStripViewParams.AUTO_CORRECT_* and etc. --> <flag name="autoCorrectBold" value="0x01" /> <flag name="autoCorrectUnderline" value="0x02" /> <flag name="validTypedWordBold" value="0x04" /> diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index 1f1282129..8797fd7aa 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -114,7 +114,7 @@ <item name="android:background">@drawable/keyboard_suggest_strip</item> </style> <style - name="SuggestionsViewStyle" + name="SuggestionStripViewStyle" parent="SuggestionsStripBackgroundStyle" > <item name="suggestionStripOption">autoCorrectBold|validTypedWordBold</item> @@ -348,7 +348,7 @@ <item name="android:background">@drawable/keyboard_suggest_strip_holo</item> </style> <style - name="SuggestionsViewStyle.IceCreamSandwich" + name="SuggestionStripViewStyle.IceCreamSandwich" parent="SuggestionsStripBackgroundStyle.IceCreamSandwich" > <item name="suggestionStripOption">autoCorrectBold|validTypedWordBold</item> diff --git a/java/res/values/themes-basic-highcontrast.xml b/java/res/values/themes-basic-highcontrast.xml index f849919be..b3ea05045 100644 --- a/java/res/values/themes-basic-highcontrast.xml +++ b/java/res/values/themes-basic-highcontrast.xml @@ -23,7 +23,7 @@ <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView</item> <item name="moreKeysKeyboardPanelStyle">@style/MoreKeysKeyboardPanelStyle</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item> - <item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item> + <item name="suggestionStripViewStyle">@style/SuggestionStripViewStyle</item> <item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item> <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item> diff --git a/java/res/values/themes-basic.xml b/java/res/values/themes-basic.xml index 4bd9dc3e3..ff6a70a08 100644 --- a/java/res/values/themes-basic.xml +++ b/java/res/values/themes-basic.xml @@ -23,7 +23,7 @@ <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView</item> <item name="moreKeysKeyboardPanelStyle">@style/MoreKeysKeyboardPanelStyle</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item> - <item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item> + <item name="suggestionStripViewStyle">@style/SuggestionStripViewStyle</item> <item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item> <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item> diff --git a/java/res/values/themes-gingerbread.xml b/java/res/values/themes-gingerbread.xml index 00de9c59a..0ce0b8a9b 100644 --- a/java/res/values/themes-gingerbread.xml +++ b/java/res/values/themes-gingerbread.xml @@ -23,7 +23,7 @@ <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.Gingerbread</item> <item name="moreKeysKeyboardPanelStyle">@style/MoreKeysKeyboardPanelStyle</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item> - <item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item> + <item name="suggestionStripViewStyle">@style/SuggestionStripViewStyle</item> <item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item> <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item> diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml index f605d15f5..8df58c594 100644 --- a/java/res/values/themes-ics.xml +++ b/java/res/values/themes-ics.xml @@ -23,7 +23,7 @@ <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.IceCreamSandwich</item> <item name="moreKeysKeyboardPanelStyle">@style/MoreKeysKeyboardPanelStyle.IceCreamSandwich</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle.IceCreamSandwich</item> - <item name="suggestionsViewStyle">@style/SuggestionsViewStyle.IceCreamSandwich</item> + <item name="suggestionStripViewStyle">@style/SuggestionStripViewStyle.IceCreamSandwich</item> <item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle.IceCreamSandwich</item> <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle.IceCreamSandwich</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle.IceCreamSandwich</item> diff --git a/java/res/values/themes-stone-bold.xml b/java/res/values/themes-stone-bold.xml index 0065b1f8a..355a97f7b 100644 --- a/java/res/values/themes-stone-bold.xml +++ b/java/res/values/themes-stone-bold.xml @@ -23,7 +23,7 @@ <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.Stone</item> <item name="moreKeysKeyboardPanelStyle">@style/MoreKeysKeyboardPanelStyle</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item> - <item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item> + <item name="suggestionStripViewStyle">@style/SuggestionStripViewStyle</item> <item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item> <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item> diff --git a/java/res/values/themes-stone.xml b/java/res/values/themes-stone.xml index 941eb703b..23437f780 100644 --- a/java/res/values/themes-stone.xml +++ b/java/res/values/themes-stone.xml @@ -23,7 +23,7 @@ <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.Stone</item> <item name="moreKeysKeyboardPanelStyle">@style/MoreKeysKeyboardPanelStyle</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item> - <item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item> + <item name="suggestionStripViewStyle">@style/SuggestionStripViewStyle</item> <item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item> <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item> |