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

Commit cc76d06b authored Aug 09, 2024 by Josh Tsuji Committed by Android (Google) Code Review Aug 09, 2024

Merge "Flag off parts of SBKVM/KVM#reset." into main

parents 7dfc8e37 9c3ba59c

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -2334,6 +2334,12 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		Log.e(TAG, "doKeyguard: we're still showing, but going away. Re-show the "
		+ "keyguard rather than short-circuiting and resetting.");
		} else {
		// We're removing "reset" in the refactor - "resetting" the views will happen
		// as a reaction to the root cause of the "reset" signal.
		if (KeyguardWmStateRefactor.isEnabled()) {
		return;
		}

		// It's already showing, and we're not trying to show it while the screen is
		// off. We can simply reset all of the views, but don't hide the bouncer in case
		// the user is currently interacting with it.

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -972,8 +972,12 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		if (isOccluded && !mDozing) {
		mCentralSurfaces.hideKeyguard();
		if (hideBouncerWhenShowing \|\| needsFullscreenBouncer()) {
		// We're removing "reset" in the refactor - bouncer will be hidden by the root
		// cause of the "reset" calls.
		if (!KeyguardWmStateRefactor.isEnabled()) {
		hideBouncer(false /* destroyView */);
		}
		}
		} else {
		showBouncerOrKeyguard(hideBouncerWhenShowing, isFalsingReset);
		}