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

src/com/android/settings/SettingsInitialize.java

diff --git a/src/com/android/settings/SettingsInitialize.java b/src/com/android/settings/SettingsInitialize.java
index 376d916..ca13683 100644
--- a/src/com/android/settings/SettingsInitialize.java
+++ b/src/com/android/settings/SettingsInitialize.java
@@ -40,7 +40,7 @@
 import androidx.window.embedding.SplitController;
 
 import com.android.settings.Settings.CreateShortcutActivity;
-import com.android.settings.homepage.SettingsHomepageActivity;
+import com.android.settings.homepage.DeepLinkHomepageActivity;
 import com.android.settings.search.SearchStateReceiver;
 import com.android.settingslib.utils.ThreadUtils;
 
@@ -150,8 +150,8 @@
     }
 
     private void enableTwoPaneDeepLinkActivityIfNecessary(PackageManager pm, Context context) {
-        final ComponentName deepLinkHome = new ComponentName(Utils.SETTINGS_PACKAGE_NAME,
-                SettingsHomepageActivity.ALIAS_DEEP_LINK);
+        final ComponentName deepLinkHome = new ComponentName(context,
+                DeepLinkHomepageActivity.class);
         final ComponentName searchStateReceiver = new ComponentName(context,
                 SearchStateReceiver.class);
         final int enableState = SplitController.getInstance().isSplitSupported()