diff options
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/layout/input_view.xml | 20 | ||||
| -rw-r--r-- | java/res/values-v19/spinner-style.xml | 2 | ||||
| -rw-r--r-- | java/res/values/donottranslate-debug-settings.xml | 6 | ||||
| -rw-r--r-- | java/res/values/spinner-style.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/prefs_screen_debug.xml | 18 |
5 files changed, 40 insertions, 8 deletions
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> diff --git a/java/res/values-v19/spinner-style.xml b/java/res/values-v19/spinner-style.xml index 7de59edf3..a69990575 100644 --- a/java/res/values-v19/spinner-style.xml +++ b/java/res/values-v19/spinner-style.xml @@ -21,7 +21,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> <!-- Until KitKat (API 19), {@link android.widget.Spinner} of dialog mode in a Dialog can't handle orientation change correctly. Using dropdown mode avoids the issue. - This file overrides values/spinner-style.xml on KitKat and newer device. --> + This file overrides values/spinner-style.xml on KitKat and up. --> <style name="additionalSubtypeSpinnerStyle"> <item name="android:spinnerMode">dialog</item> </style> diff --git a/java/res/values/donottranslate-debug-settings.xml b/java/res/values/donottranslate-debug-settings.xml index 491043f1a..55ab9335d 100644 --- a/java/res/values/donottranslate-debug-settings.xml +++ b/java/res/values/donottranslate-debug-settings.xml @@ -47,6 +47,12 @@ <string name="prefs_resize_keyboard">Enable keyboard resizing</string> <!-- Title of the settings for setting keyboard height --> <string name="prefs_keyboard_height_scale">Keyboard height scale</string> + <!-- Title of the settings for setting keyboard width --> + <string name="prefs_keyboard_bottom_margin">Keyboard bottom margin</string> + <!-- Title of the settings for setting keyboard width --> + <string name="prefs_keyboard_left_margin">Keyboard left margin</string> + <!-- Title of the settings for setting keyboard width --> + <string name="prefs_keyboard_right_margin">Keyboard right margin</string> <!-- Message to show when there are no files to install as an external dictionary [CHAR LIMIT=100] --> <string name="read_external_dictionary_no_files_message">No dictionary files in the Downloads folder</string> <!-- Title of the dialog that selects a file to install as an external dictionary [CHAR LIMIT=50] --> diff --git a/java/res/values/spinner-style.xml b/java/res/values/spinner-style.xml index 4043ad49c..c0f32abe0 100644 --- a/java/res/values/spinner-style.xml +++ b/java/res/values/spinner-style.xml @@ -21,7 +21,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> <!-- Until KitKat (API 19), {@link android.widget.Spinner} of dialog mode in a Dialog can't handle orientation change correctly. Using dropdown mode avoids the issue. - This file is overridden by values-v19/spinner-style.xml on KitKat and newer device. --> + This file is overridden by values-v19/spinner-style.xml on KitKat and up. --> <style name="additionalSubtypeSpinnerStyle"> <item name="android:spinnerMode">dropdown</item> </style> diff --git a/java/res/xml/prefs_screen_debug.xml b/java/res/xml/prefs_screen_debug.xml index 905bc045c..31347271c 100644 --- a/java/res/xml/prefs_screen_debug.xml +++ b/java/res/xml/prefs_screen_debug.xml @@ -87,6 +87,24 @@ android:title="@string/prefs_keyboard_height_scale" latin:minValue="50" latin:maxValue="120" /> <!-- percentage --> + <com.android.inputmethod.latin.settings.SeekBarDialogPreference + android:dependency="pref_resize_keyboard" + android:key="pref_keyboard_bottom_margin" + android:title="@string/prefs_keyboard_bottom_margin" + latin:minValue="0" + latin:maxValue="50" /> <!-- percentage --> + <com.android.inputmethod.latin.settings.SeekBarDialogPreference + android:dependency="pref_resize_keyboard" + android:key="pref_keyboard_left_margin" + android:title="@string/prefs_keyboard_left_margin" + latin:minValue="0" + latin:maxValue="50" /> <!-- percentage --> + <com.android.inputmethod.latin.settings.SeekBarDialogPreference + android:dependency="pref_resize_keyboard" + android:key="pref_keyboard_right_margin" + android:title="@string/prefs_keyboard_right_margin" + latin:minValue="0" + latin:maxValue="50" /> <!-- percentage --> <PreferenceScreen android:key="read_external_dictionary" android:title="@string/prefs_read_external_dictionary" /> |