From f87a1f3f41b52bd3b64a259fcfc457164aad67b5 Mon Sep 17 00:00:00 2001 From: Matthew Fritze Date: Thu, 3 May 2018 16:46:51 -0700 Subject: [PATCH] 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 --- ...ccessibilitySlicePreferenceController.java | 3 +- ...gnificationNavbarPreferenceController.java | 2 +- ...erpriseDisclosurePreferenceController.java | 2 +- .../applications/DataSaverController.java | 2 +- .../DeviceAdministratorsController.java | 2 +- .../EnabledVrListenersController.java | 2 +- .../applications/HighPowerAppsController.java | 2 +- .../applications/PremiumSmsController.java | 2 +- .../AppBatteryPreferenceController.java | 2 +- .../AppDataUsagePreferenceController.java | 2 +- .../AppMemoryPreferenceController.java | 4 +-- ...ltAppShortcutPreferenceControllerBase.java | 2 +- .../TimeSpentInAppPreferenceController.java | 6 ++-- .../AutoRestorePreferenceController.java | 2 +- .../BackupDataPreferenceController.java | 2 +- .../BackupInactivePreferenceController.java | 2 +- ...pSettingsActivityPreferenceController.java | 2 +- .../ConfigureAccountPreferenceController.java | 2 +- .../DataManagementPreferenceController.java | 2 +- ...uetoothDeviceNamePreferenceController.java | 2 +- .../BluetoothFilesPreferenceController.java | 3 +- .../AddDevicePreferenceController.java | 2 +- .../AvailableMediaDeviceGroupController.java | 2 +- .../BluetoothDashboardFragment.java | 2 +- ...othOnWhileDrivingPreferenceController.java | 2 +- .../ConnectedDeviceGroupController.java | 3 +- .../SavedDeviceGroupController.java | 3 +- .../core/BasePreferenceController.java | 33 ++++++++++--------- .../DataUsageSummaryPreferenceController.java | 2 +- .../legal/LegalPreferenceController.java | 2 +- ...paperAttributionsPreferenceController.java | 2 +- ...ntDisplayAlwaysOnPreferenceController.java | 2 +- ...playNotificationsPreferenceController.java | 2 +- .../AutoBrightnessPreferenceController.java | 2 +- .../AutoRotatePreferenceController.java | 2 +- ...DisplayActivationPreferenceController.java | 2 +- ...htDisplayAutoModePreferenceController.java | 2 +- ...playCustomEndTimePreferenceController.java | 2 +- ...ayCustomStartTimePreferenceController.java | 2 +- ...ightDisplayFooterPreferenceController.java | 2 +- ...tDisplayIntensityPreferenceController.java | 2 +- ...FingerprintStatusPreferenceController.java | 2 +- .../AutoRestrictionPreferenceController.java | 2 +- .../SmartBatteryPreferenceController.java | 2 +- ...stGestureSettingsPreferenceController.java | 2 +- .../DoubleTapPowerPreferenceController.java | 2 +- .../DoubleTapScreenPreferenceController.java | 2 +- .../DoubleTwistPreferenceController.java | 2 +- .../GesturesSettingPreferenceController.java | 2 +- .../PickupGesturePreferenceController.java | 2 +- .../PreventRingingPreferenceController.java | 2 +- ...ipeToNotificationPreferenceController.java | 2 +- .../gestures/SwipeUpPreferenceController.java | 10 +----- .../GameControllerPreferenceController.java | 4 +-- .../language/PointerSpeedController.java | 2 +- .../LocationScanningPreferenceController.java | 2 +- .../AirplaneModePreferenceController.java | 2 +- .../NfcForegroundPreferenceController.java | 6 ++-- .../nfc/NfcPaymentPreferenceController.java | 4 +-- .../AlarmVolumePreferenceController.java | 3 +- ...dgingNotificationPreferenceController.java | 2 +- .../MediaVolumePreferenceController.java | 5 ++- ...otificationVolumePreferenceController.java | 3 +- ...PulseNotificationPreferenceController.java | 2 +- .../RingVolumePreferenceController.java | 3 +- .../PrintSettingPreferenceController.java | 2 +- .../EncryptionStatusPreferenceController.java | 2 +- .../ScreenPinningPreferenceController.java | 2 +- .../ShowPasswordPreferenceController.java | 2 +- ...ManageTrustAgentsPreferenceController.java | 2 +- .../settings/slices/SliceBuilderUtils.java | 8 ++--- .../AudioSwitchPreferenceController.java | 2 +- ...ionalSystemUpdatePreferenceController.java | 2 +- .../system/ResetPreferenceController.java | 2 +- .../SystemUpdatePreferenceController.java | 2 +- .../widget/PreferenceCategoryController.java | 4 +-- ...sibilitySlicePreferenceControllerTest.java | 5 ++- ...iseDisclosurePreferenceControllerTest.java | 2 +- .../AppDataUsagePreferenceControllerTest.java | 2 +- .../AppMemoryPreferenceControllerTest.java | 6 ++-- ...pShortcutPreferenceControllerBaseTest.java | 8 +++-- ...imeSpentInAppPreferenceControllerTest.java | 6 ++-- .../AutoRestorePreferenceControllerTest.java | 2 +- .../BackupDataPreferenceControllerTest.java | 2 +- ...ackupInactivePreferenceControllerTest.java | 2 +- ...figureAccountPreferenceControllerTest.java | 2 +- ...ataManagementPreferenceControllerTest.java | 2 +- .../AddDevicePreferenceControllerTest.java | 4 +-- ...ailableMediaDeviceGroupControllerTest.java | 4 +-- ...nWhileDrivingPreferenceControllerTest.java | 2 +- .../ConnectedDeviceGroupControllerTest.java | 5 ++- .../SavedDeviceGroupControllerTest.java | 4 +-- .../core/BasePreferenceControllerTest.java | 32 ++++++++---------- ...aUsageSummaryPreferenceControllerTest.java | 5 +-- .../CopyrightPreferenceControllerTest.java | 4 +-- .../LicensePreferenceControllerTest.java | 4 +-- .../legal/TermsPreferenceControllerTest.java | 4 +-- ...rAttributionsPreferenceControllerTest.java | 2 +- ...ebViewLicensePreferenceControllerTest.java | 4 +-- ...splayAlwaysOnPreferenceControllerTest.java | 2 +- .../AutoRotatePreferenceControllerTest.java | 4 +-- ...erprintStatusPreferenceControllerTest.java | 4 +-- ...toRestrictionPreferenceControllerTest.java | 2 +- .../SmartBatteryPreferenceControllerTest.java | 2 +- .../GesturePreferenceControllerTest.java | 2 +- ...ameControllerPreferenceControllerTest.java | 12 +++---- ...gNotificationPreferenceControllerTest.java | 2 -- ...eNotificationPreferenceControllerTest.java | 2 +- ...VolumeSeekBarPreferenceControllerTest.java | 2 +- .../slices/SliceBroadcastReceiverTest.java | 4 +-- .../slices/SliceBuilderUtilsTest.java | 6 ++-- ...oOutputSwitchPreferenceControllerTest.java | 4 +-- .../settings/testutils/SliceTester.java | 8 ++--- 113 files changed, 185 insertions(+), 207 deletions(-) diff --git a/src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java b/src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java index 6b9a480ff81..ec988cd0f23 100644 --- a/src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java +++ b/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() { diff --git a/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java b/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java index 829223eb8a3..aa4e56ee8de 100644 --- a/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java b/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java index e8a444fdfb5..4fb8cf88470 100644 --- a/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java +++ b/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; } diff --git a/src/com/android/settings/applications/DataSaverController.java b/src/com/android/settings/applications/DataSaverController.java index ce12a1663b5..afe7cd64cd3 100644 --- a/src/com/android/settings/applications/DataSaverController.java +++ b/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; } } \ No newline at end of file diff --git a/src/com/android/settings/applications/DeviceAdministratorsController.java b/src/com/android/settings/applications/DeviceAdministratorsController.java index 8b6fb7363b8..ec1d556a611 100644 --- a/src/com/android/settings/applications/DeviceAdministratorsController.java +++ b/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; } } \ No newline at end of file diff --git a/src/com/android/settings/applications/EnabledVrListenersController.java b/src/com/android/settings/applications/EnabledVrListenersController.java index 0f09e094453..7b33529d7eb 100644 --- a/src/com/android/settings/applications/EnabledVrListenersController.java +++ b/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; } } \ No newline at end of file diff --git a/src/com/android/settings/applications/HighPowerAppsController.java b/src/com/android/settings/applications/HighPowerAppsController.java index 0d294a9a908..39b84516315 100644 --- a/src/com/android/settings/applications/HighPowerAppsController.java +++ b/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; } } \ No newline at end of file diff --git a/src/com/android/settings/applications/PremiumSmsController.java b/src/com/android/settings/applications/PremiumSmsController.java index bcb9d7bc2ee..eeb5d86fd90 100644 --- a/src/com/android/settings/applications/PremiumSmsController.java +++ b/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; } } \ No newline at end of file diff --git a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java index 9f42b4d61cf..55a6c9ff4f2 100644 --- a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java index d7d318985fb..c572c3724ef 100644 --- a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java +++ b/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 diff --git a/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java index b1836adaa66..e5b6eed0f59 100644 --- a/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java index bd8127a6e94..7b45b67de29 100644 --- a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java +++ b/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 diff --git a/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java b/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java index dd07727f2be..6a390770249 100644 --- a/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java +++ b/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 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 diff --git a/src/com/android/settings/backup/AutoRestorePreferenceController.java b/src/com/android/settings/backup/AutoRestorePreferenceController.java index 0333451cf02..46802998d81 100644 --- a/src/com/android/settings/backup/AutoRestorePreferenceController.java +++ b/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; } diff --git a/src/com/android/settings/backup/BackupDataPreferenceController.java b/src/com/android/settings/backup/BackupDataPreferenceController.java index e464fc22044..3ad3e8054bd 100644 --- a/src/com/android/settings/backup/BackupDataPreferenceController.java +++ b/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; } diff --git a/src/com/android/settings/backup/BackupInactivePreferenceController.java b/src/com/android/settings/backup/BackupInactivePreferenceController.java index d44801e97e2..8bd278c2e13 100644 --- a/src/com/android/settings/backup/BackupInactivePreferenceController.java +++ b/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; } diff --git a/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java b/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java index 183d13f0033..f0439d6d0a0 100644 --- a/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/backup/ConfigureAccountPreferenceController.java b/src/com/android/settings/backup/ConfigureAccountPreferenceController.java index f6b0eb7d449..6b80d7ce83d 100644 --- a/src/com/android/settings/backup/ConfigureAccountPreferenceController.java +++ b/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; } diff --git a/src/com/android/settings/backup/DataManagementPreferenceController.java b/src/com/android/settings/backup/DataManagementPreferenceController.java index 120c827de8c..b69acfaa5e8 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; } diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java index 6ce07d31da8..dd93d7b2810 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java +++ b/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 diff --git a/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java index 28101a100ee..8ce701748c1 100644 --- a/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java b/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java index dec81299bfa..9730515343d 100644 --- a/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java +++ b/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 diff --git a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java index 9c15282606b..53268a18314 100644 --- a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java +++ b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java @@ -72,7 +72,7 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle public int getAvailabilityStatus() { return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH) ? AVAILABLE - : DISABLED_UNSUPPORTED; + : UNSUPPORTED_ON_DEVICE; } @Override diff --git a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java index 578900cf45d..f186aeffdf0 100644 --- a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java +++ b/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); } diff --git a/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceController.java b/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceController.java index 072de75f21b..6d4e8b848b1 100644 --- a/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java index 2e5598bac61..aa0b6cd54fd 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java +++ b/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 diff --git a/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java b/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java index 5d63ea51b21..4bc9cdd637f 100644 --- a/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java +++ b/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 diff --git a/src/com/android/settings/core/BasePreferenceController.java b/src/com/android/settings/core/BasePreferenceController.java index b8bdcdf7403..830439268d3 100644 --- a/src/com/android/settings/core/BasePreferenceController.java +++ b/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, - UNAVAILABLE_UNKNOWN}) + @IntDef({AVAILABLE, UNSUPPORTED_ON_DEVICE, DISABLED_FOR_USER, DISABLED_DEPENDENT_SETTING, + 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. *

* 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. - *

- * 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) || - (availabilityStatus == DISABLED_DEPENDENT_SETTING); + return (availabilityStatus == AVAILABLE + || 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; } /** diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java index 9e2d694e708..8e63ca91a53 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java b/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java index 1c03f19eb92..0d81c130f91 100644 --- a/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java +++ b/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; } } diff --git a/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceController.java b/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceController.java index 418b149df97..caa5afcdc58 100644 --- a/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceController.java +++ b/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; } } diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java index a6d5363d79b..cb04ed4ca10 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 5caad6d59c3..769fdbc405d 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 28f9260651a..564e27ad3d5 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 5241e641fa6..749f6e6c147 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 6b07ea0df22..6e30f6fd959 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 31810982df6..bb42c857a7e 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 76b362e4fdd..1eebb6be5ae 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 f1ac54e1624..19297b82f32 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 bd04d120dbf..2075cfca322 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 c3efdc0ae3c..f5bc49aa6df 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; } diff --git a/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java b/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java index ce15f61b847..519f116a048 100644 --- a/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java +++ b/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; diff --git a/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java b/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java index 020c5ea3691..7527db3acb1 100644 --- a/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java +++ b/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; } diff --git a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java index dff207a56b5..fbd779c37c0 100644 --- a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java b/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java index d1207416b06..6e318d65b2e 100644 --- a/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java index 8a3abf83d02..b8b7239d792 100644 --- a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java index 4319fbf0f38..2afd3e02e25 100644 --- a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java index 3e0a60e8d24..313e67ba86d 100644 --- a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java index 666d6b24e58..652e1518188 100644 --- a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java +++ b/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; } /** diff --git a/src/com/android/settings/gestures/PickupGesturePreferenceController.java b/src/com/android/settings/gestures/PickupGesturePreferenceController.java index a4dcd84091f..f1dcf95d2ae 100644 --- a/src/com/android/settings/gestures/PickupGesturePreferenceController.java +++ b/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 diff --git a/src/com/android/settings/gestures/PreventRingingPreferenceController.java b/src/com/android/settings/gestures/PreventRingingPreferenceController.java index aacc707a4cf..c6bc3aa8f26 100644 --- a/src/com/android/settings/gestures/PreventRingingPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java b/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java index d755d727788..bb6a26d880a 100644 --- a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/gestures/SwipeUpPreferenceController.java b/src/com/android/settings/gestures/SwipeUpPreferenceController.java index 019dffd714d..d7ffc4c448e 100644 --- a/src/com/android/settings/gestures/SwipeUpPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java index 21dbee9509a..980494a4ec8 100644 --- a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/language/PointerSpeedController.java b/src/com/android/settings/language/PointerSpeedController.java index ffde3d21e4c..8a0226a20d1 100644 --- a/src/com/android/settings/language/PointerSpeedController.java +++ b/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; } } diff --git a/src/com/android/settings/location/LocationScanningPreferenceController.java b/src/com/android/settings/location/LocationScanningPreferenceController.java index 01a66909b25..33fe612913a 100644 --- a/src/com/android/settings/location/LocationScanningPreferenceController.java +++ b/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; } } \ No newline at end of file diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java index ee6535ef118..b4ef0d235f6 100644 --- a/src/com/android/settings/network/AirplaneModePreferenceController.java +++ b/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 diff --git a/src/com/android/settings/nfc/NfcForegroundPreferenceController.java b/src/com/android/settings/nfc/NfcForegroundPreferenceController.java index fbc5a32feda..cee24c2b22a 100644 --- a/src/com/android/settings/nfc/NfcForegroundPreferenceController.java +++ b/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 appInfos = mPaymentBackend.getPaymentAppInfos(); return (appInfos != null && !appInfos.isEmpty()) ? AVAILABLE - : DISABLED_UNSUPPORTED; + : UNSUPPORTED_ON_DEVICE; } @Override diff --git a/src/com/android/settings/nfc/NfcPaymentPreferenceController.java b/src/com/android/settings/nfc/NfcPaymentPreferenceController.java index 4f2f755ad7d..783e05eb2be 100644 --- a/src/com/android/settings/nfc/NfcPaymentPreferenceController.java +++ b/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 appInfos = mPaymentBackend.getPaymentAppInfos(); return (appInfos != null && !appInfos.isEmpty()) ? AVAILABLE - : DISABLED_UNSUPPORTED; + : UNSUPPORTED_ON_DEVICE; } @Override diff --git a/src/com/android/settings/notification/AlarmVolumePreferenceController.java b/src/com/android/settings/notification/AlarmVolumePreferenceController.java index 0900e3cd731..3c238aa7f29 100644 --- a/src/com/android/settings/notification/AlarmVolumePreferenceController.java +++ b/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 diff --git a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java index dc5b67ad24d..c9e190f41f4 100644 --- a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/notification/MediaVolumePreferenceController.java b/src/com/android/settings/notification/MediaVolumePreferenceController.java index 8f0a7f9e218..f3bffe075ec 100644 --- a/src/com/android/settings/notification/MediaVolumePreferenceController.java +++ b/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 diff --git a/src/com/android/settings/notification/NotificationVolumePreferenceController.java b/src/com/android/settings/notification/NotificationVolumePreferenceController.java index 8e7171d5ca2..c3c8793cf27 100644 --- a/src/com/android/settings/notification/NotificationVolumePreferenceController.java +++ b/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 diff --git a/src/com/android/settings/notification/PulseNotificationPreferenceController.java b/src/com/android/settings/notification/PulseNotificationPreferenceController.java index 206043c682c..bcf7b17a5a0 100644 --- a/src/com/android/settings/notification/PulseNotificationPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/notification/RingVolumePreferenceController.java b/src/com/android/settings/notification/RingVolumePreferenceController.java index 0a2bed98479..703e7e3b32c 100644 --- a/src/com/android/settings/notification/RingVolumePreferenceController.java +++ b/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 diff --git a/src/com/android/settings/print/PrintSettingPreferenceController.java b/src/com/android/settings/print/PrintSettingPreferenceController.java index 38e3b4aa67a..f40846a121f 100644 --- a/src/com/android/settings/print/PrintSettingPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/security/EncryptionStatusPreferenceController.java b/src/com/android/settings/security/EncryptionStatusPreferenceController.java index 6c73ecccce4..27e896aff39 100644 --- a/src/com/android/settings/security/EncryptionStatusPreferenceController.java +++ b/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; diff --git a/src/com/android/settings/security/ScreenPinningPreferenceController.java b/src/com/android/settings/security/ScreenPinningPreferenceController.java index a90746eb1e7..37a3f9caaaf 100644 --- a/src/com/android/settings/security/ScreenPinningPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/security/ShowPasswordPreferenceController.java b/src/com/android/settings/security/ShowPasswordPreferenceController.java index 82f1935cee0..8672974fd2d 100644 --- a/src/com/android/settings/security/ShowPasswordPreferenceController.java +++ b/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; } } diff --git a/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java b/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java index b09b50aefc2..3d92bdea47d 100644 --- a/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java index 3ac00699baf..36ceb8200e0 100644 --- a/src/com/android/settings/slices/SliceBuilderUtils.java +++ b/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.UNAVAILABLE_UNKNOWN; +import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_KEY; import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_PLATFORM_DEFINED; @@ -339,7 +339,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; @@ -353,7 +353,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); diff --git a/src/com/android/settings/sound/AudioSwitchPreferenceController.java b/src/com/android/settings/sound/AudioSwitchPreferenceController.java index cae7b0cbd9e..ad98af93a59 100644 --- a/src/com/android/settings/sound/AudioSwitchPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/system/AdditionalSystemUpdatePreferenceController.java b/src/com/android/settings/system/AdditionalSystemUpdatePreferenceController.java index 1fbf83574ec..868f10f3b50 100644 --- a/src/com/android/settings/system/AdditionalSystemUpdatePreferenceController.java +++ b/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; } } \ No newline at end of file diff --git a/src/com/android/settings/system/ResetPreferenceController.java b/src/com/android/settings/system/ResetPreferenceController.java index 16f7ce3aa28..ec0c27b4ac8 100644 --- a/src/com/android/settings/system/ResetPreferenceController.java +++ b/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; } } diff --git a/src/com/android/settings/system/SystemUpdatePreferenceController.java b/src/com/android/settings/system/SystemUpdatePreferenceController.java index c3cf1ad6ac2..bd8ffa74501 100644 --- a/src/com/android/settings/system/SystemUpdatePreferenceController.java +++ b/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 diff --git a/src/com/android/settings/widget/PreferenceCategoryController.java b/src/com/android/settings/widget/PreferenceCategoryController.java index c6477f3b321..7b52be04641 100644 --- a/src/com/android/settings/widget/PreferenceCategoryController.java +++ b/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 diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java index fe6d1a3f5fd..8392412e325 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java +++ b/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 diff --git a/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java index 4ad0982d6af..ce9923b3835 100644 --- a/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java +++ b/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 diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java index 90922cf6e62..bab73b55a2a 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java +++ b/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 diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java index 469f34317bf..1c0d89705da 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java +++ b/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 diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java index 7f36b6494f6..ae61a51549e 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java +++ b/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 @@ -110,9 +112,9 @@ public class DefaultAppShortcutPreferenceControllerBaseTest { public void handlePreferenceTreeClick_shouldStartDefaultAppSettings() { mController.handlePreferenceTreeClick(mPreference); - verify(mContext).startActivity(argThat(intent-> intent != null + verify(mContext).startActivity(argThat(intent -> intent != null && intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT).equals( - DefaultAppSettings.class.getName()) + DefaultAppSettings.class.getName()) && intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS) .getString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY).equals("TestKey"))); } diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java index 675e143f3a5..9cdd2eaaa1c 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java +++ b/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); } diff --git a/tests/robotests/src/com/android/settings/backup/AutoRestorePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/AutoRestorePreferenceControllerTest.java index 9a4e167576c..c5dfc21bec9 100644 --- a/tests/robotests/src/com/android/settings/backup/AutoRestorePreferenceControllerTest.java +++ b/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); } } diff --git a/tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java index 7cfe9c740fd..4a0f85d7f1d 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java +++ b/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); } } diff --git a/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java index 51f6076e154..815263558db 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java +++ b/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); } } diff --git a/tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java index 306088356e8..2e0ae5df895 100644 --- a/tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java +++ b/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); } } diff --git a/tests/robotests/src/com/android/settings/backup/DataManagementPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/DataManagementPreferenceControllerTest.java index f192a8bdff4..2f1f11921b9 100644 --- a/tests/robotests/src/com/android/settings/backup/DataManagementPreferenceControllerTest.java +++ b/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); } } diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java index 88ea32e6302..c73313d63ff 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java +++ b/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 diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java index fbcf5859dbc..ac8c06978bc 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java +++ b/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.Matchers.anyString; @@ -141,7 +141,7 @@ public class AvailableMediaDeviceGroupControllerTest { doReturn(false).when(mPackageManager).hasSystemFeature(PackageManager.FEATURE_BLUETOOTH); assertThat(mAvailableMediaDeviceGroupController.getAvailabilityStatus()).isEqualTo( - DISABLED_UNSUPPORTED); + UNSUPPORTED_ON_DEVICE); } @Test diff --git a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceControllerTest.java index 12fca1ea66d..83763bb4142 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceControllerTest.java +++ b/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 diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java index 3cdd959880c..52715b084df 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java +++ b/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 diff --git a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java index 2710cd852bf..b1d4cd81c27 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java +++ b/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() { diff --git a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java index f9bd2e1eb48..611c1b5fb46 100644 --- a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java +++ b/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.UNAVAILABLE_UNKNOWN; +import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; 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() { - mPreferenceController.setAvailability(DISABLED_UNSUPPORTED); + public void isAvailable_availableStatusUnsupportedOnDevice_returnsFalse() { + 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); diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java index 867b28c9c24..17598eb3967 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java +++ b/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 diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java index b34efd99b30..7757f442db1 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java +++ b/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); } /** diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java index 072961eebd5..5451c508bbb 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java +++ b/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); } /** diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java index c99ebd6082b..e9fb0abc2fa 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java +++ b/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); } /** diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceControllerTest.java index c4d5577a7f5..c5862e22f7e 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceControllerTest.java +++ b/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); } } \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java index 1fcaeabd1a2..d7d15683cc5 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java +++ b/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); } /** diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java index e1c4b70477a..624b07fbd92 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java +++ b/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 diff --git a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java index 0699a93be00..c4ef0c92251 100644 --- a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java @@ -104,7 +104,7 @@ public class AutoRotatePreferenceControllerTest { @Test public void testGetAvailabilityStatus() { assertThat(mController.getAvailabilityStatus()).isEqualTo(BasePreferenceController - .DISABLED_UNSUPPORTED); + .CONDITIONALLY_UNAVAILABLE); enableAutoRotationPreference(); @@ -114,7 +114,7 @@ public class AutoRotatePreferenceControllerTest { disableAutoRotationPreference(); assertThat(mController.getAvailabilityStatus()).isEqualTo(BasePreferenceController - .DISABLED_UNSUPPORTED); + .CONDITIONALLY_UNAVAILABLE); } @Test diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java index f727ed7052c..8e94be01b47 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java @@ -17,7 +17,7 @@ package com.android.settings.fingerprint; 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.anyInt; import static org.mockito.Mockito.mock; @@ -84,7 +84,7 @@ public class FingerprintStatusPreferenceControllerTest { public void getAvailabilityStatus_noFingerprintManger_DISABLED() { when(mFingerprintManager.isHardwareDetected()).thenReturn(false); - assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_UNSUPPORTED); + assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java index eee4bf0ce7d..e8e688d84dc 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java @@ -91,7 +91,7 @@ public class AutoRestrictionPreferenceControllerTest { doReturn(true).when(mFeatureFactory.powerUsageFeatureProvider).isSmartBatterySupported(); assertThat(mController.getAvailabilityStatus()).isEqualTo( - BasePreferenceController.DISABLED_UNSUPPORTED); + BasePreferenceController.UNSUPPORTED_ON_DEVICE); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java index 7edb2ab1a7f..fc8740ef980 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java @@ -103,7 +103,7 @@ public class SmartBatteryPreferenceControllerTest { doReturn(false).when(mFeatureFactory.powerUsageFeatureProvider).isSmartBatterySupported(); assertThat(mController.getAvailabilityStatus()).isEqualTo( - BasePreferenceController.DISABLED_UNSUPPORTED); + BasePreferenceController.UNSUPPORTED_ON_DEVICE); } private void putSmartBatteryValue(int value) { diff --git a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java index 2110653f416..493e643f496 100644 --- a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java @@ -204,7 +204,7 @@ public class GesturePreferenceControllerTest { @Override public int getAvailabilityStatus() { - return mIsPrefAvailable ? AVAILABLE : DISABLED_UNSUPPORTED; + return mIsPrefAvailable ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } @Override diff --git a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java index 1b78cb253df..e5ecd6d2423 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java @@ -17,8 +17,8 @@ package com.android.settings.inputmethod; import static com.android.settings.core.BasePreferenceController.AVAILABLE; -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.CONDITIONALLY_UNAVAILABLE; +import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -90,7 +90,7 @@ public class GameControllerPreferenceControllerTest { when(mInputDevice.isVirtual()).thenReturn(false); when(mInputDevice.getVibrator().hasVibrator()).thenReturn(false); - assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_UNSUPPORTED); + assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE); } @Test @@ -99,14 +99,14 @@ public class GameControllerPreferenceControllerTest { when(mInputManager.getInputDevice(1)).thenReturn(mInputDevice); when(mInputDevice.isVirtual()).thenReturn(true); - assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_UNSUPPORTED); + assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE); } @Test public void getAvailabilityStatus_hasNoDevice_shouldReturnDisabled() { when(mInputManager.getInputDeviceIds()).thenReturn(new int[] {}); - assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_UNSUPPORTED); + assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE); } @Test @@ -114,7 +114,7 @@ public class GameControllerPreferenceControllerTest { public void getAvailabilityStatus_ifDisabled_shouldReturnDisabled() { mController = new GameControllerPreferenceController(mContext, "testkey"); - assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_UNSUPPORTED); + assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE); } @Test diff --git a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java index 6be0bade04e..326e4951cdc 100644 --- a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java @@ -18,8 +18,6 @@ package com.android.settings.notification; import static android.provider.Settings.Secure.NOTIFICATION_BADGING; -import static com.android.settings.core.BasePreferenceController.AVAILABLE; -import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED; import static com.android.settings.notification.BadgingNotificationPreferenceController.OFF; import static com.android.settings.notification.BadgingNotificationPreferenceController.ON; diff --git a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java index 91d9cb716fa..ccff0f53390 100644 --- a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java @@ -130,7 +130,7 @@ public class PulseNotificationPreferenceControllerTest { assertThat(mController.isAvailable()).isFalse(); assertThat(mController.getAvailabilityStatus()).isEqualTo( - BasePreferenceController.DISABLED_UNSUPPORTED); + BasePreferenceController.UNSUPPORTED_ON_DEVICE); } @Test diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java index b00e694517d..7b9af3e9a34 100644 --- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java @@ -169,7 +169,7 @@ public class VolumeSeekBarPreferenceControllerTest { @Override public int getAvailabilityStatus() { - return mAvailable ? AVAILABLE : DISABLED_UNSUPPORTED; + return mAvailable ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } @Override diff --git a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java index c7bf0437e9a..f03f88ed99a 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java @@ -211,7 +211,7 @@ public class SliceBroadcastReceiverTest { // Disable Setting Settings.Global.putInt(mContext.getContentResolver(), FakeToggleController.AVAILABILITY_KEY, - BasePreferenceController.DISABLED_UNSUPPORTED); + BasePreferenceController.UNSUPPORTED_ON_DEVICE); // Insert Fake Toggle into Database final String key = "key"; @@ -245,7 +245,7 @@ public class SliceBroadcastReceiverTest { // Disable Setting Settings.Global.putInt(mContext.getContentResolver(), FakeSliderController.AVAILABILITY_KEY, - BasePreferenceController.DISABLED_UNSUPPORTED); + BasePreferenceController.UNSUPPORTED_ON_DEVICE); // Insert Fake Slider into Database final String key = "key"; diff --git a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java index 20bb5a04cae..fe521da7746 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java @@ -329,7 +329,7 @@ public class SliceBuilderUtilsTest { SliceData.SliceType.SWITCH); Settings.Global.putInt(mContext.getContentResolver(), FakeUnavailablePreferenceController.AVAILABILITY_KEY, - BasePreferenceController.DISABLED_UNSUPPORTED); + BasePreferenceController.UNSUPPORTED_ON_DEVICE); final Slice slice = SliceBuilderUtils.buildSlice(mContext, data); @@ -372,12 +372,12 @@ public class SliceBuilderUtilsTest { } @Test - public void testUnavailableUnknownSlice_validTitleSummary() { + public void testConditionallyUnavailableSlice_validTitleSummary() { final SliceData data = getDummyData(FakeUnavailablePreferenceController.class, SliceData.SliceType.SWITCH); Settings.Global.putInt(mContext.getContentResolver(), FakeUnavailablePreferenceController.AVAILABILITY_KEY, - BasePreferenceController.UNAVAILABLE_UNKNOWN); + BasePreferenceController.CONDITIONALLY_UNAVAILABLE); final Slice slice = SliceBuilderUtils.buildSlice(mContext, data); diff --git a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java index 419bc45b165..aad189343f8 100644 --- a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.sound; 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; @@ -155,7 +155,7 @@ public class AudioOutputSwitchPreferenceControllerTest { @Test public void getAvailabilityStatus_whenNotVisible_isDisable() { FeatureFlagUtils.setEnabled(mContext, FeatureFlags.AUDIO_SWITCHER_SETTINGS, false); - assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_UNSUPPORTED); + assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE); } @Test diff --git a/tests/robotests/src/com/android/settings/testutils/SliceTester.java b/tests/robotests/src/com/android/settings/testutils/SliceTester.java index 9555f712480..d8861d6da95 100644 --- a/tests/robotests/src/com/android/settings/testutils/SliceTester.java +++ b/tests/robotests/src/com/android/settings/testutils/SliceTester.java @@ -19,10 +19,10 @@ package com.android.settings.testutils; import static android.app.slice.Slice.HINT_TITLE; import static android.app.slice.SliceItem.FORMAT_TEXT; +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.UNAVAILABLE_UNKNOWN; +import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.google.common.truth.Truth.assertThat; @@ -151,8 +151,8 @@ public class SliceTester { final int availabilityStatus = SliceBuilderUtils.getPreferenceController(context, sliceData).getAvailabilityStatus(); switch (availabilityStatus) { - case DISABLED_UNSUPPORTED: - case UNAVAILABLE_UNKNOWN: + case UNSUPPORTED_ON_DEVICE: + case CONDITIONALLY_UNAVAILABLE: assertThat(primaryPendingIntent).isEqualTo( SliceBuilderUtils.getSettingsIntent(context)); break;