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

Commit f59e8e6c authored by Priyanka Advani's avatar Priyanka Advani Committed by Android (Google) Code Review
Browse files

Revert "Nav bar moves independently of the layer" 

This reverts commit 1e2fdc05.

Reason for revert: b/333057476. Will be verifying through ABTD for confirmation and before submitting the revert.

Change-Id: I4017c3e1781d0967565c9e0daf265a41c87439a9
parent 1e2fdc05

tests/FlickerTests/Rotation/src/com/android/server/wm/flicker/rotation/RotationTransition.kt

+1 −43
Original line number Diff line number Diff line
@@ -17,14 +17,10 @@ 
package com.android.server.wm.flicker.rotation



import android.platform.test.annotations.Presubmit

import android.tools.Position

import android.tools.datatypes.Rect

import android.tools.device.apphelpers.StandardAppHelper

import android.tools.flicker.legacy.FlickerBuilder

import android.tools.flicker.legacy.LegacyFlickerTest

import android.tools.flicker.subject.layers.LayerTraceEntrySubject

import android.tools.traces.Condition

import android.tools.traces.DeviceStateDump

import android.tools.traces.component.ComponentNameMatcher

import android.tools.traces.component.IComponentMatcher

import android.tools.traces.surfaceflinger.Display
@@ -40,12 +36,7 @@ abstract class RotationTransition(flicker: LegacyFlickerTest) : BaseTest(flicker 
    override val transition: FlickerBuilder.() -> Unit = {

        setup { this.setRotation(flicker.scenario.startRotation) }

        teardown { testApp.exit(wmHelper) }

        transitions {

            this.setRotation(flicker.scenario.endRotation)

            wmHelper.StateSyncBuilder()

                .add(navBarInPosition(flicker.scenario.isGesturalNavigation))

                .waitForAndVerify()

        }

        transitions { this.setRotation(flicker.scenario.endRotation) }

    }



    /** {@inheritDoc} */
@@ -98,37 +89,4 @@ abstract class RotationTransition(flicker: LegacyFlickerTest) : BaseTest(flicker 
        appLayerRotates_StartingPos()

        appLayerRotates_EndingPos()

    }



    private fun navBarInPosition(isGesturalNavigation: Boolean): Condition<DeviceStateDump> {

        return Condition("navBarPosition") { dump ->

            val display =

                dump.layerState.displays.filterNot { it.isOff }.minByOrNull { it.id }

                    ?: error("There is no display!")

            val displayArea = display.layerStackSpace

            val navBarPosition = display.navBarPosition(isGesturalNavigation)

            val navBarRegion = dump.layerState

                .getLayerWithBuffer(ComponentNameMatcher.NAV_BAR)

                ?.visibleRegion?.bounds ?: Rect.EMPTY



            when (navBarPosition) {

                Position.TOP ->

                    navBarRegion.top == displayArea.top &&

                        navBarRegion.left == displayArea.left &&

                        navBarRegion.right == displayArea.right

                Position.BOTTOM ->

                    navBarRegion.bottom == displayArea.bottom &&

                        navBarRegion.left == displayArea.left &&

                        navBarRegion.right == displayArea.right

                Position.LEFT ->

                    navBarRegion.left == displayArea.left &&

                        navBarRegion.top == displayArea.top &&

                        navBarRegion.bottom == displayArea.bottom

                Position.RIGHT ->

                    navBarRegion.right == displayArea.right &&

                        navBarRegion.top == displayArea.top &&

                        navBarRegion.bottom == displayArea.bottom

                else -> error("Unknown position $navBarPosition")

            }

        }

    }

}