From a5593de4c5eb66f8991995b001211067f0e0b14d Mon Sep 17 00:00:00 2001 From: Varun Shah Date: Tue, 26 Mar 2024 00:56:04 +0000 Subject: [PATCH] Hide the Perform Backup Tasks Settings page. Since we are now hiding the new RUN_BACKUP_JOBS permission, hide the associated special app access page in Settings. Bug: 331272951 Test: BackupTasksAppsPreferenceControllerTest Test: visual (Settings pages) Change-Id: I875b286798f48ee4e94d5e37c1b21bb84acf390d --- res/xml/special_access.xml | 2 ++ .../app/specialaccess/BackupTasksAppsPreferenceController.kt | 5 +---- .../specialaccess/BackupTasksAppsPreferenceControllerTest.kt | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml index d522ef60b61..572345c404e 100644 --- a/res/xml/special_access.xml +++ b/res/xml/special_access.xml @@ -23,6 +23,8 @@ android:key="run_backup_tasks" android:title="@string/run_backup_tasks_title" android:order="-2000" + settings:isPreferenceVisible="false" + settings:searchable="false" settings:keywords="@string/keywords_run_backup_tasks" settings:controller="com.android.settings.spa.app.specialaccess.BackupTasksAppsPreferenceController"> diff --git a/src/com/android/settings/spa/app/specialaccess/BackupTasksAppsPreferenceController.kt b/src/com/android/settings/spa/app/specialaccess/BackupTasksAppsPreferenceController.kt index 8d6de4ef677..d209f0b415d 100644 --- a/src/com/android/settings/spa/app/specialaccess/BackupTasksAppsPreferenceController.kt +++ b/src/com/android/settings/spa/app/specialaccess/BackupTasksAppsPreferenceController.kt @@ -19,14 +19,11 @@ package com.android.settings.spa.app.specialaccess import android.content.Context import androidx.preference.Preference import com.android.settings.core.BasePreferenceController -import com.android.settings.flags.Flags import com.android.settings.spa.SpaActivity.Companion.startSpaActivity class BackupTasksAppsPreferenceController(context: Context, preferenceKey: String) : BasePreferenceController(context, preferenceKey) { - override fun getAvailabilityStatus() = - if (Flags.enablePerformBackupTasksInSettings()) AVAILABLE - else CONDITIONALLY_UNAVAILABLE + override fun getAvailabilityStatus() = CONDITIONALLY_UNAVAILABLE override fun handlePreferenceTreeClick(preference: Preference): Boolean { if (preference.key == mPreferenceKey) { diff --git a/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/BackupTasksAppsPreferenceControllerTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/BackupTasksAppsPreferenceControllerTest.kt index 38f81fe8da8..9473b042e42 100644 --- a/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/BackupTasksAppsPreferenceControllerTest.kt +++ b/tests/spa_unit/src/com/android/settings/spa/app/specialaccess/BackupTasksAppsPreferenceControllerTest.kt @@ -55,7 +55,8 @@ class BackupTasksAppsPreferenceControllerTest { @Test @RequiresFlagsEnabled(Flags.FLAG_ENABLE_PERFORM_BACKUP_TASKS_IN_SETTINGS) fun getAvailabilityStatus_enableBackupTasksApps_returnAvailable() { - assertThat(controller.isAvailable).isTrue() + // Feature is currently disabled so it should return false regardless of flag status. + assertThat(controller.isAvailable).isFalse() } @Test