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

Commit 9bd2d09e authored May 07, 2022 by Tracy Zhou Committed by Automerger Merge Worker May 07, 2022

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

Merge "Rename navigationBarHeight to navigationBarFrameHeight" into tm-dev am: cf134e04 am: 9e3f0399

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

Change-Id: I6f9292c042874dc37c9e98a27e1fcdeaff1bd35d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 84c6233d 9e3f0399

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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
	}		}

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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)