Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Icf430c850fbd02a9dae2f6b0e05efcc1fc894768
This commit is contained in:
TreeHugger Robot
2022-03-03 19:24:04 +00:00
committed by Automerger Merge Worker
parent 4f4f0900eb 3e2a850fa6
commit 2187f9df0f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/InsetsPolicy.java
View File

@@ -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;