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

rename v2 controllers

Browse Source 
- Remove v2 postfix on controllers now that v1 dev options have been
 removed

Bug: 34203528
Test: compiles and tests still pass
Change-Id: I7a937e914293233801dbd1d9536b7b47ee70d591
This commit is contained in:
jeffreyhuang
2017-11-22 16:44:51 -08:00
parent eeffbf6225
commit e89dc36149
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();
}
@@ -362,7 +362,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));
@@ -370,23 +370,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());