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

Merge "Correctly clear resizing drawable when nulling background." into nyc-dev

Browse Source 
am: a3ec065a43

* commit 'a3ec065a43069a19dc42f023a40d54a3178f1b44':
  Correctly clear resizing drawable when nulling background.

Change-Id: I9cbb109bbd7891c30711a68bf88d8b2c4332baa3
This commit is contained in:
Robert Carr
2016-05-20 23:01:03 +00:00
committed by android-build-merger
parent e130c935a4 a3ec065a43
commit 89770ebf62
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -908,7 +908,12 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
setBackgroundDrawable(drawable); setBackgroundDrawable(drawable);
if (drawable != null) { if (drawable != null) {
mResizingBackgroundDrawable = drawable; mResizingBackgroundDrawable = drawable;
drawable.getPadding(mBackgroundPadding); } else {
mResizingBackgroundDrawable = getResizingBackgroundDrawable(
getContext(), 0, mWindow.mBackgroundFallbackResource);
}
if (mResizingBackgroundDrawable != null) {
mResizingBackgroundDrawable.getPadding(mBackgroundPadding);
} else { } else {
mBackgroundPadding.setEmpty(); mBackgroundPadding.setEmpty();
} }