commit a3b21cf017a5c5e69a2ed606a1a3e52b0ed2dc6b
author Jason Chiu <chiujason@google.com> Tue Nov 16 18:20:19 2021 +0800
committer Jason Chiu <chiujason@google.com> Thu Nov 18 12:20:08 2021 +0800
tree 70120edbb5dedab9b1d919dbdfd27abd5a7f8359
parent 943d68127c06da9d55699830ffaa7c67c471a810

Start deep link page synchronously in SettingsActivity

- Use a synchronous API to make SettingsActivity start deep link intent
  in onCreate
- Change SettingsHomepageActivity from an alias to a real activity
- Clean up redundant codes

Fix: 206585572
Test: Manual, robotest build pass
Change-Id: Idf42c026f593bb5801a13cae250d1523030b7092

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 41b4d05..e0815d1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -144,12 +144,30 @@
                        android:value="true" />
         </activity>
 
+        <!-- Activity for launching deep link page in 2-pane. -->
+        <activity android:name=".homepage.DeepLinkHomepageActivity"
+                  android:label="@string/settings_label_launcher"
+                  android:theme="@style/Theme.Settings.Home"
+                  android:taskAffinity=""
+                  android:launchMode="singleTask"
+                  android:exported="true"
+                  android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout"
+                  android:permission="android.permission.LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK">
+            <intent-filter>
+                <action android:name="android.settings.SETTINGS_EMBED_DEEP_LINK_ACTIVITY" />
+                <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=".homepage.SliceDeepLinkHomepageActivity"
                   android:label="@string/settings_label_launcher"
                   android:theme="@style/Theme.Settings.Home"
                   android:taskAffinity=""
                   android:launchMode="singleTask"
                   android:exported="false"
+                  android:excludeFromRecents="true"
                   android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout">
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                        android:value="true" />
@@ -170,18 +188,6 @@
             <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts"/>
         </activity-alias>
 
-        <!-- Alias for SettingsHomepageActivity which works for deep link page in 2-panel. -->
-        <activity-alias android:name="DeepLinkHomepageActivity"
-                android:label="@string/settings_label_launcher"
-                android:exported="true"
-                android:permission="android.permission.LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK"
-                android:targetActivity=".homepage.SettingsHomepageActivity">
-            <intent-filter>
-                <action android:name="android.settings.SETTINGS_EMBED_DEEP_LINK_ACTIVITY" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity-alias>
-
         <receiver android:name=".SettingsInitialize"
             android:exported="true">
             <intent-filter>
@@ -4009,11 +4015,6 @@
             </intent-filter>
         </provider>
 
-        <provider
-            android:name=".activityembedding.ActivityEmbeddingProvider"
-            android:authorities="com.android.settings.activityembedding"
-            android:exported="true"/>
-
         <activity
             android:name=".wifi.dpp.WifiDppConfiguratorActivity"
             android:exported="true">