Merge "Add transition on keyguard showing" into main (1eddd1ca) · Commits · e / os / android_frameworks_base

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -142,3 +142,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

+82 B (52.9 KiB)

File changed.

No diff preview for this file type.

+6 −12

Original line number	Diff line number	Diff line
		@@ -709,18 +709,6 @@
		"group": "WM_DEBUG_CONFIGURATION",
		"at": "com\/android\/server\/wm\/ActivityTaskManagerService.java"
		},
		"2959074735946674755": {
		"message": "Trying to update display configuration for system\/invalid process.",
		"level": "WARN",
		"group": "WM_DEBUG_CONFIGURATION",
		"at": "com\/android\/server\/wm\/ActivityTaskManagerService.java"
		},
		"5668810920995272206": {
		"message": "Trying to update display configuration for invalid process, pid=%d",
		"level": "WARN",
		"group": "WM_DEBUG_CONFIGURATION",
		"at": "com\/android\/server\/wm\/ActivityTaskManagerService.java"
		},
		"-1123414663662718691": {
		"message": "setVr2dDisplayId called for: %d",
		"level": "DEBUG",
		@@ -3469,6 +3457,12 @@
		"group": "WM_DEBUG_WALLPAPER",
		"at": "com\/android\/server\/wm\/WallpaperController.java"
		},
		"257349083882992098": {
		"message": "updateWallpaperTokens requestedVisibility=%b on keyguardLocked=%b",
		"level": "VERBOSE",
		"group": "WM_DEBUG_WALLPAPER",
		"at": "com\/android\/server\/wm\/WallpaperController.java"
		},
		"7408402065665963407": {
		"message": "Wallpaper at display %d - visibility: %b, keyguardLocked: %b",
		"level": "VERBOSE",

+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();
		}
		}

+2 −4

Original line number	Diff line number	Diff line
		@@ -857,10 +857,6 @@ class WallpaperController {
		}

		public void updateWallpaperTokens(boolean keyguardLocked) {
		if (DEBUG_WALLPAPER) {
		Slog.v(TAG, "Wallpaper vis: target " + mWallpaperTarget + " prev="
		+ mPrevWallpaperTarget);
		}
		updateWallpaperTokens(mWallpaperTarget != null \|\| mPrevWallpaperTarget != null,
		keyguardLocked);
		}
		@@ -869,6 +865,8 @@ class WallpaperController {
		* Change the visibility of the top wallpaper to {@param visibility} and hide all the others.
		*/
		private void updateWallpaperTokens(boolean visibility, boolean keyguardLocked) {
		ProtoLog.v(WM_DEBUG_WALLPAPER, "updateWallpaperTokens requestedVisibility=%b on"
		+ " keyguardLocked=%b", visibility, keyguardLocked);
		WindowState topWallpaper = mFindResults.getTopWallpaper(keyguardLocked);
		WallpaperWindowToken topWallpaperToken =
		topWallpaper == null ? null : topWallpaper.mToken.asWallpaperToken();