Merge "Add ResetAppPreferences to AllAppListPage" (fb8200ae) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/applications/manageapplications/ResetAppsHelper.java

+45 −46

Original line number	Diff line number	Diff line
		@@ -110,12 +110,14 @@ public class ResetAppsHelper implements DialogInterface.OnClickListener,

		@Override
		public void onClick(DialogInterface dialog, int which) {
		if (mResetDialog != dialog) {
		return;
		if (mResetDialog == dialog) {
		resetApps();
		}
		AsyncTask.execute(new Runnable() {
		@Override
		public void run() {
		}

		/** Resets the app preferences. */
		public void resetApps() {
		AsyncTask.execute(() -> {
		final List<String> allowList = Arrays.asList(
		mContext.getResources().getStringArray(
		R.array.config_skip_reset_apps_package_name));
		@@ -123,14 +125,13 @@ public class ResetAppsHelper implements DialogInterface.OnClickListener,
		final int userId = userHandle.getIdentifier();
		final List<ApplicationInfo> apps = mPm.getInstalledApplicationsAsUser(
		PackageManager.GET_DISABLED_COMPONENTS, userId);
		for (int i = 0; i < apps.size(); i++) {
		ApplicationInfo app = apps.get(i);
		for (ApplicationInfo app : apps) {
		if (allowList.contains(app.packageName)) {
		continue;
		}
		try {
		mNm.clearData(app.packageName, app.uid, false);
		} catch (android.os.RemoteException ex) {
		} catch (RemoteException ex) {
		}
		if (!app.enabled) {
		try {
		@@ -154,8 +155,7 @@ public class ResetAppsHelper implements DialogInterface.OnClickListener,
		}
		mAom.resetAllModes();
		BatteryOptimizeUtils.resetAppOptimizationMode(mContext, mIPm, mAom);
		final int[] restrictedUids = mNpm.getUidsWithPolicy(
		POLICY_REJECT_METERED_BACKGROUND);
		final int[] restrictedUids = mNpm.getUidsWithPolicy(POLICY_REJECT_METERED_BACKGROUND);
		final int currentUserId = ActivityManager.getCurrentUser();
		for (int uid : restrictedUids) {
		// Only reset for current user
		@@ -163,7 +163,6 @@ public class ResetAppsHelper implements DialogInterface.OnClickListener,
		mNpm.setUidPolicy(uid, POLICY_NONE);
		}
		}
		}
		});
		}
		}

src/com/android/settings/spa/app/AllAppList.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -58,10 +58,12 @@ object AllAppListPageProvider : SettingsPageProvider {

		@Composable
		private fun AllAppListPage() {
		val resetAppDialogPresenter = rememberResetAppDialogPresenter()
		AppListPage(
		title = stringResource(R.string.all_apps),
		listModel = remember { AllAppListModel() },
		showInstantApps = true,
		moreOptions = { ResetAppPreferences(resetAppDialogPresenter::open) }
		) { itemModel ->
		AppListItem(
		itemModel = itemModel,

src/com/android/settings/spa/app/ResetAppPreferences.kt

0 → 100644

+60 −0

Original line number	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.app

		import android.os.UserHandle
		import android.os.UserManager
		import androidx.compose.material3.Text
		import androidx.compose.runtime.Composable
		import androidx.compose.runtime.remember
		import androidx.compose.ui.platform.LocalContext
		import androidx.compose.ui.res.stringResource
		import com.android.settings.R
		import com.android.settings.applications.manageapplications.ResetAppsHelper
		import com.android.settingslib.spa.widget.dialog.AlertDialogButton
		import com.android.settingslib.spa.widget.dialog.AlertDialogPresenter
		import com.android.settingslib.spa.widget.dialog.rememberAlertDialogPresenter
		import com.android.settingslib.spa.widget.scaffold.MoreOptionsScope
		import com.android.settingslib.spaprivileged.model.enterprise.Restrictions
		import com.android.settingslib.spaprivileged.template.scaffold.RestrictedMenuItem

		@Composable
		fun MoreOptionsScope.ResetAppPreferences(onClick: () -> Unit) {
		RestrictedMenuItem(
		text = stringResource(R.string.reset_app_preferences),
		restrictions = remember {
		Restrictions(
		userId = UserHandle.myUserId(),
		keys = listOf(UserManager.DISALLOW_APPS_CONTROL),
		)
		},
		onClick = onClick,
		)
		}

		@Composable
		fun rememberResetAppDialogPresenter(): AlertDialogPresenter {
		val context = LocalContext.current
		return rememberAlertDialogPresenter(
		confirmButton = AlertDialogButton(stringResource(R.string.reset_app_preferences_button)) {
		ResetAppsHelper(context).resetApps()
		},
		dismissButton = AlertDialogButton(stringResource(R.string.cancel)),
		title = stringResource(R.string.reset_app_preferences_title),
		text = { Text(stringResource(R.string.reset_app_preferences_desc)) },
		)
		}

tests/spa_unit/src/com/android/settings/spa/app/ResetAppPreferencesTest.kt

0 → 100644

+90 −0

Original line number	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.app

		import android.content.Context
		import androidx.compose.runtime.LaunchedEffect
		import androidx.compose.ui.test.assertIsDisplayed
		import androidx.compose.ui.test.junit4.createComposeRule
		import androidx.compose.ui.test.onNodeWithText
		import androidx.test.core.app.ApplicationProvider
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import com.android.settings.R
		import com.android.settingslib.spa.widget.scaffold.MoreOptionsScope
		import org.junit.Rule
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.Spy

		@RunWith(AndroidJUnit4::class)
		class ResetAppPreferencesTest {
		@get:Rule
		val composeTestRule = createComposeRule()

		@Spy
		private val context: Context = ApplicationProvider.getApplicationContext()

		@Test
		fun resetAppPreferences_titleIsDisplayed() {
		setResetAppPreferences()

		composeTestRule.onNodeWithText(context.getString(R.string.reset_app_preferences))
		.assertIsDisplayed()
		}

		private fun setResetAppPreferences() {
		val fakeMoreOptionsScope = object : MoreOptionsScope {
		override fun dismiss() {}
		}
		composeTestRule.setContent {
		fakeMoreOptionsScope.ResetAppPreferences {}
		}
		}

		@Test
		fun resetAppDialogPresenter_confirmButtonDisplayed() {
		setAndOpenDialog()

		composeTestRule.onNodeWithText(context.getString(R.string.reset_app_preferences_button))
		.assertIsDisplayed()
		}

		@Test
		fun resetAppDialogPresenter_titleDisplayed() {
		setAndOpenDialog()

		composeTestRule.onNodeWithText(context.getString(R.string.reset_app_preferences_title))
		.assertIsDisplayed()
		}

		@Test
		fun resetAppDialogPresenter_textDisplayed() {
		setAndOpenDialog()

		composeTestRule.onNodeWithText(context.getString(R.string.reset_app_preferences_desc))
		.assertIsDisplayed()
		}

		private fun setAndOpenDialog() {
		composeTestRule.setContent {
		val dialogPresenter = rememberResetAppDialogPresenter()
		LaunchedEffect(Unit) {
		dialogPresenter.open()
		}
		}
		}
		}