Inform window manager of the wallpaper flag change (dceca1af) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -923,6 +923,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
	if (DEBUG) Slog.v(TAG, "Adding window token: " + mToken);		if (DEBUG) Slog.v(TAG, "Adding window token: " + mToken);
	mWindowManagerInternal.addWindowToken(mToken, TYPE_WALLPAPER, mDisplayId,		mWindowManagerInternal.addWindowToken(mToken, TYPE_WALLPAPER, mDisplayId,
	null /* options */);		null /* options */);
			mWindowManagerInternal.setWallpaperShowWhenLocked(
			mToken, (wallpaper.mWhich & FLAG_LOCK) != 0);
	final DisplayData wpdData =		final DisplayData wpdData =
	mWallpaperDisplayHelper.getDisplayDataOrCreate(mDisplayId);		mWallpaperDisplayHelper.getDisplayDataOrCreate(mDisplayId);
	try {		try {
	@@ -1415,12 +1417,13 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
	try {		try {
	if (connector.mEngine != null) {		if (connector.mEngine != null) {
	connector.mEngine.setWallpaperFlags(which);		connector.mEngine.setWallpaperFlags(which);
			mWindowManagerInternal.setWallpaperShowWhenLocked(
			connector.mToken, (which & FLAG_LOCK) != 0);
	}		}
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Slog.e(TAG, "Failed to update wallpaper engine flags", e);		Slog.e(TAG, "Failed to update wallpaper engine flags", e);
	}		}
	}		});
	);
	}		}
	}		}

services/core/java/com/android/server/wm/WallpaperController.java

+11 −4

Original line number	Original line	Diff line number	Diff line
	@@ -37,6 +37,7 @@ import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
	import static com.android.server.wm.WindowManagerService.H.WALLPAPER_DRAW_PENDING_TIMEOUT;		import static com.android.server.wm.WindowManagerService.H.WALLPAPER_DRAW_PENDING_TIMEOUT;

	import android.annotation.Nullable;		import android.annotation.Nullable;
			import android.content.res.Resources;
	import android.graphics.Bitmap;		import android.graphics.Bitmap;
	import android.graphics.Point;		import android.graphics.Point;
	import android.graphics.Rect;		import android.graphics.Rect;
	@@ -55,6 +56,7 @@ import android.view.WindowManager;
	import android.view.animation.Animation;		import android.view.animation.Animation;
	import android.window.ScreenCapture;		import android.window.ScreenCapture;

			import com.android.internal.R;
	import com.android.internal.annotations.VisibleForTesting;		import com.android.internal.annotations.VisibleForTesting;
	import com.android.internal.protolog.ProtoLogImpl;		import com.android.internal.protolog.ProtoLogImpl;
	import com.android.internal.protolog.common.ProtoLog;		import com.android.internal.protolog.common.ProtoLog;
	@@ -120,6 +122,8 @@ class WallpaperController {

	private boolean mShouldOffsetWallpaperCenter;		private boolean mShouldOffsetWallpaperCenter;

			final boolean mEnableSeparateLockScreenEngine;

	private final ToBooleanFunction<WindowState> mFindWallpaperTargetFunction = w -> {		private final ToBooleanFunction<WindowState> mFindWallpaperTargetFunction = w -> {
	if ((w.mAttrs.type == TYPE_WALLPAPER)) {		if ((w.mAttrs.type == TYPE_WALLPAPER)) {
	if (mFindResults.topWallpaper == null \|\| mFindResults.resetTopWallpaper) {		if (mFindResults.topWallpaper == null \|\| mFindResults.resetTopWallpaper) {
	@@ -249,11 +253,14 @@ class WallpaperController {
	WallpaperController(WindowManagerService service, DisplayContent displayContent) {		WallpaperController(WindowManagerService service, DisplayContent displayContent) {
	mService = service;		mService = service;
	mDisplayContent = displayContent;		mDisplayContent = displayContent;
	mMaxWallpaperScale = service.mContext.getResources()		Resources resources = service.mContext.getResources();
	.getFloat(com.android.internal.R.dimen.config_wallpaperMaxScale);		mMaxWallpaperScale =
	mShouldOffsetWallpaperCenter = service.mContext.getResources()		resources.getFloat(com.android.internal.R.dimen.config_wallpaperMaxScale);
	.getBoolean(		mShouldOffsetWallpaperCenter =
			resources.getBoolean(
	com.android.internal.R.bool.config_offsetWallpaperToCenterOfLargestDisplay);		com.android.internal.R.bool.config_offsetWallpaperToCenterOfLargestDisplay);
			mEnableSeparateLockScreenEngine =
			resources.getBoolean(R.bool.config_independentLockscreenLiveWallpaper);
	}		}

	void resetLargestDisplay(Display display) {		void resetLargestDisplay(Display display) {

services/core/java/com/android/server/wm/WallpaperWindowToken.java

+12 −8

Original line number	Original line	Diff line number	Diff line
	@@ -76,15 +76,19 @@ class WallpaperWindowToken extends WindowToken {
	return;		return;
	}		}
	mShowWhenLocked = showWhenLocked;		mShowWhenLocked = showWhenLocked;
			if (mDisplayContent.mWallpaperController.mEnableSeparateLockScreenEngine) {
	// Move the window token to the front (private) or back (showWhenLocked). This is possible		// Move the window token to the front (private) or back (showWhenLocked). This is
	// because the DisplayArea underneath TaskDisplayArea only contains TYPE_WALLPAPER windows.		// possible
			// because the DisplayArea underneath TaskDisplayArea only contains TYPE_WALLPAPER
			// windows.
	final int position = showWhenLocked ? POSITION_BOTTOM : POSITION_TOP;		final int position = showWhenLocked ? POSITION_BOTTOM : POSITION_TOP;

	// Note: Moving all the way to the front or back breaks ordering based on addition times.		// Note: Moving all the way to the front or back breaks ordering based on addition
			// times.
	// We should never have more than one non-animating token of each type.		// We should never have more than one non-animating token of each type.
	getParent().positionChildAt(position, this /* child /, false /includingParents */);		getParent().positionChildAt(position, this /* child /, false /includingParents */);
	}		}
			}

	boolean canShowWhenLocked() {		boolean canShowWhenLocked() {
	return mShowWhenLocked;		return mShowWhenLocked;