diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-08-28 11:25:31 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-08-28 11:25:31 +0000 |
| commit | ade725ed019250ff446ba81d1f0ebf97b4527c2e (patch) | |
| tree | d94e872a0c64357df6856271cf89952c076c2701 /java/res/layout | |
| parent | 2a084e88a7bd2693d18b1d247646ed9b7c096a99 (diff) | |
| parent | 0861d67fd80a99156e42ec00d4ff4b2b1e8e14dc (diff) | |
| download | latinime-ade725ed019250ff446ba81d1f0ebf97b4527c2e.tar.gz latinime-ade725ed019250ff446ba81d1f0ebf97b4527c2e.tar.xz latinime-ade725ed019250ff446ba81d1f0ebf97b4527c2e.zip | |
Merge "Fix unit test"
Diffstat (limited to 'java/res/layout')
| -rw-r--r-- | java/res/layout/hint_add_to_dictionary.xml | 2 | ||||
| -rw-r--r-- | java/res/layout/input_view.xml | 1 | ||||
| -rw-r--r-- | java/res/layout/more_keys_keyboard.xml | 2 | ||||
| -rw-r--r-- | java/res/layout/more_suggestions.xml | 2 | ||||
| -rw-r--r-- | java/res/layout/suggestion_info.xml | 2 | ||||
| -rw-r--r-- | java/res/layout/suggestion_word.xml | 2 |
6 files changed, 5 insertions, 6 deletions
diff --git a/java/res/layout/hint_add_to_dictionary.xml b/java/res/layout/hint_add_to_dictionary.xml index 63d4001ad..68a9faf19 100644 --- a/java/res/layout/hint_add_to_dictionary.xml +++ b/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" /> diff --git a/java/res/layout/input_view.xml b/java/res/layout/input_view.xml index 51133b289..78217b01a 100644 --- a/java/res/layout/input_view.xml +++ b/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+. --> diff --git a/java/res/layout/more_keys_keyboard.xml b/java/res/layout/more_keys_keyboard.xml index cab3abcd9..6637117e0 100644 --- a/java/res/layout/more_keys_keyboard.xml +++ b/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" diff --git a/java/res/layout/more_suggestions.xml b/java/res/layout/more_suggestions.xml index 0ec0ed1b3..8659f0761 100644 --- a/java/res/layout/more_suggestions.xml +++ b/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" diff --git a/java/res/layout/suggestion_info.xml b/java/res/layout/suggestion_info.xml index 8b0ee3484..0aa26000d 100644 --- a/java/res/layout/suggestion_info.xml +++ b/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" /> diff --git a/java/res/layout/suggestion_word.xml b/java/res/layout/suggestion_word.xml index e32e6952b..c82a13c99 100644 --- a/java/res/layout/suggestion_word.xml +++ b/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" /> |