From 8d0a400119d3095a1e3aa0bcdb118e179b7eb050 Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Tue, 14 Jun 2016 15:24:39 -0400
Subject: [PATCH] Only reload callback on configuration change.

So it'll get zen changes when the volume dialog is not showing.

Change-Id: I0d4220d0a000d74c6994b07b2d5b8562a6a52585
Fixes: 29355577
---
 .../src/com/android/systemui/volume/VolumeDialog.java |  1 +
 .../src/com/android/systemui/volume/ZenFooter.java    | 11 ++---------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
index c6992aad068e1..1973e058e3e98 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
@@ -977,6 +977,7 @@ public class VolumeDialog implements TunerService.Tunable {
             final int density = newConfig.densityDpi;
             if (density != mDensity) {
                 mDialog.dismiss();
+                mZenFooter.cleanup();
                 initDialog();
             }
             updateWindowWidthH();
diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java b/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java
index 65975d9e9f33b..f01e95fa38735 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java
@@ -79,18 +79,11 @@ public class ZenFooter extends LinearLayout {
         mZen = controller.getZen();
         mConfig = controller.getConfig();
         mController = controller;
+        mController.addCallback(mZenCallback);
         update();
     }
 
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        mController.addCallback(mZenCallback);
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
+    public void cleanup() {
         mController.removeCallback(mZenCallback);
     }