From 1775617aa4bc99fbef0102adcfa6b5ab08c8f994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Go=CC=88llner?= <chrisgollner@google.com>
Date: Thu, 2 Jun 2022 17:10:20 +0100
Subject: [PATCH] Fix split-shade expansion animation on non-lockscreen.

Before this change, the notifications side was showing much earlier than
the qs side of the shade. The motion spec is for both to show up at the same time.

This is a partial revert of ag/18566290

Test: NotificationPanelViewControllerTest.java
Test: NotificationStackScrollLayoutTest.java
Test: Manually
Bug: 214946307
Change-Id: I013ba4e793c7b5f6c3ec6991b33700e58ee839b5
---
 .../notification/stack/NotificationStackScrollLayout.java    | 5 -----
 .../systemui/statusbar/phone/PanelViewController.java        | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
index 368122230fb89..398ab0a9f32b2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
@@ -1371,12 +1371,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
      */
     @ShadeViewRefactor(RefactorComponent.COORDINATOR)
     public void setExpandedHeight(float height) {
-        final float shadeBottom = getHeight() - getEmptyBottomMargin();
         final boolean skipHeightUpdate = shouldSkipHeightUpdate();
-        if (!skipHeightUpdate) {
-            final float expansionFraction = MathUtils.saturate(height / shadeBottom);
-            mAmbientState.setExpansionFraction(expansionFraction);
-        }
         updateStackPosition();
 
         if (!skipHeightUpdate) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java
index fc0c4d6d6f56a..9f0ecb9d40969 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java
@@ -808,6 +808,7 @@ public abstract class PanelViewController {
             mExpansionDragDownAmountPx = h;
             mExpandedFraction = Math.min(1f,
                     maxPanelHeight == 0 ? 0 : mExpandedHeight / maxPanelHeight);
+            mAmbientState.setExpansionFraction(mExpandedFraction);
             onHeightUpdated(mExpandedHeight);
             updatePanelExpansionAndVisibility();
         });