diff options
author | John Spurlock <jspurlock@google.com> | 2015-04-09 12:50:04 -0400 |
---|---|---|
committer | John Spurlock <jspurlock@google.com> | 2015-04-09 20:56:16 -0400 |
commit | 45fa140b8c6846b4546fdeabebf989ae9102cebb (patch) | |
tree | ddebdae6ced30e4be858c4381c7c029e132dfa4a /src/com/android/settings/notification/ZenModeConditionSelection.java | |
parent | 342d08537fe316f0d046a3a3097c294e4b30e912 (diff) | |
download | packages_apps_Settings-45fa140b8c6846b4546fdeabebf989ae9102cebb.zip packages_apps_Settings-45fa140b8c6846b4546fdeabebf989ae9102cebb.tar.gz packages_apps_Settings-45fa140b8c6846b4546fdeabebf989ae9102cebb.tar.bz2 |
Settings: An update on Downtime.
- Migrate settings to the new zen mode state model.
- Remove downtime settings.
- Add automatic rule management page (add/remove)
- Bind new automatic schedule rules to detail editor.
- Clean up a few found miscapitalized string captions.
- Migrate zen switch to report the shared summary string.
Bug: 20064962
Change-Id: Ia561e7f77c90c962729240b4d51ba1915297f64a
Diffstat (limited to 'src/com/android/settings/notification/ZenModeConditionSelection.java')
-rw-r--r-- | src/com/android/settings/notification/ZenModeConditionSelection.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/settings/notification/ZenModeConditionSelection.java b/src/com/android/settings/notification/ZenModeConditionSelection.java index 9beea0a..481bd88 100644 --- a/src/com/android/settings/notification/ZenModeConditionSelection.java +++ b/src/com/android/settings/notification/ZenModeConditionSelection.java @@ -45,11 +45,14 @@ public class ZenModeConditionSelection extends RadioGroup { private final H mHandler = new H(); private final Context mContext; private final List<Condition> mConditions; + private final int mZenMode; + private Condition mCondition; - public ZenModeConditionSelection(Context context) { + public ZenModeConditionSelection(Context context, int zenMode) { super(context); mContext = context; + mZenMode = zenMode; mConditions = new ArrayList<Condition>(); setLayoutTransition(new LayoutTransition()); final int p = mContext.getResources().getDimensionPixelSize(R.dimen.content_margin_left); @@ -130,7 +133,7 @@ public class ZenModeConditionSelection extends RadioGroup { public void confirmCondition() { if (DEBUG) Log.d(TAG, "confirmCondition " + mCondition); try { - mNoMan.setZenModeCondition(mCondition); + mNoMan.setZenMode(mZenMode, mCondition != null ? mCondition.id : null, TAG); } catch (RemoteException e) { // noop } |