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

Commit 0df63d5d authored by Chong Zhang's avatar Chong Zhang
Browse files

Make sure background drawable callback is cleared during resizing

bug: 27297724
Change-Id: I8ee3d0e093f94a7fc293f64949abbb612e0b2aa4
parent 16ad43c0
Loading
Loading
Loading
Loading
+4 −5
Original line number Original line Diff line number Diff line
@@ -1744,6 +1744,10 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
            mCaptionBackgroundDrawable = getContext().getDrawable(
            mCaptionBackgroundDrawable = getContext().getDrawable(
                    R.drawable.decor_caption_title_focused);
                    R.drawable.decor_caption_title_focused);
        }
        }
        if (mResizingBackgroundDrawable != null) {
            mLastBackgroundDrawableCb = mResizingBackgroundDrawable.getCallback();
            mResizingBackgroundDrawable.setCallback(null);
        }
    }
    }


    // Free floating overlapping windows require a caption.
    // Free floating overlapping windows require a caption.
@@ -1914,11 +1918,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
        final ThreadedRenderer renderer = getHardwareRenderer();
        final ThreadedRenderer renderer = getHardwareRenderer();
        if (renderer != null) {
        if (renderer != null) {
            loadBackgroundDrawablesIfNeeded();
            loadBackgroundDrawablesIfNeeded();
            if (mResizingBackgroundDrawable != null) {
                mLastBackgroundDrawableCb = mResizingBackgroundDrawable.getCallback();
                mResizingBackgroundDrawable.setCallback(null);
            }

            mBackdropFrameRenderer = new BackdropFrameRenderer(this, renderer,
            mBackdropFrameRenderer = new BackdropFrameRenderer(this, renderer,
                    initialBounds, mResizingBackgroundDrawable, mCaptionBackgroundDrawable,
                    initialBounds, mResizingBackgroundDrawable, mCaptionBackgroundDrawable,
                    mUserCaptionBackgroundDrawable, getCurrentColor(mStatusColorViewState),
                    mUserCaptionBackgroundDrawable, getCurrentColor(mStatusColorViewState),