diff options
| author | AdrianDC <radian.dc@gmail.com> | 2016-01-19 12:23:41 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-01-24 17:46:31 -0800 |
| commit | 7554a81057aafab96eea1b057b3ada5bade9e9ff (patch) | |
| tree | 436bf5cb8b44ba30b61c9cd5d4cd21d0955b1faf /src/com/android/settings/notification/SoundSettings.java | |
| parent | c02cb4d7197f538d9036daef877f36e926a12393 (diff) | |
| download | packages_apps_Settings-7554a81057aafab96eea1b057b3ada5bade9e9ff.zip packages_apps_Settings-7554a81057aafab96eea1b057b3ada5bade9e9ff.tar.gz packages_apps_Settings-7554a81057aafab96eea1b057b3ada5bade9e9ff.tar.bz2 | |
Settings: Move Do Not Disturb Access under DND settings
Change-Id: I4763577b4cd5aae01705cc693dfaaf06152bd3e6
Signed-off-by: AdrianDC <radian.dc@gmail.com>
Diffstat (limited to 'src/com/android/settings/notification/SoundSettings.java')
| -rw-r--r-- | src/com/android/settings/notification/SoundSettings.java | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java index 33fe821..679eb97 100644 --- a/src/com/android/settings/notification/SoundSettings.java +++ b/src/com/android/settings/notification/SoundSettings.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2014 The Android Open Source Project + * Copyright (C) 2016 The CyanogenMod Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -91,7 +92,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab private static final String KEY_INCREASING_RING_VOLUME = "increasing_ring_volume"; private static final String KEY_VIBRATION_INTENSITY = "vibration_intensity"; private static final String KEY_VIBRATE_ON_TOUCH = "vibrate_on_touch"; - private static final String KEY_ZEN_ACCESS = "manage_zen_access"; private static final String KEY_ZEN_MODE = "zen_mode"; private static final String KEY_VOLUME_LINK_NOTIFICATION = "volume_link_notification"; @@ -100,7 +100,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab KEY_ALARM_VOLUME, KEY_RING_VOLUME, KEY_NOTIFICATION_VOLUME, - KEY_ZEN_ACCESS, KEY_ZEN_MODE, }; @@ -136,7 +135,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab private Preference mNotificationRingtonePreference; private TwoStatePreference mVibrateWhenRinging; private Preference mNotificationAccess; - private Preference mZenAccess; private boolean mSecure; private int mLockscreenSelectedValue; private ComponentName mSuppressor; @@ -192,8 +190,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab mNotificationAccess = findPreference(KEY_NOTIFICATION_ACCESS); refreshNotificationListeners(); - mZenAccess = findPreference(KEY_ZEN_ACCESS); - refreshZenAccess(); updateRingerMode(); updateEffectsSuppressor(); } @@ -202,7 +198,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab public void onResume() { super.onResume(); refreshNotificationListeners(); - refreshZenAccess(); lookupRingtoneNames(); updateNotificationPreferenceState(); mSettingsObserver.register(true); @@ -544,12 +539,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab } } - // === Zen access === - - private void refreshZenAccess() { - // noop for now - } - // === Callbacks === private final class SettingsObserver extends ContentObserver { |