commit 1a36c637e4af6a9331b8e363443460070d05d952
author Cyrus Boadway <boadway@google.com> Wed May 05 16:02:29 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 05 16:02:29 2021 +0000
tree f58a6fe6844937019e499f6bd796e2e3edc410bb
parent 60e8e6680f6251b54a86de2dfcac88e405198103
parent e41034034f078583b9fffb4aeb776d93ae130b8a

Fix FloatingWidgetView post-animation fallback background handling am: e41034034f

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

Change-Id: I3dc5a43bfc407ca89d67c494deee6d70a596b8bd

quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java

diff --git a/quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java b/quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java
index f74aa55..9ea2369 100644
--- a/quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java
+++ b/quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java
@@ -100,8 +100,8 @@
     /** Restores the drawables to the source view. */
     void finish() {
         if (isUninitialized()) return;
-        mSourceView.setForeground(mOriginalForeground);
-        mSourceView.setBackground(mOriginalBackground);
+        if (mOriginalForeground != null) mSourceView.setForeground(mOriginalForeground);
+        if (mOriginalBackground != null) mSourceView.setBackground(mOriginalBackground);
     }
 
     void recycle() {