Unsupport DebugActivity & EntryProvider in Settings.

Set SpaEnvironment (with Spp only) in SettingsApplication
Remove DebugActivity & EntryProvider from Settings.

Bug: 244122804
Test: manual - build Settings
Change-Id: I18e97c80b4f1d6094bb22cf28e7e84ea325869d7
This commit is contained in:
Zekan Qian
2022-10-12 13:57:16 +08:00
parent ee4d902410
commit 430ed29262
6 changed files with 15 additions and 55 deletions

View File

@@ -26,7 +26,9 @@ import androidx.window.embedding.SplitController;
import com.android.settings.activityembedding.ActivityEmbeddingRulesController;
import com.android.settings.homepage.SettingsHomepageActivity;
import com.android.settings.spa.SettingsSpaEnvironment;
import com.android.settingslib.applications.AppIconCacheManager;
import com.android.settingslib.spa.framework.common.SpaEnvironmentFactory;
import com.google.android.setupcompat.util.WizardManagerHelper;
@@ -41,6 +43,9 @@ public class SettingsApplication extends Application {
public void onCreate() {
super.onCreate();
// Set Spa environment.
setSpaEnvironment();
if (FeatureFlagUtils.isEnabled(this, FeatureFlagUtils.SETTINGS_SUPPORT_LARGE_SCREEN)
&& SplitController.getInstance().isSplitSupported()) {
if (WizardManagerHelper.isUserSetupComplete(this)) {
@@ -51,6 +56,14 @@ public class SettingsApplication extends Application {
}
}
/**
* Set the spa environment instance.
* Override this function to set different spa environment for different Settings app.
*/
protected void setSpaEnvironment() {
SpaEnvironmentFactory.INSTANCE.setInstance(new SettingsSpaEnvironment());
}
public void setHomeActivity(SettingsHomepageActivity homeActivity) {
mHomeActivity = new WeakReference<>(homeActivity);
}