diff options
Diffstat (limited to 'java/res/layout')
| -rw-r--r-- | java/res/layout/additional_subtype_dialog.xml | 8 | ||||
| -rw-r--r-- | java/res/layout/input_view.xml | 3 | ||||
| -rw-r--r-- | java/res/layout/suggestions_strip.xml | 24 | ||||
| -rw-r--r-- | java/res/layout/user_dictionary_add_word_fullscreen.xml | 20 |
4 files changed, 6 insertions, 49 deletions
diff --git a/java/res/layout/additional_subtype_dialog.xml b/java/res/layout/additional_subtype_dialog.xml index b7804f5df..2de7d07a8 100644 --- a/java/res/layout/additional_subtype_dialog.xml +++ b/java/res/layout/additional_subtype_dialog.xml @@ -38,7 +38,6 @@ android:text="@string/subtype_locale" /> <Spinner android:id="@+id/subtype_locale_spinner" - android:spinnerMode="dialog" android:layout_width="0dp" android:layout_weight="70" android:layout_height="wrap_content" @@ -47,7 +46,8 @@ android:layout_marginTop="8dip" android:layout_gravity="fill_horizontal|center_vertical" android:gravity="start|left" - android:prompt="@string/subtype_locale" /> + android:prompt="@string/subtype_locale" + style="@style/additionalSubtypeSpinnerStyle" /> </LinearLayout> <LinearLayout android:orientation="horizontal" @@ -63,7 +63,6 @@ android:text="@string/keyboard_layout_set" /> <Spinner android:id="@+id/keyboard_layout_set_spinner" - android:spinnerMode="dialog" android:layout_width="0dp" android:layout_weight="70" android:layout_height="wrap_content" @@ -72,6 +71,7 @@ android:layout_marginTop="8dip" android:layout_gravity="fill_horizontal|center_vertical" android:gravity="start|left" - android:prompt="@string/keyboard_layout_set" /> + android:prompt="@string/keyboard_layout_set" + style="@style/additionalSubtypeSpinnerStyle" /> </LinearLayout> </LinearLayout> diff --git a/java/res/layout/input_view.xml b/java/res/layout/input_view.xml index 46551f63f..ae3c19db5 100644 --- a/java/res/layout/input_view.xml +++ b/java/res/layout/input_view.xml @@ -21,7 +21,8 @@ <com.android.inputmethod.latin.InputView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + style="?attr/inputViewStyle"> <include android:id="@+id/main_keyboard_frame" layout="@layout/main_keyboard_frame" /> diff --git a/java/res/layout/suggestions_strip.xml b/java/res/layout/suggestions_strip.xml index aefdb8cad..47e9a918e 100644 --- a/java/res/layout/suggestions_strip.xml +++ b/java/res/layout/suggestions_strip.xml @@ -33,30 +33,6 @@ android:soundEffectsEnabled="false" /> <!-- Provide audio and haptic feedback by ourselves based on the keyboard settings. We just need to ignore the system's audio and haptic feedback settings. --> - <LinearLayout - android:id="@+id/add_to_dictionary_strip" - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginLeft="@dimen/config_suggestions_strip_horizontal_margin" - android:layout_marginRight="@dimen/config_suggestions_strip_horizontal_margin" - android:hapticFeedbackEnabled="false" - android:soundEffectsEnabled="false"> - <TextView - android:id="@+id/word_to_save" - android:layout_width="match_parent" - android:layout_height="match_parent" - style="?attr/suggestionWordStyle" /> - <include - android:id="@+id/word_to_save_divider" - layout="@layout/suggestion_divider" /> - <TextView - android:id="@+id/hint_add_to_dictionary" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="center_vertical|start" - style="?attr/suggestionWordStyle" /> - </LinearLayout> <!-- Provide audio and haptic feedback by ourselves based on the keyboard settings. We just need to ignore the system's audio and haptic feedback settings. --> <LinearLayout diff --git a/java/res/layout/user_dictionary_add_word_fullscreen.xml b/java/res/layout/user_dictionary_add_word_fullscreen.xml index 9bcb189b4..cbdfba67d 100644 --- a/java/res/layout/user_dictionary_add_word_fullscreen.xml +++ b/java/res/layout/user_dictionary_add_word_fullscreen.xml @@ -44,26 +44,6 @@ android:columnCount="2" > <TextView - android:id="@+id/user_dictionary_add_shortcut_label" - style="?android:attr/textAppearanceSmall" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="start|center_vertical" - android:text="@string/user_dict_settings_add_shortcut_option_name" /> - - <EditText - android:id="@+id/user_dictionary_add_shortcut" - android:layout_width="wrap_content" - android:layout_gravity="fill_horizontal|center_vertical" - android:layout_marginBottom="8dip" - android:layout_marginStart="8dip" - android:layout_marginTop="8dip" - android:hint="@string/user_dict_settings_add_shortcut_hint" - android:imeOptions="flagNoFullscreen" - android:inputType="textNoSuggestions" - android:maxLength="@integer/config_user_dictionary_max_word_length" /> - - <TextView android:id="@+id/user_dictionary_add_locale_label" style="?android:attr/textAppearanceSmall" android:layout_width="wrap_content" |