commit 8eea7e9c44de5f43b524deabbba5fe15fd85bac9
author Steven Ng <stevenckng@google.com> Fri Mar 19 13:03:22 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 19 13:03:22 2021 +0000
tree 9be6ae9fd68450022dbff9b97d5c6c55ba042471
parent d52a244d88f0bb92be30351d926b6453c149a5d6
parent be7386863424a683e378631a7a368be8ef4de6d3

Merge "Notify WidgetHostView drag content change only at onDraw" into sc-dev am: be73868634

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

Change-Id: Iefe026c2cefe15b63f8dab60e03e412b656534f2

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

diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index 8df70fb..5c18faf 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -19,6 +19,7 @@
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.content.res.Configuration;
+import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.os.Handler;
@@ -120,8 +121,12 @@
         } else {
             super.setColorResources(colors);
         }
+    }
 
-        if (mDragListener != null) {
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        if (mIsInDragMode && mDragListener != null) {
             mDragListener.onDragContentChanged();
         }
     }

src/com/android/launcher3/widget/dragndrop/AppWidgetHostViewDragListener.java

diff --git a/src/com/android/launcher3/widget/dragndrop/AppWidgetHostViewDragListener.java b/src/com/android/launcher3/widget/dragndrop/AppWidgetHostViewDragListener.java
index c5e6fbd..66bb363 100644
--- a/src/com/android/launcher3/widget/dragndrop/AppWidgetHostViewDragListener.java
+++ b/src/com/android/launcher3/widget/dragndrop/AppWidgetHostViewDragListener.java
@@ -54,6 +54,8 @@
 
     /** Notifies when there is a content change in the drag view. */
     public void onDragContentChanged() {
-        mDragObject.dragView.invalidate();
+        if (mDragObject.dragView != null) {
+            mDragObject.dragView.invalidate();
+        }
     }
 }