Merge "Allow wallpaper surface in preview to scale to a rect" into rvc-d1-dev am: acb0a6ea12 (8afa29a9) · Commits · e / os / android_frameworks_base

core/java/android/service/wallpaper/IWallpaperEngine.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -38,4 +38,5 @@ oneway interface IWallpaperEngine {
		@UnsupportedAppUsage
		void destroy();
		void setZoomOut(float scale);
		void scalePreview(in Rect positionInWindow);
		}

core/java/android/service/wallpaper/WallpaperService.java

+58 −5

Original line number	Diff line number	Diff line
		@@ -16,6 +16,11 @@

		package android.service.wallpaper;

		import static android.graphics.Matrix.MSCALE_X;
		import static android.graphics.Matrix.MSCALE_Y;
		import static android.graphics.Matrix.MSKEW_X;
		import static android.graphics.Matrix.MSKEW_Y;

		import android.annotation.FloatRange;
		import android.annotation.Nullable;
		import android.annotation.SdkConstant;
		@@ -31,6 +36,7 @@ import android.content.Intent;
		import android.content.res.TypedArray;
		import android.graphics.Bitmap;
		import android.graphics.Canvas;
		import android.graphics.Matrix;
		import android.graphics.PixelFormat;
		import android.graphics.Point;
		import android.graphics.Rect;
		@@ -123,7 +129,8 @@ public abstract class WallpaperService extends Service {
		private static final int MSG_WINDOW_MOVED = 10035;
		private static final int MSG_TOUCH_EVENT = 10040;
		private static final int MSG_REQUEST_WALLPAPER_COLORS = 10050;
		private static final int MSG_SCALE = 10100;
		private static final int MSG_ZOOM = 10100;
		private static final int MSG_SCALE_PREVIEW = 10110;

		private static final int NOTIFY_COLORS_RATE_LIMIT_MS = 1000;

		@@ -178,6 +185,7 @@ public abstract class WallpaperService extends Service {
		WindowManager.LayoutParams.PRIVATE_FLAG_WANTS_OFFSET_NOTIFICATIONS;
		int mCurWindowFlags = mWindowFlags;
		int mCurWindowPrivateFlags = mWindowPrivateFlags;
		Rect mPreviewSurfacePosition;
		final Rect mVisibleInsets = new Rect();
		final Rect mWinFrame = new Rect();
		final Rect mContentInsets = new Rect();
		@@ -194,6 +202,8 @@ public abstract class WallpaperService extends Service {
		final InsetsSourceControl[] mTempControls = new InsetsSourceControl[0];
		final MergedConfiguration mMergedConfiguration = new MergedConfiguration();
		private final Point mSurfaceSize = new Point();
		private final Matrix mTmpMatrix = new Matrix();
		private final float[] mTmpValues = new float[9];

		final WindowManager.LayoutParams mLayout
		= new WindowManager.LayoutParams();
		@@ -366,7 +376,7 @@ public abstract class WallpaperService extends Service {
		Message msg = mCaller.obtainMessage(MSG_WALLPAPER_OFFSETS);
		mCaller.sendMessage(msg);
		}
		Message msg = mCaller.obtainMessageI(MSG_SCALE, Float.floatToIntBits(zoom));
		Message msg = mCaller.obtainMessageI(MSG_ZOOM, Float.floatToIntBits(zoom));
		mCaller.sendMessage(msg);
		}
		}
		@@ -747,6 +757,8 @@ public abstract class WallpaperService extends Service {
		out.println(mMergedConfiguration.getMergedConfiguration());
		out.print(prefix); out.print("mLayout="); out.println(mLayout);
		out.print(prefix); out.print("mZoom="); out.println(mZoom);
		out.print(prefix); out.print("mPreviewSurfacePosition=");
		out.println(mPreviewSurfacePosition);
		synchronized (mLock) {
		out.print(prefix); out.print("mPendingXOffset="); out.print(mPendingXOffset);
		out.print(" mPendingXOffset="); out.println(mPendingXOffset);
		@@ -908,7 +920,6 @@ public abstract class WallpaperService extends Service {
		mInsetsState, mTempControls, mSurfaceSize, mTmpSurfaceControl);
		if (mSurfaceControl.isValid()) {
		mSurfaceHolder.mSurface.copyFrom(mSurfaceControl);
		mSurfaceControl.release();
		}

		if (DEBUG) Log.v(TAG, "New surface: " + mSurfaceHolder.mSurface
		@@ -1063,6 +1074,7 @@ public abstract class WallpaperService extends Service {
		if (redrawNeeded) {
		mSession.finishDrawing(mWindow, null /* postDrawTransaction */);
		}
		reposition();
		mIWallpaperEngine.reportShown();
		}
		} catch (RemoteException ex) {
		@@ -1073,6 +1085,39 @@ public abstract class WallpaperService extends Service {
		}
		}

		private void scalePreview(Rect position) {
		if (isPreview() && mPreviewSurfacePosition == null && position != null
		\|\| mPreviewSurfacePosition != null
		&& !mPreviewSurfacePosition.equals(position)) {
		mPreviewSurfacePosition = position;
		if (mSurfaceControl.isValid()) {
		reposition();
		} else {
		updateSurface(false, false, false);
		}
		}
		}

		private void reposition() {
		if (mPreviewSurfacePosition == null) {
		return;
		}
		if (DEBUG) {
		Log.i(TAG, "reposition: rect: " + mPreviewSurfacePosition);
		}

		mTmpMatrix.setTranslate(mPreviewSurfacePosition.left, mPreviewSurfacePosition.top);
		mTmpMatrix.postScale(((float) mPreviewSurfacePosition.width()) / mCurWidth,
		((float) mPreviewSurfacePosition.height()) / mCurHeight);
		mTmpMatrix.getValues(mTmpValues);
		SurfaceControl.Transaction t = new SurfaceControl.Transaction();
		t.setPosition(mSurfaceControl, mPreviewSurfacePosition.left,
		mPreviewSurfacePosition.top);
		t.setMatrix(mSurfaceControl, mTmpValues[MSCALE_X], mTmpValues[MSKEW_Y],
		mTmpValues[MSKEW_X], mTmpValues[MSCALE_Y]);
		t.apply();
		}

		void attach(IWallpaperEngineWrapper wrapper) {
		if (DEBUG) Log.v(TAG, "attach: " + this + " wrapper=" + wrapper);
		if (mDestroyed) {
		@@ -1414,7 +1459,7 @@ public abstract class WallpaperService extends Service {
		}

		public void setZoomOut(float scale) {
		Message msg = mCaller.obtainMessageI(MSG_SCALE, Float.floatToIntBits(scale));
		Message msg = mCaller.obtainMessageI(MSG_ZOOM, Float.floatToIntBits(scale));
		mCaller.sendMessage(msg);
		}

		@@ -1444,6 +1489,11 @@ public abstract class WallpaperService extends Service {
		mDetached.set(true);
		}

		public void scalePreview(Rect position) {
		Message msg = mCaller.obtainMessageO(MSG_SCALE_PREVIEW, position);
		mCaller.sendMessage(msg);
		}

		private void doDetachEngine() {
		mActiveEngines.remove(mEngine);
		mEngine.detach();
		@@ -1490,9 +1540,12 @@ public abstract class WallpaperService extends Service {
		case MSG_UPDATE_SURFACE:
		mEngine.updateSurface(true, false, false);
		break;
		case MSG_SCALE:
		case MSG_ZOOM:
		mEngine.setZoom(Float.intBitsToFloat(message.arg1));
		break;
		case MSG_SCALE_PREVIEW:
		mEngine.scalePreview((Rect) message.obj);
		break;
		case MSG_VISIBILITY_CHANGED:
		if (DEBUG) Log.v(TAG, "Visibility change in " + mEngine
		+ ": " + message.arg1);