Merge changes Ie23f83ee,I799505f0 into main (be6999f4) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −20

Original line number	Diff line number	Diff line
		@@ -1572,26 +1572,6 @@ flag {
		}
		}

		flag {
		name: "use_transitions_for_keyguard_occluded"
		namespace: "systemui"
		description: "Use Keyguard Transitions to set Notification Shade occlusion state"
		bug: "344716537"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "relock_with_power_button_immediately"
		namespace: "systemui"
		description: "UDFPS unlock followed by immediate power button push should relock"
		bug: "343327511"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "classic_flags_multi_user"
		namespace: "systemui"

+1 −4

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STR
		import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_FOR_UNATTENDED_UPDATE;
		import static com.android.systemui.DejankUtils.whitelistIpcs;
		import static com.android.systemui.Flags.notifyPowerManagerUserActivityBackground;
		import static com.android.systemui.Flags.relockWithPowerButtonImmediately;
		import static com.android.systemui.Flags.simPinBouncerReset;
		import static com.android.systemui.Flags.translucentOccludingActivityFix;
		import static com.android.systemui.keyguard.ui.viewmodel.LockscreenToDreamingTransitionViewModel.DREAMING_ANIMATION_DURATION_MS;
		@@ -3567,9 +3566,7 @@ public class KeyguardViewMediator implements CoreStartable,
		// A lock is pending, meaning the keyguard exit animation was cancelled because we're
		// re-locking. We should just end the surface-behind animation without exiting the
		// keyguard. The pending lock will be handled by onFinishedGoingToSleep().
		if (relockWithPowerButtonImmediately()) {
		mIsKeyguardExitAnimationCanceled = true;
		}
		finishSurfaceBehindRemoteAnimation(true /* showKeyguard */);
		maybeHandlePendingLock();
		} else {

+1 −1

Original line number	Diff line number	Diff line
		@@ -364,7 +364,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW
		);
		}

		if (!SceneContainerFlag.isEnabled() && Flags.useTransitionsForKeyguardOccluded()) {
		if (!SceneContainerFlag.isEnabled()) {
		collectFlow(
		mWindowRootView,
		mNotificationShadeWindowModel.isKeyguardOccluded(),

+2 −7

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import static androidx.lifecycle.Lifecycle.State.RESUMED;

		import static com.android.systemui.Dependency.TIME_TICK_HANDLER_NAME;
		import static com.android.systemui.Flags.keyboardShortcutHelperRewrite;
		import static com.android.systemui.Flags.relockWithPowerButtonImmediately;
		import static com.android.systemui.Flags.statusBarSignalPolicyRefactor;
		import static com.android.systemui.charging.WirelessChargingAnimation.UNKNOWN_BATTERY_LEVEL;
		import static com.android.systemui.flags.Flags.SHORTCUT_LIST_SEARCH_LAYOUT;
		@@ -2399,12 +2398,8 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
		mStatusBarKeyguardViewManager.reset(true);
		} else if (mState == StatusBarState.KEYGUARD
		&& !mStatusBarKeyguardViewManager.primaryBouncerIsOrWillBeShowing()) {
		boolean needsBouncer = mStatusBarKeyguardViewManager.isSecure();
		if (relockWithPowerButtonImmediately()) {
		// Only request if SIM bouncer is needed
		needsBouncer = mStatusBarKeyguardViewManager.needsFullscreenBouncer();
		}

		boolean needsBouncer = mStatusBarKeyguardViewManager.needsFullscreenBouncer();
		if (needsBouncer) {
		var reason = "CentralSurfacesImpl#showBouncerOrLockScreenIfKeyguard";
		if (SceneContainerFlag.isEnabled()) {

+0 −6

Original line number	Diff line number	Diff line
		@@ -1146,9 +1146,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		SysUiStatsLog.KEYGUARD_STATE_CHANGED__STATE__OCCLUDED);
		if (mCentralSurfaces.isLaunchingActivityOverLockscreen()) {
		final Runnable postCollapseAction = () -> {
		if (!Flags.useTransitionsForKeyguardOccluded()) {
		mNotificationShadeWindowController.setKeyguardOccluded(isOccluded);
		}
		reset(true /* hideBouncerWhenShowing */);
		};
		if (mCentralSurfaces.isDismissingShadeForActivityLaunch()) {
		@@ -1164,9 +1161,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_STATE_CHANGED,
		SysUiStatsLog.KEYGUARD_STATE_CHANGED__STATE__SHOWN);
		}
		if (!Flags.useTransitionsForKeyguardOccluded()) {
		mNotificationShadeWindowController.setKeyguardOccluded(isOccluded);
		}

		// setDozing(false) will call reset once we stop dozing. Also, if we're going away, there's
		// no need to reset the keyguard views as we'll be gone shortly. Resetting now could cause