Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Consolidate DISABLE_RECENT condition in adjustStatusBarLocked()" into udc-d1-dev

Browse Source
This commit is contained in:
Bill Lin
2023-07-20 03:44:21 +00:00
committed by Android (Google) Code Review
parent 2a5ccc71d6 1b38955585
commit a3a2612b09
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -2945,6 +2945,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
} }
private void onKeyguardExitFinished() { private void onKeyguardExitFinished() {
if (DEBUG) Log.d(TAG, "onKeyguardExitFinished()");
// only play "unlock" noises if not on a call (since the incall UI // only play "unlock" noises if not on a call (since the incall UI
// disables the keyguard) // disables the keyguard)
if (TelephonyManager.EXTRA_STATE_IDLE.equals(mPhoneState)) { if (TelephonyManager.EXTRA_STATE_IDLE.equals(mPhoneState)) {
@@ -3166,13 +3167,14 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
flags |= StatusBarManager.DISABLE_RECENT; flags |= StatusBarManager.DISABLE_RECENT;
} }
if (mPowerGestureIntercepted) { if (mPowerGestureIntercepted && mOccluded && isSecure()) {
flags |= StatusBarManager.DISABLE_RECENT; flags |= StatusBarManager.DISABLE_RECENT;
} }
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "adjustStatusBarLocked: mShowing=" + mShowing + " mOccluded=" + mOccluded Log.d(TAG, "adjustStatusBarLocked: mShowing=" + mShowing + " mOccluded=" + mOccluded
+ " isSecure=" + isSecure() + " force=" + forceHideHomeRecentsButtons + " isSecure=" + isSecure() + " force=" + forceHideHomeRecentsButtons
+ " mPowerGestureIntercepted=" + mPowerGestureIntercepted
+ " --> flags=0x" + Integer.toHexString(flags)); + " --> flags=0x" + Integer.toHexString(flags));
} }
@@ -3400,6 +3402,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
pw.print(" mPendingLock: "); pw.println(mPendingLock); pw.print(" mPendingLock: "); pw.println(mPendingLock);
pw.print(" wakeAndUnlocking: "); pw.println(mWakeAndUnlocking); pw.print(" wakeAndUnlocking: "); pw.println(mWakeAndUnlocking);
pw.print(" mPendingPinLock: "); pw.println(mPendingPinLock); pw.print(" mPendingPinLock: "); pw.println(mPendingPinLock);
pw.print(" mPowerGestureIntercepted: "); pw.println(mPowerGestureIntercepted);
} }
/** /**