Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: f8fb6d1261

* commit 'f8fb6d1261dd7ee4ee5342766f0f12e1b31080b2':
  Make sure background drawable callback is cleared during resizing
This commit is contained in:
Chong Zhang
2016-02-25 02:12:22 +00:00
committed by android-build-merger
parent b4541890a4 f8fb6d1261
commit 4d99bc6a70
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/com/android/internal/policy/DecorView.java
View File

@@ -1745,6 +1745,10 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
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 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
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),