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

Merge "Let navigation bar has control if it is focused" into udc-dev

Browse Source
This commit is contained in:
Tiger Huang
2023-03-06 08:31:13 +00:00
committed by Android (Google) Code Review
parent a21f721f6d d4193b97a2
commit 1dd100693a
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -580,6 +580,13 @@ class InsetsPolicy {
// Notification shade has control anyways, no reason to force anything. // Notification shade has control anyways, no reason to force anything.
return focusedWin; return focusedWin;
} }
if (focusedWin != null) {
final InsetsSourceProvider provider = focusedWin.getControllableInsetProvider();
if (provider != null && provider.getSource().getType() == Type.navigationBars()) {
// Navigation bar has control if it is focused.
return focusedWin;
}
}
if (mPolicy.isForceShowNavigationBarEnabled() && focusedWin != null if (mPolicy.isForceShowNavigationBarEnabled() && focusedWin != null
&& focusedWin.getActivityType() == ACTIVITY_TYPE_STANDARD) { && focusedWin.getActivityType() == ACTIVITY_TYPE_STANDARD) {
// When "force show navigation bar" is enabled, it means both force visible is true, and // When "force show navigation bar" is enabled, it means both force visible is true, and