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

Merge "rename v2 controllers"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-11-27 19:48:36 +00:00
committed by Android (Google) Code Review
parent 79bd22ae5b e89dc36149
commit d7054033cb
20 changed files with 123 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/development/BugReportInPowerPreferenceControllerV2.java → src/com/android/settings/development/BugReportInPowerPreferenceController.java
View File

@@ -30,7 +30,7 @@ import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.wrapper.PackageManagerWrapper;
public class BugReportInPowerPreferenceControllerV2 extends
public class BugReportInPowerPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
@@ -48,7 +48,7 @@ public class BugReportInPowerPreferenceControllerV2 extends
private final UserManager mUserManager;
private SwitchPreference mPreference;
public BugReportInPowerPreferenceControllerV2(Context context) {
public BugReportInPowerPreferenceController(Context context) {
super(context);
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
mPackageManager = new PackageManagerWrapper(context.getPackageManager());

4
src/com/android/settings/development/BugReportPreferenceControllerV2.java → src/com/android/settings/development/BugReportPreferenceController.java
View File

@@ -22,14 +22,14 @@ import android.os.UserManager;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class BugReportPreferenceControllerV2 extends DeveloperOptionsPreferenceController implements
public class BugReportPreferenceController extends DeveloperOptionsPreferenceController implements
PreferenceControllerMixin {
private static final String KEY_BUGREPORT = "bugreport";
private final UserManager mUserManager;
public BugReportPreferenceControllerV2(Context context) {
public BugReportPreferenceController(Context context) {
super(context);
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);

4
src/com/android/settings/development/CameraLaserSensorPreferenceControllerV2.java → src/com/android/settings/development/CameraLaserSensorPreferenceController.java
View File

@@ -29,7 +29,7 @@ import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class CameraLaserSensorPreferenceControllerV2 extends
public class CameraLaserSensorPreferenceController extends
DeveloperOptionsPreferenceController implements
Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
@@ -51,7 +51,7 @@ public class CameraLaserSensorPreferenceControllerV2 extends
private SwitchPreference mPreference;
public CameraLaserSensorPreferenceControllerV2(Context context) {
public CameraLaserSensorPreferenceController(Context context) {
super(context);
}

4
src/com/android/settings/development/ConnectivityMonitorPreferenceControllerV2.java → src/com/android/settings/development/ConnectivityMonitorPreferenceController.java
View File

@@ -29,7 +29,7 @@ import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class ConnectivityMonitorPreferenceControllerV2 extends
public class ConnectivityMonitorPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
@@ -55,7 +55,7 @@ public class ConnectivityMonitorPreferenceControllerV2 extends
private SwitchPreference mPreference;
public ConnectivityMonitorPreferenceControllerV2(Context context) {
public ConnectivityMonitorPreferenceController(Context context) {
super(context);
}

24
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -257,15 +257,15 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
@Override
public void onDisableLogPersistDialogConfirmed() {
final LogPersistPreferenceControllerV2 controller = getDevelopmentOptionsController(
LogPersistPreferenceControllerV2.class);
final LogPersistPreferenceController controller = getDevelopmentOptionsController(
LogPersistPreferenceController.class);
controller.onDisableLogPersistDialogConfirmed();
}
@Override
public void onDisableLogPersistDialogRejected() {
final LogPersistPreferenceControllerV2 controller = getDevelopmentOptionsController(
LogPersistPreferenceControllerV2.class);
final LogPersistPreferenceController controller = getDevelopmentOptionsController(
LogPersistPreferenceController.class);
controller.onDisableLogPersistDialogRejected();
}
@@ -371,7 +371,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
BluetoothA2dpConfigStore bluetoothA2dpConfigStore) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new MemoryUsagePreferenceController(context));
controllers.add(new BugReportPreferenceControllerV2(context));
controllers.add(new BugReportPreferenceController(context));
controllers.add(new LocalBackupPasswordPreferenceController(context));
controllers.add(new StayAwakePreferenceController(context, lifecycle));
controllers.add(new HdcpCheckingPreferenceController(context));
@@ -379,23 +379,23 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
controllers.add(new OemUnlockPreferenceController(context, activity, fragment));
controllers.add(new FileEncryptionPreferenceController(context));
controllers.add(new PictureColorModePreferenceController(context, lifecycle));
controllers.add(new WebViewAppPreferenceControllerV2(context));
controllers.add(new WebViewAppPreferenceController(context));
controllers.add(new CoolColorTemperaturePreferenceController(context));
controllers.add(new DisableAutomaticUpdatesPreferenceController(context));
controllers.add(new AdbPreferenceController(context, fragment));
controllers.add(new ClearAdbKeysPreferenceController(context, fragment));
controllers.add(new LocalTerminalPreferenceController(context));
controllers.add(new BugReportInPowerPreferenceControllerV2(context));
controllers.add(new BugReportInPowerPreferenceController(context));
controllers.add(new MockLocationAppPreferenceController(context, fragment));
controllers.add(new DebugViewAttributesPreferenceController(context));
controllers.add(new SelectDebugAppPreferenceController(context, fragment));
controllers.add(new WaitForDebuggerPreferenceController(context));
controllers.add(new EnableGpuDebugLayersPreferenceController(context));
controllers.add(new VerifyAppsOverUsbPreferenceControllerV2(context));
controllers.add(new LogdSizePreferenceControllerV2(context));
controllers.add(new LogPersistPreferenceControllerV2(context, fragment, lifecycle));
controllers.add(new ConnectivityMonitorPreferenceControllerV2(context));
controllers.add(new CameraLaserSensorPreferenceControllerV2(context));
controllers.add(new VerifyAppsOverUsbPreferenceController(context));
controllers.add(new LogdSizePreferenceController(context));
controllers.add(new LogPersistPreferenceController(context, fragment, lifecycle));
controllers.add(new ConnectivityMonitorPreferenceController(context));
controllers.add(new CameraLaserSensorPreferenceController(context));
controllers.add(new WifiDisplayCertificationPreferenceController(context));
controllers.add(new WifiVerboseLoggingPreferenceController(context));
controllers.add(new WifiAggressiveHandoverPreferenceController(context));

4
src/com/android/settings/development/LogPersistPreferenceControllerV2.java → src/com/android/settings/development/LogPersistPreferenceController.java
View File

@@ -26,14 +26,14 @@ import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.development.AbstractLogpersistPreferenceController;
public class LogPersistPreferenceControllerV2 extends
public class LogPersistPreferenceController extends
AbstractLogpersistPreferenceController implements PreferenceControllerMixin {
private final DevelopmentSettingsDashboardFragment mFragment;
private ListPreference mPreference;
public LogPersistPreferenceControllerV2(Context context,
public LogPersistPreferenceController(Context context,
DevelopmentSettingsDashboardFragment fragment, Lifecycle lifecycle) {
super(context, lifecycle);

4
src/com/android/settings/development/LogdSizePreferenceControllerV2.java → src/com/android/settings/development/LogdSizePreferenceController.java
View File

@@ -24,12 +24,12 @@ import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.AbstractLogdSizePreferenceController;
public class LogdSizePreferenceControllerV2 extends AbstractLogdSizePreferenceController implements
public class LogdSizePreferenceController extends AbstractLogdSizePreferenceController implements
Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private ListPreference mPreference;
public LogdSizePreferenceControllerV2(Context context) {
public LogdSizePreferenceController(Context context) {
super(context);
}

4
src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerV2.java → src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java
View File

@@ -38,7 +38,7 @@ import java.util.List;
/**
* Controller to manage the state of "Verify apps over USB" toggle.
*/
public class VerifyAppsOverUsbPreferenceControllerV2 extends
public class VerifyAppsOverUsbPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
AdbOnChangeListener, PreferenceControllerMixin {
private static final String VERIFY_APPS_OVER_USB_KEY = "verify_apps_over_usb";
@@ -70,7 +70,7 @@ public class VerifyAppsOverUsbPreferenceControllerV2 extends
// This field is accessed using reflection in the test, please keep name in sync.
private final PackageManagerWrapper mPackageManager;
public VerifyAppsOverUsbPreferenceControllerV2(Context context) {
public VerifyAppsOverUsbPreferenceController(Context context) {
super(context);
mPackageManager = new PackageManagerWrapper(context.getPackageManager());

4
src/com/android/settings/development/WebViewAppPreferenceControllerV2.java → src/com/android/settings/development/WebViewAppPreferenceController.java
View File

@@ -31,7 +31,7 @@ import com.android.settings.webview.WebViewUpdateServiceWrapper;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.wrapper.PackageManagerWrapper;
public class WebViewAppPreferenceControllerV2 extends
public class WebViewAppPreferenceController extends
DeveloperOptionsPreferenceController implements PreferenceControllerMixin {
private static final String TAG = "WebViewAppPrefCtrl";
@@ -42,7 +42,7 @@ public class WebViewAppPreferenceControllerV2 extends
private Preference mPreference;
public WebViewAppPreferenceControllerV2(Context context) {
public WebViewAppPreferenceController(Context context) {
super(context);
mPackageManager = new PackageManagerWrapper(context.getPackageManager());

2
src/com/android/settings/webview/WebViewAppPreferenceController.java
View File

@@ -23,7 +23,7 @@ import com.android.settings.applications.defaultapps.DefaultAppInfo;
import com.android.settings.applications.defaultapps.DefaultAppPreferenceController;
/**
* Deprecated in favor of {@link com.android.settings.development.WebViewAppPreferenceControllerV2}
* Deprecated in favor of {@link com.android.settings.development.WebViewAppPreferenceController}
*/
@Deprecated
public class WebViewAppPreferenceController extends DefaultAppPreferenceController {

17
tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerV2Test.java → tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java
View File

@@ -16,12 +16,11 @@
package com.android.settings.development;
import static com.android.settings.development
.BugReportInPowerPreferenceControllerV2.COMPONENT_NAME;
import static com.android.settings.development
.BugReportInPowerPreferenceControllerV2.SETTING_VALUE_OFF;
import static com.android.settings.development
.BugReportInPowerPreferenceControllerV2.SETTING_VALUE_ON;
import static com.android.settings.development.BugReportInPowerPreferenceController.COMPONENT_NAME;
import static com.android.settings.development.BugReportInPowerPreferenceController
.SETTING_VALUE_OFF;
import static com.android.settings.development.BugReportInPowerPreferenceController
.SETTING_VALUE_ON;
import static com.google.common.truth.Truth.assertThat;
@@ -53,7 +52,7 @@ import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BugReportInPowerPreferenceControllerV2Test {
public class BugReportInPowerPreferenceControllerTest {
@Mock
private PreferenceScreen mScreen;
@@ -67,7 +66,7 @@ public class BugReportInPowerPreferenceControllerV2Test {
private SwitchPreference mPreference;
private ContentResolver mContentResolver;
private BugReportInPowerPreferenceControllerV2 mController;
private BugReportInPowerPreferenceController mController;
@Before
public void setUp() {
@@ -75,7 +74,7 @@ public class BugReportInPowerPreferenceControllerV2Test {
mContentResolver = RuntimeEnvironment.application.getContentResolver();
when(mContext.getContentResolver()).thenReturn(mContentResolver);
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
mController = new BugReportInPowerPreferenceControllerV2(mContext);
mController = new BugReportInPowerPreferenceController(mContext);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
}

6
tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerV2Test.java → tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java
View File

@@ -36,20 +36,20 @@ import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BugReportPreferenceControllerV2Test {
public class BugReportPreferenceControllerTest {
@Mock
private Context mContext;
@Mock
private UserManager mUserManager;
private BugReportPreferenceControllerV2 mController;
private BugReportPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
mController = new BugReportPreferenceControllerV2(mContext);
mController = new BugReportPreferenceController(mContext);
}
@Test

53
tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerV2Test.java → tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
View File

@@ -16,18 +16,16 @@
package com.android.settings.development;
import static com.android.settings.development.CameraLaserSensorPreferenceControllerV2.ENG_BUILD;
import static com.android.settings.development
.CameraLaserSensorPreferenceControllerV2.USERDEBUG_BUILD;
import static com.android.settings.development.CameraLaserSensorPreferenceControllerV2.USER_BUILD;
import static com.android.settings.development.CameraLaserSensorPreferenceController.ENG_BUILD;
import static com.android.settings.development.CameraLaserSensorPreferenceController
.USERDEBUG_BUILD;
import static com.android.settings.development.CameraLaserSensorPreferenceController.USER_BUILD;
import android.content.Context;
import android.content.res.Resources;
import android.os.SystemProperties;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
@@ -36,7 +34,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
@@ -50,7 +47,7 @@ import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
shadows = {SettingsShadowSystemProperties.class})
public class CameraLaserSensorPreferenceControllerV2Test {
public class CameraLaserSensorPreferenceControllerTest {
@Mock
private PreferenceScreen mScreen;
@@ -59,13 +56,13 @@ public class CameraLaserSensorPreferenceControllerV2Test {
private Context mContext;
private CameraLaserSensorPreferenceControllerV2 mController;
private CameraLaserSensorPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new CameraLaserSensorPreferenceControllerV2(mContext);
mController = new CameraLaserSensorPreferenceController(mContext);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
mController.displayPreference(mScreen);
@@ -85,7 +82,7 @@ public class CameraLaserSensorPreferenceControllerV2Test {
@Test
public void isAvailable_withUserdebugBuild_shouldReturnTrue() {
SettingsShadowSystemProperties.set(
CameraLaserSensorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD);
CameraLaserSensorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
assertThat(mController.isAvailable()).isTrue();
}
@@ -93,7 +90,7 @@ public class CameraLaserSensorPreferenceControllerV2Test {
@Test
public void isAvailable_withEngBuild_shouldReturnTrue() {
SettingsShadowSystemProperties.set(
CameraLaserSensorPreferenceControllerV2.BUILD_TYPE, ENG_BUILD);
CameraLaserSensorPreferenceController.BUILD_TYPE, ENG_BUILD);
assertThat(mController.isAvailable()).isTrue();
}
@@ -101,7 +98,7 @@ public class CameraLaserSensorPreferenceControllerV2Test {
@Test
public void isAvailable_withUserBuild_shouldReturnFalse() {
SettingsShadowSystemProperties.set(
CameraLaserSensorPreferenceControllerV2.BUILD_TYPE, USER_BUILD);
CameraLaserSensorPreferenceController.BUILD_TYPE, USER_BUILD);
assertThat(mController.isAvailable()).isFalse();
}
@@ -109,10 +106,10 @@ public class CameraLaserSensorPreferenceControllerV2Test {
@Test
public void updateState_cameraLaserSensorEnabled_shouldCheckedPreference() {
SettingsShadowSystemProperties.set(
CameraLaserSensorPreferenceControllerV2.PROPERTY_CAMERA_LASER_SENSOR,
Integer.toString(CameraLaserSensorPreferenceControllerV2.ENABLED));
CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,
Integer.toString(CameraLaserSensorPreferenceController.ENABLED));
SettingsShadowSystemProperties.set(
CameraLaserSensorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD);
CameraLaserSensorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
mController.updateState(mScreen);
@@ -122,10 +119,10 @@ public class CameraLaserSensorPreferenceControllerV2Test {
@Test
public void updateState_cameraLaserSensorEnabled_shouldUncheckedPreference() {
SettingsShadowSystemProperties.set(
CameraLaserSensorPreferenceControllerV2.PROPERTY_CAMERA_LASER_SENSOR,
Integer.toString(CameraLaserSensorPreferenceControllerV2.DISABLED));
CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,
Integer.toString(CameraLaserSensorPreferenceController.DISABLED));
SettingsShadowSystemProperties.set(
CameraLaserSensorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD);
CameraLaserSensorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
mController.updateState(mScreen);
@@ -136,20 +133,20 @@ public class CameraLaserSensorPreferenceControllerV2Test {
public void onPreferenceChange_preferenceChecked_shouldEnableCameraLaserSensor() {
mController.onPreferenceChange(mPreference, true);
assertThat(Integer.toString(CameraLaserSensorPreferenceControllerV2.ENABLED)).isEqualTo(
assertThat(Integer.toString(CameraLaserSensorPreferenceController.ENABLED)).isEqualTo(
SystemProperties.get(
CameraLaserSensorPreferenceControllerV2.PROPERTY_CAMERA_LASER_SENSOR,
Integer.toString(CameraLaserSensorPreferenceControllerV2.ENABLED)));
CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,
Integer.toString(CameraLaserSensorPreferenceController.ENABLED)));
}
@Test
public void onPreferenceChange__preferenceUnchecked_shouldDisableCameraLaserSensor() {
mController.onPreferenceChange(mPreference, false);
assertThat(Integer.toString(CameraLaserSensorPreferenceControllerV2.DISABLED)).isEqualTo(
assertThat(Integer.toString(CameraLaserSensorPreferenceController.DISABLED)).isEqualTo(
SystemProperties.get(
CameraLaserSensorPreferenceControllerV2.PROPERTY_CAMERA_LASER_SENSOR,
Integer.toString(CameraLaserSensorPreferenceControllerV2.ENABLED)));
CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,
Integer.toString(CameraLaserSensorPreferenceController.ENABLED)));
}
@Test
@@ -165,9 +162,9 @@ public class CameraLaserSensorPreferenceControllerV2Test {
verify(mPreference).setEnabled(false);
verify(mPreference).setChecked(false);
assertThat(Integer.toString(CameraLaserSensorPreferenceControllerV2.DISABLED)).isEqualTo(
assertThat(Integer.toString(CameraLaserSensorPreferenceController.DISABLED)).isEqualTo(
SystemProperties.get(
CameraLaserSensorPreferenceControllerV2.PROPERTY_CAMERA_LASER_SENSOR,
Integer.toString(CameraLaserSensorPreferenceControllerV2.ENABLED)));
CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,
Integer.toString(CameraLaserSensorPreferenceController.ENABLED)));
}
}

72
tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerV2Test.java → tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerTest.java
View File

@@ -16,9 +16,9 @@
package com.android.settings.development;
import static com.android.settings.development.ConnectivityMonitorPreferenceControllerV2.ENG_BUILD;
import static com.android.settings.development
.ConnectivityMonitorPreferenceControllerV2.USERDEBUG_BUILD;
import static com.android.settings.development.ConnectivityMonitorPreferenceController.ENG_BUILD;
import static com.android.settings.development.ConnectivityMonitorPreferenceController
.USERDEBUG_BUILD;
import static com.google.common.truth.Truth.assertThat;
@@ -45,7 +45,7 @@ import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows =
SettingsShadowSystemProperties.class)
public class ConnectivityMonitorPreferenceControllerV2Test {
public class ConnectivityMonitorPreferenceControllerTest {
private static final String USER_BUILD = "user";
@@ -55,14 +55,14 @@ public class ConnectivityMonitorPreferenceControllerV2Test {
private SwitchPreference mPreference;
private Context mContext;
private ConnectivityMonitorPreferenceControllerV2 mController;
private ConnectivityMonitorPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
SettingsShadowSystemProperties.clear();
mContext = RuntimeEnvironment.application;
mController = new ConnectivityMonitorPreferenceControllerV2(mContext);
mController = new ConnectivityMonitorPreferenceController(mContext);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
mController.displayPreference(mScreen);
}
@@ -70,7 +70,7 @@ public class ConnectivityMonitorPreferenceControllerV2Test {
@Test
public void isAvailable_trueShowFlagWithUserdebugBuild_shouldReturnTrue() {
SettingsShadowSystemProperties.set(
ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD);
ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
assertThat(mController.isAvailable()).isTrue();
}
@@ -78,7 +78,7 @@ public class ConnectivityMonitorPreferenceControllerV2Test {
@Test
public void isAvailable_trueShowFlagWithEngBuild_shouldReturnTrue() {
SettingsShadowSystemProperties.set(
ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, ENG_BUILD);
ConnectivityMonitorPreferenceController.BUILD_TYPE, ENG_BUILD);
assertThat(mController.isAvailable()).isTrue();
}
@@ -86,7 +86,7 @@ public class ConnectivityMonitorPreferenceControllerV2Test {
@Test
public void isAvailable_trueShowFlagWithUserBuild_shouldReturnFalse() {
SettingsShadowSystemProperties.set(
ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USER_BUILD);
ConnectivityMonitorPreferenceController.BUILD_TYPE, USER_BUILD);
assertThat(mController.isAvailable()).isFalse();
}
@@ -95,7 +95,7 @@ public class ConnectivityMonitorPreferenceControllerV2Test {
@Config(qualifiers = "mcc999")
public void isAvailable_falseShowFlagWithUserdebugBuild_shouldReturnFalse() {
SettingsShadowSystemProperties.set(
ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD);
ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
assertThat(mController.isAvailable()).isFalse();
}
@@ -104,7 +104,7 @@ public class ConnectivityMonitorPreferenceControllerV2Test {
@Config(qualifiers = "mcc999")
public void isAvailable_falseShowFlagWithEngBuild_shouldReturnFalse() {
SettingsShadowSystemProperties.set(
ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, ENG_BUILD);
ConnectivityMonitorPreferenceController.BUILD_TYPE, ENG_BUILD);
assertThat(mController.isAvailable()).isFalse();
}
@@ -113,7 +113,7 @@ public class ConnectivityMonitorPreferenceControllerV2Test {
@Config(qualifiers = "mcc999")
public void isAvailable_falseShowFlagWithUserBuild_shouldReturnFalse() {
SettingsShadowSystemProperties.set(
ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USER_BUILD);
ConnectivityMonitorPreferenceController.BUILD_TYPE, USER_BUILD);
assertThat(mController.isAvailable()).isFalse();
}
@@ -121,10 +121,10 @@ public class ConnectivityMonitorPreferenceControllerV2Test {
@Test
public void updateState_connectivityMonitorEnabled_shouldCheckedPreference() {
SettingsShadowSystemProperties.set(
ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR,
ConnectivityMonitorPreferenceControllerV2.ENABLED_STATUS);
ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
ConnectivityMonitorPreferenceController.ENABLED_STATUS);
SettingsShadowSystemProperties.set(
ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD);
ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
mController.updateState(mPreference);
@@ -134,10 +134,10 @@ public class ConnectivityMonitorPreferenceControllerV2Test {
@Test
public void updateState_connectivityMonitorUserEnabled_shouldCheckedPreference() {
SettingsShadowSystemProperties.set(
ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR,
ConnectivityMonitorPreferenceControllerV2.USER_ENABLED_STATUS);
ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
ConnectivityMonitorPreferenceController.USER_ENABLED_STATUS);
SettingsShadowSystemProperties.set(
ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD);
ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
mController.updateState(mPreference);
@@ -147,10 +147,10 @@ public class ConnectivityMonitorPreferenceControllerV2Test {
@Test
public void updateState_connectivityMonitorDisabled_shouldUncheckedPreference() {
SettingsShadowSystemProperties.set(
ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR,
ConnectivityMonitorPreferenceControllerV2.DISABLED_STATUS);
ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
ConnectivityMonitorPreferenceController.DISABLED_STATUS);
SettingsShadowSystemProperties.set(
ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD);
ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
mController.updateState(mPreference);
@@ -160,10 +160,10 @@ public class ConnectivityMonitorPreferenceControllerV2Test {
@Test
public void updateState_connectivityMonitorUserDisabled_shouldUncheckedPreference() {
SettingsShadowSystemProperties.set(
ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR,
ConnectivityMonitorPreferenceControllerV2.USER_DISABLED_STATUS);
ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
ConnectivityMonitorPreferenceController.USER_DISABLED_STATUS);
SettingsShadowSystemProperties.set(
ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD);
ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
mController.updateState(mPreference);
@@ -173,29 +173,29 @@ public class ConnectivityMonitorPreferenceControllerV2Test {
@Test
public void onPreferenceChange_preferenceChecked_shouldEnableConnectivityMonitor() {
SystemProperties.set(
ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR,
ConnectivityMonitorPreferenceControllerV2.USER_ENABLED_STATUS);
ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
ConnectivityMonitorPreferenceController.USER_ENABLED_STATUS);
mController.handlePreferenceTreeClick(mPreference);
assertThat(ConnectivityMonitorPreferenceControllerV2.USER_ENABLED_STATUS).isEqualTo(
assertThat(ConnectivityMonitorPreferenceController.USER_ENABLED_STATUS).isEqualTo(
SystemProperties.get(
ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR,
ConnectivityMonitorPreferenceControllerV2.DISABLED_STATUS));
ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
ConnectivityMonitorPreferenceController.DISABLED_STATUS));
}
@Test
public void onPreferenceChange_preferenceUnchecked_shouldDisableConnectivityMonitor() {
SystemProperties.set(
ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR,
ConnectivityMonitorPreferenceControllerV2.USER_DISABLED_STATUS);
ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
ConnectivityMonitorPreferenceController.USER_DISABLED_STATUS);
mController.handlePreferenceTreeClick(mPreference);
assertThat(ConnectivityMonitorPreferenceControllerV2.USER_DISABLED_STATUS).isEqualTo(
assertThat(ConnectivityMonitorPreferenceController.USER_DISABLED_STATUS).isEqualTo(
SystemProperties.get(
ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR,
ConnectivityMonitorPreferenceControllerV2.DISABLED_STATUS));
ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
ConnectivityMonitorPreferenceController.DISABLED_STATUS));
}
@Test
@@ -210,10 +210,10 @@ public class ConnectivityMonitorPreferenceControllerV2Test {
mController.onDeveloperOptionsSwitchDisabled();
String mode = SystemProperties.get(
ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR,
ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
null /* default */);
assertThat(mode).isEqualTo(ConnectivityMonitorPreferenceControllerV2.USER_DISABLED_STATUS);
assertThat(mode).isEqualTo(ConnectivityMonitorPreferenceController.USER_DISABLED_STATUS);
verify(mPreference).setEnabled(false);
verify(mPreference).setChecked(false);
}

12
tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
View File

@@ -223,10 +223,10 @@ public class DevelopmentSettingsDashboardFragmentTest {
@Test
public void onDisableLogPersistDialogConfirmed_shouldCallControllerDialogConfirmed() {
final LogPersistPreferenceControllerV2 controller = mock(
LogPersistPreferenceControllerV2.class);
final LogPersistPreferenceController controller = mock(
LogPersistPreferenceController.class);
doReturn(controller).when(mDashboard).getDevelopmentOptionsController(
LogPersistPreferenceControllerV2.class);
LogPersistPreferenceController.class);
mDashboard.onDisableLogPersistDialogConfirmed();
verify(controller).onDisableLogPersistDialogConfirmed();
@@ -234,10 +234,10 @@ public class DevelopmentSettingsDashboardFragmentTest {
@Test
public void onDisableLogPersistDialogRejected_shouldCallControllerDialogRejected() {
final LogPersistPreferenceControllerV2 controller = mock(
LogPersistPreferenceControllerV2.class);
final LogPersistPreferenceController controller = mock(
LogPersistPreferenceController.class);
doReturn(controller).when(mDashboard).getDevelopmentOptionsController(
LogPersistPreferenceControllerV2.class);
LogPersistPreferenceController.class);
mDashboard.onDisableLogPersistDialogRejected();
verify(controller).onDisableLogPersistDialogRejected();

6
tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerV2Test.java → tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java
View File

@@ -42,7 +42,7 @@ import org.robolectric.annotation.Config;
@Config(manifest = TestConfig.MANIFEST_PATH,
sdk = TestConfig.SDK_VERSION,
shadows = {SettingsShadowSystemProperties.class})
public class LogPersistPreferenceControllerV2Test {
public class LogPersistPreferenceControllerTest {
@Mock
private ListPreference mPreference;
@@ -52,7 +52,7 @@ public class LogPersistPreferenceControllerV2Test {
private DevelopmentSettingsDashboardFragment mFragment;
private Context mContext;
private LogPersistPreferenceControllerV2 mController;
private LogPersistPreferenceController mController;
private Lifecycle mLifecycle;
@Before
@@ -60,7 +60,7 @@ public class LogPersistPreferenceControllerV2Test {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mLifecycle = new Lifecycle(() -> mLifecycle);
mController = new LogPersistPreferenceControllerV2(mContext, mFragment, mLifecycle);
mController = new LogPersistPreferenceController(mContext, mFragment, mLifecycle);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
SystemProperties.set("ro.debuggable", "1");
mController.displayPreference(mScreen);

6
tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerV2Test.java → tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java
View File

@@ -41,7 +41,7 @@ import org.robolectric.annotation.Config;
@Config(manifest = TestConfig.MANIFEST_PATH,
sdk = TestConfig.SDK_VERSION,
shadows = {SettingsShadowSystemProperties.class})
public class LogdSizePreferenceControllerV2Test {
public class LogdSizePreferenceControllerTest {
@Mock
private PreferenceScreen mScreen;
@@ -61,7 +61,7 @@ public class LogdSizePreferenceControllerV2Test {
private String[] mListValues;
private String[] mListSummaries;
private Context mContext;
private LogdSizePreferenceControllerV2 mController;
private LogdSizePreferenceController mController;
@Before
public void setup() {
@@ -69,7 +69,7 @@ public class LogdSizePreferenceControllerV2Test {
mContext = RuntimeEnvironment.application;
mListValues = mContext.getResources().getStringArray(R.array.select_logd_size_values);
mListSummaries = mContext.getResources().getStringArray(R.array.select_logd_size_summaries);
mController = new LogdSizePreferenceControllerV2(mContext);
mController = new LogdSizePreferenceController(mContext);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
mController.displayPreference(mScreen);
}

12
tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerV2Test.java → tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
View File

@@ -52,7 +52,7 @@ import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class VerifyAppsOverUsbPreferenceControllerV2Test {
public class VerifyAppsOverUsbPreferenceControllerTest {
@Mock
private PackageManagerWrapper mPackageManager;
@@ -62,11 +62,11 @@ public class VerifyAppsOverUsbPreferenceControllerV2Test {
private RestrictedSwitchPreference mPreference;
@Mock
private VerifyAppsOverUsbPreferenceControllerV2.RestrictedLockUtilsDelegate
private VerifyAppsOverUsbPreferenceController.RestrictedLockUtilsDelegate
mRestrictedLockUtilsDelegate;
private Context mContext;
private VerifyAppsOverUsbPreferenceControllerV2 mController;
private VerifyAppsOverUsbPreferenceController mController;
/** Convenience class for setting global int settings. */
class GlobalSetter {
@@ -83,7 +83,7 @@ public class VerifyAppsOverUsbPreferenceControllerV2Test {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
when(mScreen.findPreference(anyString())).thenReturn(mPreference);
mController = new VerifyAppsOverUsbPreferenceControllerV2(mContext);
mController = new VerifyAppsOverUsbPreferenceController(mContext);
ReflectionHelpers.setField(
mController, "mRestrictedLockUtils", mRestrictedLockUtilsDelegate);
ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
@@ -188,7 +188,7 @@ public class VerifyAppsOverUsbPreferenceControllerV2Test {
final int mode = Settings.Global.getInt(mContext.getContentResolver(),
android.provider.Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, -1 /* default */);
assertThat(mode).isEqualTo(VerifyAppsOverUsbPreferenceControllerV2.SETTING_VALUE_ON);
assertThat(mode).isEqualTo(VerifyAppsOverUsbPreferenceController.SETTING_VALUE_ON);
}
@Test
@@ -198,7 +198,7 @@ public class VerifyAppsOverUsbPreferenceControllerV2Test {
final int mode = Settings.Global.getInt(mContext.getContentResolver(),
android.provider.Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, -1 /* default */);
assertThat(mode).isEqualTo(VerifyAppsOverUsbPreferenceControllerV2.SETTING_VALUE_OFF);
assertThat(mode).isEqualTo(VerifyAppsOverUsbPreferenceController.SETTING_VALUE_OFF);
}
@Test

6
tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerV2Test.java → tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java
View File

@@ -43,7 +43,7 @@ import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WebViewAppPreferenceControllerV2Test {
public class WebViewAppPreferenceControllerTest {
@Mock
private PreferenceScreen mPreferenceScreen;
@@ -57,13 +57,13 @@ public class WebViewAppPreferenceControllerV2Test {
private DefaultAppInfo mAppInfo;
private Context mContext;
private WebViewAppPreferenceControllerV2 mController;
private WebViewAppPreferenceController mController;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = spy(new WebViewAppPreferenceControllerV2(mContext));
mController = spy(new WebViewAppPreferenceController(mContext));
ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
ReflectionHelpers.setField(mController, "mWebViewUpdateServiceWrapper",
mWebViewUpdateServiceWrapper);

2
tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java
View File

@@ -31,7 +31,7 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
/**
* Deprecated in favor of {@link com.android.settings.development.WebViewAppPreferenceControllerV2}
* Deprecated in favor of {@link com.android.settings.development.WebViewAppPreferenceController}
*/
@Deprecated
@RunWith(SettingsRobolectricTestRunner.class)