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
This commit is contained in:
Matthew Fritze
2018-05-03 16:46:51 -07:00
parent 1220c364c4
commit f87a1f3f41
113 changed files with 185 additions and 207 deletions

View File

@@ -23,7 +23,6 @@ import android.content.Context;
import android.provider.Settings; import android.provider.Settings;
import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityManager;
import com.android.settings.accessibility.AccessibilitySettings;
import com.android.settings.core.TogglePreferenceController; import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.accessibility.AccessibilityUtils; import com.android.settingslib.accessibility.AccessibilityUtils;
@@ -88,7 +87,7 @@ public class AccessibilitySlicePreferenceController extends TogglePreferenceCont
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
// Return unsupported when the service is disabled or not installed. // 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() { private AccessibilityServiceInfo getAccessibilityServiceInfo() {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -37,7 +37,7 @@ public class DataManagementPreferenceController extends BasePreferenceController
} }
boolean manageEnabled = (mPSCD.getManageIntent() != null) && mPSCD.isBackupEnabled(); boolean manageEnabled = (mPSCD.getManageIntent() != null) && mPSCD.isBackupEnabled();
if (!manageEnabled) { if (!manageEnabled) {
return DISABLED_UNSUPPORTED; return UNSUPPORTED_ON_DEVICE;
} }
return AVAILABLE; return AVAILABLE;
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -49,8 +49,8 @@ public abstract class BasePreferenceController extends AbstractPreferenceControl
* {@link #isSupported()}. * {@link #isSupported()}.
*/ */
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({AVAILABLE, DISABLED_UNSUPPORTED, DISABLED_FOR_USER, DISABLED_DEPENDENT_SETTING, @IntDef({AVAILABLE, UNSUPPORTED_ON_DEVICE, DISABLED_FOR_USER, DISABLED_DEPENDENT_SETTING,
UNAVAILABLE_UNKNOWN}) CONDITIONALLY_UNAVAILABLE})
public @interface AvailabilityStatus { public @interface AvailabilityStatus {
} }
@@ -60,12 +60,20 @@ public abstract class BasePreferenceController extends AbstractPreferenceControl
public static final int AVAILABLE = 0; 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> * <p>
* There is no guarantee that the setting page exists, and any links to the Setting should take * There is no guarantee that the setting page exists, and any links to the Setting should take
* you to the home page of Settings. * 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. * 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 * Links to the Setting should take you to the page of the Setting, even if it cannot be
* changed. * 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. * 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 * Links to the Setting should take you to the page of the Setting, even if it cannot be
* changed. * 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; protected final String mPreferenceKey;
@@ -181,8 +182,8 @@ public abstract class BasePreferenceController extends AbstractPreferenceControl
@Override @Override
public final boolean isAvailable() { public final boolean isAvailable() {
final int availabilityStatus = getAvailabilityStatus(); final int availabilityStatus = getAvailabilityStatus();
return (availabilityStatus == AVAILABLE) || return (availabilityStatus == AVAILABLE
(availabilityStatus == DISABLED_DEPENDENT_SETTING); || availabilityStatus == DISABLED_DEPENDENT_SETTING);
} }
/** /**
@@ -193,7 +194,7 @@ public abstract class BasePreferenceController extends AbstractPreferenceControl
* Note that a return value of {@code true} does not mean that the setting is available. * Note that a return value of {@code true} does not mean that the setting is available.
*/ */
public final boolean isSupported() { public final boolean isSupported() {
return getAvailabilityStatus() != DISABLED_UNSUPPORTED; return getAvailabilityStatus() != UNSUPPORTED_ON_DEVICE;
} }
/** /**

View File

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

View File

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

View File

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

View File

@@ -50,7 +50,7 @@ public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreference
if (mConfig == null) { if (mConfig == null) {
mConfig = new AmbientDisplayConfiguration(mContext); mConfig = new AmbientDisplayConfiguration(mContext);
} }
return isAvailable(mConfig) ? AVAILABLE : DISABLED_UNSUPPORTED; return isAvailable(mConfig) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
} }
@Override @Override

View File

@@ -86,7 +86,7 @@ public class AmbientDisplayNotificationsPreferenceController extends
if (mConfig == null) { if (mConfig == null) {
mConfig = new AmbientDisplayConfiguration(mContext); mConfig = new AmbientDisplayConfiguration(mContext);
} }
return mConfig.pulseOnNotificationAvailable() ? AVAILABLE : DISABLED_UNSUPPORTED; return mConfig.pulseOnNotificationAvailable() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
} }
@Override @Override

View File

@@ -57,7 +57,7 @@ public class AutoBrightnessPreferenceController extends TogglePreferenceControll
return mContext.getResources().getBoolean( return mContext.getResources().getBoolean(
com.android.internal.R.bool.config_automatic_brightness_available) com.android.internal.R.bool.config_automatic_brightness_available)
? AVAILABLE ? AVAILABLE
: DISABLED_UNSUPPORTED; : UNSUPPORTED_ON_DEVICE;
} }
@Override @Override

View File

@@ -71,7 +71,7 @@ public class AutoRotatePreferenceController extends TogglePreferenceController i
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return RotationPolicy.isRotationLockToggleVisible(mContext) return RotationPolicy.isRotationLockToggleVisible(mContext)
? AVAILABLE : DISABLED_UNSUPPORTED; ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
} }
@Override @Override

View File

@@ -50,7 +50,7 @@ public class NightDisplayActivationPreferenceController extends TogglePreference
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED; return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
} }
@Override @Override

View File

@@ -37,7 +37,7 @@ public class NightDisplayAutoModePreferenceController extends BasePreferenceCont
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED; return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
} }
@Override @Override

View File

@@ -35,7 +35,7 @@ public class NightDisplayCustomEndTimePreferenceController extends BasePreferenc
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED; return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
} }
@Override @Override

View File

@@ -35,7 +35,7 @@ public class NightDisplayCustomStartTimePreferenceController extends BasePrefere
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED; return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
} }
@Override @Override

View File

@@ -31,7 +31,7 @@ public class NightDisplayFooterPreferenceController extends BasePreferenceContro
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED; return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
} }
@Override @Override

View File

@@ -35,7 +35,7 @@ public class NightDisplayIntensityPreferenceController extends SliderPreferenceC
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
if (!ColorDisplayController.isAvailable(mContext)) { if (!ColorDisplayController.isAvailable(mContext)) {
return DISABLED_UNSUPPORTED; return UNSUPPORTED_ON_DEVICE;
} else if (!mController.isActivated()) { } else if (!mController.isActivated()) {
return DISABLED_DEPENDENT_SETTING; return DISABLED_DEPENDENT_SETTING;
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -17,6 +17,7 @@
package com.android.settings.applications.appinfo; package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -84,7 +85,8 @@ public class DefaultAppShortcutPreferenceControllerBaseTest {
mController.capable = false; mController.capable = false;
when(mUserManager.isManagedProfile()).thenReturn(false); when(mUserManager.isManagedProfile()).thenReturn(false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_UNSUPPORTED); assertThat(mController.getAvailabilityStatus()).isEqualTo(
mController.UNSUPPORTED_ON_DEVICE);
} }
@Test @Test
@@ -110,9 +112,9 @@ public class DefaultAppShortcutPreferenceControllerBaseTest {
public void handlePreferenceTreeClick_shouldStartDefaultAppSettings() { public void handlePreferenceTreeClick_shouldStartDefaultAppSettings() {
mController.handlePreferenceTreeClick(mPreference); mController.handlePreferenceTreeClick(mPreference);
verify(mContext).startActivity(argThat(intent-> intent != null verify(mContext).startActivity(argThat(intent -> intent != null
&& intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT).equals( && intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT).equals(
DefaultAppSettings.class.getName()) DefaultAppSettings.class.getName())
&& intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS) && intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
.getString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY).equals("TestKey"))); .getString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY).equals("TestKey")));
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -16,7 +16,7 @@
package com.android.settings.connecteddevice; package com.android.settings.connecteddevice;
import static com.android.settings.core.BasePreferenceController.AVAILABLE; 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 com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.anyString;
@@ -141,7 +141,7 @@ public class AvailableMediaDeviceGroupControllerTest {
doReturn(false).when(mPackageManager).hasSystemFeature(PackageManager.FEATURE_BLUETOOTH); doReturn(false).when(mPackageManager).hasSystemFeature(PackageManager.FEATURE_BLUETOOTH);
assertThat(mAvailableMediaDeviceGroupController.getAvailabilityStatus()).isEqualTo( assertThat(mAvailableMediaDeviceGroupController.getAvailabilityStatus()).isEqualTo(
DISABLED_UNSUPPORTED); UNSUPPORTED_ON_DEVICE);
} }
@Test @Test

View File

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

View File

@@ -16,7 +16,7 @@
package com.android.settings.connecteddevice; package com.android.settings.connecteddevice;
import static com.android.settings.core.BasePreferenceController.AVAILABLE; 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 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.connecteddevice.usb.ConnectedUsbDeviceUpdater;
import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -157,7 +156,7 @@ public class ConnectedDeviceGroupControllerTest {
mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, false); mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, false);
assertThat(mConnectedDeviceGroupController.getAvailabilityStatus()).isEqualTo( assertThat(mConnectedDeviceGroupController.getAvailabilityStatus()).isEqualTo(
DISABLED_UNSUPPORTED); UNSUPPORTED_ON_DEVICE);
} }
@Test @Test

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

Some files were not shown because too many files have changed in this diff Show More