diff options
| author | fuzz <fuzzzzzzzzzzzzzzzzzz@gmail.com> | 2013-01-31 12:04:57 +0900 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-02-18 14:44:15 -0800 |
| commit | ab9ecc34fbed8526ef6a5b31ab3ce7b398cd1eb9 (patch) | |
| tree | 532040072f3e5d667deb4a9bfc2cd5c9181881e5 /src/com/android/settings/DisplaySettings.java | |
| parent | 93bb7d1aa3dcab8492d58004e95b439bc695af9a (diff) | |
| download | packages_apps_settings-ab9ecc34fbed8526ef6a5b31ab3ce7b398cd1eb9.zip packages_apps_settings-ab9ecc34fbed8526ef6a5b31ab3ce7b398cd1eb9.tar.gz packages_apps_settings-ab9ecc34fbed8526ef6a5b31ab3ce7b398cd1eb9.tar.bz2 | |
Add ability to hide volume rocker preferences
also make the config_show_volumeRockerWake config to false
see more details: http://review.cyanogenmod.org/#/c/26310/
Change-Id: Id885aa423074b3e3fb871716560837a183357cac
Diffstat (limited to 'src/com/android/settings/DisplaySettings.java')
| -rw-r--r-- | src/com/android/settings/DisplaySettings.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index aeb1325..60e5931 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -45,6 +45,7 @@ import android.util.Log; import com.android.internal.view.RotationPolicy; import com.android.settings.cyanogenmod.DisplayRotation; +import com.android.settings.Utils; import java.util.ArrayList; @@ -142,7 +143,8 @@ public class DisplaySettings extends SettingsPreferenceFragment implements mVolumeWake = (CheckBoxPreference) findPreference(KEY_VOLUME_WAKE); if (mVolumeWake != null) { - if (!getResources().getBoolean(R.bool.config_show_volumeRockerWake)) { + if (!getResources().getBoolean(R.bool.config_show_volumeRockerWake) + && !Utils.hasVolumeRocker(getActivity())) { getPreferenceScreen().removePreference(mVolumeWake); getPreferenceScreen().removePreference((PreferenceCategory) findPreference(KEY_WAKEUP_CATEGORY)); } else { |