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

Commit 8e6c262c authored by Alex Chau's avatar Alex Chau Committed by Automerger Merge Worker
Browse files

Merge "Override statusBar top inset in Launcher" into tm-dev am: f9aa3673 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17570025



Change-Id: I4cdd1c3f81fe3d2ca93ce1a0538aac7072f0eacc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 464562ae f9aa3673

src/com/android/launcher3/util/window/WindowManagerProxy.java

+11 −0
Original line number Diff line number Diff line
@@ -165,6 +165,17 @@ public class WindowManagerProxy implements ResourceBasedOverride { 
        insetsBuilder.setInsets(WindowInsets.Type.navigationBars(), newNavInsets);

        insetsBuilder.setInsetsIgnoringVisibility(WindowInsets.Type.navigationBars(), newNavInsets);



        Insets statusBarInsets = oldInsets.getInsets(WindowInsets.Type.statusBars());

        int statusBarHeight = getDimenByName("status_bar_height", systemRes, 0);

        Insets newStatusBarInsets = Insets.of(

                statusBarInsets.left,

                Math.max(statusBarInsets.top, statusBarHeight),

                statusBarInsets.right,

                statusBarInsets.bottom);

        insetsBuilder.setInsets(WindowInsets.Type.statusBars(), newStatusBarInsets);

        insetsBuilder.setInsetsIgnoringVisibility(

                WindowInsets.Type.statusBars(), newStatusBarInsets);



        // Override the tappable insets to be 0 on the bottom for gesture nav (otherwise taskbar

        // would count towards it). This is used for the bottom protection in All Apps for example.

        if (isGesture) {