Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[QS] Do not set QS visible when animating away." into tm-dev am: e63fb2fde8

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18354261

Change-Id: I0543f71fc06cf3cc01fec43a13771382751a95e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aaron Liu
2022-05-18 21:17:36 +00:00
committed by Automerger Merge Worker
parent 58b58904d6 e63fb2fde8
commit 0ecf693791
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
View File

@@ -2315,8 +2315,9 @@ public class NotificationPanelViewController extends PanelViewController {
void setQsExpansion(float height) { void setQsExpansion(float height) {
height = Math.min(Math.max(height, mQsMinExpansionHeight), mQsMaxExpansionHeight); height = Math.min(Math.max(height, mQsMinExpansionHeight), mQsMaxExpansionHeight);
mQsFullyExpanded = height == mQsMaxExpansionHeight && mQsMaxExpansionHeight != 0; mQsFullyExpanded = height == mQsMaxExpansionHeight && mQsMaxExpansionHeight != 0;
boolean qsAnimatingAway = !mQsAnimatorExpand && mAnimatingQS;
if (height > mQsMinExpansionHeight && !mQsExpanded && !mStackScrollerOverscrolling if (height > mQsMinExpansionHeight && !mQsExpanded && !mStackScrollerOverscrolling
&& !mDozing) { && !mDozing && !qsAnimatingAway) {
setQsExpanded(true); setQsExpanded(true);
} else if (height <= mQsMinExpansionHeight && mQsExpanded) { } else if (height <= mQsMinExpansionHeight && mQsExpanded) {
setQsExpanded(false); setQsExpanded(false);