From f87a1f3f41b52bd3b64a259fcfc457164aad67b5 Mon Sep 17 00:00:00 2001 From: Matthew Fritze Date: Thu, 3 May 2018 16:46:51 -0700 Subject: Establish permanently unavailable settings Distinguish between settings which are permanently unavailable on the device, and temporarily unavailable. This enables us to restrict which setting slices are exposed in onSliceGetDescendants. The primary changes in this CL are renaming: "DISABLED_UNSUPPORTED" -> "UNSUPPORTED_ON_DEVICE" to be more clear the the setting will cannot be accessed on the device, and, adding a new enum to encapsulate settings which are currently unavailable, but could be enabled in the future. Also remove UNAVAILABLE_UNKNOWN. Devs should never need this enum. Bug: 78910582 Bug: 79245656 Test: robotests Change-Id: I58821a6cfd6134b3b351657b6edf5f74ead00643 --- src/com/android/settings/backup/DataManagementPreferenceController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/com/android/settings/backup/DataManagementPreferenceController.java') diff --git a/src/com/android/settings/backup/DataManagementPreferenceController.java b/src/com/android/settings/backup/DataManagementPreferenceController.java index 120c827de8..b69acfaa5e 100644 --- a/src/com/android/settings/backup/DataManagementPreferenceController.java +++ b/src/com/android/settings/backup/DataManagementPreferenceController.java @@ -37,7 +37,7 @@ public class DataManagementPreferenceController extends BasePreferenceController } boolean manageEnabled = (mPSCD.getManageIntent() != null) && mPSCD.isBackupEnabled(); if (!manageEnabled) { - return DISABLED_UNSUPPORTED; + return UNSUPPORTED_ON_DEVICE; } return AVAILABLE; } -- cgit v1.2.3