diff options
| author | Chris Wren <cwren@android.com> | 2014-05-30 21:43:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-30 21:43:43 +0000 |
| commit | 2221cb6f6a00e8bc02eb54dadf8ae0390c5c6fdb (patch) | |
| tree | 61e5d7f47e948e1de11aa8bcc8eed7b9695f34a6 /src/com/android | |
| parent | cac94ba2468376f8e2ec80ef5ed8be55a283d8ed (diff) | |
| parent | d711b22130cbe97c63b8f7475720c1b5098f38ed (diff) | |
| download | packages_apps_Settings-2221cb6f6a00e8bc02eb54dadf8ae0390c5c6fdb.tar.gz packages_apps_Settings-2221cb6f6a00e8bc02eb54dadf8ae0390c5c6fdb.tar.bz2 packages_apps_Settings-2221cb6f6a00e8bc02eb54dadf8ae0390c5c6fdb.zip | |
am d711b221: Merge "Support audience filtering in the Zen Mode settings." into lmp-preview-dev
* commit 'd711b22130cbe97c63b8f7475720c1b5098f38ed':
Support audience filtering in the Zen Mode settings.
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/settings/notification/ZenModeSettings.java | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index 8a66d1b29..cdc4d3ae8 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/src/com/android/settings/notification/ZenModeSettings.java @@ -74,6 +74,7 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index private static final String KEY_GENERAL = "general"; private static final String KEY_CALLS = "phone_calls"; private static final String KEY_MESSAGES = "messages"; + private static final String KEY_STARRED = "starred"; private static final String KEY_AUTOMATIC = "automatic"; private static final String KEY_WHEN = "when"; @@ -91,6 +92,7 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index rt.put(R.string.zen_mode_phone_calls, KEY_CALLS); } rt.put(R.string.zen_mode_messages, KEY_MESSAGES); + rt.put(R.string.zen_mode_from_starred, KEY_STARRED); rt.put(R.string.zen_mode_automatic_category, KEY_AUTOMATIC); rt.put(R.string.zen_mode_when, KEY_WHEN); rt.put(R.string.zen_mode_start_time, KEY_START_TIME); @@ -194,12 +196,25 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index }); mStarred = new DropDownPreference(mContext); - mStarred.setEnabled(false); + mStarred.setKey(KEY_STARRED); mStarred.setTitle(R.string.zen_mode_from); mStarred.setDropDownWidth(R.dimen.zen_mode_dropdown_width); - mStarred.addItem(R.string.zen_mode_from_anyone, null); - mStarred.addItem(R.string.zen_mode_from_starred, null); - mStarred.addItem(R.string.zen_mode_from_contacts, null); + mStarred.addItem(R.string.zen_mode_from_anyone, ZenModeConfig.SOURCE_ANYONE); + mStarred.addItem(R.string.zen_mode_from_starred, ZenModeConfig.SOURCE_STAR); + mStarred.addItem(R.string.zen_mode_from_contacts, ZenModeConfig.SOURCE_CONTACT); + mStarred.setCallback(new DropDownPreference.Callback() { + @Override + public boolean onItemSelected(int pos, Object newValue) { + if (mDisableListeners) return true; + final int val = (Integer) newValue; + if (val == mConfig.allowFrom) return true; + if (DEBUG) Log.d(TAG, "onPrefChange allowFrom=" + + ZenModeConfig.sourceToString(val)); + final ZenModeConfig newConfig = mConfig.copy(); + newConfig.allowFrom = val; + return setZenModeConfig(newConfig); + } + }); general.addPreference(mStarred); final Preference alarmInfo = new Preference(mContext) { @@ -317,7 +332,7 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index mCalls.setChecked(mConfig.allowCalls); } mMessages.setChecked(mConfig.allowMessages); - mStarred.setSelectedItem(0); + mStarred.setSelectedValue(mConfig.allowFrom); mWhen.setSelectedValue(mConfig.sleepMode); mStart.setTime(mConfig.sleepStartHour, mConfig.sleepStartMinute); mEnd.setTime(mConfig.sleepEndHour, mConfig.sleepEndMinute); |