From 62fe3205ba41fe35cccc226b2e76572e7b51a7c8 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Wed, 7 Jun 2017 09:15:54 -0400
Subject: Make DND tile primary toggle remember favorite zen

Test: manual
Change-Id: I2b589dbabf4bd7704d4df968ecbd986604e3b757
Fixes: 37794901
---
 packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java
index ecbc4f7683b8..9557262cc2a5 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java
@@ -140,7 +140,8 @@ public class DndTile extends QSTileImpl<BooleanState> {
         if (mState.value) {
             mController.setZen(ZEN_MODE_OFF, null, TAG);
         } 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);
         }
     }
 
-- 
cgit v1.2.3-59-g8ed1b