Merge "Connect to network while clicking open or saved networks on slice"

diff --combined AndroidManifest.xml
index 6e1d8f8,fb581d6..285fc56
--- 1/AndroidManifest.xml
--- 2/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -1825,7 -1825,7 +1825,7 @@@
          <activity
              android:name="Settings$PrintSettingsActivity"
              android:label="@string/print_settings"
 -            android:icon="@drawable/ic_settings_print"
 +            android:icon="@*android:drawable/ic_settings_print"
              android:parentActivityName="Settings">
              <intent-filter android:priority="1">
                  <action android:name="android.settings.ACTION_PRINT_SETTINGS" />
@@@ -2591,6 -2591,12 +2591,12 @@@
              </intent-filter>
          </activity>
  
+         <activity
+             android:name=".wifi.slice.ConnectToWifiHandler"
+             android:theme="@android:style/Theme.NoDisplay"
+             android:excludeFromRecents="true"
+             android:exported="false" />
+ 
          <activity android:name=".sim.SimDialogActivity"
                  android:theme="@style/Theme.AlertDialog"
                  android:label="@string/sim_settings_title"
@@@ -2776,17 -2782,13 +2782,17 @@@
                  android:value="com.android.settings.webview.WebViewAppPicker" />
          </activity-alias>
  
 -        <activity android:name=".backup.BackupSettingsActivity"
 +        <provider
 +            android:name=".backup.BackupSettingsContentProvider"
 +            android:authorities="com.android.settings.backup.BackupSettingsContentProvider"
 +          android:exported="true">
 +        </provider>
 +
 +        <activity android:name=".backup.UserBackupSettingsActivity"
                    android:label="@string/privacy_settings_title"
 -                  android:icon="@drawable/ic_settings_backup"
 -                  android:parentActivityName="Settings">
 +                  android:icon="@drawable/ic_settings_backup">
              <intent-filter android:priority="1">
                  <action android:name="android.settings.PRIVACY_SETTINGS" />
 -                <action android:name="android.settings.BACKUP_AND_RESET_SETTINGS" />
                  <category android:name="android.intent.category.DEFAULT" />
              </intent-filter>
              <intent-filter>
@@@ -2794,16 -2796,10 +2800,16 @@@
                  <category android:name="android.intent.category.DEFAULT" />
                  <category android:name="android.intent.category.VOICE_LAUNCH" />
              </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" />
 +            <!-- Mark the activity as a dynamic setting -->
 +            <intent-filter>
 +                <action android:name="com.android.settings.action.IA_SETTINGS" />
 +            </intent-filter>
 +            <!-- Tell Settings app which category it belongs to -->
 +            <meta-data android:name="com.android.settings.category"
 +                       android:value="com.android.settings.category.ia.system" />
 +            <meta-data android:name="com.android.settings.summary_uri"
 +                     android:value="content://com.android.settings.backup.BackupSettingsContentProvider/summary" />
 +            <meta-data android:name="com.android.settings.order" android:value="-60"/>
          </activity>
  
          <activity
@@@ -2993,17 -2989,6 +2999,17 @@@
                  </intent-filter>
          </activity>
  
 +        <activity-alias
 +            android:name="MediaOutputSlice"
 +            android:label="@string/media_output_panel_title"
 +            android:permission="android.permission.BLUETOOTH_PRIVILEGED"
 +            android:targetActivity=".panel.SettingsPanelActivity">
 +                <intent-filter>
 +                    <action android:name="com.android.settings.panel.action.MEDIA_OUTPUT" />
 +                    <category android:name="android.intent.category.DEFAULT" />
 +                </intent-filter>
 +        </activity-alias>
 +
          <provider android:name=".slices.SettingsSliceProvider"
                    android:authorities="com.android.settings.slices;android.settings.slices"
                    android:exported="true"
@@@ -3069,7 -3054,7 +3075,7 @@@
              <intent-filter>
                  <action android:name="android.settings.WIFI_DPP_CONFIGURATOR_QR_CODE_SCANNER"/>
                  <action android:name="android.settings.WIFI_DPP_CONFIGURATOR_QR_CODE_GENERATOR"/>
 -                <action android:name="android.settings.PROCESS_WIFI_DPP_QR_CODE"/>
 +                <action android:name="android.settings.PROCESS_WIFI_EASY_CONNECT_QR_CODE"/>
                  <category android:name="android.intent.category.DEFAULT"/>
              </intent-filter>
          </activity>