Merge "Hide the Perform Backup Tasks Settings page." into main
This commit is contained in:
@@ -23,6 +23,8 @@
|
|||||||
android:key="run_backup_tasks"
|
android:key="run_backup_tasks"
|
||||||
android:title="@string/run_backup_tasks_title"
|
android:title="@string/run_backup_tasks_title"
|
||||||
android:order="-2000"
|
android:order="-2000"
|
||||||
|
settings:isPreferenceVisible="false"
|
||||||
|
settings:searchable="false"
|
||||||
settings:keywords="@string/keywords_run_backup_tasks"
|
settings:keywords="@string/keywords_run_backup_tasks"
|
||||||
settings:controller="com.android.settings.spa.app.specialaccess.BackupTasksAppsPreferenceController">
|
settings:controller="com.android.settings.spa.app.specialaccess.BackupTasksAppsPreferenceController">
|
||||||
</Preference>
|
</Preference>
|
||||||
|
@@ -19,14 +19,11 @@ package com.android.settings.spa.app.specialaccess
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import androidx.preference.Preference
|
import androidx.preference.Preference
|
||||||
import com.android.settings.core.BasePreferenceController
|
import com.android.settings.core.BasePreferenceController
|
||||||
import com.android.settings.flags.Flags
|
|
||||||
import com.android.settings.spa.SpaActivity.Companion.startSpaActivity
|
import com.android.settings.spa.SpaActivity.Companion.startSpaActivity
|
||||||
|
|
||||||
class BackupTasksAppsPreferenceController(context: Context, preferenceKey: String) :
|
class BackupTasksAppsPreferenceController(context: Context, preferenceKey: String) :
|
||||||
BasePreferenceController(context, preferenceKey) {
|
BasePreferenceController(context, preferenceKey) {
|
||||||
override fun getAvailabilityStatus() =
|
override fun getAvailabilityStatus() = CONDITIONALLY_UNAVAILABLE
|
||||||
if (Flags.enablePerformBackupTasksInSettings()) AVAILABLE
|
|
||||||
else CONDITIONALLY_UNAVAILABLE
|
|
||||||
|
|
||||||
override fun handlePreferenceTreeClick(preference: Preference): Boolean {
|
override fun handlePreferenceTreeClick(preference: Preference): Boolean {
|
||||||
if (preference.key == mPreferenceKey) {
|
if (preference.key == mPreferenceKey) {
|
||||||
|
@@ -55,7 +55,8 @@ class BackupTasksAppsPreferenceControllerTest {
|
|||||||
@Test
|
@Test
|
||||||
@RequiresFlagsEnabled(Flags.FLAG_ENABLE_PERFORM_BACKUP_TASKS_IN_SETTINGS)
|
@RequiresFlagsEnabled(Flags.FLAG_ENABLE_PERFORM_BACKUP_TASKS_IN_SETTINGS)
|
||||||
fun getAvailabilityStatus_enableBackupTasksApps_returnAvailable() {
|
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
|
@Test
|
||||||
|
Reference in New Issue
Block a user