commit f8b0d6f3c1a6fcbb96bb6b4c2caed1cf53ab79bf
author Cyrus Boadway <boadway@google.com> Wed May 05 16:03:02 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 05 16:03:02 2021 +0000
tree 9f210ac2637785dc01276b4011c37c880f294814
parent c2a22018e45f8336d65cbbc5d6b4933a9a971ce2
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: If1146ba268af3817474213cafc2a320081268499

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() {