Cleanup Controllers/Fragments
- Removed extra comments in DevelopmentSettingsDashboardFragment - Removed unused methods from controllers - Clean up method names Bug: 34203528 Test: make RunSettingsRoboTests -j40 Change-Id: Ibe7a0921926d4529f62a212b55c8fa2f14ecb18b
This commit is contained in:
@@ -44,14 +44,4 @@ public class BugReportPreferenceControllerV2 extends DeveloperOptionsPreferenceC
|
|||||||
public String getPreferenceKey() {
|
public String getPreferenceKey() {
|
||||||
return KEY_BUGREPORT;
|
return KEY_BUGREPORT;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onDeveloperOptionsSwitchEnabled() {
|
|
||||||
// intentional no-op
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onDeveloperOptionsSwitchDisabled() {
|
|
||||||
// intentional no-op
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@@ -358,14 +358,11 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
|||||||
controllers.add(new HdcpCheckingPreferenceController(context));
|
controllers.add(new HdcpCheckingPreferenceController(context));
|
||||||
controllers.add(new BluetoothSnoopLogPreferenceController(context));
|
controllers.add(new BluetoothSnoopLogPreferenceController(context));
|
||||||
controllers.add(new OemUnlockPreferenceController(context, activity, fragment));
|
controllers.add(new OemUnlockPreferenceController(context, activity, fragment));
|
||||||
// running services
|
|
||||||
controllers.add(new FileEncryptionPreferenceController(context));
|
controllers.add(new FileEncryptionPreferenceController(context));
|
||||||
controllers.add(new PictureColorModePreferenceController(context, lifecycle));
|
controllers.add(new PictureColorModePreferenceController(context, lifecycle));
|
||||||
controllers.add(new WebViewAppPreferenceControllerV2(context));
|
controllers.add(new WebViewAppPreferenceControllerV2(context));
|
||||||
controllers.add(new CoolColorTemperaturePreferenceController(context));
|
controllers.add(new CoolColorTemperaturePreferenceController(context));
|
||||||
controllers.add(new DisableAutomaticUpdatesPreferenceController(context));
|
controllers.add(new DisableAutomaticUpdatesPreferenceController(context));
|
||||||
// system ui demo mode
|
|
||||||
// quick settings developer tiles
|
|
||||||
controllers.add(new AdbPreferenceController(context, fragment));
|
controllers.add(new AdbPreferenceController(context, fragment));
|
||||||
controllers.add(new ClearAdbKeysPreferenceController(context, fragment));
|
controllers.add(new ClearAdbKeysPreferenceController(context, fragment));
|
||||||
controllers.add(new LocalTerminalPreferenceController(context));
|
controllers.add(new LocalTerminalPreferenceController(context));
|
||||||
@@ -380,7 +377,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
|||||||
controllers.add(new ConnectivityMonitorPreferenceControllerV2(context));
|
controllers.add(new ConnectivityMonitorPreferenceControllerV2(context));
|
||||||
controllers.add(new CameraLaserSensorPreferenceControllerV2(context));
|
controllers.add(new CameraLaserSensorPreferenceControllerV2(context));
|
||||||
controllers.add(new CameraHalHdrPlusPreferenceControllerV2(context));
|
controllers.add(new CameraHalHdrPlusPreferenceControllerV2(context));
|
||||||
// feature flags
|
|
||||||
controllers.add(new WifiDisplayCertificationPreferenceController(context));
|
controllers.add(new WifiDisplayCertificationPreferenceController(context));
|
||||||
controllers.add(new WifiVerboseLoggingPreferenceController(context));
|
controllers.add(new WifiVerboseLoggingPreferenceController(context));
|
||||||
controllers.add(new WifiAggressiveHandoverPreferenceController(context));
|
controllers.add(new WifiAggressiveHandoverPreferenceController(context));
|
||||||
@@ -411,7 +407,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
|||||||
controllers.add(new TransitionAnimationScalePreferenceController(context));
|
controllers.add(new TransitionAnimationScalePreferenceController(context));
|
||||||
controllers.add(new AnimatorDurationScalePreferenceController(context));
|
controllers.add(new AnimatorDurationScalePreferenceController(context));
|
||||||
controllers.add(new SecondaryDisplayPreferenceController(context));
|
controllers.add(new SecondaryDisplayPreferenceController(context));
|
||||||
// smallest width
|
|
||||||
controllers.add(new ForceGpuRenderingPreferenceController(context));
|
controllers.add(new ForceGpuRenderingPreferenceController(context));
|
||||||
controllers.add(new GpuViewUpdatesPreferenceController(context));
|
controllers.add(new GpuViewUpdatesPreferenceController(context));
|
||||||
controllers.add(new HardwareLayersUpdatesPreferenceController(context));
|
controllers.add(new HardwareLayersUpdatesPreferenceController(context));
|
||||||
@@ -426,10 +421,8 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
|||||||
controllers.add(new ProfileGpuRenderingPreferenceController(context));
|
controllers.add(new ProfileGpuRenderingPreferenceController(context));
|
||||||
controllers.add(new KeepActivitiesPreferenceController(context));
|
controllers.add(new KeepActivitiesPreferenceController(context));
|
||||||
controllers.add(new BackgroundProcessLimitPreferenceController(context));
|
controllers.add(new BackgroundProcessLimitPreferenceController(context));
|
||||||
// background check
|
|
||||||
controllers.add(new AppsNotRespondingPreferenceController(context));
|
controllers.add(new AppsNotRespondingPreferenceController(context));
|
||||||
controllers.add(new NotificationChannelWarningsPreferenceController(context));
|
controllers.add(new NotificationChannelWarningsPreferenceController(context));
|
||||||
// inactive apps
|
|
||||||
controllers.add(new AllowAppsOnExternalPreferenceController(context));
|
controllers.add(new AllowAppsOnExternalPreferenceController(context));
|
||||||
controllers.add(new ResizableActivityPreferenceController(context));
|
controllers.add(new ResizableActivityPreferenceController(context));
|
||||||
controllers.add(new FreeformWindowsPreferenceController(context));
|
controllers.add(new FreeformWindowsPreferenceController(context));
|
||||||
|
@@ -86,16 +86,6 @@ public class FileEncryptionPreferenceController extends
|
|||||||
mContext.getResources().getString(R.string.convert_to_file_encryption_done));
|
mContext.getResources().getString(R.string.convert_to_file_encryption_done));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onDeveloperOptionsSwitchEnabled() {
|
|
||||||
// intentional no-op
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onDeveloperOptionsSwitchDisabled() {
|
|
||||||
// intentional no-op
|
|
||||||
}
|
|
||||||
|
|
||||||
private IStorageManager getStorageManager() {
|
private IStorageManager getStorageManager() {
|
||||||
try {
|
try {
|
||||||
return IStorageManager.Stub.asInterface(
|
return IStorageManager.Stub.asInterface(
|
||||||
|
@@ -55,16 +55,6 @@ public class LocalBackupPasswordPreferenceController extends
|
|||||||
updatePasswordSummary(preference);
|
updatePasswordSummary(preference);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onDeveloperOptionsSwitchEnabled() {
|
|
||||||
// intentional no-op
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onDeveloperOptionsSwitchDisabled() {
|
|
||||||
// intentional no-op
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updatePasswordSummary(Preference preference) {
|
private void updatePasswordSummary(Preference preference) {
|
||||||
preference.setEnabled(isAdminUser() && mBackupManager != null);
|
preference.setEnabled(isAdminUser() && mBackupManager != null);
|
||||||
if (mBackupManager == null) {
|
if (mBackupManager == null) {
|
||||||
|
@@ -58,16 +58,6 @@ public class ShortcutManagerThrottlingPreferenceController extends
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onDeveloperOptionsSwitchEnabled() {
|
|
||||||
// intentional no-op
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onDeveloperOptionsSwitchDisabled() {
|
|
||||||
// intentional no-op
|
|
||||||
}
|
|
||||||
|
|
||||||
private void resetShortcutManagerThrottling() {
|
private void resetShortcutManagerThrottling() {
|
||||||
if (mShortcutService == null) {
|
if (mShortcutService == null) {
|
||||||
return;
|
return;
|
||||||
|
@@ -90,17 +90,17 @@ public class ShowTapsPreferenceControllerTest {
|
|||||||
public void onPreferenceChange_preferenceChecked_shouldEnableShowTaps() {
|
public void onPreferenceChange_preferenceChecked_shouldEnableShowTaps() {
|
||||||
mController.onPreferenceChange(mPreference, true /* new value */);
|
mController.onPreferenceChange(mPreference, true /* new value */);
|
||||||
|
|
||||||
int showTapsMode = Settings.System.getInt(mContext.getContentResolver(),
|
final int showTapsMode = Settings.System.getInt(mContext.getContentResolver(),
|
||||||
Settings.System.SHOW_TOUCHES, -1 /* default */);
|
Settings.System.SHOW_TOUCHES, -1 /* default */);
|
||||||
|
|
||||||
assertThat(showTapsMode).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_ON);
|
assertThat(showTapsMode).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_ON);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onPreferenceChange__preferenceUnchecked_shouldDisableCameraLaserSensor() {
|
public void onPreferenceChange__preferenceUnchecked_shouldDisableShowTaps() {
|
||||||
mController.onPreferenceChange(mPreference, false /* new value */);
|
mController.onPreferenceChange(mPreference, false /* new value */);
|
||||||
|
|
||||||
int showTapsMode = Settings.System.getInt(mContext.getContentResolver(),
|
final int showTapsMode = Settings.System.getInt(mContext.getContentResolver(),
|
||||||
Settings.System.SHOW_TOUCHES, -1 /* default */);
|
Settings.System.SHOW_TOUCHES, -1 /* default */);
|
||||||
|
|
||||||
assertThat(showTapsMode).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_OFF);
|
assertThat(showTapsMode).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_OFF);
|
||||||
@@ -117,7 +117,7 @@ public class ShowTapsPreferenceControllerTest {
|
|||||||
public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeEnabled() {
|
public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeEnabled() {
|
||||||
mController.onDeveloperOptionsSwitchDisabled();
|
mController.onDeveloperOptionsSwitchDisabled();
|
||||||
|
|
||||||
int showTapsMode = Settings.System.getInt(mContext.getContentResolver(),
|
final int showTapsMode = Settings.System.getInt(mContext.getContentResolver(),
|
||||||
Settings.System.SHOW_TOUCHES, -1 /* default */);
|
Settings.System.SHOW_TOUCHES, -1 /* default */);
|
||||||
|
|
||||||
assertThat(showTapsMode).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_OFF);
|
assertThat(showTapsMode).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_OFF);
|
||||||
|
Reference in New Issue
Block a user