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

Commit f8fb6d12 authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "Make sure background drawable callback is cleared during resizing" into nyc-dev

parents 106c651a 0df63d5d

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

+4 −5
Original line number Diff line number Diff line
@@ -1745,6 +1745,10 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
            mCaptionBackgroundDrawable = getContext().getDrawable(

                    R.drawable.decor_caption_title_focused);

        }

        if (mResizingBackgroundDrawable != null) {

            mLastBackgroundDrawableCb = mResizingBackgroundDrawable.getCallback();

            mResizingBackgroundDrawable.setCallback(null);

        }

    }



    // Free floating overlapping windows require a caption.
@@ -1915,11 +1919,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
        final ThreadedRenderer renderer = getHardwareRenderer();

        if (renderer != null) {

            loadBackgroundDrawablesIfNeeded();

            if (mResizingBackgroundDrawable != null) {

                mLastBackgroundDrawableCb = mResizingBackgroundDrawable.getCallback();

                mResizingBackgroundDrawable.setCallback(null);

            }



            mBackdropFrameRenderer = new BackdropFrameRenderer(this, renderer,

                    initialBounds, mResizingBackgroundDrawable, mCaptionBackgroundDrawable,

                    mUserCaptionBackgroundDrawable, getCurrentColor(mStatusColorViewState),