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

Commit ace8b686 authored by Tracy Zhou's avatar Tracy Zhou Committed by Automerger Merge Worker
Browse files

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: Iaf46e2850ff4ede488df7d3520c8c25766245697
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a4ad2afb 9e3f0399

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

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ class AppPairsHelper( 
        val displayBounds = WindowUtils.displayBounds

        val secondaryAppBounds = Region.from(0,

                dividerBounds.bounds.bottom - WindowUtils.dockedStackDividerInset,

                displayBounds.right, displayBounds.bottom - WindowUtils.navigationBarHeight)

                displayBounds.right, displayBounds.bottom - WindowUtils.navigationBarFrameHeight)

        return secondaryAppBounds

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ class ResizeLegacySplitScreen( 
            val bottomAppBounds = Region.from(0,

                dividerBounds.bottom - WindowUtils.dockedStackDividerInset,

                displayBounds.right,

                displayBounds.bottom - WindowUtils.navigationBarHeight)

                displayBounds.bottom - WindowUtils.navigationBarFrameHeight)

            visibleRegion(Components.SimpleActivity.COMPONENT.toFlickerComponent())

                .coversExactly(topAppBounds)

            visibleRegion(Components.ImeActivity.COMPONENT.toFlickerComponent())
@@ -192,7 +192,7 @@ class ResizeLegacySplitScreen( 
            val bottomAppBounds = Region.from(0,

                dividerBounds.bottom - WindowUtils.dockedStackDividerInset,

                displayBounds.right,

                displayBounds.bottom - WindowUtils.navigationBarHeight)

                displayBounds.bottom - WindowUtils.navigationBarFrameHeight)



            visibleRegion(Components.SimpleActivity.COMPONENT.toFlickerComponent())

                .coversExactly(topAppBounds)