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

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

Merge "Only consume status bar if FULLSCREEN is set" into qt-dev 

am: 89d1bded

Change-Id: Ia61bda8b198150c38bff53eeae9b18437de1def7
parents 50db797d 89d1bded

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

+5 −1
Original line number Diff line number Diff line
@@ -1174,12 +1174,16 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 


        // If we didn't request fullscreen layout, but we still got it because of the

        // mForceWindowDrawsBarBackgrounds flag, also consume top inset.

        // If we should always consume system bars, only consume that if the app wanted to go to

        // fullscreen, as othrewise we can expect the app to handle it.

        boolean fullscreen = (sysUiVisibility & SYSTEM_UI_FLAG_FULLSCREEN) != 0

                || (attrs.flags & FLAG_FULLSCREEN) != 0;

        boolean consumingStatusBar = (sysUiVisibility & SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN) == 0

                && (attrs.flags & FLAG_LAYOUT_IN_SCREEN) == 0

                && (attrs.flags & FLAG_LAYOUT_INSET_DECOR) == 0

                && mForceWindowDrawsBarBackgrounds

                && mLastTopInset != 0

                || mLastShouldAlwaysConsumeSystemBars;

                || (mLastShouldAlwaysConsumeSystemBars && fullscreen);



        int consumedTop = consumingStatusBar ? mLastTopInset : 0;

        int consumedRight = consumingNavBar ? mLastRightInset : 0;