diff options
Diffstat (limited to 'java/res')
16 files changed, 65 insertions, 58 deletions
diff --git a/java/res/drawable-hdpi/sym_keyboard_info_holo_dark.png b/java/res/drawable-hdpi/sym_keyboard_info_holo_dark.png Binary files differnew file mode 100644 index 000000000..f52f5af7a --- /dev/null +++ b/java/res/drawable-hdpi/sym_keyboard_info_holo_dark.png diff --git a/java/res/drawable-hdpi/sym_keyboard_more_holo_dark.png b/java/res/drawable-hdpi/sym_keyboard_more_holo_dark.png Binary files differnew file mode 100644 index 000000000..72e2b297d --- /dev/null +++ b/java/res/drawable-hdpi/sym_keyboard_more_holo_dark.png diff --git a/java/res/drawable-mdpi/sym_keyboard_info_holo_dark.png b/java/res/drawable-mdpi/sym_keyboard_info_holo_dark.png Binary files differnew file mode 100644 index 000000000..fa4e2390f --- /dev/null +++ b/java/res/drawable-mdpi/sym_keyboard_info_holo_dark.png diff --git a/java/res/drawable-mdpi/sym_keyboard_more_holo_dark.png b/java/res/drawable-mdpi/sym_keyboard_more_holo_dark.png Binary files differnew file mode 100644 index 000000000..58e27a2df --- /dev/null +++ b/java/res/drawable-mdpi/sym_keyboard_more_holo_dark.png diff --git a/java/res/drawable-xhdpi/sym_keyboard_info_holo_dark.png b/java/res/drawable-xhdpi/sym_keyboard_info_holo_dark.png Binary files differnew file mode 100644 index 000000000..513892fb9 --- /dev/null +++ b/java/res/drawable-xhdpi/sym_keyboard_info_holo_dark.png diff --git a/java/res/drawable-xhdpi/sym_keyboard_more_holo_dark.png b/java/res/drawable-xhdpi/sym_keyboard_more_holo_dark.png Binary files differnew file mode 100644 index 000000000..07e9bee38 --- /dev/null +++ b/java/res/drawable-xhdpi/sym_keyboard_more_holo_dark.png diff --git a/java/res/drawable-xxhdpi/sym_keyboard_info_holo_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_info_holo_dark.png Binary files differnew file mode 100644 index 000000000..b214d0eca --- /dev/null +++ b/java/res/drawable-xxhdpi/sym_keyboard_info_holo_dark.png diff --git a/java/res/drawable-xxhdpi/sym_keyboard_more_holo_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_more_holo_dark.png Binary files differnew file mode 100644 index 000000000..702da2720 --- /dev/null +++ b/java/res/drawable-xxhdpi/sym_keyboard_more_holo_dark.png diff --git a/java/res/layout/suggestion_word.xml b/java/res/layout/suggestion_word.xml deleted file mode 100644 index 47d2bd864..000000000 --- a/java/res/layout/suggestion_word.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2011, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<!-- Provide a haptic feedback by ourselves based on the keyboard settings. - We just need to ignore the system's haptic feedback settings. --> -<TextView - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:minWidth="@dimen/config_suggestion_min_width" - android:textSize="@dimen/config_suggestion_text_size" - android:gravity="center" - android:paddingLeft="@dimen/config_suggestion_text_horizontal_padding" - android:paddingTop="0dp" - android:paddingRight="@dimen/config_suggestion_text_horizontal_padding" - android:paddingBottom="0dp" - android:hapticFeedbackEnabled="false" - android:focusable="false" - android:clickable="false" - android:singleLine="true" - android:ellipsize="none" - style="?attr/suggestionWordStyle" /> diff --git a/java/res/layout/suggestions_strip.xml b/java/res/layout/suggestions_strip.xml index 85d60e681..9ffd231de 100644 --- a/java/res/layout/suggestions_strip.xml +++ b/java/res/layout/suggestions_strip.xml @@ -31,13 +31,31 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible"> - <include - layout="@layout/suggestion_word" - android:id="@+id/word_to_save" /> + <TextView + android:id="@+id/word_to_save" + android:layout_width="match_parent" + android:layout_height="match_parent" + style="?attr/suggestionWordStyle" /> <include layout="@layout/suggestion_divider" /> - <include - layout="@layout/suggestion_word" - android:id="@+id/hint_add_to_dictionary" /> + <TextView + android:id="@+id/hint_add_to_dictionary" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:textAlignment="viewStart" + style="?attr/suggestionWordStyle" /> + </LinearLayout> + <LinearLayout + android:id="@+id/important_notice_strip" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <TextView + android:id="@+id/important_notice_title" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1.0" + android:textSize="14sp" + style="?attr/suggestionWordStyle" /> </LinearLayout> </merge> diff --git a/java/res/layout/suggestion_info.xml b/java/res/values/strings-config-important-notice.xml index 0aa26000d..da206a37c 100644 --- a/java/res/layout/suggestion_info.xml +++ b/java/res/values/strings-config-important-notice.xml @@ -2,7 +2,7 @@ <!-- /* ** -** Copyright 2011, The Android Open Source Project +** Copyright 2014, The Android Open Source Project ** ** Licensed under the Apache License, Version 2.0 (the "License"); ** you may not use this file except in compliance with the License. @@ -18,10 +18,10 @@ */ --> -<TextView - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="6dp" - android:textColor="@android:color/white" - style="?attr/suggestionWordStyle" /> +<resources> + <integer name="config_important_notice_version">0</integer> + <!-- The title of the important notice displayed on the suggestion strip. --> + <string name="important_notice_title"></string> + <!-- The contents of the important notice. --> + <string name="important_notice_contents"></string> +</resources> diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml index 7c9b51c0a..3bfd73a55 100644 --- a/java/res/values/themes-common.xml +++ b/java/res/values/themes-common.xml @@ -127,7 +127,22 @@ <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item> <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item> </style> - <style name="SuggestionWord" /> + <style name="SuggestionWord"> + <item name="android:minWidth">@dimen/config_suggestion_min_width</item> + <item name="android:textSize">@dimen/config_suggestion_text_size</item> + <item name="android:gravity">center</item> + <item name="android:paddingLeft">@dimen/config_suggestion_text_horizontal_padding</item> + <item name="android:paddingTop">0dp</item> + <item name="android:paddingRight">@dimen/config_suggestion_text_horizontal_padding</item> + <item name="android:paddingBottom">0dp</item> + <!-- Provide a haptic feedback by ourselves based on the keyboard settings. + We just need to ignore the system's haptic feedback settings. --> + <item name="android:hapticFeedbackEnabled">false</item> + <item name="android:focusable">false</item> + <item name="android:clickable">false</item> + <item name="android:singleLine">true</item> + <item name="android:ellipsize">none</item> + </style> <style name="MoreKeysKeyboardAnimation"> <item name="android:windowEnterAnimation">@anim/more_keys_keyboard_fadein</item> <item name="android:windowExitAnimation">@anim/more_keys_keyboard_fadeout</item> diff --git a/java/res/values/themes-gb.xml b/java/res/values/themes-gb.xml index 52ecafd62..a460d4f7f 100644 --- a/java/res/values/themes-gb.xml +++ b/java/res/values/themes-gb.xml @@ -140,7 +140,11 @@ <item name="colorSuggested">@color/highlight_color_gb</item> <item name="alphaObsoleted">50%</item> </style> - <style name="SuggestionWord.GB"> + <style + name="SuggestionWord.GB" + parent="SuggestionWord" + > <item name="android:background">@drawable/btn_suggestion_gb</item> + <item name="android:textColor">@color/highlight_color_gb</item> </style> </resources> diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml index 125b640b6..caea92186 100644 --- a/java/res/values/themes-ics.xml +++ b/java/res/values/themes-ics.xml @@ -119,7 +119,11 @@ <item name="colorSuggested">@color/suggested_word_color_ics</item> <item name="alphaObsoleted">70%</item> </style> - <style name="SuggestionWord.ICS"> + <style + name="SuggestionWord.ICS" + parent="SuggestionWord" + > <item name="android:background">@drawable/btn_suggestion_ics</item> + <item name="android:textColor">@color/highlight_color_ics</item> </style> </resources> diff --git a/java/res/values/themes-klp.xml b/java/res/values/themes-klp.xml index f6c076767..0599fb65e 100644 --- a/java/res/values/themes-klp.xml +++ b/java/res/values/themes-klp.xml @@ -119,7 +119,11 @@ <item name="colorSuggested">@color/suggested_word_color_klp</item> <item name="alphaObsoleted">70%</item> </style> - <style name="SuggestionWord.KLP"> + <style + name="SuggestionWord.KLP" + parent="SuggestionWord" + > <item name="android:background">@drawable/btn_suggestion_klp</item> + <item name="android:textColor">@color/highlight_color_klp</item> </style> </resources> diff --git a/java/res/xml/keys_comma_period_symbols.xml b/java/res/xml/keys_comma_period_symbols.xml index cbdbe2ea2..880fe40d9 100644 --- a/java/res/xml/keys_comma_period_symbols.xml +++ b/java/res/xml/keys_comma_period_symbols.xml @@ -22,7 +22,8 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="," /> + latin:keyLabel="!text/keylabel_for_comma" + latin:moreKeys="!text/more_keys_for_comma" /> <!-- U+2026: "…" HORIZONTAL ELLIPSIS --> <Key latin:keyLabel="." |
