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

Merge "Merge "Correctly clear resizing drawable when nulling background." into nyc-dev am: a3ec065a43 am: fe25025c5c" into nyc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-05-20 23:08:56 +00:00
committed by Android (Google) Code Review
parent c0d61dec97 ac0ed76278
commit abb81c5972
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();
} }