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

Commit 779e2527 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Pretend to be having the original background" into qt-dev am: 757cbfea 

am: 7419ddbb

Change-Id: Ifc69513134f0c3ad6da27d5ff0578360d32bf0b5
parents ca4dcd8d 7419ddbb

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

+6 −1
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 = getBackground();

            Drawable bg = super.getBackground();

            if (bg != null) {

                bg.setBounds(drawingBounds);

            }
@@ -1238,6 +1238,11 @@ 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,