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

Commit 88179a14 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 am: 664ef298

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



Change-Id: I201c743de7f25d7fe8ffdde69c4e694a966435e5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79c19d21 664ef298

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) {