diff options
| author | Matthew Fritze <mfritze@google.com> | 2018-05-03 16:46:51 -0700 |
|---|---|---|
| committer | Matthew Fritze <mfritze@google.com> | 2018-05-09 08:36:59 -0700 |
| commit | f87a1f3f41b52bd3b64a259fcfc457164aad67b5 (patch) | |
| tree | b2bbd17405b2d9233e36a5fc7be49f6df660893b /src | |
| parent | 1220c364c4e6da3587fc356bb30d3cba99ab7946 (diff) | |
| download | packages_apps_Settings-f87a1f3f41b52bd3b64a259fcfc457164aad67b5.tar.gz packages_apps_Settings-f87a1f3f41b52bd3b64a259fcfc457164aad67b5.tar.bz2 packages_apps_Settings-f87a1f3f41b52bd3b64a259fcfc457164aad67b5.zip | |
Establish permanently unavailable settings
Distinguish between settings which are permanently unavailable on
the device, and temporarily unavailable. This enables us to restrict
which setting slices are exposed in onSliceGetDescendants.
The primary changes in this CL are renaming:
"DISABLED_UNSUPPORTED" -> "UNSUPPORTED_ON_DEVICE"
to be more clear the the setting will cannot be accessed on the device, and,
adding a new enum to encapsulate settings which are currently unavailable, but
could be enabled in the future.
Also remove UNAVAILABLE_UNKNOWN. Devs should never need this enum.
Bug: 78910582
Bug: 79245656
Test: robotests
Change-Id: I58821a6cfd6134b3b351657b6edf5f74ead00643
Diffstat (limited to 'src')
76 files changed, 104 insertions, 119 deletions
diff --git a/src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java b/src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java index 6b9a480ff8..ec988cd0f2 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 829223eb8a..aa4e56ee8d 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 e8a444fdfb..4fb8cf8847 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 ce12a1663b..afe7cd64cd 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 8b6fb7363b..ec1d556a61 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 0f09e09445..7b33529d7e 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 0d294a9a90..39b8451631 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 bcb9d7bc2e..eeb5d86fd9 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 9f42b4d61c..55a6c9ff4f 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 d7d318985f..c572c3724e 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 b1836adaa6..e5b6eed0f5 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 bd8127a6e9..7b45b67de2 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 dd07727f2b..6a39077024 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<ResolveInfo> resolved = mPackageManager.queryIntentActivities(mIntent, 0 /* flags */); if (resolved == null || resolved.isEmpty()) { - return DISABLED_UNSUPPORTED; + return UNSUPPORTED_ON_DEVICE; } for (ResolveInfo info : resolved) { if (isSystemApp(info)) { return AVAILABLE; } } - return DISABLED_UNSUPPORTED; + return UNSUPPORTED_ON_DEVICE; } @Override diff --git a/src/com/android/settings/backup/AutoRestorePreferenceController.java b/src/com/android/settings/backup/AutoRestorePreferenceController.java index 0333451cf0..46802998d8 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 e464fc2204..3ad3e8054b 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 d44801e97e..8bd278c2e1 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 183d13f003..f0439d6d0a 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 f6b0eb7d44..6b80d7ce83 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 120c827de8..b69acfaa5e 100644 --- a/src/com/android/settings/backup/DataManagementPreferenceController.java +++ b/src/com/android/settings/backup/DataManagementPreferenceController.java @@ -37,7 +37,7 @@ public class DataManagementPreferenceController extends BasePreferenceController } boolean manageEnabled = (mPSCD.getManageIntent() != null) && mPSCD.isBackupEnabled(); if (!manageEnabled) { - return DISABLED_UNSUPPORTED; + return UNSUPPORTED_ON_DEVICE; } return AVAILABLE; } diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java index 6ce07d31da..dd93d7b281 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 28101a100e..8ce701748c 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 dec81299bf..9730515343 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 9c15282606..53268a1831 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 578900cf45..f186aeffdf 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 072de75f21..6d4e8b848b 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 2e5598bac6..aa0b6cd54f 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 5d63ea51b2..4bc9cdd637 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 b8bdcdf740..830439268d 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. * <p> * There is no guarantee that the setting page exists, and any links to the Setting should take * you to the home page of Settings. */ - public static final int DISABLED_UNSUPPORTED = 1; + public static final int UNSUPPORTED_ON_DEVICE = 2; + /** * The setting cannot be changed by the current user. @@ -73,7 +81,7 @@ public abstract class BasePreferenceController extends AbstractPreferenceControl * Links to the Setting should take you to the page of the Setting, even if it cannot be * changed. */ - public static final int DISABLED_FOR_USER = 2; + public static final int DISABLED_FOR_USER = 3; /** * The setting has a dependency in the Settings App which is currently blocking access. @@ -90,15 +98,8 @@ public abstract class BasePreferenceController extends AbstractPreferenceControl * Links to the Setting should take you to the page of the Setting, even if it cannot be * changed. */ - public static final int DISABLED_DEPENDENT_SETTING = 3; + public static final int DISABLED_DEPENDENT_SETTING = 4; - /** - * A catch-all case for internal errors and inexplicable unavailability. - * <p> - * There is no guarantee that the setting page exists, and any links to the Setting should take - * you to the home page of Settings. - */ - public static final int UNAVAILABLE_UNKNOWN = 4; protected final String mPreferenceKey; @@ -181,8 +182,8 @@ public abstract class BasePreferenceController extends AbstractPreferenceControl @Override public final boolean isAvailable() { final int availabilityStatus = getAvailabilityStatus(); - return (availabilityStatus == AVAILABLE) || - (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 9e2d694e70..8e63ca91a5 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 1c03f19eb9..0d81c130f9 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 418b149df9..caa5afcdc5 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 a6d5363d79..cb04ed4ca1 100644 --- a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java +++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java @@ -50,7 +50,7 @@ public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreference if (mConfig == null) { mConfig = new AmbientDisplayConfiguration(mContext); } - return isAvailable(mConfig) ? AVAILABLE : DISABLED_UNSUPPORTED; + return isAvailable(mConfig) ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } @Override diff --git a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java index 5caad6d59c..769fdbc405 100644 --- a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java +++ b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java @@ -86,7 +86,7 @@ public class AmbientDisplayNotificationsPreferenceController extends if (mConfig == null) { mConfig = new AmbientDisplayConfiguration(mContext); } - return mConfig.pulseOnNotificationAvailable() ? AVAILABLE : DISABLED_UNSUPPORTED; + return mConfig.pulseOnNotificationAvailable() ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } @Override diff --git a/src/com/android/settings/display/AutoBrightnessPreferenceController.java b/src/com/android/settings/display/AutoBrightnessPreferenceController.java index 28f9260651..564e27ad3d 100644 --- a/src/com/android/settings/display/AutoBrightnessPreferenceController.java +++ b/src/com/android/settings/display/AutoBrightnessPreferenceController.java @@ -57,7 +57,7 @@ public class AutoBrightnessPreferenceController extends TogglePreferenceControll return mContext.getResources().getBoolean( com.android.internal.R.bool.config_automatic_brightness_available) ? AVAILABLE - : DISABLED_UNSUPPORTED; + : UNSUPPORTED_ON_DEVICE; } @Override diff --git a/src/com/android/settings/display/AutoRotatePreferenceController.java b/src/com/android/settings/display/AutoRotatePreferenceController.java index 5241e641fa..749f6e6c14 100644 --- a/src/com/android/settings/display/AutoRotatePreferenceController.java +++ b/src/com/android/settings/display/AutoRotatePreferenceController.java @@ -71,7 +71,7 @@ public class AutoRotatePreferenceController extends TogglePreferenceController i @Override public int getAvailabilityStatus() { return RotationPolicy.isRotationLockToggleVisible(mContext) - ? AVAILABLE : DISABLED_UNSUPPORTED; + ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; } @Override diff --git a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java index 6b07ea0df2..6e30f6fd95 100644 --- a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java @@ -50,7 +50,7 @@ public class NightDisplayActivationPreferenceController extends TogglePreference @Override public int getAvailabilityStatus() { - return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED; + return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } @Override diff --git a/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java b/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java index 31810982df..bb42c857a7 100644 --- a/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java +++ b/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java @@ -37,7 +37,7 @@ public class NightDisplayAutoModePreferenceController extends BasePreferenceCont @Override public int getAvailabilityStatus() { - return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED; + return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } @Override diff --git a/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java b/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java index 76b362e4fd..1eebb6be5a 100644 --- a/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java +++ b/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java @@ -35,7 +35,7 @@ public class NightDisplayCustomEndTimePreferenceController extends BasePreferenc @Override public int getAvailabilityStatus() { - return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED; + return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } @Override diff --git a/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java b/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java index f1ac54e162..19297b82f3 100644 --- a/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java +++ b/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java @@ -35,7 +35,7 @@ public class NightDisplayCustomStartTimePreferenceController extends BasePrefere @Override public int getAvailabilityStatus() { - return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED; + return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } @Override diff --git a/src/com/android/settings/display/NightDisplayFooterPreferenceController.java b/src/com/android/settings/display/NightDisplayFooterPreferenceController.java index bd04d120db..2075cfca32 100644 --- a/src/com/android/settings/display/NightDisplayFooterPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayFooterPreferenceController.java @@ -31,7 +31,7 @@ public class NightDisplayFooterPreferenceController extends BasePreferenceContro @Override public int getAvailabilityStatus() { - return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED; + return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } @Override diff --git a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java index c3efdc0ae3..f5bc49aa6d 100644 --- a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java @@ -35,7 +35,7 @@ public class NightDisplayIntensityPreferenceController extends SliderPreferenceC @Override public int getAvailabilityStatus() { if (!ColorDisplayController.isAvailable(mContext)) { - return DISABLED_UNSUPPORTED; + return UNSUPPORTED_ON_DEVICE; } else if (!mController.isActivated()) { return DISABLED_DEPENDENT_SETTING; } diff --git a/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java b/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java index ce15f61b84..519f116a04 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 020c5ea369..7527db3acb 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 dff207a56b..fbd779c37c 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 d1207416b0..6e318d65b2 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 8a3abf83d0..b8b7239d79 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 4319fbf0f3..2afd3e02e2 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 3e0a60e8d2..313e67ba86 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 666d6b24e5..652e151818 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 a4dcd84091..f1dcf95d2a 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 aacc707a4c..c6bc3aa8f2 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 d755d72778..bb6a26d880 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 019dffd714..d7ffc4c448 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 21dbee9509..980494a4ec 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 ffde3d21e4..8a0226a20d 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 01a66909b2..33fe612913 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 ee6535ef11..b4ef0d235f 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 fbc5a32fed..cee24c2b22 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<PaymentBackend.PaymentAppInfo> 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 4f2f755ad7..783e05eb2b 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<PaymentAppInfo> 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 0900e3cd73..3c238aa7f2 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 dc5b67ad24..c9e190f41f 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 8f0a7f9e21..f3bffe075e 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 8e7171d5ca..c3c8793cf2 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 206043c682..bcf7b17a5a 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 0a2bed9847..703e7e3b32 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 38e3b4aa67..f40846a121 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 6c73ecccce..27e896aff3 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 a90746eb1e..37a3f9caaa 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 82f1935cee..8672974fd2 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 b09b50aefc..3d92bdea47 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 3ac00699ba..36ceb8200e 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 cae7b0cbd9..ad98af93a5 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 1fbf83574e..868f10f3b5 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 16f7ce3aa2..ec0c27b4ac 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 c3cf1ad6ac..bd8ffa7450 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 c6477f3b32..7b52be0464 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 |