commit 949c6cde6e8e892c7d558addf894119c1e54e933
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 25 02:09:53 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 25 02:09:53 2021 +0000
tree 70f4592fb077c7f9da7893eb27a0cd87793d9dc6
parent 88913da9e034a80f85d5bcf7337ff0e4e2149f44
parent 729761e4e01b68ea3cc62305e9ded252065ad41e

Merge "Replace the no preview layout check with Resources.ID_NULL(0)" into sc-dev am: 729761e4e0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13686847

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b4162ec44d4c796758e2fbcd5d9ce7b6bd9fc51

src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java

diff --git a/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java b/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java
index 71e10a8..be6a07f 100644
--- a/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java
+++ b/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java
@@ -1,6 +1,9 @@
 package com.android.launcher3.dragndrop;
 
+import static com.android.launcher3.Utilities.ATLEAST_S;
+
 import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.util.AttributeSet;
 import android.view.View;
@@ -62,9 +65,10 @@
 
     @Override
     public void applyFromCellItem(WidgetItem item, WidgetPreviewLoader loader) {
-        if (mPreview == null
+        if (ATLEAST_S
+                && mPreview == null
                 && item.widgetInfo != null
-                && item.widgetInfo.previewLayout != View.NO_ID) {
+                && item.widgetInfo.previewLayout != Resources.ID_NULL) {
             mPreview = new RemoteViews(item.widgetInfo.provider.getPackageName(),
                     item.widgetInfo.previewLayout);
         }