Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7dfbc94 authored by Robert Carr's avatar Robert Carr Committed by android-build-merger
Browse files

Merge "Merge "Correctly clear resizing drawable when nulling background." into... 

Merge "Merge "Correctly clear resizing drawable when nulling background." into nyc-dev am: a3ec065a am: fe25025c" into nyc-mr1-dev-plus-aosp
am: abb81c59

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

Change-Id: I50ee5eda0a88af238719a83a3e39ed81da0f2dbe
parents 6c82927d abb81c59

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

+6 −1
Original line number Diff line number Diff line
@@ -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();

            }