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

Commit de1383f4 authored by Paul Scovanner's avatar Paul Scovanner Committed by Android (Google) Code Review
Browse files

Merge "Revert "Pretend to be having the original background"" into qt-dev

parents d6d09d95 956bbb7e

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

+1 −6
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
                drawingBounds.bottom -= framePadding.bottom - frameOffsets.bottom;

            }



            Drawable bg = super.getBackground();

            Drawable bg = getBackground();

            if (bg != null) {

                bg.setBounds(drawingBounds);

            }
@@ -1238,11 +1238,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
        mLastOriginalBackgroundDrawable = mOriginalBackgroundDrawable;

    }



    @Override

    public Drawable getBackground() {

        return mOriginalBackgroundDrawable;

    }



    private int calculateStatusBarColor() {

        return calculateBarColor(mWindow.getAttributes().flags, FLAG_TRANSLUCENT_STATUS,

                mSemiTransparentBarColor, mWindow.mStatusBarColor,