From b7199c4dbfedd55eec088d15ccdeadb3069e1491 Mon Sep 17 00:00:00 2001
From: Fabian Kozynski <kozynski@google.com>
Date: Mon, 10 Sep 2018 12:36:37 -0400
Subject: [PATCH] State of QSSecurityFooter refreshes early.

QSSecurityFooter refreshes its state and listens regardless of the
expansion of QSPanel. It now knows its size before expansion animation
starts and is reported properly.

Change-Id: I66e29b4b14c2fbc663704255649515f68f41bd48
Fixes: 80219694
Test: Manual & runtest
---
 packages/SystemUI/src/com/android/systemui/qs/QSFragment.java    | 1 +
 packages/SystemUI/src/com/android/systemui/qs/QSPanel.java       | 1 -
 .../SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java   | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
index 03febda3f4c53..c36cdf6ac2626 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
@@ -288,6 +288,7 @@ public class QSFragment extends Fragment implements QS, CommandQueue.Callbacks {
         mHeader.setListening(listening);
         mFooter.setListening(listening);
         mQSPanel.setListening(mListening && mQsExpanded);
+        mQSPanel.getFooter().setListening(listening);
     }
 
     @Override
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
index 8697015742378..dec66d2441f41 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
@@ -350,7 +350,6 @@ public class QSPanel extends LinearLayout implements Tunable, Callback, Brightne
         if (mTileLayout != null) {
             mTileLayout.setListening(listening);
         }
-        mFooter.setListening(mListening);
         if (mListening) {
             refreshAllTiles();
         }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java b/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java
index 6418c8075b1e9..8f3a7b3c04e97 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java
@@ -96,6 +96,7 @@ public class QSSecurityFooter implements OnClickListener, DialogInterface.OnClic
     public void setListening(boolean listening) {
         if (listening) {
             mSecurityController.addCallback(mCallback);
+            refreshState();
         } else {
             mSecurityController.removeCallback(mCallback);
         }