Merge "[QS] Do not set QS visible when animating away." into tm-dev am: e63fb2fde8 am: 0ecf693791
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18354261 Change-Id: I1aef89c9653b2b5255fd9cf3bd46f011614e768b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user