Merge "Unsupport DebugActivity & EntryProvider in Settings." (99b2bffe) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -4621,13 +4621,6 @@

	<activity android:name=".spa.SpaActivity" android:exported="false"/>		<activity android:name=".spa.SpaActivity" android:exported="false"/>
	<activity android:name=".spa.SpaBridgeActivity" android:exported="false"/>		<activity android:name=".spa.SpaBridgeActivity" android:exported="false"/>
	<activity android:name=".spa.SpaDebugActivity" android:exported="false"/>
	<provider
	android:name=".spa.SpaEntryProvider"
	android:authorities="com.android.settings.spa.provider"
	android:enabled="true"
	android:exported="false">
	</provider>

	<activity-alias android:name="UsageStatsActivity"		<activity-alias android:name="UsageStatsActivity"
	android:exported="true"		android:exported="true"

src/com/android/settings/SettingsApplication.java

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,7 +26,9 @@ import androidx.window.embedding.SplitController;

	import com.android.settings.activityembedding.ActivityEmbeddingRulesController;		import com.android.settings.activityembedding.ActivityEmbeddingRulesController;
	import com.android.settings.homepage.SettingsHomepageActivity;		import com.android.settings.homepage.SettingsHomepageActivity;
			import com.android.settings.spa.SettingsSpaEnvironment;
	import com.android.settingslib.applications.AppIconCacheManager;		import com.android.settingslib.applications.AppIconCacheManager;
			import com.android.settingslib.spa.framework.common.SpaEnvironmentFactory;

	import com.google.android.setupcompat.util.WizardManagerHelper;		import com.google.android.setupcompat.util.WizardManagerHelper;

	@@ -41,6 +43,9 @@ public class SettingsApplication extends Application {
	public void onCreate() {		public void onCreate() {
	super.onCreate();		super.onCreate();

			// Set Spa environment.
			setSpaEnvironment();

	if (FeatureFlagUtils.isEnabled(this, FeatureFlagUtils.SETTINGS_SUPPORT_LARGE_SCREEN)		if (FeatureFlagUtils.isEnabled(this, FeatureFlagUtils.SETTINGS_SUPPORT_LARGE_SCREEN)
	&& SplitController.getInstance().isSplitSupported()) {		&& SplitController.getInstance().isSplitSupported()) {
	if (WizardManagerHelper.isUserSetupComplete(this)) {		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) {		public void setHomeActivity(SettingsHomepageActivity homeActivity) {
	mHomeActivity = new WeakReference<>(homeActivity);		mHomeActivity = new WeakReference<>(homeActivity);
	}		}

src/com/android/settings/spa/SettingsSpaEnvironment.kt

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -36,7 +36,7 @@ import com.android.settingslib.spa.framework.common.SettingsPageProviderReposito
	import com.android.settingslib.spa.framework.common.SpaEnvironment		import com.android.settingslib.spa.framework.common.SpaEnvironment
	import com.android.settingslib.spaprivileged.template.app.TogglePermissionAppListTemplate		import com.android.settingslib.spaprivileged.template.app.TogglePermissionAppListTemplate

	object SettingsSpaEnvironment : SpaEnvironment() {		open class SettingsSpaEnvironment : SpaEnvironment() {
	override val pageProviderRepository = lazy {		override val pageProviderRepository = lazy {
	val togglePermissionAppListTemplate = TogglePermissionAppListTemplate(		val togglePermissionAppListTemplate = TogglePermissionAppListTemplate(
	allProviders = listOf(		allProviders = listOf(
	@@ -65,8 +65,4 @@ object SettingsSpaEnvironment : SpaEnvironment() {
	),		),
	)		)
	}		}

	override val browseActivityClass = SpaActivity::class.java

	override val entryProviderAuthorities = "com.android.settings.spa.provider"
	}		}

src/com/android/settings/spa/SpaActivity.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,7 @@ import android.content.Context
	import android.content.Intent		import android.content.Intent
	import com.android.settingslib.spa.framework.BrowseActivity		import com.android.settingslib.spa.framework.BrowseActivity

	class SpaActivity : BrowseActivity(SettingsSpaEnvironment) {		class SpaActivity : BrowseActivity() {
	companion object {		companion object {
	@JvmStatic		@JvmStatic
	fun startSpaActivity(context: Context, destination: String) {		fun startSpaActivity(context: Context, destination: String) {

src/com/android/settings/spa/SpaDebugActivity.kt

deleted100644 → 0

+0 −21

Original line number	Original line	Diff line number	Diff line
	/*
	* Copyright (C) 2022 The Android Open Source Project
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	package com.android.settings.spa

	import com.android.settingslib.spa.framework.DebugActivity

	class SpaDebugActivity : DebugActivity(SettingsSpaEnvironment)