Prevent accounts page directly opening in screen pinning mode

[android-x86/packages-apps-Settings.git] / AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9c40c17..dbccf6c 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -29,12 +29,14 @@
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.LOCAL_MAC_ADDRESS" />
     <uses-permission android:name="android.permission.ACCESS_WIMAX_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIMAX_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="com.android.certinstaller.INSTALL_AS_USER" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.TETHER_PRIVILEGED" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
@@ -72,6 +74,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />
     <uses-permission android:name="android.permission.READ_SEARCH_INDEXABLES" />
+    <uses-permission android:name="android.permission.BIND_SETTINGS_SUGGESTIONS_SERVICE" />
     <uses-permission android:name="android.permission.OEM_UNLOCK_STATE" />
     <uses-permission android:name="android.permission.MANAGE_USER_OEM_UNLOCK_STATE" />
     <uses-permission android:name="android.permission.OVERRIDE_WIFI_CONFIG" />
@@ -82,9 +85,15 @@
     <uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>
     <uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.DELETE_PACKAGES"/>
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
     <uses-permission android:name="android.permission.MANAGE_APP_OPS_RESTRICTIONS"/>
-    <uses-permission android:name="android.permission.NETWORK_SETTINGS" />
+    <uses-permission android:name="android.permission.MANAGE_APP_OPS_MODES" />
     <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>
+    <uses-permission android:name="android.permission.READ_PRINT_SERVICES" />
+    <uses-permission android:name="android.permission.NETWORK_SETTINGS" />
+    <uses-permission android:name="android.permission.TEST_BLACKLISTED_PASSWORD" />
+    <uses-permission android:name="android.permission.USE_RESERVED_DISK" />
+    <uses-permission android:name="android.permission.MANAGE_SCOPED_ACCESS_DIRECTORY_PERMISSIONS" />
 
     <application android:label="@string/settings_label"
             android:icon="@drawable/ic_launcher_settings"
@@ -96,12 +105,14 @@
             android:allowBackup="false"
             android:usesCleartextTraffic="true"
             android:defaultToDeviceProtectedStorage="true"
-            android:directBootAware="true">
+            android:directBootAware="true"
+            android:appComponentFactory="android.support.v4.app.CoreComponentFactory">
 
+        <uses-library android:name="org.apache.http.legacy" />
         <!-- Settings -->
 
         <activity android:name="Settings"
-                android:taskAffinity="com.android.settings"
+                android:taskAffinity="com.android.settings.root"
                 android:label="@string/settings_label_launcher"
                 android:launchMode="singleTask">
             <intent-filter android:priority="1">
@@ -114,7 +125,7 @@
 
         <!-- Alias for launcher activity only, as this belongs to each profile. -->
         <activity-alias android:name="Settings"
-                android:taskAffinity="com.android.settings"
+                android:taskAffinity="com.android.settings.root"
                 android:label="@string/settings_label_launcher"
                 android:launchMode="singleTask"
                 android:targetActivity="Settings">
@@ -135,10 +146,9 @@
 
         <activity android:name=".SubSettings"
                 android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings">
-        </activity>
+                android:parentActivityName="Settings" />
 
-        <activity android:name="CreateShortcut"
+        <activity android:name=".shortcut.CreateShortcut"
                   android:label="@string/settings_shortcut">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT"/>
@@ -147,11 +157,12 @@
         </activity>
 
         <!-- Wireless Controls -->
-        <activity android:name=".Settings$NetworkDashboardActivity"
-            android:taskAffinity="com.android.settings"
+        <activity
+            android:name=".Settings$NetworkDashboardActivity"
             android:label="@string/network_dashboard_title"
-            android:icon="@drawable/ic_settings_wireless"
-            android:parentActivityName="Settings">
+            android:icon="@drawable/ic_homepage_network"
+            android:parentActivityName="Settings"
+            android:taskAffinity="com.android.settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.WIRELESS_SETTINGS" />
                 <action android:name="android.settings.AIRPLANE_MODE_SETTINGS" />
@@ -173,19 +184,19 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name=".Settings$ConnectedDeviceDashboardActivity"
-            android:taskAffinity="com.android.settings"
+        <activity
+            android:name=".Settings$ConnectedDeviceDashboardActivity"
             android:label="@string/connected_devices_dashboard_title"
-            android:icon="@drawable/ic_devices_other"
+            android:icon="@drawable/ic_homepage_connected_device"
+            android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NFC_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.BLUETOOTH_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
             <intent-filter android:priority="10">
                 <action android:name="com.android.settings.action.SETTINGS"/>
@@ -209,20 +220,23 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".search.SearchActivity"
-                  android:label="@string/search_settings"
-                  android:icon="@drawable/ic_search_history"
-                  android:parentActivityName="Settings"
-                  android:theme="@style/Theme.Settings.NoActionBar">
+        <activity android:name=".search.SearchResultTrampoline"
+                  android:theme="@android:style/Theme.NoDisplay"
+                  android:excludeFromRecents="true"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="com.android.settings.SEARCH_RESULT_TRAMPOLINE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
         </activity>
 
-        <!-- Top-level settings -->
-
-        <activity android:name="Settings$WifiSettingsActivity"
-                android:taskAffinity=""
-                android:label="@string/wifi_settings"
-                android:icon="@drawable/ic_settings_wireless"
-                android:configChanges="orientation|keyboardHidden|screenSize">
+        <activity
+            android:name="Settings$WifiSettingsActivity"
+            android:label="@string/wifi_settings"
+            android:icon="@drawable/ic_settings_wireless"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.WIFI_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -239,21 +253,10 @@
                 android:value="true" />
         </activity>
 
-        <!-- Keep compatibility with old shortcuts. -->
-        <activity-alias android:name=".wifi.WifiSettings"
-                android:taskAffinity="com.android.settings"
-                android:label="@string/wifi_settings"
-                android:icon="@drawable/ic_settings_wireless"
-                android:targetActivity="Settings$WifiSettingsActivity"
-                android:configChanges="orientation|keyboardHidden|screenSize"
-                android:exported="true">
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.wifi.WifiSettings" />
-        </activity-alias>
-
-        <activity android:name=".wifi.WifiPickerActivity"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings">
+        <activity
+            android:name=".wifi.WifiPickerActivity"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.net.wifi.PICK_WIFI_NETWORK" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -266,12 +269,13 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="Settings$ConfigureWifiSettingsActivity"
-                android:taskAffinity="com.android.settings"
-                android:label="@string/wifi_configure_settings_preference_title"
-                android:icon="@drawable/ic_settings_wireless"
-                android:configChanges="orientation|keyboardHidden|screenSize"
-                android:parentActivityName="Settings$WifiSettingsActivity">
+        <activity
+            android:name="Settings$ConfigureWifiSettingsActivity"
+            android:label="@string/wifi_configure_settings_preference_title"
+            android:icon="@drawable/ic_settings_wireless"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.WIFI_IP_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -287,12 +291,13 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="Settings$SavedAccessPointsSettingsActivity"
-                android:taskAffinity="com.android.settings"
-                android:label="@string/wifi_saved_access_points_label"
-                android:icon="@drawable/ic_settings_wireless"
-                android:configChanges="orientation|keyboardHidden|screenSize"
-                android:parentActivityName="Settings$WifiSettingsActivity">
+        <activity
+            android:name="Settings$SavedAccessPointsSettingsActivity"
+            android:label="@string/wifi_saved_access_points_label"
+            android:icon="@drawable/ic_settings_wireless"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.WIFI_SAVED_NETWORK_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -307,9 +312,7 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name=".Settings$WifiInfoActivity"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$WifiSettingsActivity">
+        <activity android:name=".Settings$WifiInfoActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -319,9 +322,7 @@
                        android:value="com.android.settings.wifi.WifiInfo" />
         </activity>
 
-        <activity android:name=".wifi.WifiConfigInfo"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$WifiSettingsActivity">
+        <activity android:name=".wifi.WifiConfigInfo">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -386,31 +387,37 @@
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.ApnSettings" />
+                       android:value="com.android.settings.network.ApnSettings" />
         </activity>
 
-        <activity android:name="Settings$BluetoothSettingsActivity"
-                android:label="@string/bluetooth_settings_title"
-                android:icon="@drawable/ic_settings_bluetooth"
-                android:taskAffinity="">
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.BLUETOOTH_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+        <!-- Keep compatibility with old shortcuts. -->
+        <activity-alias
+            android:name="Settings$BluetoothSettingsActivity"
+            android:label="@string/devices_title"
+            android:targetActivity=".Settings$ConnectedDeviceDashboardActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.VOICE_LAUNCH" />
-                <category android:name="com.android.settings.SHORTCUT" />
                 <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.bluetooth.BluetoothSettings" />
-        </activity>
+                android:value="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment" />
+        </activity-alias>
+
+        <!-- Keep compatibility with old shortcuts. -->
+        <activity-alias android:name=".bluetooth.BluetoothSettings"
+                        android:label="@string/devices_title"
+                        android:targetActivity="Settings$BluetoothSettingsActivity"
+                        android:exported="true"
+                        android:clearTaskOnLaunch="true">
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment" />
+        </activity-alias>
 
         <activity android:name="Settings$AssistGestureSettingsActivity"
             android:label="@string/assist_gesture_title"
-            android:icon="@drawable/ic_settings_gestures"
-            android:taskAffinity="">
+            android:icon="@drawable/ic_settings_gestures">
             <intent-filter>
                 <action android:name="android.settings.ASSIST_GESTURE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -419,18 +426,9 @@
                 android:value="com.android.settings.gestures.AssistGestureSettings" />
         </activity>
 
-        <!-- Keep compatibility with old shortcuts. -->
-        <activity-alias android:name=".bluetooth.BluetoothSettings"
-                android:label="@string/bluetooth_settings_title"
-                android:targetActivity="Settings$BluetoothSettingsActivity"
-                android:exported="true"
-                android:clearTaskOnLaunch="true">
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.bluetooth.BluetoothSettings" />
-        </activity-alias>
-
         <activity android:name=".bluetooth.DevicePickerActivity"
                 android:label="@string/device_picker"
+                android:configChanges="orientation|keyboardHidden|screenSize"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.bluetooth.devicepicker.action.LAUNCH" />
@@ -438,7 +436,7 @@
             </intent-filter>
         </activity>
 
-        <service android:name=".TetherService"
+        <service android:name=".wifi.tether.TetherService"
             android:exported="true"
             android:permission="android.permission.TETHER_PRIVILEGED" />
 
@@ -453,10 +451,12 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="Settings$TetherSettingsActivity"
-                android:label="@string/tether_settings_title_all"
-                android:icon="@drawable/ic_settings_wireless"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$TetherSettingsActivity"
+            android:label="@string/tether_settings_title_all"
+            android:icon="@drawable/ic_settings_wireless"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -467,6 +467,20 @@
                 android:value="com.android.settings.TetherSettings" />
         </activity>
 
+        <activity
+            android:name="Settings$WifiTetherSettingsActivity"
+            android:label="@string/wifi_hotspot_checkbox_text"
+            android:icon="@drawable/ic_wifi_tethering"
+            android:parentActivityName="Settings">
+            <intent-filter>
+                <action android:name="com.android.settings.WIFI_TETHER_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.wifi.tether.WifiTetherSettings" />
+        </activity>
+
+
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name=".TetherSettings"
                   android:label="@string/tether_settings_title_all"
@@ -478,8 +492,8 @@
         </activity-alias>
 
         <activity android:name="Settings$WifiP2pSettingsActivity"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$WifiSettingsActivity">
+                  android:taskAffinity="com.android.settings"
+                  android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -489,11 +503,12 @@
                 android:value="com.android.settings.wifi.p2p.WifiP2pSettings" />
         </activity>
 
-
-        <activity android:name="Settings$VpnSettingsActivity"
-                android:label="@string/vpn_settings_title"
-                android:icon="@drawable/ic_settings_wireless"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$VpnSettingsActivity"
+            android:label="@string/vpn_settings_title"
+            android:icon="@drawable/ic_settings_wireless"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.VPN_SETTINGS" />
                 <action android:name="android.net.vpn.SETTINGS" />
@@ -511,10 +526,12 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="Settings$DateTimeSettingsActivity"
-                android:label="@string/date_and_time"
-                android:icon="@drawable/ic_settings_date_time"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$DateTimeSettingsActivity"
+            android:label="@string/date_and_time"
+            android:icon="@drawable/ic_settings_date_time"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.DATE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -536,11 +553,12 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="Settings$LocalePickerActivity"
-                android:label="@string/language_picker_title"
-                android:icon="@drawable/ic_settings_language"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$LanguageAndInputSettingsActivity">
+        <activity
+            android:name="Settings$LocalePickerActivity"
+            android:label="@string/language_picker_title"
+            android:icon="@drawable/ic_settings_language"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings$LanguageAndInputSettingsActivity">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.LOCALE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -556,11 +574,12 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name=".Settings$LanguageAndInputSettingsActivity"
-            android:label="@string/language_input_gesture_title"
+        <activity
+            android:name=".Settings$LanguageAndInputSettingsActivity"
+            android:label="@string/language_settings"
             android:icon="@drawable/ic_settings_language"
             android:taskAffinity="com.android.settings"
-            android:parentActivityName="Settings$SystemDashboardActivity">
+            android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
@@ -589,10 +608,11 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="Settings$ManageAssistActivity"
-                android:label="@string/assist_and_voice_input_title"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$ManageApplicationsActivity">
+        <activity
+            android:name="Settings$ManageAssistActivity"
+            android:label="@string/assist_and_voice_input_title"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.VOICE_INPUT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -641,10 +661,11 @@
                 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$LanguageAndInputSettingsActivity">
+        <activity
+            android:name="Settings$SpellCheckersSettingsActivity"
+            android:label="@string/spellcheckers_settings_title"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
@@ -670,17 +691,11 @@
                 android:value="true" />
         </activity>
 
-        <receiver android:name=".inputmethod.InputMethodDialogReceiver"
-                android:enabled="true">
-            <intent-filter>
-                <action android:name="android.settings.SHOW_INPUT_METHOD_PICKER" />
-            </intent-filter>
-        </receiver>
-
-        <activity android:name="Settings$UserDictionarySettingsActivity"
-                android:label="@string/user_dict_settings_title"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$LanguageAndInputSettingsActivity">
+        <activity
+            android:name="Settings$UserDictionarySettingsActivity"
+            android:label="@string/user_dict_settings_title"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.USER_DICTIONARY_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -697,6 +712,7 @@
         </activity>
 
         <activity android:name=".inputmethod.UserDictionaryAddWordActivity"
+                  android:visibleToInstantApps="true"
                   android:label="@string/user_dict_settings_title"
                   android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"
                   android:windowSoftInputMode="stateVisible"
@@ -710,36 +726,24 @@
                 android:value="true" />
         </activity>
 
-        <!-- Keep compatibility with old shortcuts. -->
-        <activity-alias android:name="UserDictionarySettings"
-                android:label="@string/user_dict_settings_title"
-                android:exported="true"
-                android:targetActivity="Settings$UserDictionarySettingsActivity">
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.UserDictionarySettings" />
-        </activity-alias>
-
-        <activity android:name="Settings$ZenModeSettingsActivity"
-                android:label="@string/zen_mode_settings_title"
-                android:icon="@drawable/ic_settings_notifications"
-                android:exported="true"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$ZenModeSettingsActivity"
+            android:label="@string/zen_mode_settings_title"
+            android:icon="@drawable/ic_notifications"
+            android:exported="true"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ZEN_MODE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="com.android.settings.SHORTCUT" />
-            </intent-filter>
             <intent-filter android:priority="1">
-                <action android:name="android.settings.ZEN_MODE_AUTOMATION_SETTINGS" />
+                <action android:name="android.settings.ZEN_MODE_PRIORITY_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.ACTION_CONDITION_PROVIDER_SETTINGS" />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.notification.ZenModeSettings" />
@@ -747,36 +751,64 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="Settings$ZenModeVisualInterruptionSettingsActivity"
-                  android:label="@string/zen_mode_visual_interruptions_settings_title"
-                  android:icon="@drawable/ic_settings_notifications"
-                  android:exported="true"
-                  android:taskAffinity="">
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.notification.ZenModeVisualInterruptionSettings" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true" />
+        <activity
+            android:name=".notification.ZenSuggestionActivity"
+            android:label="@string/zen_mode_settings_title"
+            android:icon="@drawable/ic_do_not_disturb_on_24dp"
+            android:theme="@android:style/Theme.NoDisplay">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.suggested.category.ZEN" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.dismiss"
+                       android:value="0" />
+            <meta-data android:name="com.android.settings.title"
+                       android:resource="@string/zen_suggestion_title" />
+            <meta-data android:name="com.android.settings.summary"
+                       android:resource="@string/zen_suggestion_summary" />
         </activity>
 
-        <activity android:name="Settings$ZenModePrioritySettingsActivity"
-                android:label="@string/zen_mode_priority_settings_title"
-                android:icon="@drawable/ic_settings_notifications"
-                android:exported="true"
-                android:taskAffinity="">
+        <activity
+            android:name=".notification.ZenOnboardingActivity"
+            android:label="@string/zen_onboarding_dnd_visual_disturbances_header"
+            android:icon="@drawable/ic_notifications"
+            android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"
+            android:exported="true"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
-                <action android:name="android.settings.ZEN_MODE_PRIORITY_SETTINGS" />
+                <action android:name="android.settings.ZEN_MODE_ONBOARDING" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="Settings$ZenModeAutomationSettingsActivity"
+            android:label="@string/zen_mode_automation_settings_title"
+            android:icon="@drawable/ic_notifications"
+            android:exported="true"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings$ZenModeSettingsActivity">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.ZEN_MODE_AUTOMATION_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.ACTION_CONDITION_PROVIDER_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.notification.ZenModePrioritySettings" />
+                       android:value="com.android.settings.notification.ZenModeAutomationSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                android:value="true" />
+                       android:value="true" />
         </activity>
 
         <activity android:name="Settings$WallpaperSettingsActivity"
                   android:label="@string/wallpaper_settings_fragment_title"
-                  android:icon="@drawable/ic_wallpaper"
-                  android:taskAffinity="">
+                  android:icon="@drawable/ic_wallpaper">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                        android:value="com.android.settings.wallpaper.WallpaperTypeSettings" />
         </activity>
@@ -804,7 +836,7 @@
 
         <activity android:name=".support.NewDeviceIntroSuggestionActivity"
                   android:label="@string/new_device_suggestion_title"
-                  android:icon="@drawable/ic_new_releases_24dp"
+                  android:icon="@drawable/ic_new_device_suggestion_24dp"
                   android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -818,9 +850,11 @@
                        android:resource="@string/new_device_suggestion_summary" />
         </activity>
 
-        <activity android:name="Settings$ZenModeScheduleRuleSettingsActivity"
-                android:exported="true"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$ZenModeScheduleRuleSettingsActivity"
+            android:exported="true"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings$ZenModeAutomationSettingsActivity">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ZEN_MODE_SCHEDULE_RULE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -835,9 +869,11 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="Settings$ZenModeEventRuleSettingsActivity"
-                android:exported="true"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$ZenModeEventRuleSettingsActivity"
+            android:exported="true"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings$ZenModeAutomationSettingsActivity">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ZEN_MODE_EVENT_RULE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -852,27 +888,12 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="Settings$ZenModeExternalRuleSettingsActivity"
-                android:exported="true"
-                android:taskAffinity="">
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.ZEN_MODE_EXTERNAL_RULE_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.notification.ZenModeExternalRuleSettings" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                android:value="true" />
-        </activity>
-
-        <activity android:name="Settings$DisplaySettingsActivity"
-                android:label="@string/display_settings"
-                android:icon="@drawable/ic_settings_display"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$DisplaySettingsActivity"
+            android:label="@string/display_settings"
+            android:icon="@drawable/ic_homepage_display"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.DISPLAY_SETTINGS" />
                 <action android:name="android.settings.DISPLAY_SETTINGS" />
@@ -906,11 +927,12 @@
                 android:value="com.android.settings.DisplaySettings" />
         </activity-alias>
 
-        <activity android:name="Settings$NightDisplaySettingsActivity"
-                android:label="@string/night_display_title"
-                android:enabled="@*android:bool/config_nightDisplayAvailable"
-                android:icon="@drawable/ic_settings_night_display"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$NightDisplaySettingsActivity"
+            android:label="@string/night_display_title"
+            android:enabled="@*android:bool/config_nightDisplayAvailable"
+            android:icon="@drawable/ic_settings_night_display"
+            android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -926,11 +948,33 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="Settings$DeviceInfoSettingsActivity"
-                android:label="@string/device_info_settings"
-                android:icon="@drawable/ic_settings_about"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings">
+        <activity
+            android:name="Settings$NightDisplaySuggestionActivity"
+            android:enabled="@*android:bool/config_nightDisplayAvailable"
+            android:icon="@drawable/ic_settings_night_display">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.dismiss"
+                android:value="6,10,30" />
+            <meta-data android:name="com.android.settings.title"
+                android:resource="@string/night_display_suggestion_title" />
+            <meta-data android:name="com.android.settings.summary"
+                android:resource="@string/night_display_suggestion_summary" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.display.NightDisplaySettings" />
+        </activity>
+
+        <activity
+            android:name="Settings$DeviceInfoSettingsActivity"
+            android:label="@string/device_info_settings"
+            android:icon="@drawable/ic_settings_about"
+            android:taskAffinity="com.android.settings"
+            android:enabled="false"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.DEVICE_INFO_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -948,29 +992,62 @@
             <meta-data android:name="com.android.settings.title"
                 android:resource="@string/about_settings" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.DeviceInfoSettings" />
+                android:value="com.android.settings.deviceinfo.DeviceInfoSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
-        <activity android:name="SettingsLicenseActivity"
-                android:label="@string/settings_license_activity_title"
-                android:theme="@android:style/Theme.DeviceDefault.Light.Panel"
-                android:configChanges="orientation|screenSize">
+        <activity android:name=".Settings$MyDeviceInfoActivity"
+                  android:label="@string/about_settings"
+                  android:icon="@drawable/ic_homepage_about"
+                  android:taskAffinity="com.android.settings"
+                  android:parentActivityName="Settings">
             <intent-filter android:priority="1">
-                <action android:name="android.settings.LICENSE" />
+                <action android:name="android.settings.DEVICE_INFO_SETTINGS" />
+                <action android:name="android.settings.DEVICE_NAME" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                android:value="true" />
-        </activity>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
+            </intent-filter>
+            <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.title"
+                       android:resource="@string/about_settings" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                       android:value="true" />
+        </activity>
 
-        <activity android:name="Settings$ManageApplicationsActivity"
-                android:label="@string/applications_settings"
-                android:taskAffinity="">
+        <activity
+            android:name="SettingsLicenseActivity"
+            android:label="@string/settings_license_activity_title"
+            android:configChanges="orientation|screenSize"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.LICENSE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
+        </activity>
+
+        <activity
+            android:name="Settings$ManageApplicationsActivity"
+            android:label="@string/applications_settings"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.APPLICATION_SETTINGS" />
                 <action android:name="android.settings.MANAGE_APPLICATIONS_SETTINGS" />
+                <action android:name="android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
@@ -980,15 +1057,25 @@
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
+                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
-        <activity android:name="Settings$ManageDomainUrlsActivity"
-                  android:taskAffinity="com.android.settings"
-                  android:label="@string/domain_urls_title"
-                  android:icon="@drawable/ic_settings_memory">
+        <!-- Keep compatibility with old shortcuts. -->
+        <activity-alias android:name=".applications.ManageApplications"
+                        android:label="@string/applications_settings"
+                        android:exported="true"
+                        android:targetActivity="Settings$ManageApplicationsActivity">
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.applications.manageapplications.ManageApplications" />
+        </activity-alias>
+
+        <activity
+            android:name="Settings$ManageDomainUrlsActivity"
+            android:label="@string/domain_urls_title"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.settings.MANAGE_DOMAIN_URLS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -999,19 +1086,11 @@
 
         <activity android:name="Settings$MemorySettingsActivity"
                 android:label="@string/memory_settings_title"
-                android:icon="@drawable/ic_settings_memory"
-                android:taskAffinity="">
+                android:icon="@drawable/ic_settings_memory">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
-            <intent-filter android:priority="3">
-                <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.development" />
-            <meta-data android:name="com.android.settings.summary"
-                android:resource="@string/summary_empty" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.ProcessStatsSummary" />
         </activity>
@@ -1027,35 +1106,24 @@
                        android:value="com.android.settings.applications.ProcessStatsUi" />
         </activity>
 
-        <activity android:name="Settings$AllApplicationsActivity"
-                android:label="@string/applications_settings"
-                android:taskAffinity="">
-            <intent-filter>
-                <action android:name="android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                android:value="true" />
-        </activity>
-
-        <activity android:name="Settings$HighPowerApplicationsActivity"
-                android:label="@string/high_power_apps"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$HighPowerApplicationsActivity"
+            android:label="@string/high_power_apps"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
+                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
-        <activity android:name=".datausage.AppDataUsageActivity"
-                android:taskAffinity=""
-                android:noHistory="true">
+        <activity
+            android:name=".datausage.AppDataUsageActivity"
+            android:noHistory="true">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1063,10 +1131,10 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".fuelgauge.RequestIgnoreBatteryOptimizations"
-                android:label="@string/high_power_apps"
-                android:taskAffinity=""
-                android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
+        <activity
+            android:name=".fuelgauge.RequestIgnoreBatteryOptimizations"
+            android:label="@string/high_power_apps"
+            android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1074,21 +1142,18 @@
             </intent-filter>
         </activity>
 
-        <!-- Keep compatibility with old shortcuts. -->
-        <activity-alias android:name=".applications.ManageApplications"
-                android:label="@string/applications_settings"
-                android:exported="true"
-                android:targetActivity="Settings$ManageApplicationsActivity">
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
-        </activity-alias>
-
-        <!-- Keep compatibility with old shortcuts. Pre-gingerbread. -->
-        <activity-alias android:name=".ManageApplications"
-                  android:label="@string/manageapplications_settings_title"
-                  android:exported="true"
-                  android:targetActivity="Settings$ManageApplicationsActivity">
-        </activity-alias>
+        <activity
+            android:name=".slices.SliceDeepLinkSpringBoard"
+            android:excludeFromRecents="true"
+            android:theme="@android:style/Theme.NoDisplay">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="settings"
+                      android:host="com.android.settings.slices" />
+            </intent-filter>
+        </activity>
 
         <!-- Provide direct entry into manage apps showing running services.
              This is for compatibility with old shortcuts. -->
@@ -1097,7 +1162,7 @@
                 android:exported="true"
                 android:targetActivity="Settings$ManageApplicationsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
+                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
         </activity-alias>
 
         <!-- Provide direct entry into manage apps showing storage usage for apps.
@@ -1107,7 +1172,7 @@
                 android:exported="true"
                 android:targetActivity="Settings$ManageApplicationsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
+                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
         </activity-alias>
 
         <!-- Still need a top-level activity for showing app details.  Aliasing
@@ -1115,10 +1180,7 @@
              InstalledAppDetails. -->
         <activity android:name=".applications.InstalledAppDetailsTop"
                   android:label="@string/application_info_label"
-                  android:exported="true"
-                  android:taskAffinity=""
-                  android:parentActivityName="Settings$ManageApplicationsActivity">
-        </activity>
+                  android:exported="true" />
 
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name=".applications.InstalledAppDetails"
@@ -1132,6 +1194,17 @@
             </intent-filter>
         </activity-alias>
 
+        <activity android:name=".applications.InstalledAppOpenByDefaultPage"
+                  android:label="@string/application_info_label"
+                  android:permission="android.permission.OPEN_APPLICATION_DETAILS_OPEN_BY_DEFAULT_PAGE"
+                  android:exported="true">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.APPLICATION_DETAILS_SETTINGS_OPEN_BY_DEFAULT_PAGE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="package" />
+            </intent-filter>
+        </activity>
+
         <!-- Provide direct entry into manage apps showing running services. -->
         <activity android:name="Settings$RunningServicesActivity"
                 android:label="@string/runningservices_settings_title"
@@ -1144,16 +1217,17 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
+                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
         <!-- Provide direct entry into manage apps showing storage usage of apps. -->
-        <activity android:name="Settings$StorageUseActivity"
-                android:label="@string/storageuse_settings_title"
-                android:taskAffinity=""
-                android:parentActivityName="Settings">
+        <activity
+            android:name="Settings$StorageUseActivity"
+            android:label="@string/storageuse_settings_title"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.intent.action.MANAGE_PACKAGE_STORAGE" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1165,15 +1239,16 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
+                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
-        <activity android:name="Settings$NotificationStationActivity"
-                android:theme="@style/Theme.NotificationStation"
-                android:label="@string/notification_log_title"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$NotificationStationActivity"
+            android:label="@string/notification_log_title"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1193,40 +1268,24 @@
             </intent-filter>
         </activity>
 
-        <!--
-        <activity android:name="Settings$AppOpsSummaryActivity"
-                android:label="@string/app_ops_settings"
-                android:taskAffinity=""
-                android:enabled="false">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.APP_OPS_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.VOICE_LAUNCH" />
-                <category android:name="com.android.settings.SHORTCUT" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.AppOpsSummary" />
-        </activity>
-        -->
-
         <activity android:name="Settings$BackgroundCheckSummaryActivity"
                 android:label="@string/background_check_title"
-                android:taskAffinity=""
                 android:enabled="false">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.BackgroundCheckSummary" />
+                android:value="com.android.settings.applications.appops.BackgroundCheckSummary" />
         </activity>
 
-        <activity android:name="Settings$LocationSettingsActivity"
-                android:label="@string/location_settings_title"
-                android:icon="@drawable/ic_settings_location"
-                android:configChanges="orientation|keyboardHidden|screenSize"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$LocationSettingsActivity"
+            android:label="@string/location_settings_title"
+            android:icon="@drawable/ic_settings_location"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1242,13 +1301,30 @@
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
+        <activity
+            android:name="Settings$ScanningSettingsActivity"
+            android:label="@string/location_scanning_screen_title"
+            android:icon="@drawable/ic_settings_location"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.LOCATION_SCANNING_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.location.ScanningSettings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
+        </activity>
 
-        <activity android:name="Settings$SecuritySettingsActivity"
-                android:label="@string/security_settings_title"
-                android:icon="@drawable/ic_settings_security"
-                android:configChanges="orientation|keyboardHidden|screenSize"
-                android:taskAffinity=""
-                android:parentActivityName="Settings">
+        <activity
+            android:name=".Settings$SecurityDashboardActivity"
+            android:label="@string/security_settings_title"
+            android:icon="@drawable/ic_homepage_security"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.SECURITY_SETTINGS" />
                 <action android:name="android.credentials.UNLOCK" />
@@ -1265,7 +1341,7 @@
             <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.SecuritySettings" />
+                android:value="com.android.settings.security.SecuritySettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -1285,10 +1361,12 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="Settings$TrustedCredentialsSettingsActivity"
-                android:label="@string/trusted_credentials"
-                android:icon="@drawable/ic_settings_security"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$TrustedCredentialsSettingsActivity"
+            android:label="@string/trusted_credentials"
+            android:icon="@drawable/ic_settings_security"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.TRUSTED_CREDENTIALS" />
                 <action android:name="com.android.settings.TRUSTED_CREDENTIALS_USER" />
@@ -1300,16 +1378,6 @@
                 android:value="true" />
         </activity>
 
-        <!-- Keep compatibility with old shortcuts. -->
-        <activity-alias android:name="SecuritySettings"
-                android:label="@string/security_settings_title"
-                android:configChanges="orientation|keyboardHidden|screenSize"
-                android:exported="true"
-                android:targetActivity="Settings$SecuritySettingsActivity">
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.SecuritySettings" />
-        </activity-alias>
-
         <activity android:name="Settings$PrivacySettingsActivity"
                 android:label="@string/privacy_settings_title"
                 android:icon="@drawable/ic_settings_backup"
@@ -1328,8 +1396,8 @@
         </activity>
 
         <activity android:name="SetFullBackupPassword"
-                android:exported="false">
-        </activity>
+                  android:label="@string/local_backup_password_title"
+                  android:exported="false" />
 
         <activity android:name="CredentialStorage"
                 android:theme="@style/Transparent"
@@ -1343,10 +1411,11 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="Settings$DeviceAdminSettingsActivity"
-                android:label="@string/device_admin_settings_title"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$SecuritySettingsActivity">
+        <activity
+            android:name="Settings$DeviceAdminSettingsActivity"
+            android:label="@string/device_admin_settings_title"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1374,10 +1443,20 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="Settings$UsageAccessSettingsActivity"
-                android:label="@string/usage_access_title"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$SecuritySettingsActivity">
+        <activity-alias android:name="SetProfileOwner"
+                        android:label="@string/profile_owner_add_title"
+                        android:targetActivity="DeviceAdminAdd">
+            <intent-filter android:priority="1000">
+                <action android:name="android.app.action.SET_PROFILE_OWNER" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity-alias>
+
+        <activity
+            android:name="Settings$UsageAccessSettingsActivity"
+            android:label="@string/usage_access_title"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.USAGE_ACCESS_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1387,18 +1466,9 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
+                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
         </activity>
 
-        <activity-alias android:name="SetProfileOwner"
-                android:label="@string/profile_owner_add_title"
-                android:targetActivity="DeviceAdminAdd">
-            <intent-filter android:priority="1000">
-                <action android:name="android.app.action.SET_PROFILE_OWNER" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity-alias>
-
         <activity android:name="Settings$IccLockSettingsActivity"
                 android:label="@string/sim_lock_settings"
                 android:process="com.android.phone">
@@ -1411,11 +1481,13 @@
                 android:value="com.android.settings.IccLockSettings" />
         </activity>
 
-        <activity android:name="Settings$AccessibilitySettingsActivity"
-                android:label="@string/accessibility_settings"
-                android:icon="@drawable/ic_settings_accessibility"
-                android:configChanges="orientation|keyboardHidden|screenSize"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$AccessibilitySettingsActivity"
+            android:label="@string/accessibility_settings"
+            android:icon="@drawable/ic_homepage_accessibility"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ACCESSIBILITY_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1462,10 +1534,11 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="Settings$AccessibilityDaltonizerSettingsActivity"
-                android:label="@string/accessibility_display_daltonizer_preference_title"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$AccessibilitySettingsActivity">
+        <activity
+            android:name="Settings$AccessibilityDaltonizerSettingsActivity"
+            android:label="@string/accessibility_display_daltonizer_preference_title"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.ACCESSIBILITY_COLOR_SPACE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1480,10 +1553,11 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="Settings$CaptioningSettingsActivity"
-                android:label="@string/accessibility_captioning_title"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$AccessibilitySettingsActivity">
+        <activity
+            android:name="Settings$CaptioningSettingsActivity"
+            android:label="@string/accessibility_captioning_title"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.CAPTIONING_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1498,10 +1572,11 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="Settings$TextToSpeechSettingsActivity"
-                android:label="@string/tts_settings"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$LanguageAndInputSettingsActivity">
+        <activity
+            android:name="Settings$TextToSpeechSettingsActivity"
+            android:label="@string/tts_settings"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.TTS_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1512,10 +1587,11 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="Settings$EnterprisePrivacySettingsActivity"
-                android:label="@string/enterprise_privacy_settings"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$SecuritySettingsActivity">
+        <activity
+            android:name="Settings$EnterprisePrivacySettingsActivity"
+            android:label="@string/enterprise_privacy_settings"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.settings.ENTERPRISE_PRIVACY_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1524,8 +1600,6 @@
                 android:value="com.android.settings.enterprise.EnterprisePrivacySettings" />
         </activity>
 
-        <!-- Second and third-level settings -->
-
         <!-- Lock screen settings -->
         <activity android:name=".password.ConfirmDeviceCredentialActivity"
             android:exported="true"
@@ -1595,7 +1669,14 @@
         <activity android:name=".fingerprint.FingerprintEnrollFindSensor" android:exported="false"/>
         <activity android:name=".fingerprint.FingerprintEnrollEnrolling" android:exported="false"/>
         <activity android:name=".fingerprint.FingerprintEnrollFinish" android:exported="false"/>
-        <activity android:name=".fingerprint.FingerprintEnrollIntroduction" android:exported="false" />
+        <activity android:name=".fingerprint.FingerprintEnrollIntroduction"
+            android:exported="true"
+            android:theme="@style/GlifTheme.Light">
+            <intent-filter>
+                <action android:name="android.settings.FINGERPRINT_ENROLL" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
 
         <activity android:name=".fingerprint.SetupFingerprintEnrollFindSensor" android:exported="false"/>
         <activity android:name=".fingerprint.SetupFingerprintEnrollEnrolling" android:exported="false"/>
@@ -1672,14 +1753,12 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name=".Settings$ScreenLockSuggestionActivity"
+        <activity android:name=".password.ScreenLockSuggestionActivity"
             android:icon="@drawable/ic_settings_security">
             <intent-filter android:priority="1">
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="com.android.settings.suggested.category.LOCK_SCREEN" />
             </intent-filter>
-            <meta-data android:name="com.android.settings.dismiss"
-                       android:value="0,30" />
             <meta-data android:name="com.android.settings.title"
                        android:resource="@string/suggested_lock_settings_title" />
             <meta-data android:name="com.android.settings.summary"
@@ -1687,7 +1766,7 @@
             <meta-data android:name="com.android.settings.icon_tintable" android:value="true" />
         </activity>
 
-        <activity android:name=".Settings$FingerprintEnrollSuggestionActivity"
+        <activity android:name=".fingerprint.FingerprintEnrollSuggestionActivity"
             android:icon="@drawable/ic_suggestion_fingerprint">
             <intent-filter android:priority="2">
                 <action android:name="android.intent.action.MAIN" />
@@ -1701,6 +1780,7 @@
                 android:resource="@string/suggested_fingerprint_lock_settings_title" />
             <meta-data android:name="com.android.settings.summary"
                 android:resource="@string/suggested_fingerprint_lock_settings_summary" />
+            <meta-data android:name="com.android.settings.icon_tintable" android:value="true" />
         </activity>
 
         <activity android:name=".password.ChooseLockGeneric$InternalActivity"
@@ -1736,50 +1816,12 @@
         <activity android:name=".EncryptionInterstitial"
             android:theme="@style/GlifTheme.Light" />
 
-        <activity android:name=".Settings$StatusActivity"
-                android:label="@string/device_status_activity_title"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$DeviceInfoSettingsActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.VOICE_LAUNCH" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.deviceinfo.Status" />
-        </activity>
-
-        <!-- Runs in the phone process since it needs access to the Phone object -->
-        <activity android:name=".Settings$SimStatusActivity"
-                android:label="@string/sim_status_title"
-                android:process="com.android.phone">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.VOICE_LAUNCH" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.deviceinfo.SimStatus" />
-        </activity>
-
-        <!-- Runs in the phone process since it needs access to the Phone object -->
-        <activity android:name=".Settings$ImeiInformationActivity"
-                android:label="@string/imei_information_title"
-                android:process="com.android.phone">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.VOICE_LAUNCH" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.deviceinfo.ImeiInformation" />
-        </activity>
-
-        <activity android:name=".Settings$StorageDashboardActivity"
-                android:label="@string/storage_settings"
-                android:icon="@drawable/ic_settings_storage"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings">
+        <activity
+            android:name=".Settings$StorageDashboardActivity"
+            android:label="@string/storage_settings"
+            android:icon="@drawable/ic_homepage_storage"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.INTERNAL_STORAGE_SETTINGS" />
                 <action android:name="android.settings.MEMORY_CARD_SETTINGS" />
@@ -1803,18 +1845,18 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="Settings$PrivateVolumeSettingsActivity"
-                android:label="@string/storage_settings_title"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$StorageDashboardActivity">
+        <activity
+            android:name="Settings$PrivateVolumeSettingsActivity"
+            android:label="@string/storage_settings_title">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.deviceinfo.PrivateVolumeSettings" />
+                       android:value="com.android.settings.deviceinfo.PrivateVolumeSettings" />
         </activity>
 
-        <activity android:name="Settings$PublicVolumeSettingsActivity"
-                android:label="@string/storage_settings_title"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$StorageDashboardActivity">
+        <activity
+            android:name="Settings$PublicVolumeSettingsActivity"
+            android:label="@string/storage_settings_title"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.provider.action.DOCUMENT_ROOT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1827,47 +1869,50 @@
                 android:value="com.android.settings.deviceinfo.PublicVolumeSettings" />
         </activity>
 
-        <activity android:name="Settings$PrivateVolumeForgetActivity"
-                android:label="@string/storage_settings_title"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$StorageDashboardActivity"
-                android:exported="true"
-                android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS">
+        <activity
+            android:name="Settings$PrivateVolumeForgetActivity"
+            android:label="@string/storage_settings_title"
+            android:exported="true"
+            android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.deviceinfo.PrivateVolumeForget" />
         </activity>
 
         <!-- Exported for SystemUI to launch into -->
         <activity android:name=".deviceinfo.StorageWizardInit"
-                android:theme="@style/SuwThemeMaterial.Light"
+                android:theme="@style/GlifV3Theme.Light"
                 android:taskAffinity="com.android.settings.storage_wizard"
                 android:exported="true"
                 android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
-        <activity android:name=".deviceinfo.StorageWizardFormatConfirm"
-                android:taskAffinity="com.android.settings.storage_wizard"
-                android:exported="false" />
         <activity android:name=".deviceinfo.StorageWizardFormatProgress"
+                android:theme="@style/GlifV3Theme.Light"
                 android:taskAffinity="com.android.settings.storage_wizard"
                 android:exported="false" />
-        <activity android:name=".deviceinfo.StorageWizardMigrate"
+        <activity android:name=".deviceinfo.StorageWizardFormatSlow"
+                android:theme="@style/GlifV3Theme.Light"
                 android:taskAffinity="com.android.settings.storage_wizard"
                 android:exported="false" />
         <activity android:name=".deviceinfo.StorageWizardMigrateConfirm"
+                android:theme="@style/GlifV3Theme.Light"
                 android:taskAffinity="com.android.settings.storage_wizard"
                 android:exported="false" />
         <activity android:name=".deviceinfo.StorageWizardMigrateProgress"
+                android:theme="@style/GlifV3Theme.Light"
                 android:taskAffinity="com.android.settings.storage_wizard"
                 android:exported="true"
                 android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
         <activity android:name=".deviceinfo.StorageWizardReady"
+                android:theme="@style/GlifV3Theme.Light"
                 android:taskAffinity="com.android.settings.storage_wizard"
                 android:exported="true"
                 android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
 
         <activity android:name=".deviceinfo.StorageWizardMoveConfirm"
+                android:theme="@style/GlifV3Theme.Light"
                 android:taskAffinity="com.android.settings.storage_wizard"
                 android:exported="false" />
         <activity android:name=".deviceinfo.StorageWizardMoveProgress"
+                android:theme="@style/GlifV3Theme.Light"
                 android:taskAffinity="com.android.settings.storage_wizard"
                 android:exported="true"
                 android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
@@ -1893,30 +1938,32 @@
                 <data android:mimeType="vnd.android.cursor.dir/telephony-carrier" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.ApnEditor" />
+                       android:value="com.android.settings.network.ApnEditor" />
         </activity>
 
-        <activity android:name="Settings$DevelopmentSettingsActivity"
-                android:label="@string/development_settings_title"
-                android:icon="@drawable/ic_settings_development"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings">
+        <activity
+            android:name="Settings$DevelopmentSettingsDashboardActivity"
+            android:label="@string/development_settings_title"
+            android:icon="@drawable/ic_settings_development"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings"
+            android:enabled="false">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
                 <action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter android:priority="50">
+            <intent-filter android:priority="40">
                 <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" />
+                       android:value="com.android.settings.category.ia.system" />
             <meta-data android:name="com.android.settings.summary"
-                android:resource="@string/summary_empty"/>
+                       android:resource="@string/summary_empty"/>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.development.DevelopmentSettings" />
+                       android:value="com.android.settings.development.DevelopmentSettingsDashboardFragment" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                android:value="true" />
+                       android:value="true" />
         </activity>
 
         <!-- The opposite of DevelopmentSettingsActivity, it's no-op and only enabled when the real
@@ -1933,11 +1980,12 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="Settings$PrintSettingsActivity"
-                android:label="@string/print_settings"
-                android:icon="@drawable/ic_settings_print"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings">
+        <activity
+            android:name="Settings$PrintSettingsActivity"
+            android:label="@string/print_settings"
+            android:icon="@drawable/ic_settings_print"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ACTION_PRINT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1947,11 +1995,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
-            <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.device" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.print.PrintSettingsFragment" />
         </activity>
@@ -1974,19 +2017,7 @@
                   android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" />
 
         <activity android:name="Settings$WebViewAppPickerActivity"
-                  android:label="@string/select_webview_provider_dialog_title">
-        </activity>
-
-        <!-- Keep compatibility with old shortcuts. -->
-        <activity-alias android:name="UsbSettings"
-                  android:exported="true"
-                  android:label="@string/storage_title_usb"
-                  android:targetActivity="Settings$DevelopmentSettingsActivity">
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.deviceinfo.UsbSettings" />
-        </activity-alias>
-
-        <!-- Bluetooth stuff -->
+                  android:label="@string/select_webview_provider_dialog_title" />
 
         <activity android:name=".bluetooth.BluetoothPairingDialog"
                   android:excludeFromRecents="true"
@@ -2019,13 +2050,21 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".deviceinfo.UsbModeChooserActivity"
+        <activity android:name=".connecteddevice.usb.UsbModeChooserActivity"
                   android:excludeFromRecents="true"
                   android:exported="true"
                   android:permission="android.permission.MANAGE_USB"
                   android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar">
         </activity>
 
+        <activity android:name=".Settings$UsbDetailsActivity"
+                  android:excludeFromRecents="true"
+                  android:permission="android.permission.MANAGE_USB"
+                  android:exported="true">
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.connecteddevice.usb.UsbDetailsFragment"/>
+        </activity>
+
         <activity android:name=".RemoteBugreportActivity"
                   android:excludeFromRecents="true"
                   android:exported="true"
@@ -2083,10 +2122,11 @@
         </activity>
 
         <!-- NFC settings -->
-        <activity android:name="Settings$AndroidBeamSettingsActivity"
-                android:label="@string/android_beam_settings_title"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings$ConnectedDeviceDashboardActivity">
+        <activity
+            android:name="Settings$AndroidBeamSettingsActivity"
+            android:label="@string/android_beam_settings_title"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NFCSHARING_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2101,10 +2141,12 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="Settings$WifiDisplaySettingsActivity"
-                android:label="@string/wifi_display_settings_title"
-                android:icon="@drawable/ic_cast_24dp"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$WifiDisplaySettingsActivity"
+            android:label="@string/wifi_display_settings_title"
+            android:icon="@drawable/ic_cast_24dp"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.CAST_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2122,17 +2164,9 @@
                 android:value="com.android.settings.wfd.WifiDisplaySettings" />
         </activity>
 
-        <activity android:name="Display" android:label="@string/display_label"
-                android:configChanges="fontScale"
-                android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="RadioInfo" android:label="@string/phone_info_label"
+        <activity
+            android:name="RadioInfo"
+            android:label="@string/phone_info_label"
             android:process="com.android.phone">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -2188,7 +2222,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="UsageStatsActivity" android:label="@string/usage_stats_label"
+        <activity android:name="UsageStatsActivity"
+                  android:label="@string/usage_stats_label"
                   android:taskAffinity="com.android.settings"
                   android:parentActivityName="Settings">
             <intent-filter>
@@ -2197,10 +2232,12 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="Settings$PowerUsageSummaryActivity"
-                android:label="@string/power_usage_summary_title"
-                android:icon="@drawable/ic_settings_battery"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$PowerUsageSummaryActivity"
+            android:label="@string/power_usage_summary_title"
+            android:icon="@drawable/ic_homepage_battery"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.intent.action.POWER_USAGE_SUMMARY" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2219,25 +2256,18 @@
                 android:value="com.android.settings.fuelgauge.PowerUsageSummary" />
         </activity>
 
-        <!-- Keep compatibility with old shortcuts. -->
-        <activity-alias android:name=".fuelgauge.PowerUsageSummary"
-                android:label="@string/power_usage_summary_title"
-                android:exported="true"
-                android:targetActivity="Settings$PowerUsageSummaryActivity">
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.fuelgauge.PowerUsageSummary" />
-        </activity-alias>
-
-        <activity android:name="Settings$BatterySaverSettingsActivity"
-                android:label="@string/battery_saver"
-                android:icon="@drawable/ic_settings_battery"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$BatterySaverSettingsActivity"
+            android:label="@string/battery_saver"
+            android:icon="@drawable/ic_settings_battery"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.BATTERY_SAVER_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.fuelgauge.BatterySaverSettings" />
+                android:value="com.android.settings.fuelgauge.batterysaver.BatterySaverSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -2253,9 +2283,10 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="Settings$AccountSyncSettingsActivity"
+        <activity
+            android:name="Settings$AccountSyncSettingsActivity"
             android:label="@string/account_sync_settings_title"
-            android:taskAffinity=""
+            android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ACCOUNT_SYNC_SETTINGS" />
@@ -2270,9 +2301,10 @@
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
-        <activity android:name="Settings$ManagedProfileSettingsActivity"
+        <activity
+            android:name="Settings$ManagedProfileSettingsActivity"
             android:label="@string/managed_profile_settings_title"
-            android:taskAffinity=""
+            android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings"
             android:permission="android.permission.MANAGE_USERS">
             <intent-filter android:priority="1">
@@ -2283,12 +2315,13 @@
                 android:value="com.android.settings.accounts.ManagedProfileSettings" />
         </activity>
 
-        <activity android:name="com.android.settings.accounts.AddAccountSettings"
+        <activity
+            android:name="com.android.settings.accounts.AddAccountSettings"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/header_add_an_account"
             android:taskAffinity="com.android.settings"
-            android:parentActivityName="Settings$UserAndAccountDashboardActivity">
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ADD_ACCOUNT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2328,6 +2361,7 @@
         <!-- Triggered when user-selected home app isn't encryption aware -->
         <activity android:name=".FallbackHome"
                   android:excludeFromRecents="true"
+                  android:label=""
                   android:screenOrientation="nosensor"
                   android:theme="@style/FallbackHome">
             <intent-filter android:priority="-1000">
@@ -2354,20 +2388,47 @@
                 android:label="@string/crypt_keeper_encrypt_title">
             <intent-filter android:priority="1">
                 <action android:name="android.app.action.START_ENCRYPTION" />
-                <category android:name="android.intent.category.DEFAULT" /> />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" /> />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.CryptKeeperSettings" />
+                android:value="com.android.settings.security.CryptKeeperSettings" />
         </activity>
 
-        <activity android:name="Settings$DataUsageSummaryActivity"
-                android:label="@string/data_usage_summary_title"
-                android:icon="@drawable/ic_settings_data_usage"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$DataUsageSummaryActivity"
+            android:label="@string/data_usage_summary_title"
+            android:icon="@drawable/ic_settings_data_usage"
+            android:enabled="false"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
+            <!-- TODO(b/70950124): add shortcut intent-filter -->
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.DATA_USAGE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <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.wireless" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.datausage.DataUsageSummary" />
+        </activity>
+
+        <activity
+            android:name="Settings$DataUsageSummaryLegacyActivity"
+            android:label="@string/data_usage_summary_title"
+            android:icon="@drawable/ic_settings_data_usage"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.DATA_USAGE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2377,15 +2438,30 @@
                 <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.wireless" />
+                       android:value="com.android.settings.category.ia.wireless" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.datausage.DataUsageSummary" />
+                       android:value="com.android.settings.datausage.DataUsageSummaryLegacy" />
         </activity>
 
-        <activity android:name="Settings$DreamSettingsActivity"
-                android:label="@string/screensaver_settings_title"
-                android:icon="@drawable/ic_settings_display"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$MobileDataUsageListActivity"
+            android:label="@string/cellular_data_usage"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.MOBILE_DATA_USAGE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.datausage.DataUsageList" />
+        </activity>
+
+        <activity
+            android:name="Settings$DreamSettingsActivity"
+            android:label="@string/screensaver_settings_title"
+            android:icon="@drawable/ic_settings_display"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.DREAM_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2401,10 +2477,12 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="Settings$UserSettingsActivity"
-                android:label="@string/user_settings_title"
-                android:icon="@drawable/ic_settings_multiuser"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$UserSettingsActivity"
+            android:label="@string/user_settings_title"
+            android:icon="@drawable/ic_settings_multiuser"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.USER_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2413,21 +2491,23 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter android:priority="8">
+            <intent-filter  android:priority="45">
                 <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.accounts" />
+                android:value="com.android.settings.category.ia.system" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.users.UserSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
-        <activity android:name="Settings$PaymentSettingsActivity"
-                android:label="@string/nfc_payment_settings_title"
-                android:icon="@drawable/ic_settings_nfc_payment"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$PaymentSettingsActivity"
+            android:label="@string/nfc_payment_settings_title"
+            android:icon="@drawable/ic_settings_nfc_payment"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NFC_PAYMENT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2436,11 +2516,6 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <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.apps.default" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.nfc.PaymentSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2461,7 +2536,7 @@
 
         <activity android:name=".nfc.HowItWorks"
                   android:label="@string/nfc_payment_settings_title"
-                  android:parentActivityName="Settings$PaymentSettingsActivity">
+                  android:parentActivityName="Settings$PaymentSettingsActivity"
                   android:excludeFromRecents="true">
         </activity>
 
@@ -2475,9 +2550,11 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="Settings$NotificationAccessSettingsActivity"
-                  android:label="@string/manage_notification_access_title"
-                  android:taskAffinity="">
+        <activity
+            android:name="Settings$NotificationAccessSettingsActivity"
+            android:label="@string/manage_notification_access_title"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2490,9 +2567,11 @@
                        android:value="com.android.settings.notification.NotificationAccessSettings" />
         </activity>
 
-        <activity android:name="Settings$VrListenersSettingsActivity"
-                  android:label="@string/vr_listeners_title"
-                  android:taskAffinity="">
+        <activity
+            android:name="Settings$VrListenersSettingsActivity"
+            android:label="@string/vr_listeners_title"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.VR_LISTENER_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2505,9 +2584,11 @@
                        android:value="com.android.settings.applications.VrListenerSettings" />
         </activity>
 
-        <activity android:name="Settings$PictureInPictureSettingsActivity"
+        <activity
+            android:name="Settings$PictureInPictureSettingsActivity"
             android:label="@string/picture_in_picture_title"
-            android:taskAffinity="">
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.PICTURE_IN_PICTURE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2517,24 +2598,27 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.PictureInPictureSettings" />
+                android:value="com.android.settings.applications.appinfo.PictureInPictureSettings" />
         </activity>
 
-        <activity android:name="Settings$AppPictureInPictureSettingsActivity"
+        <activity
+            android:name="Settings$AppPictureInPictureSettingsActivity"
             android:label="@string/picture_in_picture_title"
-            android:taskAffinity="">
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.settings.PICTURE_IN_PICTURE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="package" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.PictureInPictureDetails" />
+                android:value="com.android.settings.applications.appinfo.PictureInPictureDetails" />
         </activity>
 
-        <activity android:name="Settings$ZenAccessSettingsActivity"
-                  android:label="@string/manage_zen_access_title"
-                  android:taskAffinity="">
+        <activity
+            android:name="Settings$ZenAccessSettingsActivity"
+            android:label="@string/manage_zen_access_title"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2547,10 +2631,12 @@
                        android:value="com.android.settings.notification.ZenAccessSettings" />
         </activity>
 
-        <activity android:name="Settings$ConfigureNotificationSettingsActivity"
-                android:label="@string/configure_notification_settings"
-                android:exported="true"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$ConfigureNotificationSettingsActivity"
+            android:label="@string/configure_notification_settings"
+            android:exported="true"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NOTIFICATION_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2565,6 +2651,8 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
                 android:value="com.android.settings.category.ia.apps"/>
+            <meta-data android:name="com.android.settings.summary"
+                       android:resource="@string/summary_empty"/>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.notification.ConfigureNotificationSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2572,11 +2660,13 @@
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
-        <activity android:name="Settings$SoundSettingsActivity"
-                android:label="@string/sound_settings"
-                android:icon="@drawable/ic_settings_sound"
-                android:taskAffinity=""
-                android:exported="true">
+        <activity
+            android:name="Settings$SoundSettingsActivity"
+            android:label="@string/sound_settings"
+            android:icon="@drawable/ic_homepage_sound"
+            android:exported="true"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.SOUND_SETTINGS" />
                 <action android:name="android.settings.SOUND_SETTINGS" />
@@ -2602,28 +2692,21 @@
                 android:resource="@string/sound_dashboard_summary"/>
         </activity>
 
-        <!-- Keep compatibility with old shortcuts. -->
-        <activity-alias android:name="SoundSettings"
-                android:label="@string/sound_settings"
-                android:exported="true"
-                android:targetActivity="Settings$SoundSettingsActivity">
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.notification.SoundSettings" />
-        </activity-alias>
-
         <!-- Show apps for which application-level notification settings are applicable -->
         <activity android:name="Settings$NotificationAppListActivity"
-                android:label="@string/app_notifications_title"
-                android:icon="@drawable/ic_notifications"
-                android:exported="true"
-                android:taskAffinity="">
+                  android:label="@string/app_notifications_title"
+                  android:icon="@drawable/ic_notifications"
+                  android:exported="true"
+                  android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.ALL_APPS_NOTIFICATION_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter android:priority="150">
                 <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.notifications" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.NotificationApps" />
+                       android:value="com.android.settings.applications.manageapplications.ManageApplications" />
         </activity>
 
         <!-- Show application-level notification settings (app passed in as extras) -->
@@ -2641,8 +2724,20 @@
                 android:value="com.android.settings.notification.AppNotificationSettings" />
         </activity>
 
+        <!-- Show channel group-level notification settings (group passed in as extras) -->
+        <activity android:name="Settings$ChannelGroupNotificationSettingsActivity"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.notification.ChannelGroupNotificationSettings" />
+        </activity>
+
         <!-- Show channel-level notification settings (channel passed in as extras) -->
         <activity android:name="Settings$ChannelNotificationSettingsActivity"
+                  android:label="@string/notification_channel_title"
                   android:exported="true">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.CHANNEL_NOTIFICATION_SETTINGS" />
@@ -2657,10 +2752,12 @@
         </activity>
 
         <!-- Show Manual (from settings item) -->
-        <activity android:name="ManualDisplayActivity"
-                  android:label="@string/manual"
-                  android:taskAffinity=""
-                  android:enabled="@bool/config_show_manual">
+        <activity
+            android:name="ManualDisplayActivity"
+            android:label="@string/manual"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings"
+            android:enabled="@bool/config_show_manual">
             <intent-filter>
                 <action android:name="android.settings.SHOW_MANUAL" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2670,10 +2767,12 @@
         </activity>
 
         <!-- Show regulatory info (from settings item or dialing "*#07#") -->
-        <activity android:name="RegulatoryInfoDisplayActivity"
-                  android:label="@string/regulatory_labels"
-                  android:taskAffinity=""
-                  android:enabled="@bool/config_show_regulatory_info">
+        <activity
+            android:name="RegulatoryInfoDisplayActivity"
+            android:label="@string/regulatory_labels"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings"
+            android:enabled="@bool/config_show_regulatory_info">
             <intent-filter>
                 <action android:name="android.settings.SHOW_REGULATORY_INFO" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2732,10 +2831,12 @@
                 android:resource="@xml/file_paths" />
         </provider>
 
-        <activity android:name="Settings$SimSettingsActivity"
-                android:label="@string/sim_settings_title"
-                android:icon="@drawable/ic_settings_sim"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$SimSettingsActivity"
+            android:label="@string/sim_settings_title"
+            android:icon="@drawable/ic_settings_sim"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.sim.SIM_SUB_INFO_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2749,17 +2850,19 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
                 android:value="com.android.settings.category.ia.wireless" />
+            <meta-data android:name="com.android.settings.summary"
+                android:resource="@string/summary_empty"/>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.sim.SimSettings" />
         </activity>
 
         <activity android:name=".sim.SimPreferenceDialog"
             android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"
-            android:excludeFromRecents="true">
-        </activity>
+            android:excludeFromRecents="true" />
 
-        <activity android:name=".wifi.RequestToggleWiFiActivity"
-                  android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"
+        <activity
+            android:name=".wifi.RequestToggleWiFiActivity"
+            android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"
             android:excludeFromRecents="true"
             android:permission="android.permission.CHANGE_WIFI_STATE">
             <intent-filter>
@@ -2769,7 +2872,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".wifi.WifiDialogActivity"
+        <activity
+            android:name=".wifi.WifiDialogActivity"
             android:label=""
             android:theme="@style/Transparent"
             android:excludeFromRecents="true"
@@ -2791,9 +2895,11 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="Settings$WifiCallingSettingsActivity"
-                  android:label="@string/wifi_calling_settings_title"
-                  android:taskAffinity="">
+        <activity
+            android:name="Settings$WifiCallingSettingsActivity"
+            android:label="@string/wifi_calling_settings_title"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.WIFI_CALLING_SETTINGS" />
@@ -2801,21 +2907,20 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.WifiCallingSettings" />
+                       android:value="com.android.settings.wifi.calling.WifiCallingSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                        android:value="true" />
         </activity>
 
-        <activity android:name="Settings$WifiCallingSuggestionActivity"
+        <activity android:name=".wifi.calling.WifiCallingSuggestionActivity"
                   android:label="@string/wifi_calling_settings_title"
-                  android:icon="@drawable/ic_settings_wireless"
-                  android:taskAffinity="">
+                  android:icon="@drawable/ic_settings_wireless">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.WifiCallingSettings" />
+                       android:value="com.android.settings.wifi.calling.WifiCallingSettings" />
             <meta-data android:name="com.android.settings.dismiss"
                 android:value="10,14,30" />
             <meta-data android:name="com.android.settings.title"
@@ -2836,62 +2941,80 @@
             </intent-filter>
         </provider>
 
-        <activity android:name="Settings$OverlaySettingsActivity"
-                android:label="@string/draw_overlay"
-                android:taskAffinity="">
+        <provider
+            android:name=".dashboard.suggestions.SuggestionStateProvider"
+            android:authorities="com.android.settings.suggestions.status"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.android.settings.action.SUGGESTION_STATE_PROVIDER" />
+            </intent-filter>
+        </provider>
+
+        <activity
+            android:name="Settings$OverlaySettingsActivity"
+            android:label="@string/draw_overlay"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.action.MANAGE_OVERLAY_PERMISSION" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
+                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
         </activity>
 
-        <activity android:name="Settings$AppDrawOverlaySettingsActivity"
-                android:label="@string/draw_overlay"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$AppDrawOverlaySettingsActivity"
+            android:label="@string/draw_overlay"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.action.MANAGE_OVERLAY_PERMISSION" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="package" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.DrawOverlayDetails" />
+                android:value="com.android.settings.applications.appinfo.DrawOverlayDetails" />
         </activity>
 
-        <activity android:name="Settings$WriteSettingsActivity"
-                android:label="@string/write_settings_title"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$WriteSettingsActivity"
+            android:label="@string/write_settings_title"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.action.MANAGE_WRITE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
+                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
         </activity>
 
-
-        <activity android:name="Settings$AppWriteSettingsActivity"
-                  android:label="@string/write_settings_title"
-                  android:taskAffinity="">
+        <activity
+            android:name="Settings$AppWriteSettingsActivity"
+            android:label="@string/write_settings_title"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.action.MANAGE_WRITE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="package" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.applications.WriteSettingsDetails" />
+                       android:value="com.android.settings.applications.appinfo.WriteSettingsDetails" />
         </activity>
 
-        <activity android:name="Settings$ManageExternalSourcesActivity"
-                android:label="@string/install_other_apps"
-                android:taskAffinity="">
+        <activity
+            android:name="Settings$ManageExternalSourcesActivity"
+            android:label="@string/install_other_apps"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MANAGE_UNKNOWN_APP_SOURCES" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.ManageApplications" />
+                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
         </activity>
 
         <activity android:name="Settings$ManageAppExternalSourcesActivity"
@@ -2903,23 +3026,25 @@
                 <data android:scheme="package" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.applications.ExternalSourcesDetails" />
+                       android:value="com.android.settings.applications.appinfo.ExternalSourcesDetails" />
         </activity>
 
-        <activity android:name="ShowAdminSupportDetailsDialog"
+        <activity android:name=".enterprise.ActionDisabledByAdminDialog"
                 android:theme="@style/Transparent"
                 android:excludeFromRecents="true"
                 android:launchMode="singleTop">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.settings.SHOW_ADMIN_SUPPORT_DETAILS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
-        <activity android:name="Settings$AdvancedAppsActivity"
-                  android:taskAffinity=""
-                  android:exported="true"
-                  android:label="@string/app_default_dashboard_title">
+        <activity
+            android:name="Settings$AdvancedAppsActivity"
+            android:exported="true"
+            android:label="@string/app_default_dashboard_title"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MANAGE_DEFAULT_APPS_SETTINGS" />
                 <action android:name="android.settings.HOME_SETTINGS" />
@@ -2931,7 +3056,7 @@
             <meta-data android:name="com.android.settings.category"
                        android:value="com.android.settings.category.ia.apps"/>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.applications.AdvancedAppSettings" />
+                       android:value="com.android.settings.applications.DefaultAppSettings" />
             <meta-data android:name="com.android.settings.summary"
                        android:resource="@string/summary_empty"/>
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2969,19 +3094,18 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
-            <intent-filter android:priority="60">
-                <action android:name="com.android.settings.action.SETTINGS" />
-            </intent-filter>
             <meta-data android:name="com.android.settings.summary"
                        android:resource="@string/summary_empty"/>
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                        android:value="true" />
         </activity>
 
-        <activity android:name="Settings$AutomaticStorageManagerSettingsActivity"
-                  android:exported="@bool/config_storage_manager_settings_enabled"
-                  android:label="@string/automatic_storage_manager_settings"
-                  android:taskAffinity="">
+        <activity
+            android:name="Settings$AutomaticStorageManagerSettingsActivity"
+            android:exported="@bool/config_storage_manager_settings_enabled"
+            android:label="@string/automatic_storage_manager_settings"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.STORAGE_MANAGER_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2990,18 +3114,12 @@
                        android:value="com.android.settings.deletionhelper.AutomaticStorageManagerSettings" />
         </activity>
 
-        <activity android:name="Settings$LegacySupportActivity"
-                  android:label="@string/page_tab_title_support">
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-            android:value="com.android.settings.dashboard.SupportFragment"/>
-        </activity>
-
-        <!-- Information architecture host activities -->
-
-        <!-- Alias for battery settings in new IA. Remove and merge metadata into TargetActivity -->
-        <activity android:name=".Settings$AppAndNotificationDashboardActivity"
-                  android:label="@string/app_and_notification_dashboard_title"
-                  android:icon="@drawable/ic_apps">
+        <activity
+            android:name=".Settings$AppAndNotificationDashboardActivity"
+            android:label="@string/app_and_notification_dashboard_title"
+            android:icon="@drawable/ic_homepage_apps"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="9">
                 <action android:name="com.android.settings.action.SETTINGS"/>
             </intent-filter>
@@ -3013,9 +3131,12 @@
                        android:resource="@string/app_and_notification_dashboard_summary"/>
         </activity>
 
-        <activity android:name=".Settings$UserAndAccountDashboardActivity"
-                  android:label="@string/account_dashboard_title"
-                  android:icon="@drawable/ic_settings_accounts">
+        <activity
+            android:name=".Settings$AccountDashboardActivity"
+            android:label="@string/account_dashboard_title"
+            android:icon="@drawable/ic_homepage_accounts"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="3">
                 <action android:name="com.android.settings.action.SETTINGS"/>
             </intent-filter>
@@ -3024,16 +3145,19 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.accounts.UserAndAccountDashboardFragment"/>
+                       android:value="com.android.settings.accounts.AccountDashboardFragment"/>
             <meta-data android:name="com.android.settings.category"
                        android:value="com.android.settings.category.ia.homepage"/>
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-              android:value="true" />
+                       android:value="true" />
         </activity>
 
-        <activity android:name=".Settings$SystemDashboardActivity"
-                  android:label="@string/header_category_system"
-                  android:icon="@drawable/ic_settings_about">
+        <activity
+            android:name=".Settings$SystemDashboardActivity"
+            android:label="@string/header_category_system"
+            android:icon="@drawable/ic_homepage_system_dashboard"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
             <intent-filter android:priority="-1">
                 <action android:name="com.android.settings.action.SETTINGS"/>
             </intent-filter>
@@ -3047,10 +3171,10 @@
 
         <activity android:name=".support.SupportDashboardActivity"
                   android:label="@string/page_tab_title_support"
-                  android:icon="@drawable/ic_help"
+                  android:icon="@drawable/ic_homepage_support"
                   android:theme="@android:style/Theme.DeviceDefault.Light.Panel"
                   android:enabled="@bool/config_support_enabled">
-            <intent-filter android:priority="-2">
+            <intent-filter android:priority="-3">
                 <action android:name="com.android.settings.action.SETTINGS"/>
             </intent-filter>
             <intent-filter>
@@ -3063,16 +3187,17 @@
                        android:resource="@string/support_summary"/>
         </activity>
 
-        <!-- End of information architecture host activities -->
-
         <service
             android:name=".SettingsDumpService"
             android:exported="true"
             android:permission="android.permission.DUMP" />
 
+         <service android:name=".search.DeviceIndexUpdateJobService"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
+
         <!-- Quick Settings tiles for Developer Options -->
         <service
-            android:name=".qstile.DevelopmentTiles$ShowLayout"
+            android:name=".development.qstile.DevelopmentTiles$ShowLayout"
             android:label="@string/debug_layout"
             android:icon="@drawable/tile_icon_show_layout"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
@@ -3082,7 +3207,7 @@
             </intent-filter>
         </service>
         <service
-            android:name=".qstile.DevelopmentTiles$GPUProfiling"
+            android:name=".development.qstile.DevelopmentTiles$GPUProfiling"
             android:label="@string/track_frame_time"
             android:icon="@drawable/tile_icon_graphics"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
@@ -3092,7 +3217,7 @@
             </intent-filter>
         </service>
         <service
-            android:name=".qstile.DevelopmentTiles$ForceRTL"
+            android:name=".development.qstile.DevelopmentTiles$ForceRTL"
             android:label="@string/force_rtl_layout_all_locales"
             android:icon="@drawable/tile_icon_force_rtl"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
@@ -3102,7 +3227,7 @@
             </intent-filter>
         </service>
         <service
-            android:name=".qstile.DevelopmentTiles$AnimationSpeed"
+            android:name=".development.qstile.DevelopmentTiles$AnimationSpeed"
             android:label="@string/window_animation_scale_title"
             android:icon="@drawable/tile_icon_animation_speed"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
@@ -3111,11 +3236,16 @@
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
         </service>
-        <activity
-            android:name=".qstile.DevelopmentTileConfigActivity"
-            android:excludeFromRecents="true"
-            android:launchMode="singleInstance"
-            android:label="@string/quick_settings_developer_tiles" />
+        <service
+            android:name=".development.qstile.DevelopmentTiles$WinscopeTrace"
+            android:label="@string/winscope_trace_quick_settings_title"
+            android:icon="@drawable/tile_icon_winscope_trace"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:enabled="false">
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+        </service>
 
         <activity android:name=".HelpTrampoline"
             android:exported="true"
@@ -3123,116 +3253,95 @@
             android:permission="android.permission.DUMP"
             android:enabled="@bool/config_has_help" />
 
+        <activity android:name=".applications.autofill.AutofillPickerActivity"
+                android:excludeFromRecents="true"
+                android:launchMode="singleInstance"
+                android:exported="false">
+        </activity>
 
-        <!-- Activities for moves/gestures suggestions -->
-        <activity
-            android:name=".Settings$DoubleTapPowerSuggestionActivity"
-            android:label="@string/double_tap_power_for_camera_title"
-            android:icon="@drawable/ic_suggestion_gesture">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.settings.suggested.category.GESTURE" />
+        <activity android:name=".applications.autofill.AutofillPickerTrampolineActivity"
+                android:theme="@android:style/Theme.NoDisplay"
+                android:excludeFromRecents="true"
+                android:launchMode="singleInstance"
+                android:label="@string/autofill_app">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.REQUEST_SET_AUTOFILL_SERVICE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="package" />
             </intent-filter>
-            <meta-data android:name="com.android.settings.dismiss"
-                       android:value="4,8,30" />
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.gestures.DoubleTapPowerSettings"/>
-            <meta-data android:name="com.android.settings.title"
-                       android:resource="@string/double_tap_power_for_camera_suggestion_title" />
-            <meta-data android:name="com.android.settings.summary"
-                       android:resource="@string/double_tap_power_for_camera_suggestion_summary" />
         </activity>
 
-        <activity
-            android:name=".Settings$DoubleTwistSuggestionActivity"
-            android:label="@string/double_twist_for_camera_mode_title"
-            android:icon="@drawable/ic_suggestion_gesture">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.settings.suggested.category.GESTURE" />
+        <activity android:name="Settings$AdvancedConnectedDeviceActivity"
+                  android:label="@string/connected_device_connections_title"
+                  android:taskAffinity="com.android.settings"
+                  android:parentActivityName="Settings$ConnectedDeviceDashboardActivity">
+            <intent-filter android:priority="1">
+                <action android:name="com.android.settings.ADVANCED_CONNECTED_DEVICE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <meta-data android:name="com.android.settings.dismiss"
-                       android:value="4,8,30" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.gestures.DoubleTwistGestureSettings"/>
-            <meta-data android:name="com.android.settings.title"
-                       android:resource="@string/double_twist_for_camera_suggestion_title" />
-            <meta-data android:name="com.android.settings.summary"
-                       android:resource="@string/double_twist_for_camera_suggestion_summary" />
+                       android:value="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                       android:value="true" />
         </activity>
 
-        <activity
-            android:name=".Settings$AmbientDisplaySuggestionActivity"
-            android:label="@string/ambient_display_title"
-            android:icon="@drawable/ic_suggestion_gesture">
+        <activity android:name="Settings$DirectoryAccessSettingsActivity"
+                android:label="@string/directory_access"
+                android:taskAffinity="">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.settings.suggested.category.GESTURE" />
+                <action android:name="android.settings.STORAGE_VOLUME_ACCESS_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <meta-data android:name="com.android.settings.dismiss"
-                       android:value="9,13,30" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.gestures.DoubleTapScreenSettings"/>
-            <meta-data android:name="com.android.settings.title"
-                       android:resource="@string/ambient_display_title" />
-            <meta-data android:name="com.android.settings.summary"
-                       android:resource="@string/ambient_display_suggestion_summary" />
+                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
         </activity>
 
-        <activity
-            android:name=".Settings$AmbientDisplayPickupSuggestionActivity"
-            android:label="@string/ambient_display_pickup_title"
-            android:icon="@drawable/ic_suggestion_gesture">
+        <provider android:name=".slices.SettingsSliceProvider"
+                  android:authorities="com.android.settings.slices;android.settings.slices"
+                  android:exported="true"
+                  android:grantUriPermissions="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.settings.suggested.category.GESTURE" />
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.app.slice.category.SLICE" />
+                <data android:scheme="settings"
+                      android:host="com.android.settings.slices" />
             </intent-filter>
-            <meta-data android:name="com.android.settings.dismiss"
-                       android:value="9,13,30" />
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.gestures.PickupGestureSettings"/>
-            <meta-data android:name="com.android.settings.title"
-                       android:resource="@string/ambient_display_pickup_title" />
-            <meta-data android:name="com.android.settings.summary"
-                       android:resource="@string/ambient_display_pickup_suggestion_summary" />
-        </activity>
+        </provider>
 
-        <activity
-            android:name=".Settings$SwipeToNotificationSuggestionActivity"
-            android:label="@string/fingerprint_swipe_for_notifications_title"
-            android:icon="@drawable/ic_suggestion_gesture">
+        <receiver
+            android:name=".slices.SliceBroadcastReceiver"
+            android:exported="false">
+        </receiver>
+
+        <receiver
+            android:name=".slices.SliceRelayReceiver"
+            android:permission="android.permission.MANAGE_SLICE_PERMISSIONS"
+            android:exported="true">
+
+        </receiver>
+
+        <!-- Couldn't be triggered from outside of settings. Statsd can trigger it because we send
+             PendingIntent to it-->
+        <receiver android:name=".fuelgauge.batterytip.AnomalyDetectionReceiver"
+                  android:exported="false" />
+
+        <receiver android:name=".fuelgauge.batterytip.AnomalyConfigReceiver">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.settings.suggested.category.GESTURE" />
+                <action android:name="android.app.action.STATSD_STARTED"/>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>
-            <meta-data android:name="com.android.settings.dismiss"
-                       android:value="9,13,30" />
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.gestures.SwipeToNotificationSettings"/>
-            <meta-data android:name="com.android.settings.title"
-                       android:resource="@string/fingerprint_swipe_for_notifications_suggestion_title" />
-            <meta-data android:name="com.android.settings.summary"
-                       android:resource="@string/fingerprint_swipe_for_notifications_suggestion_summary" />
-        </activity>
-        <!-- End activities for moves/gestures suggestions -->
+        </receiver>
 
-        <activity android:name=".applications.autofill.AutofillPickerActivity"
-                android:excludeFromRecents="true"
-                android:launchMode="singleInstance"
-                android:exported="false">
-        </activity>
+        <service android:name=".fuelgauge.batterytip.AnomalyCleanupJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE" />
 
-        <activity android:name=".applications.autofill.AutofillPickerTrampolineActivity"
-                android:theme="@android:style/Theme.NoDisplay"
-                android:excludeFromRecents="true"
-                android:launchMode="singleInstance"
-                android:label="@string/autofill_app">
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.REQUEST_SET_AUTOFILL_SERVICE" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="package" />
-            </intent-filter>
-        </activity>
+        <service android:name=".fuelgauge.batterytip.AnomalyConfigJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE" />
+
+        <service android:name=".fuelgauge.batterytip.AnomalyDetectionJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE" />
 
         <!-- This is the longest AndroidManifest.xml ever. -->
     </application>