From 49a29550d44f9dece64a82c6fcfe522ddede6751 Mon Sep 17 00:00:00 2001
From: Shawn Lee <syeonlee@google.com>
Date: Thu, 22 Jun 2023 10:58:07 -0700
Subject: [PATCH] Disable fling on layout update after programmatic shade
 collapse

Shade collapse triggered by three-button-nav can lead to fling expand
on the next layout change. Theoretically this could affect any shade
collapse that doesn't involve a down action on the shade.

Test: verified behavior with logging
Bug: 285798806
Change-Id: Icc044e67177767a5ef1d745d7dfbcdc81e1054ba
---
 .../android/systemui/shade/NotificationPanelViewController.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
index d1d956d054e0c..e83b7f1a1fce9 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
@@ -1822,6 +1822,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
 
             // Set after notifyExpandingStarted, as notifyExpandingStarted resets the closing state.
             setClosing(true);
+            mUpdateFlingOnLayout = false;
             if (delayed) {
                 mNextCollapseSpeedUpFactor = speedUpFactor;
                 this.mView.postDelayed(mFlingCollapseRunnable, 120);