PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Establish permanently unavailable settings

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java
View File

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

2
tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java
View File

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

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

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

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

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

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

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

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

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

2
tests/robotests/src/com/android/settings/backup/AutoRestorePreferenceControllerTest.java
View File

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

2
tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java
View File

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

2
tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java
View File

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

2
tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java
View File

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

2
tests/robotests/src/com/android/settings/backup/DataManagementPreferenceControllerTest.java
View File

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

4
tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java
View File

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

4
tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java
View File

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

2
tests/robotests/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceControllerTest.java
View File

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

5
tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
View File

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

4
tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java
View File

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

32
tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java
View File

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

5
tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
View File

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

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

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

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

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

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

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

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

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

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

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

2
tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
View File

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

4
tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
View File

@@ -104,7 +104,7 @@ public class AutoRotatePreferenceControllerTest {
@Test
public void testGetAvailabilityStatus() {
assertThat(mController.getAvailabilityStatus()).isEqualTo(BasePreferenceController
.DISABLED_UNSUPPORTED);
.CONDITIONALLY_UNAVAILABLE);
enableAutoRotationPreference();
@@ -114,7 +114,7 @@ public class AutoRotatePreferenceControllerTest {
disableAutoRotationPreference();
assertThat(mController.getAvailabilityStatus()).isEqualTo(BasePreferenceController
.DISABLED_UNSUPPORTED);
.CONDITIONALLY_UNAVAILABLE);
}
@Test

4
tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java
View File

@@ -17,7 +17,7 @@
package com.android.settings.fingerprint;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
@@ -84,7 +84,7 @@ public class FingerprintStatusPreferenceControllerTest {
public void getAvailabilityStatus_noFingerprintManger_DISABLED() {
when(mFingerprintManager.isHardwareDetected()).thenReturn(false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_UNSUPPORTED);
assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
@Test

2
tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java
View File

@@ -91,7 +91,7 @@ public class AutoRestrictionPreferenceControllerTest {
doReturn(true).when(mFeatureFactory.powerUsageFeatureProvider).isSmartBatterySupported();
assertThat(mController.getAvailabilityStatus()).isEqualTo(
BasePreferenceController.DISABLED_UNSUPPORTED);
BasePreferenceController.UNSUPPORTED_ON_DEVICE);
}
@Test

2
tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java
View File

@@ -103,7 +103,7 @@ public class SmartBatteryPreferenceControllerTest {
doReturn(false).when(mFeatureFactory.powerUsageFeatureProvider).isSmartBatterySupported();
assertThat(mController.getAvailabilityStatus()).isEqualTo(
BasePreferenceController.DISABLED_UNSUPPORTED);
BasePreferenceController.UNSUPPORTED_ON_DEVICE);
}
private void putSmartBatteryValue(int value) {

2
tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
View File

@@ -204,7 +204,7 @@ public class GesturePreferenceControllerTest {
@Override
public int getAvailabilityStatus() {
return mIsPrefAvailable ? AVAILABLE : DISABLED_UNSUPPORTED;
return mIsPrefAvailable ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override

12
tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
View File

@@ -17,8 +17,8 @@
package com.android.settings.inputmethod;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
@@ -90,7 +90,7 @@ public class GameControllerPreferenceControllerTest {
when(mInputDevice.isVirtual()).thenReturn(false);
when(mInputDevice.getVibrator().hasVibrator()).thenReturn(false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_UNSUPPORTED);
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}
@Test
@@ -99,14 +99,14 @@ public class GameControllerPreferenceControllerTest {
when(mInputManager.getInputDevice(1)).thenReturn(mInputDevice);
when(mInputDevice.isVirtual()).thenReturn(true);
assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_UNSUPPORTED);
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}
@Test
public void getAvailabilityStatus_hasNoDevice_shouldReturnDisabled() {
when(mInputManager.getInputDeviceIds()).thenReturn(new int[] {});
assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_UNSUPPORTED);
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}
@Test
@@ -114,7 +114,7 @@ public class GameControllerPreferenceControllerTest {
public void getAvailabilityStatus_ifDisabled_shouldReturnDisabled() {
mController = new GameControllerPreferenceController(mContext, "testkey");
assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_UNSUPPORTED);
assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
@Test

2
tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java
View File

@@ -18,8 +18,6 @@ package com.android.settings.notification;
import static android.provider.Settings.Secure.NOTIFICATION_BADGING;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
import static com.android.settings.notification.BadgingNotificationPreferenceController.OFF;
import static com.android.settings.notification.BadgingNotificationPreferenceController.ON;

2
tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java
View File

@@ -130,7 +130,7 @@ public class PulseNotificationPreferenceControllerTest {
assertThat(mController.isAvailable()).isFalse();
assertThat(mController.getAvailabilityStatus()).isEqualTo(
BasePreferenceController.DISABLED_UNSUPPORTED);
BasePreferenceController.UNSUPPORTED_ON_DEVICE);
}
@Test

2
tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
View File

@@ -169,7 +169,7 @@ public class VolumeSeekBarPreferenceControllerTest {
@Override
public int getAvailabilityStatus() {
return mAvailable ? AVAILABLE : DISABLED_UNSUPPORTED;
return mAvailable ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override

4
tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
View File

@@ -211,7 +211,7 @@ public class SliceBroadcastReceiverTest {
// Disable Setting
Settings.Global.putInt(mContext.getContentResolver(),
FakeToggleController.AVAILABILITY_KEY,
BasePreferenceController.DISABLED_UNSUPPORTED);
BasePreferenceController.UNSUPPORTED_ON_DEVICE);
// Insert Fake Toggle into Database
final String key = "key";
@@ -245,7 +245,7 @@ public class SliceBroadcastReceiverTest {
// Disable Setting
Settings.Global.putInt(mContext.getContentResolver(),
FakeSliderController.AVAILABILITY_KEY,
BasePreferenceController.DISABLED_UNSUPPORTED);
BasePreferenceController.UNSUPPORTED_ON_DEVICE);
// Insert Fake Slider into Database
final String key = "key";

6
tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
View File

@@ -329,7 +329,7 @@ public class SliceBuilderUtilsTest {
SliceData.SliceType.SWITCH);
Settings.Global.putInt(mContext.getContentResolver(),
FakeUnavailablePreferenceController.AVAILABILITY_KEY,
BasePreferenceController.DISABLED_UNSUPPORTED);
BasePreferenceController.UNSUPPORTED_ON_DEVICE);
final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
@@ -372,12 +372,12 @@ public class SliceBuilderUtilsTest {
}
@Test
public void testUnavailableUnknownSlice_validTitleSummary() {
public void testConditionallyUnavailableSlice_validTitleSummary() {
final SliceData data = getDummyData(FakeUnavailablePreferenceController.class,
SliceData.SliceType.SWITCH);
Settings.Global.putInt(mContext.getContentResolver(),
FakeUnavailablePreferenceController.AVAILABILITY_KEY,
BasePreferenceController.UNAVAILABLE_UNKNOWN);
BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);

4
tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
View File

@@ -18,7 +18,7 @@ package com.android.settings.sound;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
import static com.google.common.truth.Truth.assertThat;
@@ -155,7 +155,7 @@ public class AudioOutputSwitchPreferenceControllerTest {
@Test
public void getAvailabilityStatus_whenNotVisible_isDisable() {
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.AUDIO_SWITCHER_SETTINGS, false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_UNSUPPORTED);
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}
@Test

8
tests/robotests/src/com/android/settings/testutils/SliceTester.java
View File

@@ -19,10 +19,10 @@ package com.android.settings.testutils;
import static android.app.slice.Slice.HINT_TITLE;
import static android.app.slice.SliceItem.FORMAT_TEXT;
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
import static com.android.settings.core.BasePreferenceController.UNAVAILABLE_UNKNOWN;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
import static com.google.common.truth.Truth.assertThat;
@@ -151,8 +151,8 @@ public class SliceTester {
final int availabilityStatus = SliceBuilderUtils.getPreferenceController(context,
sliceData).getAvailabilityStatus();
switch (availabilityStatus) {
case DISABLED_UNSUPPORTED:
case UNAVAILABLE_UNKNOWN:
case UNSUPPORTED_ON_DEVICE:
case CONDITIONALLY_UNAVAILABLE:
assertThat(primaryPendingIntent).isEqualTo(
SliceBuilderUtils.getSettingsIntent(context));
break;