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

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

Merge "Fixing QS appearing when going from AOD to unlocked in split shade"... 

Merge "Fixing QS appearing when going from AOD to unlocked in split shade" into tm-qpr-dev am: b495bedb am: 3cfa9f55

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



Change-Id: I4340d69773c748f9fbaff0f00b0a78afe36335d8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 88fae290 3cfa9f55

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+2 −6
Original line number Diff line number Diff line
@@ -425,8 +425,6 @@ public final class NotificationPanelViewController extends PanelViewController { 
            new KeyguardClockPositionAlgorithm.Result();

    private boolean mIsExpanding;



    private boolean mBlockTouches;



    /**

     * Determines if QS should be already expanded when expanding shade.

     * Used for split shade, two finger gesture as well as accessibility shortcut to QS.
@@ -1693,7 +1691,6 @@ public final class NotificationPanelViewController extends PanelViewController { 


    public void resetViews(boolean animate) {

        mIsLaunchTransitionFinished = false;

        mBlockTouches = false;

        mCentralSurfaces.getGutsManager().closeAndSaveGuts(true /* leavebehind */, true /* force */,

                true /* controls */, -1 /* x */, -1 /* y */, true /* resetMenu */);

        if (animate && !isFullyCollapsed()) {
@@ -4198,7 +4195,7 @@ public final class NotificationPanelViewController extends PanelViewController { 
                            "NPVC onInterceptTouchEvent (" + event.getId() + "): (" + event.getX()

                                    + "," + event.getY() + ")");

                }

                if (mBlockTouches || mQs.disallowPanelTouches()) {

                if (mQs.disallowPanelTouches()) {

                    return false;

                }

                initDownStates(event);
@@ -4241,8 +4238,7 @@ public final class NotificationPanelViewController extends PanelViewController { 
                }





                if (mBlockTouches || (mQsFullyExpanded && mQs != null

                        && mQs.disallowPanelTouches())) {

                if (mQsFullyExpanded && mQs != null && mQs.disallowPanelTouches()) {

                    return false;

                }

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

+3 −2
Original line number Diff line number Diff line
@@ -4434,10 +4434,11 @@ public class CentralSurfacesImpl extends CoreStartable implements 
                    Trace.beginSection("CentralSurfaces#updateDozing");

                    mDozing = isDozing;



                    // Collapse the notification panel if open

                    boolean dozingAnimated = mDozeServiceHost.getDozingRequested()

                            && mDozeParameters.shouldControlScreenOff();

                    mNotificationPanelViewController.resetViews(dozingAnimated);

                    // resetting views is already done when going into doze, there's no need to

                    // reset them again when we're waking up

                    mNotificationPanelViewController.resetViews(dozingAnimated && isDozing);



                    updateQsExpansionEnabled();

                    mKeyguardViewMediator.setDozing(mDozing);