summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/display
diff options
context:
space:
mode:
authorMatthew Fritze <mfritze@google.com>2018-05-03 16:46:51 -0700
committerMatthew Fritze <mfritze@google.com>2018-05-09 08:36:59 -0700
commitf87a1f3f41b52bd3b64a259fcfc457164aad67b5 (patch)
treeb2bbd17405b2d9233e36a5fc7be49f6df660893b /src/com/android/settings/display
parent1220c364c4e6da3587fc356bb30d3cba99ab7946 (diff)
downloadpackages_apps_Settings-f87a1f3f41b52bd3b64a259fcfc457164aad67b5.tar.gz
packages_apps_Settings-f87a1f3f41b52bd3b64a259fcfc457164aad67b5.tar.bz2
packages_apps_Settings-f87a1f3f41b52bd3b64a259fcfc457164aad67b5.zip
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
Diffstat (limited to 'src/com/android/settings/display')
-rw-r--r--src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java2
-rw-r--r--src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java2
-rw-r--r--src/com/android/settings/display/AutoBrightnessPreferenceController.java2
-rw-r--r--src/com/android/settings/display/AutoRotatePreferenceController.java2
-rw-r--r--src/com/android/settings/display/NightDisplayActivationPreferenceController.java2
-rw-r--r--src/com/android/settings/display/NightDisplayAutoModePreferenceController.java2
-rw-r--r--src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java2
-rw-r--r--src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java2
-rw-r--r--src/com/android/settings/display/NightDisplayFooterPreferenceController.java2
-rw-r--r--src/com/android/settings/display/NightDisplayIntensityPreferenceController.java2
10 files changed, 10 insertions, 10 deletions
diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
index a6d5363d79..cb04ed4ca1 100644
--- a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
@@ -50,7 +50,7 @@ public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreference
if (mConfig == null) {
mConfig = new AmbientDisplayConfiguration(mContext);
}
- return isAvailable(mConfig) ? AVAILABLE : DISABLED_UNSUPPORTED;
+ return isAvailable(mConfig) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
diff --git a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
index 5caad6d59c..769fdbc405 100644
--- a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
@@ -86,7 +86,7 @@ public class AmbientDisplayNotificationsPreferenceController extends
if (mConfig == null) {
mConfig = new AmbientDisplayConfiguration(mContext);
}
- return mConfig.pulseOnNotificationAvailable() ? AVAILABLE : DISABLED_UNSUPPORTED;
+ return mConfig.pulseOnNotificationAvailable() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
diff --git a/src/com/android/settings/display/AutoBrightnessPreferenceController.java b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
index 28f9260651..564e27ad3d 100644
--- a/src/com/android/settings/display/AutoBrightnessPreferenceController.java
+++ b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
@@ -57,7 +57,7 @@ public class AutoBrightnessPreferenceController extends TogglePreferenceControll
return mContext.getResources().getBoolean(
com.android.internal.R.bool.config_automatic_brightness_available)
? AVAILABLE
- : DISABLED_UNSUPPORTED;
+ : UNSUPPORTED_ON_DEVICE;
}
@Override
diff --git a/src/com/android/settings/display/AutoRotatePreferenceController.java b/src/com/android/settings/display/AutoRotatePreferenceController.java
index 5241e641fa..749f6e6c14 100644
--- a/src/com/android/settings/display/AutoRotatePreferenceController.java
+++ b/src/com/android/settings/display/AutoRotatePreferenceController.java
@@ -71,7 +71,7 @@ public class AutoRotatePreferenceController extends TogglePreferenceController i
@Override
public int getAvailabilityStatus() {
return RotationPolicy.isRotationLockToggleVisible(mContext)
- ? AVAILABLE : DISABLED_UNSUPPORTED;
+ ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
@Override
diff --git a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
index 6b07ea0df2..6e30f6fd95 100644
--- a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
@@ -50,7 +50,7 @@ public class NightDisplayActivationPreferenceController extends TogglePreference
@Override
public int getAvailabilityStatus() {
- return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
+ return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
diff --git a/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java b/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java
index 31810982df..bb42c857a7 100644
--- a/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java
@@ -37,7 +37,7 @@ public class NightDisplayAutoModePreferenceController extends BasePreferenceCont
@Override
public int getAvailabilityStatus() {
- return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
+ return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
diff --git a/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java b/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java
index 76b362e4fd..1eebb6be5a 100644
--- a/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java
@@ -35,7 +35,7 @@ public class NightDisplayCustomEndTimePreferenceController extends BasePreferenc
@Override
public int getAvailabilityStatus() {
- return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
+ return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
diff --git a/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java b/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java
index f1ac54e162..19297b82f3 100644
--- a/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java
@@ -35,7 +35,7 @@ public class NightDisplayCustomStartTimePreferenceController extends BasePrefere
@Override
public int getAvailabilityStatus() {
- return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
+ return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
diff --git a/src/com/android/settings/display/NightDisplayFooterPreferenceController.java b/src/com/android/settings/display/NightDisplayFooterPreferenceController.java
index bd04d120db..2075cfca32 100644
--- a/src/com/android/settings/display/NightDisplayFooterPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayFooterPreferenceController.java
@@ -31,7 +31,7 @@ public class NightDisplayFooterPreferenceController extends BasePreferenceContro
@Override
public int getAvailabilityStatus() {
- return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
+ return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
diff --git a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
index c3efdc0ae3..f5bc49aa6d 100644
--- a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
@@ -35,7 +35,7 @@ public class NightDisplayIntensityPreferenceController extends SliderPreferenceC
@Override
public int getAvailabilityStatus() {
if (!ColorDisplayController.isAvailable(mContext)) {
- return DISABLED_UNSUPPORTED;
+ return UNSUPPORTED_ON_DEVICE;
} else if (!mController.isActivated()) {
return DISABLED_DEPENDENT_SETTING;
}