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

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

Change-Id: I54992c5f5bf5f0c955ddcee6b226f3de13ffdd8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aaron Liu
2022-05-18 20:37:43 +00:00
committed by Automerger Merge Worker

View File

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