commit f8fb6d1261dd7ee4ee5342766f0f12e1b31080b2
author Chong Zhang <chz@google.com> Thu Feb 25 00:38:18 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 25 00:38:19 2016 +0000
tree 17fc3ec1a563ae92808e4528f24753708eb350f1
parent 106c651aefa39f0576fab29173050fef39b403d4
parent 0df63d5d57ee3741704290bd7f73f17c38cb1ee8

Merge "Make sure background drawable callback is cleared during resizing" into nyc-dev

core/java/com/android/internal/policy/DecorView.java

diff --git a/core/java/com/android/internal/policy/DecorView.java b/core/java/com/android/internal/policy/DecorView.java
index 6879df3..df48d6d 100644
--- a/core/java/com/android/internal/policy/DecorView.java
+++ b/core/java/com/android/internal/policy/DecorView.java
@@ -1745,6 +1745,10 @@
             mCaptionBackgroundDrawable = getContext().getDrawable(
                     R.drawable.decor_caption_title_focused);
         }
+        if (mResizingBackgroundDrawable != null) {
+            mLastBackgroundDrawableCb = mResizingBackgroundDrawable.getCallback();
+            mResizingBackgroundDrawable.setCallback(null);
+        }
     }
 
     // Free floating overlapping windows require a caption.
@@ -1915,11 +1919,6 @@
         final ThreadedRenderer renderer = getHardwareRenderer();
         if (renderer != null) {
             loadBackgroundDrawablesIfNeeded();
-            if (mResizingBackgroundDrawable != null) {
-                mLastBackgroundDrawableCb = mResizingBackgroundDrawable.getCallback();
-                mResizingBackgroundDrawable.setCallback(null);
-            }
-
             mBackdropFrameRenderer = new BackdropFrameRenderer(this, renderer,
                     initialBounds, mResizingBackgroundDrawable, mCaptionBackgroundDrawable,
                     mUserCaptionBackgroundDrawable, getCurrentColor(mStatusColorViewState),