summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/ButtonSettings.java
diff options
context:
space:
mode:
authorScott Mertz <scott@cyngn.com>2015-11-16 22:55:15 -0800
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-11-17 10:27:56 -0800
commit2209d0353965d30f88d9ee5adc5de58376c2595a (patch)
tree5e2deab673d4146c0b1595c33200e06e7f3fd57f /src/com/android/settings/ButtonSettings.java
parentbf3099fb6266e13e52e8e149697135484aa9f515 (diff)
downloadpackages_apps_Settings-2209d0353965d30f88d9ee5adc5de58376c2595a.zip
packages_apps_Settings-2209d0353965d30f88d9ee5adc5de58376c2595a.tar.gz
packages_apps_Settings-2209d0353965d30f88d9ee5adc5de58376c2595a.tar.bz2
Settings: Buttons: remove all camera button preferences if unsupported
Change-Id: Ib32263eabb2608b4324d756affd311dfb8dfc5bb
Diffstat (limited to 'src/com/android/settings/ButtonSettings.java')
-rw-r--r--src/com/android/settings/ButtonSettings.java14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/com/android/settings/ButtonSettings.java b/src/com/android/settings/ButtonSettings.java
index b55d8a7..0bd79c1 100644
--- a/src/com/android/settings/ButtonSettings.java
+++ b/src/com/android/settings/ButtonSettings.java
@@ -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);
}
- 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) {
+ 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 (!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())) {