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

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

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

am: fe25025c

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

Change-Id: Ib93cee44edc0317a806d90ea2b2a44d293af1c1f
parents 547420c8 fe25025c

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();

            }