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 | 20 |
2 files changed, 18 insertions, 10 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 ae3c19db5..98ef02b25 100644 --- a/java/res/layout/input_view.xml +++ b/java/res/layout/input_view.xml @@ -23,10 +23,18 @@ android:layout_width="match_parent" android:layout_height="wrap_content" style="?attr/inputViewStyle"> - <include - android:id="@+id/main_keyboard_frame" - layout="@layout/main_keyboard_frame" /> - <include - android:id="@+id/emoji_palettes_view" - layout="@layout/emoji_palettes_view" /> + <LinearLayout + android:id="@+id/horizontal_keyboard_frame" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:gravity="bottom" + android:orientation="horizontal"> + <include + android:id="@+id/main_keyboard_frame" + layout="@layout/main_keyboard_frame" /> + <include + android:id="@+id/emoji_palettes_view" + layout="@layout/emoji_palettes_view" /> + </LinearLayout> </com.android.inputmethod.latin.InputView> |