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

Merge "Rename navigationBarHeight to navigationBarFrameHeight" into tm-dev am: cf134e04c8

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

Change-Id: I7d85de596f79489ffd988b27017ae83c61c43177
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tracy Zhou
2022-05-07 06:29:47 +00:00
committed by Automerger Merge Worker
parent 121e7c60e5 cf134e04c8
commit 9e3f03991d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/helpers/AppPairsHelper.kt
View File

@@ -37,7 +37,7 @@ class AppPairsHelper(
val displayBounds = WindowUtils.displayBounds val displayBounds = WindowUtils.displayBounds
val secondaryAppBounds = Region.from(0, val secondaryAppBounds = Region.from(0,
dividerBounds.bounds.bottom - WindowUtils.dockedStackDividerInset, dividerBounds.bounds.bottom - WindowUtils.dockedStackDividerInset,
displayBounds.right, displayBounds.bottom - WindowUtils.navigationBarHeight) displayBounds.right, displayBounds.bottom - WindowUtils.navigationBarFrameHeight)
return secondaryAppBounds return secondaryAppBounds
} }

4
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ResizeLegacySplitScreen.kt
View File

@@ -171,7 +171,7 @@ class ResizeLegacySplitScreen(
val bottomAppBounds = Region.from(0, val bottomAppBounds = Region.from(0,
dividerBounds.bottom - WindowUtils.dockedStackDividerInset, dividerBounds.bottom - WindowUtils.dockedStackDividerInset,
displayBounds.right, displayBounds.right,
displayBounds.bottom - WindowUtils.navigationBarHeight) displayBounds.bottom - WindowUtils.navigationBarFrameHeight)
visibleRegion(Components.SimpleActivity.COMPONENT.toFlickerComponent()) visibleRegion(Components.SimpleActivity.COMPONENT.toFlickerComponent())
.coversExactly(topAppBounds) .coversExactly(topAppBounds)
visibleRegion(Components.ImeActivity.COMPONENT.toFlickerComponent()) visibleRegion(Components.ImeActivity.COMPONENT.toFlickerComponent())
@@ -192,7 +192,7 @@ class ResizeLegacySplitScreen(
val bottomAppBounds = Region.from(0, val bottomAppBounds = Region.from(0,
dividerBounds.bottom - WindowUtils.dockedStackDividerInset, dividerBounds.bottom - WindowUtils.dockedStackDividerInset,
displayBounds.right, displayBounds.right,
displayBounds.bottom - WindowUtils.navigationBarHeight) displayBounds.bottom - WindowUtils.navigationBarFrameHeight)
visibleRegion(Components.SimpleActivity.COMPONENT.toFlickerComponent()) visibleRegion(Components.SimpleActivity.COMPONENT.toFlickerComponent())
.coversExactly(topAppBounds) .coversExactly(topAppBounds)