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 
am: abb81c5972

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

Change-Id: I50ee5eda0a88af238719a83a3e39ed81da0f2dbe
This commit is contained in:
Robert Carr
2016-05-20 23:13:36 +00:00
committed by android-build-merger
parent 6c82927d7d abb81c5972
commit a7dfbc9437
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);
if (drawable != null) {
mResizingBackgroundDrawable = drawable;
drawable.getPadding(mBackgroundPadding);
} else {
mResizingBackgroundDrawable = getResizingBackgroundDrawable(
getContext(), 0, mWindow.mBackgroundFallbackResource);
}
if (mResizingBackgroundDrawable != null) {
mResizingBackgroundDrawable.getPadding(mBackgroundPadding);
} else {
mBackgroundPadding.setEmpty();
}