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

Commit 50e19f6e authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Add Input & Gesture/Language & Region pages under System."

parents e44673d6 a1d1d67c

AndroidManifest.xml

+23 −6
Original line number Diff line number Diff line
@@ -3190,18 +3190,35 @@ 
        </activity>



        <!-- Alias for IME & Language in new IA. Should merge into TargetActivity when launch -->

        <activity-alias android:name="LanguageAndInputDashboardAlias"

            android:targetActivity="Settings$InputMethodAndLanguageSettingsActivity">

            <intent-filter android:priority="250">

        <activity android:name=".Settings$LanguageAndRegionSettingsActivity"

                  android:label="@string/language_and_region_settings_title"

                  android:icon="@drawable/ic_settings_language">

            <intent-filter android:priority="260">

                <action android:name="com.android.settings.action.SETTINGS"/>

            </intent-filter>

            <meta-data android:name="com.android.settings.category"

                       android:value="com.android.settings.category.ia.system"/>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.inputmethod.InputMethodAndLanguageSettings" />

                       android:value="com.android.settings.language.LanguageAndRegionSettings"/>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                       android:value="true"/>

            <!-- Inherit intent-filter from LanguageSettingsActivity -->

        </activity>



        <activity android:name=".Settings$InputAndGestureSettingsActivity"

                  android:label="@string/input_gesture_settings_title"

                  android:icon="@drawable/ic_settings_language">

            <intent-filter android:priority="255">

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.category"

                       android:value="com.android.settings.category.ia.system" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.inputmethod.InputAndGestureSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                       android:value="true" />

        </activity-alias>

            <!-- Inherit intent-filter from LanguageSettingsActivity -->

        </activity>



        <!-- Alias for Date & Time in new IA. Should merge into TargetActivity when launch -->

        <activity-alias android:name="DateTimeDashboardAlias"

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -3717,6 +3717,10 @@ 
    <string name="language_settings">Languages&#160;&amp; input</string>

    <!-- Title of Languages & input settings screen -->

    <string name="language_keyboard_settings_title">Languages&#160;&amp; input</string>

    <!-- Title of Languages & region settings screen -->

    <string name="language_and_region_settings_title">Languages&#160;&amp; region</string>

    <!-- Title of Input & gesture settings screen -->

    <string name="input_gesture_settings_title">Input&#160;&amp; gestures</string>

    <!-- On Languages & input settings screen, heading. Inside the "Languages & input settings" screen, this is the header for settings that relate to keyboard (enable/disable each keyboard, settings for each keyboard). -->

    <string name="keyboard_settings_category">Keyboard &amp; input methods</string>

    <!-- On Text & language settings screen, setting option name. title of the setting to take the user to a screen to select the locale. -->

res/xml/input_and_gesture.xml

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

<!--

  Copyright (C) 2016 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">



    <PreferenceCategory

        android:title="@string/keyboard_and_input_methods_category">

        <Preference

            android:title="@string/virtual_keyboard_category"

            android:fragment="com.android.settings.inputmethod.VirtualKeyboardFragment"/>

        <Preference

            android:title="@string/physical_keyboard_title"

            android:fragment="com.android.settings.inputmethod.PhysicalKeyboardFragment"/>

    </PreferenceCategory>



    <PreferenceCategory

        android:key="pointer_settings_category"

        android:title="@string/pointer_settings_category">



        <com.android.settings.PointerSpeedPreference

            android:key="pointer_speed"

            android:title="@string/pointer_speed"

            android:dialogTitle="@string/pointer_speed"/>



    </PreferenceCategory>



    <PreferenceCategory

        android:key="game_controller_settings_category"

        android:title="@string/game_controller_settings_category">



        <SwitchPreference

            android:key="vibrate_input_devices"

            android:title="@string/vibrate_input_devices"

            android:summaryOn="@string/vibrate_input_devices_summary"

            android:summaryOff="@string/vibrate_input_devices_summary"/>



    </PreferenceCategory>



</PreferenceScreen>
 
 No newline at end of file

res/xml/language_and_region.xml

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

<!--

  Copyright (C) 2016 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">



    <Preference

        android:key="phone_language"

        android:title="@string/phone_language"

        android:fragment="com.android.settings.localepicker.LocaleListEditor"/>



    <!-- Spell checker preference title, summary and fragment will be set programmatically. -->

    <!-- Note: Mark this as persistent="false" to remove unnecessarily saved shared preference.

         See: InputMethodAndSubtypeUtil.removeUnnecessaryNonPersistentPreference. -->

    <Preference

        android:key="spellcheckers_settings"

        android:title="@string/spellcheckers_settings_title"

        android:persistent="false"/>



    <!-- User dictionary preference title and fragment will be set programmatically. -->

    <Preference

        android:key="key_user_dictionary_settings"

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



    <!-- TTS -->

    <PreferenceCategory

        android:key="voice_category"

        android:title="@string/voice_category">



        <Preference

            android:key="tts_settings"

            android:title="@string/tts_settings_title"

            android:fragment="com.android.settings.tts.TextToSpeechSettings"/>



    </PreferenceCategory>



</PreferenceScreen>
 
 No newline at end of file

src/com/android/settings/Settings.java

+2 −0
Original line number Diff line number Diff line
@@ -41,12 +41,14 @@ public class Settings extends SettingsActivity { 
    public static class WifiSettingsActivity extends SettingsActivity { /* empty */ }

    public static class WifiP2pSettingsActivity extends SettingsActivity { /* empty */ }

    public static class InputMethodAndLanguageSettingsActivity extends SettingsActivity { /* empty */ }

    public static class InputAndGestureSettingsActivity extends SettingsActivity { /* empty */ }

    public static class AvailableVirtualKeyboardActivity extends SettingsActivity { /* empty */ }

    public static class KeyboardLayoutPickerActivity extends SettingsActivity { /* empty */ }

    public static class PhysicalKeyboardActivity extends SettingsActivity { /* empty */ }

    public static class InputMethodAndSubtypeEnablerActivity extends SettingsActivity { /* empty */ }

    public static class SpellCheckersSettingsActivity extends SettingsActivity { /* empty */ }

    public static class LocalePickerActivity extends SettingsActivity { /* empty */ }

    public static class LanguageAndRegionSettingsActivity extends SettingsActivity { /* empty */ }

    public static class UserDictionarySettingsActivity extends SettingsActivity { /* empty */ }

    public static class HomeSettingsActivity extends SettingsActivity { /* empty */ }

    public static class DisplaySettingsActivity extends SettingsActivity { /* empty */ }