Merge "Override statusBar top inset in Launcher" into tm-dev am: f9aa367324 am: 8e6c262c6c

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

Change-Id: I4d3ee47650bf5d4b429317e9611b8a1cb6cb26d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Chau
2022-04-05 11:44:55 +00:00
committed by Automerger Merge Worker
@@ -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) {