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

Commit a7a6149c authored by Eghosa Ewansiha-Vlachavas's avatar Eghosa Ewansiha-Vlachavas Committed by Android (Google) Code Review
Browse files

Merge changes Id3254a13,Id84a4b94 into main

* changes:
  Fix aspect ratio for transparent letterboxed activity
  Fix aspect ratio for letterboxed activity in `LetterboxAppHelper`
parents 40cebfc7 db17c245
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@
package com.android.wm.shell.flicker.appcompat

import android.platform.test.annotations.Postsubmit
import android.tools.Rotation
import android.tools.flicker.assertions.FlickerTest
import android.tools.flicker.junit.FlickerParametersRunnerFactory
import android.tools.flicker.legacy.FlickerBuilder
@@ -109,9 +108,7 @@ class OpenTransparentActivityTest(flicker: LegacyFlickerTest) : TransparentBaseA
        @Parameterized.Parameters(name = "{0}")
        @JvmStatic
        fun getParams(): Collection<FlickerTest> {
            return LegacyFlickerTestFactory.nonRotationTests(
                supportedRotations = listOf(Rotation.ROTATION_90)
            )
            return LegacyFlickerTestFactory.nonRotationTests()
        }
    }
}
+1 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.graphics.Rect
import android.platform.test.annotations.Postsubmit
import android.platform.test.annotations.RequiresDevice
import android.tools.NavBar
import android.tools.Rotation
import android.tools.flicker.assertions.FlickerTest
import android.tools.flicker.junit.FlickerParametersRunnerFactory
import android.tools.flicker.legacy.FlickerBuilder
@@ -266,8 +265,7 @@ class QuickSwitchLauncherToLetterboxAppTest(flicker: LegacyFlickerTest) : BaseAp
        @JvmStatic
        fun getParams(): Collection<FlickerTest> {
            return LegacyFlickerTestFactory.nonRotationTests(
                supportedNavigationModes = listOf(NavBar.MODE_GESTURAL),
                supportedRotations = listOf(Rotation.ROTATION_90)
                supportedNavigationModes = listOf(NavBar.MODE_GESTURAL)
            )
        }
    }
+2 −2
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ class LetterboxAppHelper
@JvmOverloads
constructor(
    instr: Instrumentation,
    launcherName: String = ActivityOptions.NonResizeablePortraitActivity.LABEL,
    launcherName: String = ActivityOptions.NonResizeableFixedAspectRatioPortraitActivity.LABEL,
    component: ComponentNameMatcher =
        ActivityOptions.NonResizeablePortraitActivity.COMPONENT.toFlickerComponent()
        ActivityOptions.NonResizeableFixedAspectRatioPortraitActivity.COMPONENT.toFlickerComponent()
) : StandardAppHelper(instr, launcherName, component) {

    private val gestureHelper: GestureHelper = GestureHelper(instrumentation)
+14 −0
Original line number Diff line number Diff line
@@ -115,6 +115,19 @@
                <category android:name="android.intent.category.LAUNCHER"/>
            </intent-filter>
        </activity>
        <activity android:name=".NonResizeableFixedAspectRatioPortraitActivity"
            android:theme="@style/CutoutNever"
            android:resizeableActivity="false"
            android:screenOrientation="portrait"
            android:minAspectRatio="1.77"
            android:taskAffinity="com.android.server.wm.flicker.testapp.NonResizeableFixedAspectRatioPortraitActivity"
            android:label="NonResizeableFixedAspectRatioPortraitActivity"
            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.MAIN"/>
                <category android:name="android.intent.category.LAUNCHER"/>
            </intent-filter>
        </activity>
        <activity android:name=".StartMediaProjectionActivity"
            android:theme="@style/CutoutNever"
            android:resizeableActivity="false"
@@ -143,6 +156,7 @@
        <activity android:name=".LaunchTransparentActivity"
                  android:resizeableActivity="false"
                  android:screenOrientation="portrait"
                  android:minAspectRatio="1.77"
                  android:theme="@style/OptOutEdgeToEdge"
                  android:taskAffinity="com.android.server.wm.flicker.testapp.LaunchTransparentActivity"
                  android:label="LaunchTransparentActivity"
+6 −0
Original line number Diff line number Diff line
@@ -85,6 +85,12 @@ public class ActivityOptions {
                FLICKER_APP_PACKAGE + ".NonResizeablePortraitActivity");
    }

    public static class NonResizeableFixedAspectRatioPortraitActivity {
        public static final String LABEL = "NonResizeableFixedAspectRatioPortraitActivity";
        public static final ComponentName COMPONENT = new ComponentName(FLICKER_APP_PACKAGE,
                FLICKER_APP_PACKAGE + ".NonResizeableFixedAspectRatioPortraitActivity");
    }

    public static class StartMediaProjectionActivity {
        public static final String LABEL = "StartMediaProjectionActivity";
        public static final ComponentName COMPONENT = new ComponentName(FLICKER_APP_PACKAGE,
Loading