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

Commit 6c146f2a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove old code relating to SystemSettings not used in new IA."

parents 593d2fad d299b03f

AndroidManifest.xml

+28 −145
Original line number Diff line number Diff line
@@ -537,11 +537,11 @@ 
                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

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

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

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

            </intent-filter>

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

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

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

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

                android:value="com.android.settings.DateTimeSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -552,7 +552,7 @@ 
                android:label="@string/language_picker_title"

                android:icon="@drawable/ic_settings_language"

                android:taskAffinity="com.android.settings"

                android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">

                android:parentActivityName="Settings$LanguageAndInputSettingsActivity">

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

                <action android:name="android.settings.LOCALE_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -568,23 +568,23 @@ 
                android:value="true" />

        </activity>



        <activity android:name="Settings$InputMethodAndLanguageSettingsActivity"

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

            android:label="@string/language_keyboard_settings_title"

            android:icon="@drawable/ic_settings_language"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings">

            android:parentActivityName="Settings$SystemDashboardActivity">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

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

            <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.personal" />

                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.LanguageAndInputSettings"/>

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

                android:value="true"/>

        </activity>
@@ -648,15 +648,15 @@ 
                android:label="@string/language_keyboard_settings_title"

                android:clearTaskOnLaunch="true"

                android:exported="true"

                android:targetActivity="Settings$InputMethodAndLanguageSettingsActivity">

                android:targetActivity="Settings$LanguageAndInputSettingsActivity">

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

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

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

        </activity-alias>



        <activity android:name="Settings$SpellCheckersSettingsActivity"

                android:label="@string/spellcheckers_settings_title"

                android:taskAffinity="com.android.settings"

                android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">

                android:parentActivityName="Settings$LanguageAndInputSettingsActivity">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />
@@ -692,7 +692,7 @@ 
        <activity android:name="Settings$UserDictionarySettingsActivity"

                android:label="@string/user_dict_settings_title"

                android:taskAffinity="com.android.settings"

                android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">

                android:parentActivityName="Settings$LanguageAndInputSettingsActivity">

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

                <action android:name="android.settings.USER_DICTIONARY_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -955,11 +955,11 @@ 
                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

            </intent-filter>

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

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

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

            </intent-filter>

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

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

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

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

                android:resource="@string/about_settings" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -1454,15 +1454,17 @@ 
                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

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

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

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

            </intent-filter>

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

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

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

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

                android:value="com.android.settings.accessibility.AccessibilitySettings" />

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

                android:value="true" />

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

                android:resource="@string/accessibility_settings_summary" />

        </activity>



        <activity android:name=".accessibility.AccessibilitySettingsForSetupWizardActivity"
@@ -1520,7 +1522,7 @@ 
        <activity android:name="Settings$TextToSpeechSettingsActivity"

                android:label="@string/tts_settings"

                android:taskAffinity="com.android.settings"

                android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">

                android:parentActivityName="Settings$LanguageAndInputSettingsActivity">

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

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

                <category android:name="android.intent.category.DEFAULT" />
@@ -1540,11 +1542,11 @@ 
                <action android:name="android.settings.ENTERPRISE_PRIVACY_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter>

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

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

            </intent-filter>

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

                android:value="com.android.settings.category.device" />

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

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

                android:value="com.android.settings.enterprise.EnterprisePrivacySettings" />

        </activity>
@@ -1918,11 +1920,11 @@ 
                <action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

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

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

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

            </intent-filter>

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

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

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

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

                android:value="com.android.settings.DevelopmentSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2921,26 +2923,6 @@ 
                android:value="com.android.settings.webview.WebViewAppPicker" />

        </activity-alias>



        <!-- activity for gesture settings -->

        <activity android:name="Settings$GestureSettingsActivity"

                  android:label="@string/gesture_preference_title"

                  android:icon="@drawable/ic_settings_gestures"

                  android:enabled="@bool/config_gesture_settings_enabled">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <intent-filter>

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

            </intent-filter>

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

                       android:value="com.android.settings.category.device" />

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

                       android:value="com.android.settings.gestures.GestureSettings" />

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

                       android:resource="@string/gesture_preference_summary" />

        </activity>



        <activity android:name=".backup.BackupSettingsActivity"

                  android:label="@string/privacy_settings_title"

                  android:icon="@drawable/ic_settings_backup"
@@ -2956,11 +2938,11 @@ 
                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

            </intent-filter>

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

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

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

            </intent-filter>

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

                       android:value="com.android.settings.category.personal" />

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

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

                       android:value="true" />

        </activity>
@@ -3090,21 +3072,6 @@ 
              android:value="true" />

        </activity>



        <activity-alias android:name="AccessibilityDashboardAlias"

                        android:targetActivity="Settings$AccessibilitySettingsActivity">

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

                <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.homepage" />

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

                       android:value="com.android.settings.accessibility.AccessibilitySettings" />

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

                       android:value="true" />

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

                       android:resource="@string/accessibility_settings_summary" />

        </activity-alias>



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

                  android:label="@string/header_category_system"

                  android:icon="@drawable/ic_dashboard_system">
@@ -3133,78 +3100,6 @@ 
                       android:resource="@string/support_summary"/>

        </activity>



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

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

                  android:label="@string/language_keyboard_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.language.LanguageAndInputSettings"/>

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

                       android:value="true"/>

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

        </activity>



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

        <activity-alias android:name="DateTimeDashboardAlias"

                        android:targetActivity="Settings$DateTimeSettingsActivity">

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

                <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.DateTimeSettings" />

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

                       android:value="true" />

        </activity-alias>



        <activity-alias android:name="BackupResetDashboardAlias"

                        android:targetActivity=".backup.BackupSettingsActivity">

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

                <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.PRIMARY_PROFILE_CONTROLLED"

                       android:value="true" />

        </activity-alias>



        <!-- Alias for developer setting in new IA. Should merge into TargetActivity when launch -->

        <activity-alias android:name="DevelopmentSettingsDashboardAlias"

                        android:targetActivity="Settings$DevelopmentSettingsActivity"

                        android:label="@string/development_settings_title"

                        android:icon="@drawable/ic_settings_development">

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

                <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.DevelopmentSettings" />

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

                       android:value="true" />

        </activity-alias>



        <activity-alias android:name="AboutDeviceDashboardAlias"

                        android:targetActivity="Settings$DeviceInfoSettingsActivity">

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

                <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.DeviceInfoSettings" />

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

                android:resource="@string/about_settings" />

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

                       android:value="true" />

        </activity-alias>



        <activity-alias android:name="MemorySettingsDashboardAlias"

                        android:targetActivity=".Settings$MemorySettingsActivity">

            <intent-filter>
@@ -3307,18 +3202,6 @@ 
                       android:value="true"/>

        </activity-alias>



        <!-- Alias for enterprise privacy setting in new IA. Should merge into TargetActivity when launch -->

        <activity-alias android:name="EnterprisePrivacyDashboardAlias"

                        android:targetActivity="Settings$EnterprisePrivacySettingsActivity">

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

                <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.enterprise.EnterprisePrivacySettings" />

        </activity-alias>



        <!-- End of information architecture host activities -->



        <service

res/xml/gesture_settings.xml

deleted100644 → 0
+0 −64
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"

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

    android:title="@string/gesture_preference_title"

    settings:keywords="@string/keywords_gesture">



    <com.android.settings.gestures.GesturePreference

        android:key="gesture_assist"

        android:title="@string/assist_gesture_title"

        android:summary="@string/assist_gesture_summary"

        settings:animation="@raw/gesture_assist"

        settings:preview="@drawable/gesture_assist"/>



    <com.android.settings.gestures.GesturePreference

        android:key="gesture_swipe_down_fingerprint"

        android:title="@string/fingerprint_swipe_for_notifications_title"

        android:summary="@string/fingerprint_swipe_for_notifications_summary"

        settings:animation="@raw/gesture_fingerprint_swipe"

        settings:preview="@drawable/gesture_fingerprint_swipe"/>



    <com.android.settings.gestures.GesturePreference

        android:key="gesture_double_tap_power"

        android:title="@string/double_tap_power_for_camera_title"

        android:summary="@string/double_tap_power_for_camera_summary"

        settings:animation="@raw/gesture_double_tap"

        settings:preview="@drawable/gesture_double_tap"/>



    <com.android.settings.gestures.GesturePreference

        android:key="gesture_double_twist"

        android:title="@string/double_twist_for_camera_mode_title"

        android:summary="@string/double_twist_for_camera_mode_summary"

        settings:animation="@raw/gesture_twist"

        settings:preview="@drawable/gesture_twist"/>



    <com.android.settings.gestures.GesturePreference

        android:key="gesture_double_tap_screen"

        android:title="@string/ambient_display_title"

        android:summary="@string/ambient_display_summary"

        settings:animation="@raw/gesture_ambient_tap"

        settings:preview="@drawable/gesture_ambient_tap"/>



    <com.android.settings.gestures.GesturePreference

        android:key="gesture_pick_up"

        android:title="@string/ambient_display_pickup_title"

        android:summary="@string/ambient_display_pickup_summary"

        settings:animation="@raw/gesture_ambient_lift"

        settings:preview="@drawable/gesture_ambient_lift"/>



</PreferenceScreen>

res/xml/language_settings.xml

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

<!-- Copyright (C) 2008 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="language_keyboard_settings"

                  android:title="@string/language_keyboard_settings_title">



    <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:fragment="com.android.settings.inputmethod.SpellCheckersSettings"

        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"

            />



    <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="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>



    <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>

src/com/android/settings/Settings.java

+1 −6

File changed.

Preview size limit exceeded, changes collapsed.

src/com/android/settings/SettingsActivity.java

+0 −9

File changed.

Preview size limit exceeded, changes collapsed.