Settings: Remove HAL HDR+ option
Test: RunSettingsRoboTests Bug: 68223991 Merged-In: I9eb27c7e205ac005c6a71726e125ed1e512da33b Change-Id: I9eb27c7e205ac005c6a71726e125ed1e512da33b
This commit is contained in:
committed by
Trevor Bunker
parent
24721e7d96
commit
7bae205499
@@ -364,7 +364,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
|
||||
private BugReportPreferenceController mBugReportController;
|
||||
private BugReportInPowerPreferenceController mBugReportInPowerController;
|
||||
private TelephonyMonitorPreferenceController mTelephonyMonitorController;
|
||||
private CameraHalHdrplusPreferenceController mCameraHalHdrplusController;
|
||||
private CameraLaserSensorPreferenceController mCameraLaserSensorController;
|
||||
|
||||
private BroadcastReceiver mEnableAdbReceiver;
|
||||
@@ -406,7 +405,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
|
||||
mTelephonyMonitorController = new TelephonyMonitorPreferenceController(getActivity());
|
||||
mWebViewAppPrefController = new WebViewAppPreferenceController(getActivity());
|
||||
mVerifyAppsOverUsbController = new VerifyAppsOverUsbPreferenceController(getActivity());
|
||||
mCameraHalHdrplusController = new CameraHalHdrplusPreferenceController(getActivity());
|
||||
mCameraLaserSensorController = new CameraLaserSensorPreferenceController(getActivity());
|
||||
|
||||
setIfOnlyAvailableForAdmins(true);
|
||||
@@ -440,7 +438,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
|
||||
mBugReportInPowerController.displayPreference(getPreferenceScreen());
|
||||
mTelephonyMonitorController.displayPreference(getPreferenceScreen());
|
||||
mWebViewAppPrefController.displayPreference(getPreferenceScreen());
|
||||
mCameraHalHdrplusController.displayPreference(getPreferenceScreen());
|
||||
mEnableAdbController.displayPreference(getPreferenceScreen());
|
||||
|
||||
mCameraLaserSensorController.displayPreference(getPreferenceScreen());
|
||||
@@ -663,7 +660,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
|
||||
mBugReportInPowerController.enablePreference(enabled);
|
||||
mTelephonyMonitorController.enablePreference(enabled);
|
||||
mWebViewAppPrefController.enablePreference(enabled);
|
||||
mCameraHalHdrplusController.enablePreference(enabled);
|
||||
mCameraLaserSensorController.enablePreference(enabled);
|
||||
updateAllOptions();
|
||||
}
|
||||
@@ -798,7 +794,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
|
||||
}
|
||||
mHaveDebugSettings |= mBugReportInPowerController.updatePreference();
|
||||
mHaveDebugSettings |= mTelephonyMonitorController.updatePreference();
|
||||
mHaveDebugSettings |= mCameraHalHdrplusController.updatePreference();
|
||||
mHaveDebugSettings |= mCameraLaserSensorController.updatePreference();
|
||||
updateSwitchPreference(mKeepScreenOn, Settings.Global.getInt(cr,
|
||||
Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0) != 0);
|
||||
@@ -2469,10 +2464,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
|
||||
return true;
|
||||
}
|
||||
|
||||
if (mCameraHalHdrplusController.handlePreferenceTreeClick(preference)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (mEnableAdbController.handlePreferenceTreeClick(preference)) {
|
||||
return true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user