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

Merge "Disable 3-Button NavBar Recents key when launch secure camera" into udc-dev

Browse Source
This commit is contained in:
Bill Lin
2023-05-12 20:43:50 +00:00
committed by Android (Google) Code Review
parent 57145b116b 435ee9b979
commit d41919d2ab
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1501,13 +1501,17 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
notifyFinishedGoingToSleep();
if (cameraGestureTriggered) {
// Just to make sure, make sure the device is awake.
mContext.getSystemService(PowerManager.class).wakeUp(SystemClock.uptimeMillis(),
PowerManager.WAKE_REASON_CAMERA_LAUNCH,
"com.android.systemui:CAMERA_GESTURE_PREVENT_LOCK");
setPendingLock(false);
mPendingReset = false;
mPowerGestureIntercepted = true;
if (DEBUG) {
Log.d(TAG, "cameraGestureTriggered=" + cameraGestureTriggered
+ ",mPowerGestureIntercepted=" + mPowerGestureIntercepted);
}
}
if (mPendingReset) {
@@ -1706,7 +1710,13 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
mAnimatingScreenOff = false;
cancelDoKeyguardLaterLocked();
cancelDoKeyguardForChildProfilesLocked();
if (DEBUG) Log.d(TAG, "onStartedWakingUp, seq = " + mDelayedShowingSequence);
if (cameraGestureTriggered) {
mPowerGestureIntercepted = true;
}
if (DEBUG) {
Log.d(TAG, "onStartedWakingUp, seq = " + mDelayedShowingSequence
+ ", mPowerGestureIntercepted = " + mPowerGestureIntercepted);
}
notifyStartedWakingUp();
}
mUiEventLogger.logWithInstanceIdAndPosition(
@@ -1933,12 +1943,19 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
startKeyguardExitAnimation(0, 0);
}
mPowerGestureIntercepted = mUpdateMonitor.isSecureCameraLaunchedOverKeyguard();
if (mOccluded != isOccluded) {
mOccluded = isOccluded;
mKeyguardViewControllerLazy.get().setOccluded(isOccluded, animate
&& mDeviceInteractive);
adjustStatusBarLocked();
}
if (DEBUG) {
Log.d(TAG, "isOccluded=" + isOccluded + ",mPowerGestureIntercepted="
+ mPowerGestureIntercepted);
}
}
Trace.endSection();
}
@@ -3056,6 +3073,10 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
flags |= StatusBarManager.DISABLE_RECENT;
}
if (mPowerGestureIntercepted) {
flags |= StatusBarManager.DISABLE_RECENT;
}
if (DEBUG) {
Log.d(TAG, "adjustStatusBarLocked: mShowing=" + mShowing + " mOccluded=" + mOccluded
+ " isSecure=" + isSecure() + " force=" + forceHideHomeRecentsButtons