Merge "Adding TaplTestsSplitscreen to OOP tests" into udc-qpr-dev am: 173cf33ac1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24409976

Change-Id: Ifbc3e47e0ba04cf8d379b6446da52ab836985400
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-08-15 07:04:07 +00:00
committed by Automerger Merge Worker
2 changed files with 8 additions and 0 deletions

View File

@@ -42,5 +42,6 @@ filegroup {
"tests/src/com/android/quickstep/NavigationModeSwitchRule.java",
"tests/src/com/android/quickstep/AbstractQuickStepTest.java",
"tests/src/com/android/quickstep/TaplTestsQuickstep.java",
"tests/src/com/android/quickstep/TaplTestsSplitscreen.java",
]
}

View File

@@ -22,6 +22,8 @@ import static org.junit.Assume.assumeTrue;
import android.content.Intent;
import androidx.test.platform.app.InstrumentationRegistry;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.ui.PortraitLandscapeRunner.PortraitLandscape;
import com.android.launcher3.ui.TaplTestsLauncher3;
@@ -36,6 +38,9 @@ public class TaplTestsSplitscreen extends AbstractQuickStepTest {
private static final String CALCULATOR_APP_PACKAGE =
resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR);
private static final String READ_DEVICE_CONFIG_PERMISSION =
"android.permission.READ_DEVICE_CONFIG";
@Override
@Before
public void setUp() throws Exception {
@@ -46,6 +51,8 @@ public class TaplTestsSplitscreen extends AbstractQuickStepTest {
mLauncher.enableBlockTimeout(true);
mLauncher.showTaskbarIfHidden();
}
InstrumentationRegistry.getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(
READ_DEVICE_CONFIG_PERMISSION);
}
@After