aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 16:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Revert "Keep ViewCaptureRule logic self-contained."" into udc-dev am: 57eaf86f8d am: fc7e8fa4c2

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

Change-Id: I0da767add8247c3530af0a26e965d6830018ef75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Stefan Andonian
2023-05-30 19:02:56 +00:00
committed by Automerger Merge Worker
parent 7ae39b1bee fc7e8fa4c2
commit 55d0d21040
4 changed files with 64 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
View File

@@ -206,10 +206,11 @@ public abstract class AbstractLauncherUiTest {
}
protected TestRule getRulesInsideActivityMonitor() {
final ViewCaptureRule viewCaptureRule = new ViewCaptureRule();
final RuleChain inner = RuleChain
.outerRule(new PortraitLandscapeRunner(this))
.around(new ViewCaptureRule())
.around(new FailureWatcher(mDevice, mLauncher));
.around(viewCaptureRule)
.around(new FailureWatcher(mDevice, mLauncher, viewCaptureRule.getViewCapture()));
return TestHelpers.isInLauncherProcess()
? RuleChain.outerRule(ShellCommandRule.setDefaultLauncher()).around(inner)