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

Commit d6676139 authored by Rajeev Kumar's avatar Rajeev Kumar Committed by Automerger Merge Worker
Browse files

Merge "Hide QS whenever user switch occurs" into sc-dev am: cbd9c859 am: 237ed9b3 

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

Change-Id: I67d493053e487559c9b2121d5267a4728fd813fd
parents cc75d9cb 237ed9b3

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -175,7 +175,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
    private static final int KEYGUARD_DISPLAY_TIMEOUT_DELAY_DEFAULT = 30000;

    private static final int KEYGUARD_DISPLAY_TIMEOUT_DELAY_DEFAULT = 30000;

    private static final long KEYGUARD_DONE_PENDING_TIMEOUT_MS = 3000;

    private static final long KEYGUARD_DONE_PENDING_TIMEOUT_MS = 3000;





    private static final boolean DEBUG = true;

    private static final boolean DEBUG = KeyguardConstants.DEBUG;

    private static final boolean DEBUG_SIM_STATES = KeyguardConstants.DEBUG_SIM_STATES;

    private static final boolean DEBUG_SIM_STATES = KeyguardConstants.DEBUG_SIM_STATES;





    private final static String TAG = "KeyguardViewMediator";

    private final static String TAG = "KeyguardViewMediator";

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -495,6 +495,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
    @Override

    @Override

    public void reset(boolean hideBouncerWhenShowing) {

    public void reset(boolean hideBouncerWhenShowing) {

        if (mShowing) {

        if (mShowing) {

            mNotificationPanelViewController.closeQs();

            if (mOccluded && !mDozing) {

            if (mOccluded && !mDozing) {

                mStatusBar.hideKeyguard();

                mStatusBar.hideKeyguard();

                if (hideBouncerWhenShowing || mBouncer.needsFullscreenBouncer()) {

                if (hideBouncerWhenShowing || mBouncer.needsFullscreenBouncer()) {