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

Commit c5376624 authored by Vinit Nayak's avatar Vinit Nayak Committed by Android (Google) Code Review
Browse files

Merge "Update split with self test since it didn't account for contextual split" into main

parents 0c94fbc6 fe35d069

quickstep/tests/src/com/android/quickstep/TaplTestsSplitscreen.java

+14 −4
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 
package com.android.quickstep;

package com.android.quickstep;









import static com.android.launcher3.config.FeatureFlags.enableSplitContextually;

import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL;

import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL;

import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT;

import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT;
@@ -40,6 +41,7 @@ import com.android.wm.shell.Flags; 




import org.junit.After;

import org.junit.After;

import org.junit.Before;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;
@@ -103,11 +105,19 @@ public class TaplTestsSplitscreen extends AbstractQuickStepTest { 
                .getSplitScreenMenuItem()

                .getSplitScreenMenuItem()

                .click();

                .click();





        if (enableSplitContextually()) {

            // We're staying in all apps, use same instance

            mLauncher.getAllApps()

                    .getAppIcon(CALCULATOR_APP_NAME)

                    .launch(CALCULATOR_APP_PACKAGE);

        } else {

            // We're in overview, use taskbar instance

            mLauncher.getLaunchedAppState()

            mLauncher.getLaunchedAppState()

                    .getTaskbar()

                    .getTaskbar()

                    .getAppIcon(CALCULATOR_APP_NAME)

                    .getAppIcon(CALCULATOR_APP_NAME)

                    .launchIntoSplitScreen();

                    .launchIntoSplitScreen();

        }

        }

    }





    @Test

    @Test

    public void testSaveAppPairMenuItemExistsOnSplitPair() throws Exception {

    public void testSaveAppPairMenuItemExistsOnSplitPair() throws Exception {