Merge "Add transition on keyguard showing" into 24D1-dev (cc4ab8ae) · Commits · e / os / android_frameworks_base

core/java/android/window/flags/windowing_frontend.aconfig

+11 −0

Original line number	Diff line number	Diff line
		@@ -119,3 +119,14 @@ flag {
		bug: "151861875"
		is_fixed_read_only: true
		}

		flag {
		name: "keyguard_appear_transition"
		namespace: "windowing_frontend"
		description: "Add transition when keyguard appears"
		bug: "327970608"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}
		No newline at end of file

+8 −4

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@ import android.view.WindowManager;
		import com.android.internal.policy.IKeyguardDismissCallback;
		import com.android.server.inputmethod.InputMethodManagerInternal;
		import com.android.server.policy.WindowManagerPolicy;
		import com.android.window.flags.Flags;

		import java.io.PrintWriter;

		@@ -225,13 +226,16 @@ class KeyguardController {
		if (keyguardShowing) {
		state.mDismissalRequested = false;
		}
		if (goingAwayRemoved) {
		// Keyguard dismiss is canceled. Send a transition to undo the changes and clean up
		// before holding the sleep token again.
		if (goingAwayRemoved \|\| (keyguardShowing && Flags.keyguardAppearTransition())) {
		// Keyguard decided to show or stopped going away. Send a transition to animate back
		// to the locked state before holding the sleep token again
		final DisplayContent dc = mRootWindowContainer.getDefaultDisplay();
		dc.requestTransitionAndLegacyPrepare(
		TRANSIT_TO_FRONT, TRANSIT_FLAG_KEYGUARD_APPEARING);
		mWindowManager.executeAppTransition();
		if (Flags.keyguardAppearTransition()) {
		dc.mWallpaperController.adjustWallpaperWindows();
		}
		dc.executeAppTransition();
		}
		}