Merge "Part 2 of removing shade blinking while moving heads-up notification" into tm-qpr-dev am: debeb03577 am: fc70a971d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19930025 Change-Id: I25bba7e4cdcbc835ba2b665eba434ebd219a6626 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -3438,8 +3438,17 @@ public final class NotificationPanelViewController {
|
||||
positionClockAndNotifications();
|
||||
}
|
||||
}
|
||||
if (mQsExpandImmediate || (mQsExpanded && !mQsTracking && mQsExpansionAnimator == null
|
||||
&& !mQsExpansionFromOverscroll)) {
|
||||
// Below is true when QS are expanded and we swipe up from the same bottom of panel to
|
||||
// close the whole shade with one motion. Also this will be always true when closing
|
||||
// split shade as there QS are always expanded so every collapsing motion is motion from
|
||||
// expanded QS to closed panel
|
||||
boolean collapsingShadeFromExpandedQs = mQsExpanded && !mQsTracking
|
||||
&& mQsExpansionAnimator == null && !mQsExpansionFromOverscroll;
|
||||
boolean goingBetweenClosedShadeAndExpandedQs =
|
||||
mQsExpandImmediate || collapsingShadeFromExpandedQs;
|
||||
// we don't want to update QS expansion when HUN is visible because then the whole shade is
|
||||
// initially hidden, even though it has non-zero height
|
||||
if (goingBetweenClosedShadeAndExpandedQs && !mHeadsUpManager.isTrackingHeadsUp()) {
|
||||
float qsExpansionFraction;
|
||||
if (mSplitShadeEnabled) {
|
||||
qsExpansionFraction = 1;
|
||||
|
||||
Reference in New Issue
Block a user