| commit | 1775617aa4bc99fbef0102adcfa6b5ab08c8f994 | [log] [tgz] |
|---|---|---|
| author | Christian GoĢllner <chrisgollner@google.com> | Thu Jun 02 17:10:20 2022 +0100 |
| committer | Alex Florescu <alexflo@google.com> | Mon Jun 06 08:45:38 2022 +0000 |
| tree | c2192c39e3674c7ad6e8aaec5b6410de59048eea | |
| parent | d95834c214e74b3fe02cb60b7be5d4a88b960da9 [diff] |
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
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 3681222..398ab0a 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 @@ */ @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 fc0c4d6..9f0ecb9 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 @@ mExpansionDragDownAmountPx = h; mExpandedFraction = Math.min(1f, maxPanelHeight == 0 ? 0 : mExpandedHeight / maxPanelHeight); + mAmbientState.setExpansionFraction(mExpandedFraction); onHeightUpdated(mExpandedHeight); updatePanelExpansionAndVisibility(); });