From 0ff5792701a9c28760f2ad3e0c44dddfe60148f8 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 2 May 2019 15:22:01 -0700
Subject: [PATCH] Fixing wrong panel state being sent to launcher

Bug: 131438091
Test: Verified that swipe-up works during HUN
Change-Id: I4275895c4fd1870f9bf26a7542c5d68e29990fab
---
 .../android/systemui/statusbar/phone/NavigationBarView.java   | 4 ++--
 .../android/systemui/statusbar/phone/PhoneStatusBarView.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
index 1c038443e9e31..26e7a81db66ce 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
@@ -722,10 +722,10 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
         }
     }
 
-    public void onPanelExpandedChange(boolean expanded) {
+    public void onPanelExpandedChange() {
         updateSlippery();
         mOverviewProxyService.setSystemUiStateFlag(SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED,
-                expanded, getContext().getDisplayId());
+                mPanelView.isFullyExpanded(), getContext().getDisplayId());
     }
 
     public void updateStates() {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
index ce1d6384b7c09..68eba50984d66 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
@@ -277,7 +277,7 @@ public class PhoneStatusBarView extends PanelBar {
         super.panelExpansionChanged(frac, expanded);
         updateScrimFraction();
         if ((frac == 0 || frac == 1) && mBar.getNavigationBarView() != null) {
-            mBar.getNavigationBarView().onPanelExpandedChange(expanded);
+            mBar.getNavigationBarView().onPanelExpandedChange();
         }
     }