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

Commit 68d8b9c8 authored by Bill Lin's avatar Bill Lin Committed by Automerger Merge Worker
Browse files

Merge "Consolidate DISABLE_RECENT condition in adjustStatusBarLocked()" into... 

Merge "Consolidate DISABLE_RECENT condition in adjustStatusBarLocked()" into udc-qpr-dev am: c148d228

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



Change-Id: I11342ea94af9d570c58e24fa0853b4adefb4a660
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9f2a5d62 c148d228

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

+4 −1
Original line number Diff line number Diff line
@@ -2976,6 +2976,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
    }



    private void onKeyguardExitFinished() {

        if (DEBUG) Log.d(TAG, "onKeyguardExitFinished()");

        // only play "unlock" noises if not on a call (since the incall UI

        // disables the keyguard)

        if (TelephonyManager.EXTRA_STATE_IDLE.equals(mPhoneState)) {
@@ -3197,13 +3198,14 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
                flags |= StatusBarManager.DISABLE_RECENT;

            }



            if (mPowerGestureIntercepted) {

            if (mPowerGestureIntercepted && mOccluded && isSecure()) {

                flags |= StatusBarManager.DISABLE_RECENT;

            }



            if (DEBUG) {

                Log.d(TAG, "adjustStatusBarLocked: mShowing=" + mShowing + " mOccluded=" + mOccluded

                        + " isSecure=" + isSecure() + " force=" + forceHideHomeRecentsButtons

                        + " mPowerGestureIntercepted=" + mPowerGestureIntercepted

                        +  " --> flags=0x" + Integer.toHexString(flags));

            }
@@ -3431,6 +3433,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
        pw.print("  mPendingLock: "); pw.println(mPendingLock);

        pw.print("  wakeAndUnlocking: "); pw.println(mWakeAndUnlocking);

        pw.print("  mPendingPinLock: "); pw.println(mPendingPinLock);

        pw.print("  mPowerGestureIntercepted: "); pw.println(mPowerGestureIntercepted);

    }



    /**