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

Commit 9b140f4e authored by Jatin Matani's avatar Jatin Matani Committed by Android Git Automerger
Browse files

am 4d8efc97: am b41d1fcd: am d0d8f90a: Merge "Reorganize settings in Google Keyboard" into lmp-dev 

* commit '4d8efc97':
  Reorganize settings in Google Keyboard
parents 64176158 4d8efc97

java/res/values/strings.xml

+10 −8
Original line number Diff line number Diff line
@@ -36,18 +36,20 @@ 
    <!-- 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>



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

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

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

    <string name="settings_screen_preferences">Preferences</string>

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

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

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

    <!-- Settings screen title for multilingual options [CHAR_LIMIT=33] -->

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

    <string name="settings_screen_multilingual">Multilingual options</string>

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

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

    <string name="settings_screen_gesture">Gesture Typing</string>

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

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

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

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

    <!-- Settings screen title for keyboard theme settings [CHAR LIMIT=33] -->

    <string name="settings_screen_theme">Theme</string>



    <!-- 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>
@@ -152,14 +154,14 @@ 
    <string name="configure_input_method">Configure input methods</string>



    <!-- Title for input language selection screen -->

    <string name="language_selection_title">Input languages</string>

    <string name="language_selection_title">Languages</string>



    <!-- Title for the 'Help & feedback' settings fragment which shows a help page and has a button

         for submitting feedback. [CHAR LIMIT=35] -->

    <string name="help_and_feedback">Help &amp; feedback</string>



    <!-- Preference for input language selection -->

    <string name="select_language">Input languages</string>

    <string name="select_language">Languages</string>



    <!-- Add to dictionary hint -->

    <string name="hint_add_to_dictionary">Touch again to save</string>

java/res/xml/prefs.xml

+8 −8
Original line number Diff line number Diff line
@@ -19,17 +19,17 @@ 
    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

    android:key="english_ime_settings">

    <PreferenceScreen

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

        android:title="@string/settings_screen_input"

        android:key="screen_input" />

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

        android:title="@string/settings_screen_preferences"

        android:key="screen_preferences" />

    <PreferenceScreen

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

        android:title="@string/keyboard_theme"

        android:key="screen_theme" />

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

        android:title="@string/settings_screen_appearance"

        android:key="screen_appearance" />

    <PreferenceScreen

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

        android:title="@string/settings_screen_multi_lingual"

        android:key="screen_multi_lingual" />

        android:title="@string/settings_screen_multilingual"

        android:key="screen_multilingual" />

    <PreferenceScreen

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

        android:title="@string/settings_screen_gesture"

java/res/xml/prefs_screen_appearance.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 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.

     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.

-->



<PreferenceScreen

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

    android:key="screen_appearance"

    android:title="@string/settings_screen_appearance">

    <PreferenceScreen

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

        android:key="screen_theme"

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

    <PreferenceScreen

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

        android:key="custom_input_styles"

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

</PreferenceScreen>

java/res/xml/prefs_screen_multi_lingual.xml→java/res/xml/prefs_screen_multilingual.xml

+2 −6
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


<PreferenceScreen

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

    android:title="@string/settings_screen_multi_lingual"

    android:key="screen_multi_lingual">

    android:title="@string/settings_screen_multilingual"

    android:key="screen_multilingual">

    <CheckBoxPreference

        android:key="pref_show_language_switch_key"

        android:title="@string/show_language_switch_key"
@@ -31,8 +31,4 @@ 
        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.CustomInputStyleSettingsFragment"

        android:key="custom_input_styles"

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

</PreferenceScreen>

java/res/xml/prefs_screen_input.xml→java/res/xml/prefs_screen_preferences.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<PreferenceScreen

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

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

    android:title="@string/settings_screen_input">

    android:title="@string/settings_screen_preferences">

    <CheckBoxPreference

        android:key="auto_cap"

        android:title="@string/auto_cap"