Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 058c6c64 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Reorganize Keyboard settings screen 

This CL must be checked in together with Ie45df15b18.

Bug: 11866784
Change-Id: I44d6ceb45108be135e3eaa361f4ee2c83f04fb57
parent 7d6bc4d0

java/res/values/keyboard-themes.xml

+5 −4
Original line number Original line Diff line number Diff line
@@ -20,13 +20,14 @@ 
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- For keyboard color scheme option dialog. -->

    <!-- For keyboard color scheme option dialog. -->

    <string-array name="keyboard_theme_names" translatable="false">

    <string-array name="keyboard_theme_names" translatable="false">

        <!-- TODO: Make this item as translatable string resource. -->

        <!-- TODO: Implement Material Light theme. -->

        <item>Material</item>

        <item>@string/keyboard_theme_material_dark</item>

        <item>@string/keyboard_color_scheme_white</item>

        <item>@string/keyboard_theme_holo_white</item>

        <item>@string/keyboard_color_scheme_blue</item>

        <item>@string/keyboard_theme_holo_blue</item>

    </string-array>

    </string-array>

    <!-- An element must be a keyboard theme id of {@link KeyboardTheme#THEME_ID_*}. -->

    <!-- An element must be a keyboard theme id of {@link KeyboardTheme#THEME_ID_*}. -->

    <string-array name="keyboard_theme_ids" translatable="false">

    <string-array name="keyboard_theme_ids" translatable="false">

        <!-- TODO: Implement Material Light theme. -->

        <item>3</item>

        <item>3</item>

        <item>2</item>

        <item>2</item>

        <item>0</item>

        <item>0</item>

java/res/values/strings.xml

+22 −22
Original line number Original line Diff line number Diff line
@@ -36,22 +36,18 @@ 
    <!-- Option to control whether or not to show a popup with a larger font on each key press. -->

    <!-- Option to control whether or not to show a popup with a larger font on each key press. -->

    <string name="popup_on_keypress">Popup on keypress</string>

    <string name="popup_on_keypress">Popup on keypress</string>





    <!-- Category title for general settings for Android keyboard -->

    <!-- Settings screen title for input preferences [CHAR LIMIT=25]-->

    <string name="general_category">General</string>

    <string name="settings_screen_input">Input preferences</string>



    <!-- Settings screen title for appearance preferences [CHAR LIMIT=25] -->

    <!-- Category title for text prediction -->

    <string name="settings_screen_appearances">Appearance</string>

    <string name="correction_category">Text correction</string>

    <!-- Settings screen title for multi lingual options [CHAR_LIMIT=25] -->



    <string name="settings_screen_multi_lingual">Multi lingual options</string>

    <!-- Category title for gesture typing -->

    <!-- Settings screen title for gesture typing preferences [CHAR_LIMIT=25] -->

    <string name="gesture_typing_category">Gesture typing</string>

    <string name="settings_screen_gesture">Gesture typing preferences</string>



    <!-- Settings screen title for text correction options [CHAR_LIMIT=25] -->

    <!-- Category title for misc options  -->

    <string name="settings_screen_correction">Text correction</string>

    <string name="misc_category">Other options</string>

    <!-- Settings screen title for advanced settings [CHAR LIMIT=25] -->



    <string name="settings_screen_advanced">Advanced</string>

    <!-- Option name for advanced settings screen [CHAR LIMIT=25] -->

    <string name="advanced_settings">Advanced settings</string>

    <!-- Option summary for advanced settings screen [CHAR LIMIT=65 (two lines) or 30 (fits on one line, preferable)] -->

    <string name="advanced_settings_summary">Options for experts</string>





    <!-- Option name for including other IMEs in the language switch list [CHAR LIMIT=30] -->

    <!-- Option name for including other IMEs in the language switch list [CHAR LIMIT=30] -->

    <string name="include_other_imes_in_language_switch_list">Switch to other input methods</string>

    <string name="include_other_imes_in_language_switch_list">Switch to other input methods</string>
@@ -295,12 +291,16 @@ mobile devices. [CHAR LIMIT=25] --> 
    <!-- Description for Emoji keyboard subtype [CHAR LIMIT=25] -->

    <!-- Description for Emoji keyboard subtype [CHAR LIMIT=25] -->

    <string name="subtype_emoji">Emoji</string>

    <string name="subtype_emoji">Emoji</string>





    <!-- Title of the preference settings for switching keyboard color scheme [CHAR LIMIT=35] -->

    <!-- Title of the preference settings for switching keyboard theme [CHAR LIMIT=35] -->

    <string name="keyboard_color_scheme">Color scheme</string>

    <string name="keyboard_theme">Keyboard theme</string>

    <!-- The keyboard color scheme name, White [CHAR LIMIT=16] -->

    <!-- The keyboard theme name, Holo White [CHAR LIMIT=25] -->

    <string name="keyboard_color_scheme_white">White</string>

    <string name="keyboard_theme_holo_white">Holo White</string>

    <!-- The keyboard color scheme name, Blue [CHAR LIMIT=16] -->

    <!-- The keyboard theme name, Holo Blue [CHAR LIMIT=25] -->

    <string name="keyboard_color_scheme_blue">Blue</string>

    <string name="keyboard_theme_holo_blue">Holo Blue</string>

    <!-- The keyboard theme name, Material Dark [CHAR LIMIT=25] -->

    <string name="keyboard_theme_material_dark">Material Dark</string>

    <!-- The keyboard theme name, Material Light [CHAR LIMIT=25] -->

    <string name="keyboard_theme_material_light">Material Light</string>





    <!-- Title of the preference settings for custom input styles (language and keyboard layout pairs) [CHAR LIMIT=35]-->

    <!-- Title of the preference settings for custom input styles (language and keyboard layout pairs) [CHAR LIMIT=35]-->

    <string name="custom_input_styles_title">Custom input styles</string>

    <string name="custom_input_styles_title">Custom input styles</string>

java/res/xml/prefs.xml

+115 −122
Original line number Original line Diff line number Diff line
@@ -18,15 +18,21 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

    android:key="english_ime_settings">

    android:key="english_ime_settings">

    <PreferenceCategory

    <PreferenceScreen

        android:title="@string/general_category"

        android:title="@string/settings_screen_input"

        android:key="general_settings">

        android:key="screen_input">

        <CheckBoxPreference

        <CheckBoxPreference

            android:key="auto_cap"

            android:key="auto_cap"

            android:title="@string/auto_cap"

            android:title="@string/auto_cap"

            android:summary="@string/auto_cap_summary"

            android:summary="@string/auto_cap_summary"

            android:persistent="true"

            android:defaultValue="true"

            android:defaultValue="true" />

            android:persistent="true" />

        <CheckBoxPreference

            android:key="pref_key_use_double_space_period"

            android:title="@string/use_double_space_period"

            android:summary="@string/use_double_space_period_summary"

            android:defaultValue="true"

            android:persistent="true" />

        <CheckBoxPreference

        <CheckBoxPreference

            android:key="vibrate_on"

            android:key="vibrate_on"

            android:title="@string/vibrate_on_keypress"

            android:title="@string/vibrate_on_keypress"
@@ -40,17 +46,67 @@ 
        <CheckBoxPreference

        <CheckBoxPreference

            android:key="popup_on"

            android:key="popup_on"

            android:title="@string/popup_on_keypress"

            android:title="@string/popup_on_keypress"

            android:persistent="true"

            android:defaultValue="@bool/config_default_key_preview_popup"

            android:defaultValue="@bool/config_default_key_preview_popup" />

            android:persistent="true" />

        <CheckBoxPreference

        <CheckBoxPreference

            android:key="pref_voice_input_key"

            android:key="pref_voice_input_key"

            android:title="@string/voice_input"

            android:title="@string/voice_input"

            android:persistent="true"

            android:defaultValue="true"

            android:defaultValue="true" />

            android:persistent="true" />

    </PreferenceCategory>

    </PreferenceScreen>

    <PreferenceCategory

    <ListPreference

        android:title="@string/correction_category"

        android:key="pref_keyboard_theme"

        android:key="correction_settings">

        android:title="@string/keyboard_theme"

        android:entryValues="@array/keyboard_theme_ids"

        android:entries="@array/keyboard_theme_names"

        android:persistent="true" />

    <PreferenceScreen

        android:title="@string/settings_screen_multi_lingual"

        android:key="screen_multi_lingual">

        <CheckBoxPreference

            android:key="pref_show_language_switch_key"

            android:title="@string/show_language_switch_key"

            android:summary="@string/show_language_switch_key_summary"

            android:defaultValue="true"

            android:persistent="true" />

        <CheckBoxPreference

            android:key="pref_include_other_imes_in_language_switch_list"

            android:dependency="pref_show_language_switch_key"

            android:title="@string/include_other_imes_in_language_switch_list"

            android:summary="@string/include_other_imes_in_language_switch_list_summary"

            android:defaultValue="false"

            android:persistent="true" />

        <PreferenceScreen

            android:fragment="com.android.inputmethod.latin.settings.AdditionalSubtypeSettings"

            android:key="custom_input_styles"

            android:title="@string/custom_input_styles_title" />

    </PreferenceScreen>

    <PreferenceScreen

        android:title="@string/settings_screen_gesture"

        android:key="screen_gesture">

        <CheckBoxPreference

            android:key="gesture_input"

            android:title="@string/gesture_input"

            android:summary="@string/gesture_input_summary"

            android:defaultValue="true"

            android:persistent="true" />

        <CheckBoxPreference

            android:key="pref_gesture_floating_preview_text"

            android:dependency="gesture_input"

            android:title="@string/gesture_floating_preview_text"

            android:summary="@string/gesture_floating_preview_text_summary"

            android:defaultValue="true"

            android:persistent="true" />

        <CheckBoxPreference

            android:key="pref_gesture_preview_trail"

            android:dependency="gesture_input"

            android:title="@string/gesture_preview_trail"

            android:defaultValue="true"

            android:persistent="true" />

    </PreferenceScreen>

    <PreferenceScreen

        android:title="@string/settings_screen_correction"

        android:key="screen_correction">

        <PreferenceScreen

        <PreferenceScreen

            android:key="edit_personal_dictionary"

            android:key="edit_personal_dictionary"

            android:title="@string/edit_personal_dictionary">

            android:title="@string/edit_personal_dictionary">
@@ -71,109 +127,46 @@ 
            android:key="pref_key_block_potentially_offensive"

            android:key="pref_key_block_potentially_offensive"

            android:title="@string/prefs_block_potentially_offensive_title"

            android:title="@string/prefs_block_potentially_offensive_title"

            android:summary="@string/prefs_block_potentially_offensive_summary"

            android:summary="@string/prefs_block_potentially_offensive_summary"

            android:persistent="true"

            android:defaultValue="@bool/config_block_potentially_offensive"

            android:defaultValue="@bool/config_block_potentially_offensive" />

            android:persistent="true" />

        <ListPreference

        <ListPreference

            android:key="auto_correction_threshold"

            android:key="auto_correction_threshold"

            android:title="@string/auto_correction"

            android:title="@string/auto_correction"

            android:summary="@string/auto_correction_summary"

            android:summary="@string/auto_correction_summary"

            android:persistent="true"

            android:entryValues="@array/auto_correction_threshold_mode_indexes"

            android:entryValues="@array/auto_correction_threshold_mode_indexes"

            android:entries="@array/auto_correction_threshold_modes"

            android:entries="@array/auto_correction_threshold_modes"

            android:defaultValue="@string/auto_correction_threshold_mode_index_modest" />

            android:defaultValue="@string/auto_correction_threshold_mode_index_modest"

            android:persistent="true" />

        <ListPreference

        <ListPreference

            android:key="show_suggestions_setting"

            android:key="show_suggestions_setting"

            android:summary="@string/prefs_show_suggestions_summary"

            android:summary="@string/prefs_show_suggestions_summary"

            android:title="@string/prefs_show_suggestions"

            android:title="@string/prefs_show_suggestions"

            android:persistent="true"

            android:entryValues="@array/prefs_suggestion_visibility_values"

            android:entryValues="@array/prefs_suggestion_visibility_values"

            android:entries="@array/prefs_suggestion_visibilities"

            android:entries="@array/prefs_suggestion_visibilities"

            android:defaultValue="@string/prefs_suggestion_visibility_default_value" />

            android:defaultValue="@string/prefs_suggestion_visibility_default_value"

            android:persistent="true" />

        <CheckBoxPreference

        <CheckBoxPreference

            android:key="pref_key_use_personalized_dicts"

            android:key="pref_key_use_personalized_dicts"

            android:title="@string/use_personalized_dicts"

            android:title="@string/use_personalized_dicts"

            android:summary="@string/use_personalized_dicts_summary"

            android:summary="@string/use_personalized_dicts_summary"

            android:persistent="true"

            android:defaultValue="true"

            android:defaultValue="true" />

            android:persistent="true" />

        <!-- title will be set programmatically to embed application name -->

        <CheckBoxPreference

            android:key="pref_enable_metrics_logging"

            android:summary="@string/enable_metrics_logging_summary"

            android:persistent="true"

            android:defaultValue="true" />

    </PreferenceCategory>

    <PreferenceCategory

        android:title="@string/gesture_typing_category"

        android:key="gesture_typing_settings">

        <CheckBoxPreference

            android:key="gesture_input"

            android:title="@string/gesture_input"

            android:summary="@string/gesture_input_summary"

            android:persistent="true"

            android:defaultValue="true" />

        <!-- TODO: Move these two options to the advanced settings. -->

        <CheckBoxPreference

            android:key="pref_gesture_floating_preview_text"

            android:dependency="gesture_input"

            android:title="@string/gesture_floating_preview_text"

            android:summary="@string/gesture_floating_preview_text_summary"

            android:persistent="true"

            android:defaultValue="true" />

        <CheckBoxPreference

            android:key="pref_gesture_preview_trail"

            android:dependency="gesture_input"

            android:title="@string/gesture_preview_trail"

            android:persistent="true"

            android:defaultValue="true" />

    </PreferenceCategory>

    <PreferenceCategory

        android:title="@string/misc_category"

        android:key="misc_settings">

        <CheckBoxPreference

            android:key="next_word_prediction"

            android:title="@string/bigram_prediction"

            android:summary="@string/bigram_prediction_summary"

            android:persistent="true"

            android:defaultValue="true" />

        <PreferenceScreen

            android:key="pref_advanced_settings"

            android:title="@string/advanced_settings"

            android:summary="@string/advanced_settings_summary">

        <CheckBoxPreference

        <CheckBoxPreference

            android:key="pref_key_use_contacts_dict"

            android:key="pref_key_use_contacts_dict"

            android:title="@string/use_contacts_dict"

            android:title="@string/use_contacts_dict"

            android:summary="@string/use_contacts_dict_summary"

            android:summary="@string/use_contacts_dict_summary"

                android:persistent="true"

            android:defaultValue="true"

                android:defaultValue="true" />

            android:persistent="true" />

            <CheckBoxPreference

                android:key="pref_key_use_double_space_period"

                android:title="@string/use_double_space_period"

                android:summary="@string/use_double_space_period_summary"

                android:persistent="true"

                android:defaultValue="true" />

            <CheckBoxPreference

                android:key="pref_show_language_switch_key"

                android:title="@string/show_language_switch_key"

                android:summary="@string/show_language_switch_key_summary"

                android:persistent="true"

                android:defaultValue="true" />

        <CheckBoxPreference

        <CheckBoxPreference

                android:key="pref_include_other_imes_in_language_switch_list"

            android:key="next_word_prediction"

                android:dependency="pref_show_language_switch_key"

            android:title="@string/bigram_prediction"

                android:title="@string/include_other_imes_in_language_switch_list"

            android:summary="@string/bigram_prediction_summary"

                android:summary="@string/include_other_imes_in_language_switch_list_summary"

            android:defaultValue="true"

                android:persistent="true"

            android:persistent="true" />

                android:defaultValue="false" />

        </PreferenceScreen>

            <ListPreference

                android:key="pref_keyboard_theme"

                android:title="@string/keyboard_color_scheme"

                android:persistent="true"

                android:entryValues="@array/keyboard_theme_ids"

                android:entries="@array/keyboard_theme_names" />

    <PreferenceScreen

    <PreferenceScreen

                android:fragment="com.android.inputmethod.latin.settings.AdditionalSubtypeSettings"

        android:title="@string/settings_screen_advanced"

                android:key="custom_input_styles"

        android:key="screen_advanced">

                android:title="@string/custom_input_styles_title" />

        <!-- TODO: consolidate key preview dismiss delay with the key preview animation parameters. -->

        <!-- TODO: consolidate key preview dismiss delay with the key preview animation parameters. -->

        <ListPreference

        <ListPreference

            android:key="pref_key_preview_popup_dismiss_delay"

            android:key="pref_key_preview_popup_dismiss_delay"
@@ -192,16 +185,16 @@ 
            android:key="pref_show_setup_wizard_icon"

            android:key="pref_show_setup_wizard_icon"

            android:title="@string/show_setup_wizard_icon"

            android:title="@string/show_setup_wizard_icon"

            android:summary="@string/show_setup_wizard_icon_summary" />

            android:summary="@string/show_setup_wizard_icon_summary" />

        </PreferenceScreen>

        <!-- title will be set programmatically to embed application name -->

        <PreferenceScreen

        <CheckBoxPreference

            android:key="send_feedback"

            android:key="pref_enable_metrics_logging"

            android:title="@string/send_feedback" />

            android:summary="@string/enable_metrics_logging_summary"

        <PreferenceScreen

            android:defaultValue="true"

            android:key="about_keyboard" />

            android:persistent="true" />

        <PreferenceScreen

        <PreferenceScreen

            android:key="debug_settings"

            android:key="screen_debug"

            android:title="Debug settings"

            android:title="Debug settings"

            android:persistent="true"

            android:defaultValue="false"

            android:defaultValue="false" />

            android:persistent="true" />

    </PreferenceCategory>

        </PreferenceScreen>

</PreferenceScreen>
 
</PreferenceScreen>

java/res/xml/prefs_for_debug.xml

+6 −6
Original line number Original line Diff line number Diff line
@@ -23,19 +23,19 @@ 
    <CheckBoxPreference

    <CheckBoxPreference

        android:key="debug_mode"

        android:key="debug_mode"

        android:title="@string/prefs_debug_mode"

        android:title="@string/prefs_debug_mode"

        android:persistent="true"

        android:defaultValue="false"

        android:defaultValue="false" />

        android:persistent="true" />

    <CheckBoxPreference

    <CheckBoxPreference

        android:key="force_non_distinct_multitouch"

        android:key="force_non_distinct_multitouch"

        android:title="@string/prefs_force_non_distinct_multitouch"

        android:title="@string/prefs_force_non_distinct_multitouch"

        android:persistent="true"

        android:defaultValue="false"

        android:defaultValue="false" />

        android:persistent="true" />

    <CheckBoxPreference

    <CheckBoxPreference

        android:key="pref_sliding_key_input_preview"

        android:key="pref_sliding_key_input_preview"

        android:title="@string/sliding_key_input_preview"

        android:title="@string/sliding_key_input_preview"

        android:summary="@string/sliding_key_input_preview_summary"

        android:summary="@string/sliding_key_input_preview_summary"

        android:persistent="true"

        android:defaultValue="true"

        android:defaultValue="true" />

        android:persistent="true" />

    <com.android.inputmethod.latin.settings.SeekBarDialogPreference

    <com.android.inputmethod.latin.settings.SeekBarDialogPreference

        android:key="pref_key_longpress_timeout"

        android:key="pref_key_longpress_timeout"

        android:title="@string/prefs_key_longpress_timeout_settings"

        android:title="@string/prefs_key_longpress_timeout_settings"

java/res/xml/spell_checker_settings.xml

+8 −7
Original line number Original line Diff line number Diff line
@@ -15,11 +15,12 @@ 
-->

-->





<PreferenceScreen

<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android">

    xmlns:android="http://schemas.android.com/apk/res/android"

>

    <CheckBoxPreference

    <CheckBoxPreference

        android:key="pref_spellcheck_use_contacts"

        android:key="pref_spellcheck_use_contacts"

        android:title="@string/use_contacts_for_spellchecking_option_title"

        android:title="@string/use_contacts_for_spellchecking_option_title"

        android:summary="@string/use_contacts_for_spellchecking_option_summary"

        android:summary="@string/use_contacts_for_spellchecking_option_summary"

     android:persistent="true"

        android:defaultValue="true"

     android:defaultValue="true" />

        android:persistent="true" />

</PreferenceScreen>
 
</PreferenceScreen>