Settings: Buttons: remove all camera button preferences if unsupported (2209d035) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/ButtonSettings.java

+8 −6

Original line number	Diff line number	Diff line
		@@ -188,6 +188,8 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
		(PreferenceCategory) prefScreen.findPreference(CATEGORY_APPSWITCH);
		final PreferenceCategory volumeCategory =
		(PreferenceCategory) prefScreen.findPreference(CATEGORY_VOLUME);
		final PreferenceCategory cameraCategory =
		(PreferenceCategory) prefScreen.findPreference(CATEGORY_CAMERA);

		// Power button ends calls.
		mPowerEndCall = (SwitchPreference) findPreference(KEY_POWER_END_CALL);
		@@ -346,12 +348,12 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
		prefScreen.removePreference(appSwitchCategory);
		}

		if (hasCameraKey) {
		mCameraWakeScreen = (SwitchPreference) findPreference(CMSettings.System.CAMERA_WAKE_SCREEN);
		mCameraSleepOnRelease =
		(SwitchPreference) findPreference(CMSettings.System.CAMERA_SLEEP_ON_RELEASE);
		mCameraLaunch = (SwitchPreference) findPreference(CMSettings.System.CAMERA_LAUNCH);

		if (hasCameraKey) {
		if (!showCameraWake) {
		prefScreen.removePreference(mCameraWakeScreen);
		}
		@@ -360,7 +362,7 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
		prefScreen.removePreference(mCameraSleepOnRelease);
		}
		} else {
		prefScreen.removePreference(mCameraLaunch);
		prefScreen.removePreference(cameraCategory);
		}

		if (Utils.hasVolumeRocker(getActivity())) {