Merge "Make DND tile primary toggle remember favorite zen" into oc-dev

am: 463985178c

Change-Id: I4f1d959c130a008aad49c4aab0aa225bfb035ab3
This commit is contained in:
Jason Monk
2017-06-07 17:28:24 +00:00
committed by android-build-merger

View File

@@ -132,7 +132,8 @@ public class DndTile extends QSTileImpl<BooleanState> {
if (mState.value) { if (mState.value) {
mController.setZen(ZEN_MODE_OFF, null, TAG); mController.setZen(ZEN_MODE_OFF, null, TAG);
} else { } else {
mController.setZen(ZEN_MODE_ALARMS, null, TAG); int zen = Prefs.getInt(mContext, Prefs.Key.DND_FAVORITE_ZEN, Global.ZEN_MODE_ALARMS);
mController.setZen(zen, null, TAG);
} }
} }