Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 664ef298 authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Automerger Merge Worker
Browse files

Merge "Quick fix for notification scrim showing when swiping up the bouncer"... 

Merge "Quick fix for notification scrim showing when swiping up the bouncer" into tm-dev am: adc90ad5

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



Change-Id: I43b28958d01a7fcf1a5289105f54210f441cac1a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 29305b93 adc90ad5

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

+4 −1
Original line number Diff line number Diff line
@@ -3165,7 +3165,10 @@ public class NotificationPanelViewController extends PanelViewController { 
        mFalsingCollector.onTrackingStarted(!mKeyguardStateController.canDismissLockScreen());

        super.onTrackingStarted();

        mScrimController.onTrackingStarted();

        if (mShouldUseSplitNotificationShade) {

        // normally we want to set mQsExpandImmediate for every split shade case (at least when

        // expanding), but keyguard tracking logic is different - this callback is called when

        // unlocking with swipe up but not when swiping down to reveal shade

        if (mShouldUseSplitNotificationShade && !mKeyguardShowing) {

            mQsExpandImmediate = true;

        }

        if (mQsFullyExpanded) {