Merge "Clean up flag: keyguard_appear_transition" into main (eb306b9b) · Commits · e / os / android_frameworks_base

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

+0 −11

Original line number	Diff line number	Diff line
		@@ -157,17 +157,6 @@ flag {
		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
		}
		}

		flag {
		name: "get_dimmer_on_closing"
		namespace: "windowing_frontend"

+4 −11

Original line number	Diff line number	Diff line
		@@ -60,7 +60,6 @@ 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;

		@@ -232,19 +231,13 @@ class KeyguardController {
		state.mDismissalRequested = false;
		}
		if (goingAwayRemoved
		\|\| (Flags.keyguardAppearTransition() && keyguardShowing
		&& !Display.isOffState(dc.getDisplayInfo().state))) {
		\|\| (keyguardShowing && !Display.isOffState(dc.getDisplayInfo().state))) {
		// 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 transitionDc = Flags.keyguardAppearTransition()
		? dc
		: mRootWindowContainer.getDefaultDisplay();
		transitionDc.requestTransitionAndLegacyPrepare(
		dc.requestTransitionAndLegacyPrepare(
		TRANSIT_TO_FRONT, TRANSIT_FLAG_KEYGUARD_APPEARING);
		if (Flags.keyguardAppearTransition()) {
		dc.mWallpaperController.adjustWallpaperWindows();
		}
		transitionDc.executeAppTransition();
		dc.executeAppTransition();
		}
		}