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

Commit 2187f9df authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Null check when force navigation bar true and on lockscreen." into tm-dev am: 3e2a850f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17054378

Change-Id: Icf430c850fbd02a9dae2f6b0e05efcc1fc894768
parents 4f4f0900 3e2a850f

services/core/java/com/android/server/wm/InsetsPolicy.java

+3 −3
Original line number Diff line number Diff line
@@ -583,10 +583,10 @@ class InsetsPolicy { 
            // Notification shade has control anyways, no reason to force anything.

            return focusedWin;

        }

        if (mPolicy.isForceShowNavigationBarEnabled()

        if (mPolicy.isForceShowNavigationBarEnabled() && focusedWin != null

                && focusedWin.getActivityType() == ACTIVITY_TYPE_STANDARD) {

            // When "force show navigation bar" is enabled, it means we are in kid navigation bar

            // and 3-button navigation bar mode. In this mode, the navigation bar is forcibly shown

            // When "force show navigation bar" is enabled, it means both force visible is true, and

            // we are in 3-button navigation. In this mode, the navigation bar is forcibly shown

            // when activity type is ACTIVITY_TYPE_STANDARD which means Launcher or Recent could

            // still control the navigation bar in this mode.

            return null;