Merge "Tweak bouncer showing on swipe up" into main (e935760f) · Commits · e / os / android_frameworks_base

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

+8 −3

Original line number	Diff line number	Diff line
		@@ -2365,9 +2365,14 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
		// lock screen where users can use the UDFPS affordance to enter the device
		mStatusBarKeyguardViewManager.reset(true);
		} else if (mState == StatusBarState.KEYGUARD
		&& !mStatusBarKeyguardViewManager.primaryBouncerIsOrWillBeShowing()
		&& mStatusBarKeyguardViewManager.isSecure()) {
		if (!relockWithPowerButtonImmediately()) {
		&& !mStatusBarKeyguardViewManager.primaryBouncerIsOrWillBeShowing()) {
		boolean needsBouncer = mStatusBarKeyguardViewManager.isSecure();
		if (relockWithPowerButtonImmediately()) {
		// Only request if SIM bouncer is needed
		needsBouncer = mStatusBarKeyguardViewManager.needsFullscreenBouncer();
		}

		if (needsBouncer) {
		Log.d(TAG, "showBouncerOrLockScreenIfKeyguard, showingBouncer");
		if (SceneContainerFlag.isEnabled()) {
		mStatusBarKeyguardViewManager.showPrimaryBouncer(true /* scrimmed */);