Merge "Establish permanently unavailable settings"

src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java

@@ -23,7 +23,6 @@ import android.content.Context;
 import android.provider.Settings;
 import android.view.accessibility.AccessibilityManager;
 
-import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.core.TogglePreferenceController;
 import com.android.settingslib.accessibility.AccessibilityUtils;
 
@@ -88,7 +87,7 @@ public class AccessibilitySlicePreferenceController extends TogglePreferenceCont
     @Override
     public int getAvailabilityStatus() {
         // Return unsupported when the service is disabled or not installed.
-        return getAccessibilityServiceInfo() == null ? DISABLED_UNSUPPORTED : AVAILABLE;
+        return getAccessibilityServiceInfo() == null ? UNSUPPORTED_ON_DEVICE : AVAILABLE;
     }
 
     private AccessibilityServiceInfo getAccessibilityServiceInfo() {

src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java

@@ -56,7 +56,7 @@ public class MagnificationNavbarPreferenceController extends BasePreferenceContr
     public int getAvailabilityStatus() {
         return MagnificationPreferenceFragment.isApplicable(mContext.getResources())
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java

@@ -48,7 +48,7 @@ public class EnterpriseDisclosurePreferenceController extends BasePreferenceCont
     @Override
     public int getAvailabilityStatus() {
         if (getDisclosure() == null) {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         }
         return AVAILABLE;
     }

src/com/android/settings/applications/DataSaverController.java

@@ -35,6 +35,6 @@ public class DataSaverController extends BasePreferenceController {
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_data_saver)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 }

src/com/android/settings/applications/DeviceAdministratorsController.java

@@ -34,6 +34,6 @@ public class DeviceAdministratorsController extends BasePreferenceController {
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_device_administrators)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 }

src/com/android/settings/applications/EnabledVrListenersController.java

@@ -34,6 +34,6 @@ public class EnabledVrListenersController extends BasePreferenceController {
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_enabled_vr_listeners)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 }

src/com/android/settings/applications/HighPowerAppsController.java

@@ -34,6 +34,6 @@ public class HighPowerAppsController extends BasePreferenceController {
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_high_power_apps)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 }

src/com/android/settings/applications/PremiumSmsController.java

@@ -34,6 +34,6 @@ public class PremiumSmsController extends BasePreferenceController {
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_premium_sms)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 }

src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java

@@ -78,7 +78,7 @@ public class AppBatteryPreferenceController extends BasePreferenceController
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_app_info_settings_battery)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : CONDITIONALLY_UNAVAILABLE;
     }
 
     @Override

src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java

@@ -56,7 +56,7 @@ public class AppDataUsagePreferenceController extends AppInfoPreferenceControlle
 
     @Override
     public int getAvailabilityStatus() {
-        return isBandwidthControlEnabled() ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return isBandwidthControlEnabled() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
     @Override

src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java

@@ -105,11 +105,11 @@ public class AppMemoryPreferenceController extends BasePreferenceController
     @Override
     public int getAvailabilityStatus() {
         if (!mContext.getResources().getBoolean(R.bool.config_show_app_info_settings_memory)) {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         }
 
         return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)
-                ? AVAILABLE : DISABLED_UNSUPPORTED;
+                ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
     @Override

src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java

@@ -46,7 +46,7 @@ public abstract class DefaultAppShortcutPreferenceControllerBase extends BasePre
         if (UserManager.get(mContext).isManagedProfile()) {
             return DISABLED_FOR_USER;
         }
-        return hasAppCapability() ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return hasAppCapability() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java

@@ -55,19 +55,19 @@ public class TimeSpentInAppPreferenceController extends BasePreferenceController
     @Override
     public int getAvailabilityStatus() {
         if (TextUtils.isEmpty(mPackageName)) {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         }
         final List<ResolveInfo> resolved = mPackageManager.queryIntentActivities(mIntent,
                 0 /* flags */);
         if (resolved == null || resolved.isEmpty()) {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         }
         for (ResolveInfo info : resolved) {
             if (isSystemApp(info)) {
                 return AVAILABLE;
             }
         }
-        return DISABLED_UNSUPPORTED;
+        return UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/backup/AutoRestorePreferenceController.java

@@ -46,7 +46,7 @@ public class AutoRestorePreferenceController extends TogglePreferenceController
             return DISABLED_FOR_USER;
         }
         if (PrivacySettingsUtils.isInvisibleKey(mContext, PrivacySettingsUtils.AUTO_RESTORE)) {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         }
         return AVAILABLE;
     }

src/com/android/settings/backup/BackupDataPreferenceController.java

@@ -37,7 +37,7 @@ public class BackupDataPreferenceController extends BasePreferenceController {
             return DISABLED_FOR_USER;
         }
         if (PrivacySettingsUtils.isInvisibleKey(mContext, PrivacySettingsUtils.BACKUP_DATA)) {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         }
         return AVAILABLE;
     }

src/com/android/settings/backup/BackupInactivePreferenceController.java

@@ -32,7 +32,7 @@ public class BackupInactivePreferenceController extends BasePreferenceController
             return DISABLED_FOR_USER;
         }
         if (PrivacySettingsUtils.isInvisibleKey(mContext, PrivacySettingsUtils.BACKUP_INACTIVE)) {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         }
         return AVAILABLE;
     }

src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java

@@ -41,7 +41,7 @@ public class BackupSettingsActivityPreferenceController extends BasePreferenceCo
     public int getAvailabilityStatus() {
         return mUm.isAdminUser()
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/backup/ConfigureAccountPreferenceController.java

@@ -38,7 +38,7 @@ public class ConfigureAccountPreferenceController extends BasePreferenceControll
             return DISABLED_FOR_USER;
         }
         if (PrivacySettingsUtils.isInvisibleKey(mContext, PrivacySettingsUtils.CONFIGURE_ACCOUNT)) {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         }
         return AVAILABLE;
     }

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;
     }

src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java

@@ -99,7 +99,7 @@ public class BluetoothDeviceNamePreferenceController extends BasePreferenceContr
 
     @Override
     public int getAvailabilityStatus() {
-        return mLocalAdapter != null ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return mLocalAdapter != null ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java

@@ -26,7 +26,6 @@ import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 /**
@@ -57,7 +56,7 @@ public class BluetoothFilesPreferenceController extends BasePreferenceController
     public int getAvailabilityStatus() {
         return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/connecteddevice/AddDevicePreferenceController.java

@@ -75,7 +75,7 @@ public class AddDevicePreferenceController extends BasePreferenceController
     public int getAvailabilityStatus() {
         return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java

@@ -84,7 +84,7 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
     public int getAvailabilityStatus() {
         return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java

@@ -130,7 +130,7 @@ public class BluetoothDashboardFragment extends DashboardFragment {
                         BluetoothAdapter adapter = manager.getAdapter();
                         final int status = adapter != null
                                 ? TogglePreferenceController.AVAILABLE
-                                : TogglePreferenceController.DISABLED_UNSUPPORTED;
+                                : TogglePreferenceController.UNSUPPORTED_ON_DEVICE;
                         if (status != TogglePreferenceController.AVAILABLE) {
                             keys.add(KEY_BLUETOOTH_SCREEN);
                         }

src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceController.java

@@ -38,7 +38,7 @@ public class BluetoothOnWhileDrivingPreferenceController extends TogglePreferenc
         if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.BLUETOOTH_WHILE_DRIVING)) {
             return AVAILABLE;
         }
-        return DISABLED_UNSUPPORTED;
+        return CONDITIONALLY_UNAVAILABLE;
     }
 
     @Override

src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java

@@ -33,7 +33,6 @@ import com.android.settings.overlay.DockUpdaterFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
-import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 
 /**
@@ -88,7 +87,7 @@ public class ConnectedDeviceGroupController extends BasePreferenceController
     public int getAvailabilityStatus() {
         return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/connecteddevice/SavedDeviceGroupController.java

@@ -30,7 +30,6 @@ import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.DockUpdaterFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
@@ -86,7 +85,7 @@ public class SavedDeviceGroupController extends BasePreferenceController
     public int getAvailabilityStatus() {
         return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/core/BasePreferenceController.java

@@ -49,8 +49,8 @@ public abstract class BasePreferenceController extends AbstractPreferenceControl
      * {@link #isSupported()}.
      */
     @Retention(RetentionPolicy.SOURCE)
-    @IntDef({AVAILABLE, DISABLED_UNSUPPORTED, DISABLED_FOR_USER, DISABLED_DEPENDENT_SETTING,
+    @IntDef({AVAILABLE, UNSUPPORTED_ON_DEVICE, DISABLED_FOR_USER, DISABLED_DEPENDENT_SETTING,
-            UNAVAILABLE_UNKNOWN})
+            CONDITIONALLY_UNAVAILABLE})
     public @interface AvailabilityStatus {
     }
 
@@ -60,12 +60,20 @@ public abstract class BasePreferenceController extends AbstractPreferenceControl
     public static final int AVAILABLE = 0;
 
     /**
-     * The setting is not supported by the device.
+     * A generic catch for settings which are currently unavailable, but may become available in
+     * the future. You should use {@link #DISABLED_FOR_USER} or {@link #DISABLED_DEPENDENT_SETTING}
+     * if they describe the condition more accurately.
+     */
+    public static final int CONDITIONALLY_UNAVAILABLE = 1;
+
+    /**
+     * The setting is not, and will not supported by this device.
      * <p>
      * There is no guarantee that the setting page exists, and any links to the Setting should take
      * you to the home page of Settings.
      */
-    public static final int DISABLED_UNSUPPORTED = 1;
+    public static final int UNSUPPORTED_ON_DEVICE = 2;
+
 
     /**
      * The setting cannot be changed by the current user.
@@ -73,7 +81,7 @@ public abstract class BasePreferenceController extends AbstractPreferenceControl
      * Links to the Setting should take you to the page of the Setting, even if it cannot be
      * changed.
      */
-    public static final int DISABLED_FOR_USER = 2;
+    public static final int DISABLED_FOR_USER = 3;
 
     /**
      * The setting has a dependency in the Settings App which is currently blocking access.
@@ -90,15 +98,8 @@ public abstract class BasePreferenceController extends AbstractPreferenceControl
      * Links to the Setting should take you to the page of the Setting, even if it cannot be
      * changed.
      */
-    public static final int DISABLED_DEPENDENT_SETTING = 3;
+    public static final int DISABLED_DEPENDENT_SETTING = 4;
 
-    /**
-     * A catch-all case for internal errors and inexplicable unavailability.
-     * <p>
-     * There is no guarantee that the setting page exists, and any links to the Setting should take
-     * you to the home page of Settings.
-     */
-    public static final int UNAVAILABLE_UNKNOWN = 4;
 
     protected final String mPreferenceKey;
 
@@ -181,8 +182,8 @@ public abstract class BasePreferenceController extends AbstractPreferenceControl
     @Override
     public final boolean isAvailable() {
         final int availabilityStatus = getAvailabilityStatus();
-        return (availabilityStatus == AVAILABLE) ||
+        return (availabilityStatus == AVAILABLE
-                (availabilityStatus == DISABLED_DEPENDENT_SETTING);
+                || availabilityStatus == DISABLED_DEPENDENT_SETTING);
     }
 
     /**
@@ -193,7 +194,7 @@ public abstract class BasePreferenceController extends AbstractPreferenceControl
      * Note that a return value of {@code true} does not mean that the setting is available.
      */
     public final boolean isSupported() {
-        return getAvailabilityStatus() != DISABLED_UNSUPPORTED;
+        return getAvailabilityStatus() != UNSUPPORTED_ON_DEVICE;
     }
 
     /**

src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java

@@ -182,7 +182,7 @@ public class DataUsageSummaryPreferenceController extends BasePreferenceControll
     @Override
     public int getAvailabilityStatus() {
         return DataUsageUtils.hasSim(mActivity)
-                || DataUsageUtils.hasWifiRadio(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
+                || DataUsageUtils.hasWifiRadio(mContext) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
     @Override

src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java

@@ -41,7 +41,7 @@ public abstract class LegalPreferenceController extends BasePreferenceController
         if (findMatchingSpecificActivity() != null) {
             return AVAILABLE;
         } else {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         }
     }
 

src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceController.java

@@ -30,6 +30,6 @@ public class WallpaperAttributionsPreferenceController extends BasePreferenceCon
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_wallpaper_attribution)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 }

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

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

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

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

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

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

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

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

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

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;
         }

src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java

@@ -60,7 +60,7 @@ public class FingerprintStatusPreferenceController extends BasePreferenceControl
     @Override
     public int getAvailabilityStatus() {
         if (mFingerprintManager == null || !mFingerprintManager.isHardwareDetected()) {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         }
         if (isUserSupported()) {
             return AVAILABLE;

src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java

@@ -42,7 +42,7 @@ public class AutoRestrictionPreferenceController extends BasePreferenceControlle
     @Override
     public int getAvailabilityStatus() {
         return mPowerUsageFeatureProvider.isSmartBatterySupported()
-                ? DISABLED_UNSUPPORTED
+                ? UNSUPPORTED_ON_DEVICE
                 : AVAILABLE;
     }
 

src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java

@@ -45,7 +45,7 @@ public class SmartBatteryPreferenceController extends BasePreferenceController i
     public int getAvailabilityStatus() {
         return mPowerUsageFeatureProvider.isSmartBatterySupported()
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java

@@ -63,7 +63,7 @@ public class AssistGestureSettingsPreferenceController extends GesturePreference
     public int getAvailabilityStatus() {
         final boolean isAvailable = mAssistOnly ? mFeatureProvider.isSupported(mContext)
                 : mFeatureProvider.isSensorAvailable(mContext);
-        return isAvailable ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return isAvailable ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java

@@ -58,7 +58,7 @@ public class DoubleTapPowerPreferenceController extends GesturePreferenceControl
 
     @Override
     public int getAvailabilityStatus() {
-        return isGestureAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return isGestureAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java

@@ -74,7 +74,7 @@ public class DoubleTapScreenPreferenceController extends GesturePreferenceContro
         if (mAmbientConfig == null) {
             mAmbientConfig = new AmbientDisplayConfiguration(mContext);
         }
-        return mAmbientConfig.pulseOnDoubleTapAvailable() ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return mAmbientConfig.pulseOnDoubleTapAvailable() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/gestures/DoubleTwistPreferenceController.java

@@ -68,7 +68,7 @@ public class DoubleTwistPreferenceController extends GesturePreferenceController
 
     @Override
     public int getAvailabilityStatus() {
-        return isGestureAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return isGestureAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/gestures/GesturesSettingPreferenceController.java

@@ -51,7 +51,7 @@ public class GesturesSettingPreferenceController extends BasePreferenceControlle
         for (AbstractPreferenceController controller : mGestureControllers) {
             isAvailable = isAvailable || controller.isAvailable();
         }
-        return isAvailable ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return isAvailable ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     /**

src/com/android/settings/gestures/PickupGesturePreferenceController.java

@@ -68,7 +68,7 @@ public class PickupGesturePreferenceController extends GesturePreferenceControll
         if (mAmbientConfig == null) {
             mAmbientConfig = new AmbientDisplayConfiguration(mContext);
         }
-        return mAmbientConfig.pulseOnPickupAvailable() ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return mAmbientConfig.pulseOnPickupAvailable() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/gestures/PreventRingingPreferenceController.java

@@ -61,7 +61,7 @@ public class PreventRingingPreferenceController extends BasePreferenceController
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(
                 com.android.internal.R.bool.config_volumeHushGestureEnabled)
-                ? AVAILABLE : DISABLED_UNSUPPORTED;
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java

@@ -56,7 +56,7 @@ public class SwipeToNotificationPreferenceController extends GesturePreferenceCo
 
     @Override
     public int getAvailabilityStatus() {
-        return isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/gestures/SwipeUpPreferenceController.java

@@ -19,17 +19,9 @@ package com.android.settings.gestures;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
-import androidx.annotation.VisibleForTesting;
-import android.text.TextUtils;
-
-import com.android.settings.R;
-import com.android.settings.Utils;
 
 public class SwipeUpPreferenceController extends GesturePreferenceController {
 
@@ -59,7 +51,7 @@ public class SwipeUpPreferenceController extends GesturePreferenceController {
 
     @Override
     public int getAvailabilityStatus() {
-        return isGestureAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return isGestureAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/inputmethod/GameControllerPreferenceController.java

@@ -67,7 +67,7 @@ public class GameControllerPreferenceController extends TogglePreferenceControll
     public int getAvailabilityStatus() {
         // If device explicitly wants to hide this, return early.
         if (!mContext.getResources().getBoolean(R.bool.config_show_vibrate_input_devices)) {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         }
 
         final int[] devices = mIm.getInputDeviceIds();
@@ -77,7 +77,7 @@ public class GameControllerPreferenceController extends TogglePreferenceControll
                 return AVAILABLE;
             }
         }
-        return DISABLED_UNSUPPORTED;
+        return CONDITIONALLY_UNAVAILABLE;
     }
 
     @Override

src/com/android/settings/language/PointerSpeedController.java

@@ -36,6 +36,6 @@ public class PointerSpeedController extends BasePreferenceController {
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_pointer_speed)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 }

src/com/android/settings/location/LocationScanningPreferenceController.java

@@ -36,6 +36,6 @@ public class LocationScanningPreferenceController extends BasePreferenceControll
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_location_scanning)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 }

src/com/android/settings/network/AirplaneModePreferenceController.java

@@ -93,7 +93,7 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
     @Override
     @AvailabilityStatus
     public int getAvailabilityStatus() {
-        return isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
+        return isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/nfc/NfcForegroundPreferenceController.java

@@ -62,15 +62,15 @@ public class NfcForegroundPreferenceController extends BasePreferenceController
     public int getAvailabilityStatus() {
         final PackageManager pm = mContext.getPackageManager();
         if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC)) {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         }
         if (mPaymentBackend == null) {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         }
         final List<PaymentBackend.PaymentAppInfo> appInfos = mPaymentBackend.getPaymentAppInfos();
         return (appInfos != null && !appInfos.isEmpty())
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/nfc/NfcPaymentPreferenceController.java

@@ -80,7 +80,7 @@ public class NfcPaymentPreferenceController extends BasePreferenceController imp
     public int getAvailabilityStatus() {
         final PackageManager pm = mContext.getPackageManager();
         if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC)) {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         }
         if (mPaymentBackend == null) {
             mPaymentBackend = new PaymentBackend(mContext);
@@ -88,7 +88,7 @@ public class NfcPaymentPreferenceController extends BasePreferenceController imp
         final List<PaymentAppInfo> appInfos = mPaymentBackend.getPaymentAppInfos();
         return (appInfos != null && !appInfos.isEmpty())
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/notification/AlarmVolumePreferenceController.java

@@ -19,7 +19,6 @@ package com.android.settings.notification;
 import android.content.Context;
 import android.media.AudioManager;
 
-import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 
 public class AlarmVolumePreferenceController extends
@@ -34,7 +33,7 @@ public class AlarmVolumePreferenceController extends
     @Override
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_alarm_volume)
-                && !mHelper.isSingleVolume() ? AVAILABLE : DISABLED_UNSUPPORTED;
+                && !mHelper.isSingleVolume() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/notification/BadgingNotificationPreferenceController.java

@@ -85,7 +85,7 @@ public class BadgingNotificationPreferenceController extends TogglePreferenceCon
     public int getAvailabilityStatus() {
         return mContext.getResources()
                 .getBoolean(com.android.internal.R.bool.config_notificationBadging)
-                ? AVAILABLE : DISABLED_UNSUPPORTED;
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/notification/MediaVolumePreferenceController.java

@@ -18,9 +18,8 @@ package com.android.settings.notification;
 
 import android.content.Context;
 import android.media.AudioManager;
-import com.android.settings.notification.VolumeSeekBarPreference.Callback;
+
 import com.android.settings.R;
-import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class MediaVolumePreferenceController extends
     VolumeSeekBarPreferenceController {
@@ -35,7 +34,7 @@ public class MediaVolumePreferenceController extends
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_media_volume)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/notification/NotificationVolumePreferenceController.java

@@ -19,7 +19,6 @@ package com.android.settings.notification;
 import android.content.Context;
 import android.media.AudioManager;
 
-import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.Utils;
 
@@ -36,7 +35,7 @@ public class NotificationVolumePreferenceController extends
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_notification_volume)
                 && !Utils.isVoiceCapable(mContext) && !mHelper.isSingleVolume()
-                ? AVAILABLE : DISABLED_UNSUPPORTED;
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/notification/PulseNotificationPreferenceController.java

@@ -71,7 +71,7 @@ public class PulseNotificationPreferenceController extends TogglePreferenceContr
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(
                 com.android.internal.R.bool.config_intrusiveNotificationLed) ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/notification/RingVolumePreferenceController.java

@@ -30,7 +30,6 @@ import android.os.Looper;
 import android.os.Message;
 import android.os.Vibrator;
 
-import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -85,7 +84,7 @@ public class RingVolumePreferenceController extends VolumeSeekBarPreferenceContr
     @Override
     public int getAvailabilityStatus() {
         return Utils.isVoiceCapable(mContext) && !mHelper.isSingleVolume()
-                ? AVAILABLE : DISABLED_UNSUPPORTED;
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/print/PrintSettingPreferenceController.java

@@ -59,7 +59,7 @@ public class PrintSettingPreferenceController extends BasePreferenceController i
     @Override
     public int getAvailabilityStatus() {
         return mPackageManager.hasSystemFeature(PackageManager.FEATURE_PRINTING)
-                ? AVAILABLE : DISABLED_UNSUPPORTED;
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/security/EncryptionStatusPreferenceController.java

@@ -44,7 +44,7 @@ public class EncryptionStatusPreferenceController extends BasePreferenceControll
         if (TextUtils.equals(getPreferenceKey(), PREF_KEY_ENCRYPTION_DETAIL_PAGE) &&
                 !mContext.getResources().getBoolean(
                 R.bool.config_show_encryption_and_credentials_encryption_status)) {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         }
 
         return mUserManager.isAdminUser() ? AVAILABLE : DISABLED_FOR_USER;

src/com/android/settings/security/ScreenPinningPreferenceController.java

@@ -33,7 +33,7 @@ public class ScreenPinningPreferenceController extends BasePreferenceController
     @Override
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_screen_pinning_settings)
-                ? AVAILABLE : DISABLED_UNSUPPORTED;
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/security/ShowPasswordPreferenceController.java

@@ -55,7 +55,7 @@ public class ShowPasswordPreferenceController extends TogglePreferenceController
     @Override
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_show_password)
-                ? AVAILABLE : DISABLED_UNSUPPORTED;
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
 }

src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java

@@ -47,7 +47,7 @@ public class ManageTrustAgentsPreferenceController extends BasePreferenceControl
     @Override
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_manage_trust_agents)
-                ? AVAILABLE : DISABLED_UNSUPPORTED;
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/slices/SliceBuilderUtils.java

@@ -17,10 +17,10 @@
 package com.android.settings.slices;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
 import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
 import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
-import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
-import static com.android.settings.core.BasePreferenceController.UNAVAILABLE_UNKNOWN;
 import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_KEY;
 import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_PLATFORM_DEFINED;
 
@@ -342,7 +342,7 @@ public class SliceBuilderUtils {
         final IconCompat icon = IconCompat.createWithResource(context, data.getIconResource());
 
         switch (controller.getAvailabilityStatus()) {
-            case DISABLED_UNSUPPORTED:
+            case UNSUPPORTED_ON_DEVICE:
                 summary = context.getString(R.string.unsupported_setting_summary);
                 primaryAction = new SliceAction(getSettingsIntent(context), icon, title);
                 break;
@@ -356,7 +356,7 @@ public class SliceBuilderUtils {
                 primaryAction = new SliceAction(getContentPendingIntent(context, data), icon,
                         title);
                 break;
-            case UNAVAILABLE_UNKNOWN:
+            case CONDITIONALLY_UNAVAILABLE:
             default:
                 summary = context.getString(R.string.unknown_unavailability_setting_summary);
                 primaryAction = new SliceAction(getSettingsIntent(context), icon, title);

src/com/android/settings/sound/AudioSwitchPreferenceController.java

@@ -98,7 +98,7 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont
     @Override
     public final int getAvailabilityStatus() {
         return FeatureFlagUtils.isEnabled(mContext, FeatureFlags.AUDIO_SWITCHER_SETTINGS)
-                ? AVAILABLE : DISABLED_UNSUPPORTED;
+                ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
     @Override

src/com/android/settings/system/AdditionalSystemUpdatePreferenceController.java

@@ -32,6 +32,6 @@ public class AdditionalSystemUpdatePreferenceController extends BasePreferenceCo
         return mContext.getResources().getBoolean(
                 com.android.settings.R.bool.config_additional_system_update_setting_enable)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 }

src/com/android/settings/system/ResetPreferenceController.java

@@ -30,6 +30,6 @@ public class ResetPreferenceController extends BasePreferenceController {
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_reset_dashboard)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 }

src/com/android/settings/system/SystemUpdatePreferenceController.java

@@ -55,7 +55,7 @@ public class SystemUpdatePreferenceController extends BasePreferenceController {
         return mContext.getResources().getBoolean(R.bool.config_show_system_update_settings)
                 && mUm.isAdminUser()
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/widget/PreferenceCategoryController.java

@@ -43,7 +43,7 @@ public class PreferenceCategoryController extends BasePreferenceController {
     @Override
     public int getAvailabilityStatus() {
         if (mChildren == null || mChildren.isEmpty()) {
-            return DISABLED_UNSUPPORTED;
+            return UNSUPPORTED_ON_DEVICE;
         }
         // Category is available if any child is available
         for (AbstractPreferenceController controller : mChildren) {
@@ -51,7 +51,7 @@ public class PreferenceCategoryController extends BasePreferenceController {
                 return AVAILABLE;
             }
         }
-        return DISABLED_UNSUPPORTED;
+        return CONDITIONALLY_UNAVAILABLE;
     }
 
     @Override

tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java

@@ -17,7 +17,7 @@
 package com.android.settings.accessibility;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -30,7 +30,6 @@ import android.content.pm.ServiceInfo;
 import android.provider.Settings;
 import android.view.accessibility.AccessibilityManager;
 
-import com.android.settings.accessibility.AccessibilitySlicePreferenceController;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.accessibility.AccessibilityUtils;
 
@@ -85,7 +84,7 @@ public class AccessibilitySlicePreferenceControllerTest {
         AccessibilitySlicePreferenceController controller =
                 new AccessibilitySlicePreferenceController(mContext, "fake_service/name");
 
-        assertThat(controller.getAvailabilityStatus()).isEqualTo(DISABLED_UNSUPPORTED);
+        assertThat(controller.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
     }
 
     @Test

tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java

@@ -72,7 +72,7 @@ public class EnterpriseDisclosurePreferenceControllerTest {
         doReturn(null).when(mController).getDisclosure();
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(
-                BasePreferenceController.DISABLED_UNSUPPORTED);
+                BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 
     @Test

tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java

@@ -80,7 +80,7 @@ public class AppDataUsagePreferenceControllerTest {
         doReturn(false).when(mController).isBandwidthControlEnabled();
 
         assertThat(mController.getAvailabilityStatus())
-            .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+            .isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
     }
 
     @Test

tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java

@@ -91,7 +91,7 @@ public class AppMemoryPreferenceControllerTest {
                 Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
 
         assertThat(mController.getAvailabilityStatus())
-            .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+            .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
@@ -101,7 +101,7 @@ public class AppMemoryPreferenceControllerTest {
                 Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0);
 
         assertThat(mController.getAvailabilityStatus())
-            .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+            .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
@@ -110,7 +110,7 @@ public class AppMemoryPreferenceControllerTest {
                 Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0);
 
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+                .isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
     }
 
     @Test

tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java

@@ -17,6 +17,7 @@
 package com.android.settings.applications.appinfo;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -84,7 +85,8 @@ public class DefaultAppShortcutPreferenceControllerBaseTest {
         mController.capable = false;
         when(mUserManager.isManagedProfile()).thenReturn(false);
 
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_UNSUPPORTED);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                mController.UNSUPPORTED_ON_DEVICE);
     }
 
     @Test

tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java

@@ -71,7 +71,7 @@ public class TimeSpentInAppPreferenceControllerTest {
         mController.setPackageName(null);
 
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
@@ -79,7 +79,7 @@ public class TimeSpentInAppPreferenceControllerTest {
         mController.setPackageName(TEST_INTENT.getStringExtra(EXTRA_PACKAGE_NAME));
 
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
@@ -88,7 +88,7 @@ public class TimeSpentInAppPreferenceControllerTest {
         mController.setPackageName(TEST_INTENT.getStringExtra(EXTRA_PACKAGE_NAME));
 
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
 
     }
 

tests/robotests/src/com/android/settings/backup/AutoRestorePreferenceControllerTest.java

@@ -85,6 +85,6 @@ public class AutoRestorePreferenceControllerTest {
         ShadowPrivacySettingsUtils.setIsAdminUser(true);
         ShadowPrivacySettingsUtils.setIsInvisibleKey(true);
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 }

tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java

@@ -106,6 +106,6 @@ public class BackupDataPreferenceControllerTest {
         ShadowPrivacySettingsUtils.setIsAdminUser(true);
         ShadowPrivacySettingsUtils.setIsInvisibleKey(true);
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 }

tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java

@@ -72,6 +72,6 @@ public class BackupInactivePreferenceControllerTest {
         ShadowPrivacySettingsUtils.setIsAdminUser(true);
         ShadowPrivacySettingsUtils.setIsInvisibleKey(true);
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 }

tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java

@@ -119,6 +119,6 @@ public class ConfigureAccountPreferenceControllerTest {
         ShadowPrivacySettingsUtils.setIsAdminUser(true);
         ShadowPrivacySettingsUtils.setIsInvisibleKey(true);
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 }

tests/robotests/src/com/android/settings/backup/DataManagementPreferenceControllerTest.java

@@ -103,6 +103,6 @@ public class DataManagementPreferenceControllerTest {
         mPSCD.setManageLabel(mTitle);
 
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 }

tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java

@@ -16,7 +16,7 @@
 package com.android.settings.connecteddevice;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -121,7 +121,7 @@ public class AddDevicePreferenceControllerTest {
     public void addDevice_Availability_UnSupported() {
         mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, false);
         assertThat(mAddDevicePreferenceController.getAvailabilityStatus())
-                .isEqualTo(DISABLED_UNSUPPORTED);
+                .isEqualTo(UNSUPPORTED_ON_DEVICE);
     }
 
     @Test

tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java

@@ -16,7 +16,7 @@
 package com.android.settings.connecteddevice;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.ArgumentMatchers.any;
@@ -169,7 +169,7 @@ public class AvailableMediaDeviceGroupControllerTest {
         doReturn(false).when(mPackageManager).hasSystemFeature(PackageManager.FEATURE_BLUETOOTH);
 
         assertThat(mAvailableMediaDeviceGroupController.getAvailabilityStatus()).isEqualTo(
-                DISABLED_UNSUPPORTED);
+                UNSUPPORTED_ON_DEVICE);
     }
 
     @Test

tests/robotests/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceControllerTest.java

@@ -54,7 +54,7 @@ public class BluetoothOnWhileDrivingPreferenceControllerTest {
     @Test
     public void getAvailabilityStatus_offWhenDisabled() {
         assertThat(mController.getAvailabilityStatus())
-            .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+            .isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
     }
 
     @Test

tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java

@@ -16,7 +16,7 @@
 package com.android.settings.connecteddevice;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -39,7 +39,6 @@ import com.android.settings.connecteddevice.dock.DockUpdater;
 import com.android.settings.connecteddevice.usb.ConnectedUsbDeviceUpdater;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -157,7 +156,7 @@ public class ConnectedDeviceGroupControllerTest {
         mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, false);
 
         assertThat(mConnectedDeviceGroupController.getAvailabilityStatus()).isEqualTo(
-                DISABLED_UNSUPPORTED);
+                UNSUPPORTED_ON_DEVICE);
     }
 
     @Test

tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java

@@ -16,7 +16,7 @@
 package com.android.settings.connecteddevice;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.doReturn;
@@ -91,7 +91,7 @@ public class SavedDeviceGroupControllerTest {
     public void testGetAvailabilityStatus_noBluetoothFeature_returnUnSupported() {
         doReturn(false).when(mPackageManager).hasSystemFeature(PackageManager.FEATURE_BLUETOOTH);
         assertThat(mSavedDeviceGroupController.getAvailabilityStatus()).isEqualTo(
-                DISABLED_UNSUPPORTED);
+                UNSUPPORTED_ON_DEVICE);
     }
     @Test
     public void testGetAvailabilityStatus_BluetoothFeature_returnSupported() {

tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java

@@ -16,10 +16,10 @@
 package com.android.settings.core;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
 import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
 import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
-import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
-import static com.android.settings.core.BasePreferenceController.UNAVAILABLE_UNKNOWN;
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.anyString;
@@ -73,8 +73,16 @@ public class BasePreferenceControllerTest {
     }
 
     @Test
-    public void isAvailable_availableStatusUnsupported_returnsFalse() {
+    public void isAvailable_availableStatusUnsupportedOnDevice_returnsFalse() {
-        mPreferenceController.setAvailability(DISABLED_UNSUPPORTED);
+        mPreferenceController.setAvailability(UNSUPPORTED_ON_DEVICE);
+
+        assertThat(mPreferenceController.isAvailable()).isFalse();
+    }
+
+
+    @Test
+    public void isAvailable_availableStatusConditionallyUnavailable_returnsFalse() {
+        mPreferenceController.setAvailability(CONDITIONALLY_UNAVAILABLE);
 
         assertThat(mPreferenceController.isAvailable()).isFalse();
     }
@@ -93,13 +101,6 @@ public class BasePreferenceControllerTest {
         assertThat(mPreferenceController.isAvailable()).isTrue();
     }
 
-    @Test
-    public void isAvailable_availableStatusUnavailable_returnsFalse() {
-        mPreferenceController.setAvailability(UNAVAILABLE_UNKNOWN);
-
-        assertThat(mPreferenceController.isAvailable()).isFalse();
-    }
-
     @Test
     public void isSupported_availableStatusAvailable_returnsTrue() {
         mPreferenceController.setAvailability(AVAILABLE);
@@ -109,7 +110,7 @@ public class BasePreferenceControllerTest {
 
     @Test
     public void isSupported_availableStatusUnsupported_returnsFalse() {
-        mPreferenceController.setAvailability(DISABLED_UNSUPPORTED);
+        mPreferenceController.setAvailability(UNSUPPORTED_ON_DEVICE);
 
         assertThat(mPreferenceController.isSupported()).isFalse();
     }
@@ -128,13 +129,6 @@ public class BasePreferenceControllerTest {
         assertThat(mPreferenceController.isSupported()).isTrue();
     }
 
-    @Test
-    public void isSupported_availableStatusUnavailable_returnsTrue() {
-        mPreferenceController.setAvailability(UNAVAILABLE_UNKNOWN);
-
-        assertThat(mPreferenceController.isSupported()).isTrue();
-    }
-
     @Test
     public void getSliceType_shouldReturnIntent() {
         assertThat(mPreferenceController.getSliceType()).isEqualTo(SliceData.SliceType.INTENT);

tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java

@@ -18,7 +18,8 @@ package com.android.settings.datausage;
 
 import static android.net.ConnectivityManager.TYPE_WIFI;
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doReturn;
@@ -372,7 +373,7 @@ public class DataUsageSummaryPreferenceControllerTest {
 
         when(mTelephonyManager.getSimState()).thenReturn(TelephonyManager.SIM_STATE_ABSENT);
         when(mConnectivityManager.isNetworkSupported(TYPE_WIFI)).thenReturn(false);
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_UNSUPPORTED);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
 
     @Test

tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java

@@ -91,11 +91,11 @@ public class CopyrightPreferenceControllerTest {
         when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt()))
                 .thenReturn(testResolveInfos);
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
 
         when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt())).thenReturn(null);
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 
     /**

tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java

@@ -92,11 +92,11 @@ public class LicensePreferenceControllerTest {
         when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt()))
                 .thenReturn(testResolveInfos);
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
 
         when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt())).thenReturn(null);
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 
     /**

tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java

@@ -91,11 +91,11 @@ public class TermsPreferenceControllerTest {
         when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt()))
                 .thenReturn(testResolveInfos);
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
 
         when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt())).thenReturn(null);
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 
     /**

tests/robotests/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceControllerTest.java

@@ -52,6 +52,6 @@ public class WallpaperAttributionsPreferenceControllerTest {
     @Config(qualifiers = "mcc999")
     public void getAvailabilityStatus_ifNotVisible_false() {
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 }

tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java

@@ -91,11 +91,11 @@ public class WebViewLicensePreferenceControllerTest {
         when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt()))
                 .thenReturn(testResolveInfos);
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
 
         when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt())).thenReturn(null);
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 
     /**

tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java

@@ -77,7 +77,7 @@ public class AmbientDisplayAlwaysOnPreferenceControllerTest {
         when(mConfig.alwaysOnAvailableForUser(anyInt())).thenReturn(false);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(
-                AmbientDisplayAlwaysOnPreferenceController.DISABLED_UNSUPPORTED);
+                AmbientDisplayAlwaysOnPreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 
     @Test