Merge "Revert "Use wallpaper colors for widgets in wallpaper change preview"" into sc-dev am: 7de95d6767
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15332339
Change-Id: I49953a58f1639fb0a9b5e14ccb49b50f7c37d8df
diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index a387f04..cf3da4b 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -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 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.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.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 @@
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 @@
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 @@
view.setAppWidget(-1, providerInfo);
view.updateAppWidget(null);
view.setTag(info);
-
- if (mWallpaperColorResources != null) {
- view.setColorResources(mWallpaperColorResources);
- }
-
addInScreenFromBind(view, info);
}
diff --git a/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java b/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java
index df49359..a8c3d15 100644
--- a/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java
+++ b/src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java
@@ -209,7 +209,7 @@
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(),
diff --git a/src/com/android/launcher3/widget/LocalColorExtractor.java b/src/com/android/launcher3/widget/LocalColorExtractor.java
index 23d9e15..8ae6b2e 100644
--- a/src/com/android/launcher3/widget/LocalColorExtractor.java
+++ b/src/com/android/launcher3/widget/LocalColorExtractor.java
@@ -76,14 +76,6 @@
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.
*
* @param launcher Launcher class class.