Merge "Revert "Use wallpaper colors for widgets in wallpaper change preview"" into sc-dev (7de95d67) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/graphics/LauncherPreviewRenderer.java

+1 −25

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@
		*/
		package com.android.launcher3.graphics;

		import static android.app.WallpaperManager.FLAG_SYSTEM;
		import static android.view.View.MeasureSpec.EXACTLY;
		import static android.view.View.MeasureSpec.makeMeasureSpec;
		import static android.view.View.VISIBLE;
		@@ -27,8 +26,6 @@ import static com.android.launcher3.model.ModelUtils.sortWorkspaceItemsSpatially

		import android.annotation.TargetApi;
		import android.app.Fragment;
		import android.app.WallpaperColors;
		import android.app.WallpaperManager;
		import android.appwidget.AppWidgetHostView;
		import android.appwidget.AppWidgetProviderInfo;
		import android.content.Context;
		@@ -44,7 +41,6 @@ import android.os.Handler;
		import android.os.Looper;
		import android.os.Process;
		import android.util.AttributeSet;
		import android.util.SparseIntArray;
		import android.view.ContextThemeWrapper;
		import android.view.LayoutInflater;
		import android.view.MotionEvent;
		@@ -88,7 +84,6 @@ import com.android.launcher3.util.MainThreadInitializedObject;
		import com.android.launcher3.views.ActivityContext;
		import com.android.launcher3.views.BaseDragLayer;
		import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
		import com.android.launcher3.widget.LocalColorExtractor;
		import com.android.launcher3.widget.custom.CustomWidgetManager;

		import java.util.ArrayList;
		@@ -206,12 +201,8 @@ public class LauncherPreviewRenderer extends ContextWrapper
		private final InsettableFrameLayout mRootView;
		private final Hotseat mHotseat;
		private final CellLayout mWorkspace;
		private final SparseIntArray mWallpaperColorResources;

		public LauncherPreviewRenderer(Context context,
		InvariantDeviceProfile idp,
		WallpaperColors wallpaperColorsOverride) {

		public LauncherPreviewRenderer(Context context, InvariantDeviceProfile idp) {
		super(context);
		mUiHandler = new Handler(Looper.getMainLooper());
		mContext = context;
		@@ -263,16 +254,6 @@ public class LauncherPreviewRenderer extends ContextWrapper
		mDp.workspacePadding.top,
		mDp.workspacePadding.right + mDp.cellLayoutPaddingLeftRightPx,
		mDp.workspacePadding.bottom);

		if (Utilities.ATLEAST_S) {
		WallpaperColors wallpaperColors = wallpaperColorsOverride != null
		? wallpaperColorsOverride
		: WallpaperManager.getInstance(context).getWallpaperColors(FLAG_SYSTEM);
		mWallpaperColorResources = LocalColorExtractor.newInstance(context)
		.generateColorsOverride(wallpaperColors);
		} else {
		mWallpaperColorResources = null;
		}
		}

		/** Populate preview and render it. */
		@@ -376,11 +357,6 @@ public class LauncherPreviewRenderer extends ContextWrapper
		view.setAppWidget(-1, providerInfo);
		view.updateAppWidget(null);
		view.setTag(info);

		if (mWallpaperColorResources != null) {
		view.setColorResources(mWallpaperColorResources);
		}

		addInScreenFromBind(view, info);
		}

src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -209,7 +209,7 @@ public class PreviewSurfaceRenderer {
		if (mDestroyed) {
		return;
		}
		View view = new LauncherPreviewRenderer(inflationContext, mIdp, mWallpaperColors)
		View view = new LauncherPreviewRenderer(inflationContext, mIdp)
		.getRenderedView(dataModel, widgetProviderInfoMap);
		// This aspect scales the view to fit in the surface and centers it
		final float scale = Math.min(mWidth / (float) view.getMeasuredWidth(),

src/com/android/launcher3/widget/LocalColorExtractor.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -75,14 +75,6 @@ public class LocalColorExtractor implements ResourceBasedOverride {
		*/
		public void applyColorsOverride(Context base, WallpaperColors colors) { }

		/**
		* Generates color resource overrides from {@link WallpaperColors}.
		*/
		@Nullable
		public SparseIntArray generateColorsOverride(WallpaperColors colors) {
		return null;
		}

		/**
		* Takes a view and returns its rect that can be used by the wallpaper local color extractor.
		*