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

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

Merge "Use background drawable from the client"

parents 5247a83c 1cc95075

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

+12 −1
Original line number Original line Diff line number Diff line
@@ -197,7 +197,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
    int mStackId;

    int mStackId;





    private boolean mWindowResizeCallbacksAdded = false;

    private boolean mWindowResizeCallbacksAdded = false;



    private Drawable.Callback mLastBackgroundDrawableCb = null;

    private BackdropFrameRenderer mBackdropFrameRenderer = null;

    private BackdropFrameRenderer mBackdropFrameRenderer = null;

    private Drawable mResizingBackgroundDrawable;

    private Drawable mResizingBackgroundDrawable;

    private Drawable mCaptionBackgroundDrawable;

    private Drawable mCaptionBackgroundDrawable;
@@ -862,6 +862,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
        if (getBackground() != drawable) {

        if (getBackground() != drawable) {

            setBackgroundDrawable(drawable);

            setBackgroundDrawable(drawable);

            if (drawable != null) {

            if (drawable != null) {

                mResizingBackgroundDrawable = drawable;

                drawable.getPadding(mBackgroundPadding);

                drawable.getPadding(mBackgroundPadding);

            } else {

            } else {

                mBackgroundPadding.setEmpty();

                mBackgroundPadding.setEmpty();
@@ -1900,6 +1901,11 @@ 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),
@@ -1943,6 +1949,11 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 




    /** Release the renderer thread which is usually done when the user stops resizing. */

    /** Release the renderer thread which is usually done when the user stops resizing. */

    private void releaseThreadedRenderer() {

    private void releaseThreadedRenderer() {

        if (mResizingBackgroundDrawable != null && mLastBackgroundDrawableCb != null) {

            mResizingBackgroundDrawable.setCallback(mLastBackgroundDrawableCb);

            mLastBackgroundDrawableCb = null;

        }



        if (mBackdropFrameRenderer != null) {

        if (mBackdropFrameRenderer != null) {

            mBackdropFrameRenderer.releaseRenderer();

            mBackdropFrameRenderer.releaseRenderer();

            mBackdropFrameRenderer = null;

            mBackdropFrameRenderer = null;