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

Commit 793ea8e6 authored by Paul Scovanner's avatar Paul Scovanner Committed by android-build-merger
Browse files

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

am: c7ca36be

Change-Id: I2ea3967c90297b9bda9a81d8616504698041123b
parents eb385636 c7ca36be

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,