am ade725ed: Merge "Fix unit test"

* commit 'ade725ed019250ff446ba81d1f0ebf97b4527c2e':
  Fix unit test

java/res/layout/hint_add_to_dictionary.xml

@@ -33,4 +33,4 @@
     android:clickable="false"
     android:singleLine="true"
     android:ellipsize="none"
-    android:background="?attr/suggestionBackground" />
+    style="?attr/suggestionWordStyle" />

java/res/layout/input_view.xml

@@ -34,7 +34,6 @@
         android:layout_height="@dimen/suggestions_strip_height"
         android:paddingRight="@dimen/suggestions_strip_padding"
         android:paddingLeft="@dimen/suggestions_strip_padding"
-        android:background="?attr/suggestionStripBackground"
         style="?attr/suggestionStripViewStyle" />
     <!-- To ensure that key preview popup is correctly placed when the current system locale is
          one of RTL locales, layoutDirection="ltr" is needed in the SDK version 17+. -->

java/res/layout/more_keys_keyboard.xml

@@ -23,7 +23,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:background="?attr/moreKeysKeyboardBackground"
+    style="?attr/moreKeysKeyboardContainerStyle"
 >
     <com.android.inputmethod.keyboard.MoreKeysKeyboardView
         xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

java/res/layout/more_suggestions.xml

@@ -23,7 +23,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:background="?attr/moreKeysKeyboardBackground"
+    style="?attr/moreKeysKeyboardContainerStyle"
 >
     <com.android.inputmethod.latin.suggestions.MoreSuggestionsView
         xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

java/res/layout/suggestion_info.xml

@@ -24,4 +24,4 @@
     android:layout_height="wrap_content"
     android:textSize="6dp"
     android:textColor="@android:color/white"
-    android:background="?attr/suggestionBackground" />
+    style="?attr/suggestionWordStyle" />

java/res/layout/suggestion_word.xml

@@ -36,4 +36,4 @@
     android:clickable="false"
     android:singleLine="true"
     android:ellipsize="none"
-    android:background="?attr/suggestionBackground" />
+    style="?attr/suggestionWordStyle" />

java/res/values/attrs.xml

@@ -32,12 +32,12 @@
         <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" />
-        <!-- Styled attributes for android:background -->
+        <!-- Suggestion word style -->
-        <attr name="moreKeysKeyboardBackground" format="reference" />
+        <attr name="suggestionWordStyle" format="reference" />
-        <attr name="suggestionStripBackground" format="reference" />
-        <attr name="suggestionBackground" format="reference" />
     </declare-styleable>
 
     <declare-styleable name="KeyboardView">

java/res/values/themes-common.xml

@@ -30,6 +30,7 @@
         <item name="maxMoreKeysColumn">@integer/config_max_more_keys_column</item>
     </style>
     <style name="KeyboardView">
+        <item name="keyBackground">@drawable/btn_keyboard_key_ics</item>
         <item name="keyLetterSize">@fraction/key_letter_ratio</item>
         <item name="keyLargeLetterRatio">@fraction/key_large_letter_ratio</item>
         <item name="keyLabelSize">@fraction/key_label_ratio</item>
@@ -100,16 +101,24 @@
         <item name="gestureRecognitionSpeedThreshold">@fraction/config_gesture_recognition_speed_threshold</item>
         <item name="suppressKeyPreviewAfterBatchInputDuration">@integer/config_suppress_key_preview_after_batch_input_duration</item>
     </style>
-    <style name="MainKeyboardView" />
+    <style
+        name="MainKeyboardView"
+        parent="KeyboardView" />
     <style name="EmojiKeyboardView" />
     <style name="MoreKeysKeyboard" />
-    <style name="MoreKeysKeyboardView" />
     <style
-        name="SuggestionStripView"
+        name="MoreKeysKeyboardView"
-    >
+        parent="MainKeyboardView" />
+    <style name="MoreKeysKeyboardContainer" />
+    <style name="SuggestionStripView">
         <item name="suggestionsCountInStrip">@integer/suggestions_count_in_strip</item>
         <item name="centerSuggestionPercentile">@fraction/center_suggestion_percentile</item>
         <item name="maxMoreSuggestionsRow">@integer/max_more_suggestions_row</item>
         <item name="minMoreSuggestionsWidth">@fraction/min_more_suggestions_width</item>
     </style>
+    <style name="SuggestionWord" />
+    <style name="MoreKeysKeyboardAnimation">
+        <item name="android:windowEnterAnimation">@anim/more_keys_keyboard_fadein</item>
+        <item name="android:windowExitAnimation">@anim/more_keys_keyboard_fadeout</item>
+    </style>
 </resources>

java/res/values/themes-gb.xml

@@ -26,10 +26,9 @@
         <item name="emojiKeyboardViewStyle">@style/EmojiKeyboardView.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="moreKeysKeyboardBackground">@drawable/keyboard_popup_panel_background_gb</item>
+        <item name="suggestionWordStyle">@style/SuggestionWord.GB</item>
-        <item name="suggestionStripBackground">@drawable/keyboard_suggest_strip_gb</item>
-        <item name="suggestionBackground">@drawable/btn_suggestion_gb</item>
     </style>
     <style name="KeyboardIcons.GB">
         <!-- Keyboard icons -->
@@ -122,10 +121,16 @@
         <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"
     >
+        <item name="android:background">@drawable/keyboard_suggest_strip_gb</item>
         <item name="suggestionStripOption">autoCorrectBold|validTypedWordBold</item>
         <item name="colorValidTypedWord">@color/highlight_color_gb</item>
         <item name="colorTypedWord">@color/typed_word_color_gb</item>
@@ -133,4 +138,7 @@
         <item name="colorSuggested">@color/highlight_color_gb</item>
         <item name="alphaObsoleted">50%</item>
     </style>
+    <style name="SuggestionWord.GB">
+        <item name="android:background">@drawable/btn_suggestion_gb</item>
+    </style>
 </resources>

java/res/values/themes-ics.xml

@@ -18,7 +18,7 @@
 */
 -->
 
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
     <style name="KeyboardTheme.ICS" parent="KeyboardIcons.ICS">
         <item name="keyboardStyle">@style/Keyboard.ICS</item>
         <item name="keyboardViewStyle">@style/KeyboardView.ICS</item>
@@ -26,10 +26,9 @@
         <item name="emojiKeyboardViewStyle">@style/EmojiKeyboardView.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="moreKeysKeyboardBackground">@drawable/keyboard_popup_panel_background_holo</item>
+        <item name="suggestionWordStyle">@style/SuggestionWord.ICS</item>
-        <item name="suggestionStripBackground">@drawable/keyboard_suggest_strip_holo</item>
-        <item name="suggestionBackground">@drawable/btn_suggestion_ics</item>
     </style>
     <style name="KeyboardIcons.ICS">
         <!-- Keyboard icons -->
@@ -123,10 +122,16 @@
         <item name="keyTypeface">normal</item>
         <item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_ics</item>
     </style>
+    <style
+        name="MoreKeysKeyboardContainer.ICS"
+    >
+        <item name="android:background">@drawable/keyboard_popup_panel_background_holo</item>
+    </style>
     <style
         name="SuggestionStripView.ICS"
         parent="SuggestionStripView"
     >
+        <item name="android:background">@drawable/keyboard_suggest_strip_holo</item>
         <item name="suggestionStripOption">autoCorrectBold|validTypedWordBold</item>
         <item name="colorValidTypedWord">@color/typed_word_color_ics</item>
         <item name="colorTypedWord">@color/typed_word_color_ics</item>
@@ -134,8 +139,7 @@
         <item name="colorSuggested">@color/suggested_word_color_ics</item>
         <item name="alphaObsoleted">70%</item>
     </style>
-    <style name="MoreKeysKeyboardAnimation">
+    <style name="SuggestionWord.ICS">
-        <item name="android:windowEnterAnimation">@anim/more_keys_keyboard_fadein</item>
+        <item name="android:background">@drawable/btn_suggestion_ics</item>
-        <item name="android:windowExitAnimation">@anim/more_keys_keyboard_fadeout</item>
     </style>
 </resources>