From 9c2f5a4c62a8b6a99655177daa78ccb680744a7e Mon Sep 17 00:00:00 2001 From: Uwais Ashraf Date: Mon, 4 Mar 2024 09:49:39 +0000 Subject: [PATCH] Remove classes related to E2E testing from deviceless test classpath Fix: 327187136 Flag: NA Test: gradlew :NexusLauncher:testGoogleWithQuickstepDebugUnitTest Test: atest Launcher3RoboTests Test: presubmits passing Change-Id: I4f05524bdc55d8473f3b5115cc239eb8cc48a856 --- Android.bp | 6 +- tests/Android.bp | 68 +++++++++---------- .../celllayout/CellLayoutTestCaseReader.java | 0 .../celllayout/CellLayoutTestUtils.java | 0 .../celllayout/FavoriteItemsTransaction.java | 0 .../ReorderAlgorithmUnitTestCase.java | 0 .../launcher3/celllayout/ReorderTestCase.java | 0 .../celllayout/board/CellLayoutBoard.java | 0 .../launcher3/celllayout/board/CellType.java | 0 .../celllayout/board/FolderPoint.java | 0 .../launcher3/celllayout/board/IconPoint.java | 0 .../board/IdenticalBoardComparator.kt | 0 .../board/PermutedBoardComparator.kt | 0 .../board/TestWorkspaceBuilder.java | 0 .../celllayout/board/WidgetRect.java | 0 .../DeterministicRandomGenerator.kt | 0 .../testgenerator/RandomBoardGenerator.kt | 6 +- .../RandomMultiBoardGenerator.kt | 0 .../testcomponent/AppWidgetDynamicColors.java | 0 .../testcomponent/AppWidgetHidden.java | 0 .../testcomponent/AppWidgetNoConfig.java | 0 .../testcomponent/AppWidgetWithConfig.java | 0 .../testcomponent/AppWidgetWithDialog.java | 0 .../testcomponent/BaseTestingActivity.java | 0 .../CustomShortcutConfigActivity.java | 0 .../testcomponent/DialogTestActivity.java | 0 .../testcomponent/ImeTestActivity.java | 0 .../testcomponent/ListViewService.java | 0 .../OtherBaseTestingActivity.java | 0 .../testcomponent/RequestPinItemActivity.java | 0 .../testcomponent/TestCommandProvider.java | 0 .../testcomponent/TestCommandReceiver.java | 0 .../testcomponent/TestLauncherActivity.java | 0 .../testcomponent/TouchEventGenerator.java | 0 .../UnarchiveBroadcastReceiver.java | 0 .../testcomponent/WidgetConfigActivity.java | 0 .../launcher3/ui/AbstractLauncherUiTest.java | 0 .../launcher3/ui/PortraitLandscapeRunner.java | 0 .../android/launcher3/ui/TestViewHelpers.java | 0 .../launcher3/util/ModelTestExtensions.kt | 0 .../android/launcher3/util/TestConstants.java | 0 .../src/com/android/launcher3/util/Wait.java | 0 .../launcher3/util/rule/FailureWatcher.java | 0 .../launcher3/util/rule/SamplerRule.java | 0 .../launcher3/util/rule/ScreenRecordRule.java | 0 .../launcher3/util/rule/SetFlagsRuleExt.kt | 0 .../launcher3/util/rule/ShellCommandRule.java | 0 .../util/rule/TestIsolationRule.java | 0 .../launcher3/util/rule/ViewCaptureRule.kt | 0 .../AlphaJumpDetector.java | 0 .../viewcapture_analysis/AnomalyDetector.java | 0 .../viewcapture_analysis/FlashDetector.java | 0 .../PositionJumpDetector.java | 0 .../ViewCaptureAnalyzer.java | 0 .../tapl/AndroidManifest.xml | 0 tests/{multivalentTests => }/tapl/README | 0 .../launcher3/tapl/AddToHomeScreenPrompt.java | 0 .../com/android/launcher3/tapl/AllApps.java | 0 .../launcher3/tapl/AllAppsAppIcon.java | 0 .../android/launcher3/tapl/AllAppsQsb.java | 0 .../com/android/launcher3/tapl/AppIcon.java | 0 .../android/launcher3/tapl/AppIconMenu.java | 0 .../launcher3/tapl/AppIconMenuItem.java | 0 .../android/launcher3/tapl/Background.java | 0 .../android/launcher3/tapl/BaseOverview.java | 0 .../com/android/launcher3/tapl/Folder.java | 0 .../android/launcher3/tapl/FolderIcon.java | 0 .../tapl/com/android/launcher3/tapl/Home.java | 0 .../android/launcher3/tapl/HomeAllApps.java | 0 .../android/launcher3/tapl/HomeAppIcon.java | 0 .../launcher3/tapl/HomeAppIconMenu.java | 0 .../launcher3/tapl/HomeAppIconMenuItem.java | 0 .../com/android/launcher3/tapl/HomeQsb.java | 0 .../launcher3/tapl/IconDragTarget.java | 0 .../launcher3/tapl/KeyboardQuickSwitch.java | 0 .../tapl/KeyboardQuickSwitchSource.java | 0 .../android/launcher3/tapl/Launchable.java | 0 .../launcher3/tapl/LaunchedAppState.java | 0 .../tapl/LauncherInstrumentation.java | 0 .../launcher3/tapl/LogEventChecker.java | 0 .../com/android/launcher3/tapl/Overview.java | 0 .../launcher3/tapl/OverviewActions.java | 0 .../android/launcher3/tapl/OverviewTask.java | 0 .../launcher3/tapl/OverviewTaskMenu.java | 0 .../launcher3/tapl/OverviewTaskMenuItem.java | 0 .../tapl/com/android/launcher3/tapl/Qsb.java | 0 .../launcher3/tapl/SearchInputSource.java | 0 .../launcher3/tapl/SearchResultFromQsb.java | 0 .../tapl/SearchResultFromTaskbarQsb.java | 0 .../launcher3/tapl/SearchWebSuggestion.java | 0 .../launcher3/tapl/SelectModeButtons.java | 0 .../launcher3/tapl/SplitScreenMenuItem.java | 0 .../launcher3/tapl/SplitScreenSelect.java | 0 .../launcher3/tapl/SplitscreenDragSource.java | 0 .../com/android/launcher3/tapl/Taskbar.java | 0 .../launcher3/tapl/TaskbarAllApps.java | 0 .../launcher3/tapl/TaskbarAllAppsQsb.java | 0 .../launcher3/tapl/TaskbarAppIcon.java | 0 .../launcher3/tapl/TaskbarAppIconMenu.java | 0 .../tapl/TaskbarAppIconMenuItem.java | 0 .../tapl/TaskbarSearchWebSuggestion.java | 0 .../android/launcher3/tapl/TestHelpers.java | 0 .../com/android/launcher3/tapl/Widget.java | 0 .../launcher3/tapl/WidgetResizeFrame.java | 0 .../com/android/launcher3/tapl/Widgets.java | 0 .../com/android/launcher3/tapl/Workspace.java | 0 .../launcher3/tapl/WorkspaceAppIcon.java | 0 .../launcher3/tapl/WorkspaceDragSource.java | 0 108 files changed, 40 insertions(+), 40 deletions(-) rename tests/{multivalentTests => }/src/com/android/launcher3/celllayout/CellLayoutTestCaseReader.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/celllayout/CellLayoutTestUtils.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/celllayout/FavoriteItemsTransaction.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/celllayout/ReorderAlgorithmUnitTestCase.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/celllayout/ReorderTestCase.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/celllayout/board/CellLayoutBoard.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/celllayout/board/CellType.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/celllayout/board/FolderPoint.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/celllayout/board/IconPoint.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/celllayout/board/IdenticalBoardComparator.kt (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/celllayout/board/PermutedBoardComparator.kt (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/celllayout/board/TestWorkspaceBuilder.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/celllayout/board/WidgetRect.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/celllayout/testgenerator/DeterministicRandomGenerator.kt (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/celllayout/testgenerator/RandomBoardGenerator.kt (96%) rename tests/{multivalentTests => }/src/com/android/launcher3/celllayout/testgenerator/RandomMultiBoardGenerator.kt (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/testcomponent/AppWidgetDynamicColors.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/testcomponent/AppWidgetHidden.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/testcomponent/AppWidgetNoConfig.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/testcomponent/AppWidgetWithConfig.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/testcomponent/AppWidgetWithDialog.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/testcomponent/BaseTestingActivity.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/testcomponent/CustomShortcutConfigActivity.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/testcomponent/DialogTestActivity.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/testcomponent/ImeTestActivity.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/testcomponent/ListViewService.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/testcomponent/OtherBaseTestingActivity.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/testcomponent/RequestPinItemActivity.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/testcomponent/TestCommandProvider.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/testcomponent/TestCommandReceiver.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/testcomponent/TestLauncherActivity.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/testcomponent/TouchEventGenerator.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/testcomponent/UnarchiveBroadcastReceiver.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/testcomponent/WidgetConfigActivity.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/ui/AbstractLauncherUiTest.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/ui/PortraitLandscapeRunner.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/ui/TestViewHelpers.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/util/ModelTestExtensions.kt (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/util/TestConstants.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/util/Wait.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/util/rule/FailureWatcher.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/util/rule/SamplerRule.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/util/rule/ScreenRecordRule.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/util/rule/SetFlagsRuleExt.kt (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/util/rule/ShellCommandRule.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/util/rule/TestIsolationRule.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/util/rule/ViewCaptureRule.kt (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/util/viewcapture_analysis/AlphaJumpDetector.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/util/viewcapture_analysis/AnomalyDetector.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/util/viewcapture_analysis/FlashDetector.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/util/viewcapture_analysis/PositionJumpDetector.java (100%) rename tests/{multivalentTests => }/src/com/android/launcher3/util/viewcapture_analysis/ViewCaptureAnalyzer.java (100%) rename tests/{multivalentTests => }/tapl/AndroidManifest.xml (100%) rename tests/{multivalentTests => }/tapl/README (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/AddToHomeScreenPrompt.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/AllApps.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/AllAppsAppIcon.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/AllAppsQsb.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/AppIcon.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/AppIconMenu.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/AppIconMenuItem.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/Background.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/BaseOverview.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/Folder.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/FolderIcon.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/Home.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/HomeAllApps.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/HomeAppIcon.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/HomeAppIconMenu.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/HomeAppIconMenuItem.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/HomeQsb.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/IconDragTarget.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/KeyboardQuickSwitch.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/KeyboardQuickSwitchSource.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/Launchable.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/LaunchedAppState.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/LogEventChecker.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/Overview.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/OverviewActions.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/OverviewTask.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/OverviewTaskMenu.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/OverviewTaskMenuItem.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/Qsb.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/SearchInputSource.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/SearchResultFromQsb.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/SearchResultFromTaskbarQsb.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/SearchWebSuggestion.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/SelectModeButtons.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/SplitScreenMenuItem.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/SplitScreenSelect.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/SplitscreenDragSource.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/Taskbar.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/TaskbarAllApps.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/TaskbarAllAppsQsb.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/TaskbarAppIcon.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/TaskbarAppIconMenu.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/TaskbarAppIconMenuItem.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/TaskbarSearchWebSuggestion.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/TestHelpers.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/Widget.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/WidgetResizeFrame.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/Widgets.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/Workspace.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/WorkspaceAppIcon.java (100%) rename tests/{multivalentTests => }/tapl/com/android/launcher3/tapl/WorkspaceDragSource.java (100%) diff --git a/Android.bp b/Android.bp index 8f2e5a68d8..78db013d3a 100644 --- a/Android.bp +++ b/Android.bp @@ -107,11 +107,11 @@ android_library { "launcher-testing-shared", ], srcs: [ - "tests/multivalentTests/tapl/**/*.java", - "tests/multivalentTests/tapl/**/*.kt", + "tests/tapl/**/*.java", + "tests/tapl/**/*.kt", ], resource_dirs: [], - manifest: "tests/multivalentTests/tapl/AndroidManifest.xml", + manifest: "tests/tapl/AndroidManifest.xml", platform_apis: true, } diff --git a/tests/Android.bp b/tests/Android.bp index 9ce0777623..e9111ea44a 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -35,25 +35,25 @@ filegroup { filegroup { name: "launcher-image-tests-helpers", srcs: [ - "multivalentTests/src/com/android/launcher3/celllayout/board/*.java", - "multivalentTests/src/com/android/launcher3/celllayout/board/*.kt", - "multivalentTests/src/com/android/launcher3/celllayout/FavoriteItemsTransaction.java", - "multivalentTests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java", - "multivalentTests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java", - "multivalentTests/src/com/android/launcher3/ui/TestViewHelpers.java", + "src/com/android/launcher3/celllayout/board/*.java", + "src/com/android/launcher3/celllayout/board/*.kt", + "src/com/android/launcher3/celllayout/FavoriteItemsTransaction.java", + "src/com/android/launcher3/ui/AbstractLauncherUiTest.java", + "src/com/android/launcher3/ui/PortraitLandscapeRunner.java", + "src/com/android/launcher3/ui/TestViewHelpers.java", "multivalentTests/src/com/android/launcher3/util/LauncherLayoutBuilder.java", - "multivalentTests/src/com/android/launcher3/util/ModelTestExtensions.kt", - "multivalentTests/src/com/android/launcher3/util/TestConstants.java", + "src/com/android/launcher3/util/ModelTestExtensions.kt", + "src/com/android/launcher3/util/TestConstants.java", "multivalentTests/src/com/android/launcher3/util/TestUtil.java", - "multivalentTests/src/com/android/launcher3/util/Wait.java", + "src/com/android/launcher3/util/Wait.java", "multivalentTests/src/com/android/launcher3/util/WidgetUtils.java", + "src/com/android/launcher3/util/rule/*.java", + "src/com/android/launcher3/util/rule/*.kt", "multivalentTests/src/com/android/launcher3/util/rule/*.java", "multivalentTests/src/com/android/launcher3/util/rule/*.kt", - "multivalentTests/src/com/android/launcher3/util/rule/*.java", - "multivalentTests/src/com/android/launcher3/util/rule/*.kt", - "multivalentTests/src/com/android/launcher3/util/viewcapture_analysis/*.java", - "multivalentTests/src/com/android/launcher3/testcomponent/*.java", - "multivalentTests/src/com/android/launcher3/testcomponent/*.kt", + "src/com/android/launcher3/util/viewcapture_analysis/*.java", + "src/com/android/launcher3/testcomponent/*.java", + "src/com/android/launcher3/testcomponent/*.kt", ], } @@ -75,30 +75,30 @@ filegroup { "src/com/android/launcher3/appiconmenu/TaplAppIconMenuTest.java", "src/com/android/launcher3/dragging/TaplDragTest.java", "src/com/android/launcher3/dragging/TaplUninstallRemoveTest.java", - "multivalentTests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java", - "multivalentTests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java", + "src/com/android/launcher3/ui/AbstractLauncherUiTest.java", + "src/com/android/launcher3/ui/PortraitLandscapeRunner.java", "src/com/android/launcher3/ui/TaplTestsLauncher3Test.java", "src/com/android/launcher3/ui/widget/TaplWidgetPickerTest.java", "src/com/android/launcher3/ui/workspace/TaplWorkspaceTest.java", "multivalentTests/src/com/android/launcher3/util/LauncherLayoutBuilder.java", - "multivalentTests/src/com/android/launcher3/util/TestConstants.java", + "src/com/android/launcher3/util/TestConstants.java", "multivalentTests/src/com/android/launcher3/util/TestUtil.java", - "multivalentTests/src/com/android/launcher3/util/Wait.java", + "src/com/android/launcher3/util/Wait.java", "multivalentTests/src/com/android/launcher3/util/WidgetUtils.java", - "multivalentTests/src/com/android/launcher3/util/rule/FailureWatcher.java", - "multivalentTests/src/com/android/launcher3/util/rule/ViewCaptureRule.kt", - "multivalentTests/src/com/android/launcher3/util/rule/SamplerRule.java", - "multivalentTests/src/com/android/launcher3/util/rule/ScreenRecordRule.java", - "multivalentTests/src/com/android/launcher3/util/rule/ShellCommandRule.java", - "multivalentTests/src/com/android/launcher3/util/rule/TestIsolationRule.java", + "src/com/android/launcher3/util/rule/FailureWatcher.java", + "src/com/android/launcher3/util/rule/ViewCaptureRule.kt", + "src/com/android/launcher3/util/rule/SamplerRule.java", + "src/com/android/launcher3/util/rule/ScreenRecordRule.java", + "src/com/android/launcher3/util/rule/ShellCommandRule.java", + "src/com/android/launcher3/util/rule/TestIsolationRule.java", "multivalentTests/src/com/android/launcher3/util/rule/TestStabilityRule.java", - "multivalentTests/src/com/android/launcher3/util/viewcapture_analysis/*.java", - "multivalentTests/src/com/android/launcher3/testcomponent/BaseTestingActivity.java", - "multivalentTests/src/com/android/launcher3/testcomponent/OtherBaseTestingActivity.java", - "multivalentTests/src/com/android/launcher3/testcomponent/CustomShortcutConfigActivity.java", - "multivalentTests/src/com/android/launcher3/testcomponent/TestCommandReceiver.java", - "multivalentTests/src/com/android/launcher3/testcomponent/TestLauncherActivity.java", - "multivalentTests/src/com/android/launcher3/testcomponent/ImeTestActivity.java", + "src/com/android/launcher3/util/viewcapture_analysis/*.java", + "src/com/android/launcher3/testcomponent/BaseTestingActivity.java", + "src/com/android/launcher3/testcomponent/OtherBaseTestingActivity.java", + "src/com/android/launcher3/testcomponent/CustomShortcutConfigActivity.java", + "src/com/android/launcher3/testcomponent/TestCommandReceiver.java", + "src/com/android/launcher3/testcomponent/TestLauncherActivity.java", + "src/com/android/launcher3/testcomponent/ImeTestActivity.java", ], } @@ -192,9 +192,9 @@ filegroup { "src/**/*.kt", "multivalentTests/src/**/*.java", "multivalentTests/src/**/*.kt", - "multivalentTests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java", - "multivalentTests/tapl/com/android/launcher3/tapl/*.java", - "multivalentTests/tapl/com/android/launcher3/tapl/*.kt", + "src/com/android/launcher3/ui/AbstractLauncherUiTest.java", + "tapl/com/android/launcher3/tapl/*.java", + "tapl/com/android/launcher3/tapl/*.kt", ], exclude_srcs: [ // Test classes diff --git a/tests/multivalentTests/src/com/android/launcher3/celllayout/CellLayoutTestCaseReader.java b/tests/src/com/android/launcher3/celllayout/CellLayoutTestCaseReader.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/celllayout/CellLayoutTestCaseReader.java rename to tests/src/com/android/launcher3/celllayout/CellLayoutTestCaseReader.java diff --git a/tests/multivalentTests/src/com/android/launcher3/celllayout/CellLayoutTestUtils.java b/tests/src/com/android/launcher3/celllayout/CellLayoutTestUtils.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/celllayout/CellLayoutTestUtils.java rename to tests/src/com/android/launcher3/celllayout/CellLayoutTestUtils.java diff --git a/tests/multivalentTests/src/com/android/launcher3/celllayout/FavoriteItemsTransaction.java b/tests/src/com/android/launcher3/celllayout/FavoriteItemsTransaction.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/celllayout/FavoriteItemsTransaction.java rename to tests/src/com/android/launcher3/celllayout/FavoriteItemsTransaction.java diff --git a/tests/multivalentTests/src/com/android/launcher3/celllayout/ReorderAlgorithmUnitTestCase.java b/tests/src/com/android/launcher3/celllayout/ReorderAlgorithmUnitTestCase.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/celllayout/ReorderAlgorithmUnitTestCase.java rename to tests/src/com/android/launcher3/celllayout/ReorderAlgorithmUnitTestCase.java diff --git a/tests/multivalentTests/src/com/android/launcher3/celllayout/ReorderTestCase.java b/tests/src/com/android/launcher3/celllayout/ReorderTestCase.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/celllayout/ReorderTestCase.java rename to tests/src/com/android/launcher3/celllayout/ReorderTestCase.java diff --git a/tests/multivalentTests/src/com/android/launcher3/celllayout/board/CellLayoutBoard.java b/tests/src/com/android/launcher3/celllayout/board/CellLayoutBoard.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/celllayout/board/CellLayoutBoard.java rename to tests/src/com/android/launcher3/celllayout/board/CellLayoutBoard.java diff --git a/tests/multivalentTests/src/com/android/launcher3/celllayout/board/CellType.java b/tests/src/com/android/launcher3/celllayout/board/CellType.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/celllayout/board/CellType.java rename to tests/src/com/android/launcher3/celllayout/board/CellType.java diff --git a/tests/multivalentTests/src/com/android/launcher3/celllayout/board/FolderPoint.java b/tests/src/com/android/launcher3/celllayout/board/FolderPoint.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/celllayout/board/FolderPoint.java rename to tests/src/com/android/launcher3/celllayout/board/FolderPoint.java diff --git a/tests/multivalentTests/src/com/android/launcher3/celllayout/board/IconPoint.java b/tests/src/com/android/launcher3/celllayout/board/IconPoint.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/celllayout/board/IconPoint.java rename to tests/src/com/android/launcher3/celllayout/board/IconPoint.java diff --git a/tests/multivalentTests/src/com/android/launcher3/celllayout/board/IdenticalBoardComparator.kt b/tests/src/com/android/launcher3/celllayout/board/IdenticalBoardComparator.kt similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/celllayout/board/IdenticalBoardComparator.kt rename to tests/src/com/android/launcher3/celllayout/board/IdenticalBoardComparator.kt diff --git a/tests/multivalentTests/src/com/android/launcher3/celllayout/board/PermutedBoardComparator.kt b/tests/src/com/android/launcher3/celllayout/board/PermutedBoardComparator.kt similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/celllayout/board/PermutedBoardComparator.kt rename to tests/src/com/android/launcher3/celllayout/board/PermutedBoardComparator.kt diff --git a/tests/multivalentTests/src/com/android/launcher3/celllayout/board/TestWorkspaceBuilder.java b/tests/src/com/android/launcher3/celllayout/board/TestWorkspaceBuilder.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/celllayout/board/TestWorkspaceBuilder.java rename to tests/src/com/android/launcher3/celllayout/board/TestWorkspaceBuilder.java diff --git a/tests/multivalentTests/src/com/android/launcher3/celllayout/board/WidgetRect.java b/tests/src/com/android/launcher3/celllayout/board/WidgetRect.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/celllayout/board/WidgetRect.java rename to tests/src/com/android/launcher3/celllayout/board/WidgetRect.java diff --git a/tests/multivalentTests/src/com/android/launcher3/celllayout/testgenerator/DeterministicRandomGenerator.kt b/tests/src/com/android/launcher3/celllayout/testgenerator/DeterministicRandomGenerator.kt similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/celllayout/testgenerator/DeterministicRandomGenerator.kt rename to tests/src/com/android/launcher3/celllayout/testgenerator/DeterministicRandomGenerator.kt diff --git a/tests/multivalentTests/src/com/android/launcher3/celllayout/testgenerator/RandomBoardGenerator.kt b/tests/src/com/android/launcher3/celllayout/testgenerator/RandomBoardGenerator.kt similarity index 96% rename from tests/multivalentTests/src/com/android/launcher3/celllayout/testgenerator/RandomBoardGenerator.kt rename to tests/src/com/android/launcher3/celllayout/testgenerator/RandomBoardGenerator.kt index fcfb3dbc76..c5dbce42c4 100644 --- a/tests/multivalentTests/src/com/android/launcher3/celllayout/testgenerator/RandomBoardGenerator.kt +++ b/tests/src/com/android/launcher3/celllayout/testgenerator/RandomBoardGenerator.kt @@ -33,9 +33,9 @@ open class RandomBoardGenerator(generator: Random) : DeterministicRandomGenerato } protected fun fillBoard( - board: CellLayoutBoard, - area: Rect, - remainingEmptySpacesArg: Int + board: CellLayoutBoard, + area: Rect, + remainingEmptySpacesArg: Int ): CellLayoutBoard { var remainingEmptySpaces = remainingEmptySpacesArg if (area.height() * area.width() <= 0) return board diff --git a/tests/multivalentTests/src/com/android/launcher3/celllayout/testgenerator/RandomMultiBoardGenerator.kt b/tests/src/com/android/launcher3/celllayout/testgenerator/RandomMultiBoardGenerator.kt similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/celllayout/testgenerator/RandomMultiBoardGenerator.kt rename to tests/src/com/android/launcher3/celllayout/testgenerator/RandomMultiBoardGenerator.kt diff --git a/tests/multivalentTests/src/com/android/launcher3/testcomponent/AppWidgetDynamicColors.java b/tests/src/com/android/launcher3/testcomponent/AppWidgetDynamicColors.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/testcomponent/AppWidgetDynamicColors.java rename to tests/src/com/android/launcher3/testcomponent/AppWidgetDynamicColors.java diff --git a/tests/multivalentTests/src/com/android/launcher3/testcomponent/AppWidgetHidden.java b/tests/src/com/android/launcher3/testcomponent/AppWidgetHidden.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/testcomponent/AppWidgetHidden.java rename to tests/src/com/android/launcher3/testcomponent/AppWidgetHidden.java diff --git a/tests/multivalentTests/src/com/android/launcher3/testcomponent/AppWidgetNoConfig.java b/tests/src/com/android/launcher3/testcomponent/AppWidgetNoConfig.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/testcomponent/AppWidgetNoConfig.java rename to tests/src/com/android/launcher3/testcomponent/AppWidgetNoConfig.java diff --git a/tests/multivalentTests/src/com/android/launcher3/testcomponent/AppWidgetWithConfig.java b/tests/src/com/android/launcher3/testcomponent/AppWidgetWithConfig.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/testcomponent/AppWidgetWithConfig.java rename to tests/src/com/android/launcher3/testcomponent/AppWidgetWithConfig.java diff --git a/tests/multivalentTests/src/com/android/launcher3/testcomponent/AppWidgetWithDialog.java b/tests/src/com/android/launcher3/testcomponent/AppWidgetWithDialog.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/testcomponent/AppWidgetWithDialog.java rename to tests/src/com/android/launcher3/testcomponent/AppWidgetWithDialog.java diff --git a/tests/multivalentTests/src/com/android/launcher3/testcomponent/BaseTestingActivity.java b/tests/src/com/android/launcher3/testcomponent/BaseTestingActivity.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/testcomponent/BaseTestingActivity.java rename to tests/src/com/android/launcher3/testcomponent/BaseTestingActivity.java diff --git a/tests/multivalentTests/src/com/android/launcher3/testcomponent/CustomShortcutConfigActivity.java b/tests/src/com/android/launcher3/testcomponent/CustomShortcutConfigActivity.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/testcomponent/CustomShortcutConfigActivity.java rename to tests/src/com/android/launcher3/testcomponent/CustomShortcutConfigActivity.java diff --git a/tests/multivalentTests/src/com/android/launcher3/testcomponent/DialogTestActivity.java b/tests/src/com/android/launcher3/testcomponent/DialogTestActivity.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/testcomponent/DialogTestActivity.java rename to tests/src/com/android/launcher3/testcomponent/DialogTestActivity.java diff --git a/tests/multivalentTests/src/com/android/launcher3/testcomponent/ImeTestActivity.java b/tests/src/com/android/launcher3/testcomponent/ImeTestActivity.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/testcomponent/ImeTestActivity.java rename to tests/src/com/android/launcher3/testcomponent/ImeTestActivity.java diff --git a/tests/multivalentTests/src/com/android/launcher3/testcomponent/ListViewService.java b/tests/src/com/android/launcher3/testcomponent/ListViewService.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/testcomponent/ListViewService.java rename to tests/src/com/android/launcher3/testcomponent/ListViewService.java diff --git a/tests/multivalentTests/src/com/android/launcher3/testcomponent/OtherBaseTestingActivity.java b/tests/src/com/android/launcher3/testcomponent/OtherBaseTestingActivity.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/testcomponent/OtherBaseTestingActivity.java rename to tests/src/com/android/launcher3/testcomponent/OtherBaseTestingActivity.java diff --git a/tests/multivalentTests/src/com/android/launcher3/testcomponent/RequestPinItemActivity.java b/tests/src/com/android/launcher3/testcomponent/RequestPinItemActivity.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/testcomponent/RequestPinItemActivity.java rename to tests/src/com/android/launcher3/testcomponent/RequestPinItemActivity.java diff --git a/tests/multivalentTests/src/com/android/launcher3/testcomponent/TestCommandProvider.java b/tests/src/com/android/launcher3/testcomponent/TestCommandProvider.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/testcomponent/TestCommandProvider.java rename to tests/src/com/android/launcher3/testcomponent/TestCommandProvider.java diff --git a/tests/multivalentTests/src/com/android/launcher3/testcomponent/TestCommandReceiver.java b/tests/src/com/android/launcher3/testcomponent/TestCommandReceiver.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/testcomponent/TestCommandReceiver.java rename to tests/src/com/android/launcher3/testcomponent/TestCommandReceiver.java diff --git a/tests/multivalentTests/src/com/android/launcher3/testcomponent/TestLauncherActivity.java b/tests/src/com/android/launcher3/testcomponent/TestLauncherActivity.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/testcomponent/TestLauncherActivity.java rename to tests/src/com/android/launcher3/testcomponent/TestLauncherActivity.java diff --git a/tests/multivalentTests/src/com/android/launcher3/testcomponent/TouchEventGenerator.java b/tests/src/com/android/launcher3/testcomponent/TouchEventGenerator.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/testcomponent/TouchEventGenerator.java rename to tests/src/com/android/launcher3/testcomponent/TouchEventGenerator.java diff --git a/tests/multivalentTests/src/com/android/launcher3/testcomponent/UnarchiveBroadcastReceiver.java b/tests/src/com/android/launcher3/testcomponent/UnarchiveBroadcastReceiver.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/testcomponent/UnarchiveBroadcastReceiver.java rename to tests/src/com/android/launcher3/testcomponent/UnarchiveBroadcastReceiver.java diff --git a/tests/multivalentTests/src/com/android/launcher3/testcomponent/WidgetConfigActivity.java b/tests/src/com/android/launcher3/testcomponent/WidgetConfigActivity.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/testcomponent/WidgetConfigActivity.java rename to tests/src/com/android/launcher3/testcomponent/WidgetConfigActivity.java diff --git a/tests/multivalentTests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java rename to tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java diff --git a/tests/multivalentTests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java b/tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java rename to tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java diff --git a/tests/multivalentTests/src/com/android/launcher3/ui/TestViewHelpers.java b/tests/src/com/android/launcher3/ui/TestViewHelpers.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/ui/TestViewHelpers.java rename to tests/src/com/android/launcher3/ui/TestViewHelpers.java diff --git a/tests/multivalentTests/src/com/android/launcher3/util/ModelTestExtensions.kt b/tests/src/com/android/launcher3/util/ModelTestExtensions.kt similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/util/ModelTestExtensions.kt rename to tests/src/com/android/launcher3/util/ModelTestExtensions.kt diff --git a/tests/multivalentTests/src/com/android/launcher3/util/TestConstants.java b/tests/src/com/android/launcher3/util/TestConstants.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/util/TestConstants.java rename to tests/src/com/android/launcher3/util/TestConstants.java diff --git a/tests/multivalentTests/src/com/android/launcher3/util/Wait.java b/tests/src/com/android/launcher3/util/Wait.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/util/Wait.java rename to tests/src/com/android/launcher3/util/Wait.java diff --git a/tests/multivalentTests/src/com/android/launcher3/util/rule/FailureWatcher.java b/tests/src/com/android/launcher3/util/rule/FailureWatcher.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/util/rule/FailureWatcher.java rename to tests/src/com/android/launcher3/util/rule/FailureWatcher.java diff --git a/tests/multivalentTests/src/com/android/launcher3/util/rule/SamplerRule.java b/tests/src/com/android/launcher3/util/rule/SamplerRule.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/util/rule/SamplerRule.java rename to tests/src/com/android/launcher3/util/rule/SamplerRule.java diff --git a/tests/multivalentTests/src/com/android/launcher3/util/rule/ScreenRecordRule.java b/tests/src/com/android/launcher3/util/rule/ScreenRecordRule.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/util/rule/ScreenRecordRule.java rename to tests/src/com/android/launcher3/util/rule/ScreenRecordRule.java diff --git a/tests/multivalentTests/src/com/android/launcher3/util/rule/SetFlagsRuleExt.kt b/tests/src/com/android/launcher3/util/rule/SetFlagsRuleExt.kt similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/util/rule/SetFlagsRuleExt.kt rename to tests/src/com/android/launcher3/util/rule/SetFlagsRuleExt.kt diff --git a/tests/multivalentTests/src/com/android/launcher3/util/rule/ShellCommandRule.java b/tests/src/com/android/launcher3/util/rule/ShellCommandRule.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/util/rule/ShellCommandRule.java rename to tests/src/com/android/launcher3/util/rule/ShellCommandRule.java diff --git a/tests/multivalentTests/src/com/android/launcher3/util/rule/TestIsolationRule.java b/tests/src/com/android/launcher3/util/rule/TestIsolationRule.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/util/rule/TestIsolationRule.java rename to tests/src/com/android/launcher3/util/rule/TestIsolationRule.java diff --git a/tests/multivalentTests/src/com/android/launcher3/util/rule/ViewCaptureRule.kt b/tests/src/com/android/launcher3/util/rule/ViewCaptureRule.kt similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/util/rule/ViewCaptureRule.kt rename to tests/src/com/android/launcher3/util/rule/ViewCaptureRule.kt diff --git a/tests/multivalentTests/src/com/android/launcher3/util/viewcapture_analysis/AlphaJumpDetector.java b/tests/src/com/android/launcher3/util/viewcapture_analysis/AlphaJumpDetector.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/util/viewcapture_analysis/AlphaJumpDetector.java rename to tests/src/com/android/launcher3/util/viewcapture_analysis/AlphaJumpDetector.java diff --git a/tests/multivalentTests/src/com/android/launcher3/util/viewcapture_analysis/AnomalyDetector.java b/tests/src/com/android/launcher3/util/viewcapture_analysis/AnomalyDetector.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/util/viewcapture_analysis/AnomalyDetector.java rename to tests/src/com/android/launcher3/util/viewcapture_analysis/AnomalyDetector.java diff --git a/tests/multivalentTests/src/com/android/launcher3/util/viewcapture_analysis/FlashDetector.java b/tests/src/com/android/launcher3/util/viewcapture_analysis/FlashDetector.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/util/viewcapture_analysis/FlashDetector.java rename to tests/src/com/android/launcher3/util/viewcapture_analysis/FlashDetector.java diff --git a/tests/multivalentTests/src/com/android/launcher3/util/viewcapture_analysis/PositionJumpDetector.java b/tests/src/com/android/launcher3/util/viewcapture_analysis/PositionJumpDetector.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/util/viewcapture_analysis/PositionJumpDetector.java rename to tests/src/com/android/launcher3/util/viewcapture_analysis/PositionJumpDetector.java diff --git a/tests/multivalentTests/src/com/android/launcher3/util/viewcapture_analysis/ViewCaptureAnalyzer.java b/tests/src/com/android/launcher3/util/viewcapture_analysis/ViewCaptureAnalyzer.java similarity index 100% rename from tests/multivalentTests/src/com/android/launcher3/util/viewcapture_analysis/ViewCaptureAnalyzer.java rename to tests/src/com/android/launcher3/util/viewcapture_analysis/ViewCaptureAnalyzer.java diff --git a/tests/multivalentTests/tapl/AndroidManifest.xml b/tests/tapl/AndroidManifest.xml similarity index 100% rename from tests/multivalentTests/tapl/AndroidManifest.xml rename to tests/tapl/AndroidManifest.xml diff --git a/tests/multivalentTests/tapl/README b/tests/tapl/README similarity index 100% rename from tests/multivalentTests/tapl/README rename to tests/tapl/README diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/AddToHomeScreenPrompt.java b/tests/tapl/com/android/launcher3/tapl/AddToHomeScreenPrompt.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/AddToHomeScreenPrompt.java rename to tests/tapl/com/android/launcher3/tapl/AddToHomeScreenPrompt.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/AllApps.java b/tests/tapl/com/android/launcher3/tapl/AllApps.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/AllApps.java rename to tests/tapl/com/android/launcher3/tapl/AllApps.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/AllAppsAppIcon.java b/tests/tapl/com/android/launcher3/tapl/AllAppsAppIcon.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/AllAppsAppIcon.java rename to tests/tapl/com/android/launcher3/tapl/AllAppsAppIcon.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/AllAppsQsb.java b/tests/tapl/com/android/launcher3/tapl/AllAppsQsb.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/AllAppsQsb.java rename to tests/tapl/com/android/launcher3/tapl/AllAppsQsb.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/AppIcon.java b/tests/tapl/com/android/launcher3/tapl/AppIcon.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/AppIcon.java rename to tests/tapl/com/android/launcher3/tapl/AppIcon.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/AppIconMenu.java b/tests/tapl/com/android/launcher3/tapl/AppIconMenu.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/AppIconMenu.java rename to tests/tapl/com/android/launcher3/tapl/AppIconMenu.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/AppIconMenuItem.java b/tests/tapl/com/android/launcher3/tapl/AppIconMenuItem.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/AppIconMenuItem.java rename to tests/tapl/com/android/launcher3/tapl/AppIconMenuItem.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/Background.java b/tests/tapl/com/android/launcher3/tapl/Background.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/Background.java rename to tests/tapl/com/android/launcher3/tapl/Background.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/BaseOverview.java b/tests/tapl/com/android/launcher3/tapl/BaseOverview.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/BaseOverview.java rename to tests/tapl/com/android/launcher3/tapl/BaseOverview.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/Folder.java b/tests/tapl/com/android/launcher3/tapl/Folder.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/Folder.java rename to tests/tapl/com/android/launcher3/tapl/Folder.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/FolderIcon.java b/tests/tapl/com/android/launcher3/tapl/FolderIcon.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/FolderIcon.java rename to tests/tapl/com/android/launcher3/tapl/FolderIcon.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/Home.java b/tests/tapl/com/android/launcher3/tapl/Home.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/Home.java rename to tests/tapl/com/android/launcher3/tapl/Home.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/HomeAllApps.java b/tests/tapl/com/android/launcher3/tapl/HomeAllApps.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/HomeAllApps.java rename to tests/tapl/com/android/launcher3/tapl/HomeAllApps.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/HomeAppIcon.java b/tests/tapl/com/android/launcher3/tapl/HomeAppIcon.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/HomeAppIcon.java rename to tests/tapl/com/android/launcher3/tapl/HomeAppIcon.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/HomeAppIconMenu.java b/tests/tapl/com/android/launcher3/tapl/HomeAppIconMenu.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/HomeAppIconMenu.java rename to tests/tapl/com/android/launcher3/tapl/HomeAppIconMenu.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/HomeAppIconMenuItem.java b/tests/tapl/com/android/launcher3/tapl/HomeAppIconMenuItem.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/HomeAppIconMenuItem.java rename to tests/tapl/com/android/launcher3/tapl/HomeAppIconMenuItem.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/HomeQsb.java b/tests/tapl/com/android/launcher3/tapl/HomeQsb.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/HomeQsb.java rename to tests/tapl/com/android/launcher3/tapl/HomeQsb.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/IconDragTarget.java b/tests/tapl/com/android/launcher3/tapl/IconDragTarget.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/IconDragTarget.java rename to tests/tapl/com/android/launcher3/tapl/IconDragTarget.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/KeyboardQuickSwitch.java b/tests/tapl/com/android/launcher3/tapl/KeyboardQuickSwitch.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/KeyboardQuickSwitch.java rename to tests/tapl/com/android/launcher3/tapl/KeyboardQuickSwitch.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/KeyboardQuickSwitchSource.java b/tests/tapl/com/android/launcher3/tapl/KeyboardQuickSwitchSource.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/KeyboardQuickSwitchSource.java rename to tests/tapl/com/android/launcher3/tapl/KeyboardQuickSwitchSource.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/Launchable.java b/tests/tapl/com/android/launcher3/tapl/Launchable.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/Launchable.java rename to tests/tapl/com/android/launcher3/tapl/Launchable.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/LaunchedAppState.java b/tests/tapl/com/android/launcher3/tapl/LaunchedAppState.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/LaunchedAppState.java rename to tests/tapl/com/android/launcher3/tapl/LaunchedAppState.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java rename to tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/LogEventChecker.java b/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/LogEventChecker.java rename to tests/tapl/com/android/launcher3/tapl/LogEventChecker.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/Overview.java b/tests/tapl/com/android/launcher3/tapl/Overview.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/Overview.java rename to tests/tapl/com/android/launcher3/tapl/Overview.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/OverviewActions.java b/tests/tapl/com/android/launcher3/tapl/OverviewActions.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/OverviewActions.java rename to tests/tapl/com/android/launcher3/tapl/OverviewActions.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/OverviewTask.java b/tests/tapl/com/android/launcher3/tapl/OverviewTask.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/OverviewTask.java rename to tests/tapl/com/android/launcher3/tapl/OverviewTask.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/OverviewTaskMenu.java b/tests/tapl/com/android/launcher3/tapl/OverviewTaskMenu.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/OverviewTaskMenu.java rename to tests/tapl/com/android/launcher3/tapl/OverviewTaskMenu.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/OverviewTaskMenuItem.java b/tests/tapl/com/android/launcher3/tapl/OverviewTaskMenuItem.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/OverviewTaskMenuItem.java rename to tests/tapl/com/android/launcher3/tapl/OverviewTaskMenuItem.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/Qsb.java b/tests/tapl/com/android/launcher3/tapl/Qsb.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/Qsb.java rename to tests/tapl/com/android/launcher3/tapl/Qsb.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/SearchInputSource.java b/tests/tapl/com/android/launcher3/tapl/SearchInputSource.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/SearchInputSource.java rename to tests/tapl/com/android/launcher3/tapl/SearchInputSource.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/SearchResultFromQsb.java b/tests/tapl/com/android/launcher3/tapl/SearchResultFromQsb.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/SearchResultFromQsb.java rename to tests/tapl/com/android/launcher3/tapl/SearchResultFromQsb.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/SearchResultFromTaskbarQsb.java b/tests/tapl/com/android/launcher3/tapl/SearchResultFromTaskbarQsb.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/SearchResultFromTaskbarQsb.java rename to tests/tapl/com/android/launcher3/tapl/SearchResultFromTaskbarQsb.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/SearchWebSuggestion.java b/tests/tapl/com/android/launcher3/tapl/SearchWebSuggestion.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/SearchWebSuggestion.java rename to tests/tapl/com/android/launcher3/tapl/SearchWebSuggestion.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/SelectModeButtons.java b/tests/tapl/com/android/launcher3/tapl/SelectModeButtons.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/SelectModeButtons.java rename to tests/tapl/com/android/launcher3/tapl/SelectModeButtons.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/SplitScreenMenuItem.java b/tests/tapl/com/android/launcher3/tapl/SplitScreenMenuItem.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/SplitScreenMenuItem.java rename to tests/tapl/com/android/launcher3/tapl/SplitScreenMenuItem.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/SplitScreenSelect.java b/tests/tapl/com/android/launcher3/tapl/SplitScreenSelect.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/SplitScreenSelect.java rename to tests/tapl/com/android/launcher3/tapl/SplitScreenSelect.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/SplitscreenDragSource.java b/tests/tapl/com/android/launcher3/tapl/SplitscreenDragSource.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/SplitscreenDragSource.java rename to tests/tapl/com/android/launcher3/tapl/SplitscreenDragSource.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/Taskbar.java b/tests/tapl/com/android/launcher3/tapl/Taskbar.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/Taskbar.java rename to tests/tapl/com/android/launcher3/tapl/Taskbar.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/TaskbarAllApps.java b/tests/tapl/com/android/launcher3/tapl/TaskbarAllApps.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/TaskbarAllApps.java rename to tests/tapl/com/android/launcher3/tapl/TaskbarAllApps.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/TaskbarAllAppsQsb.java b/tests/tapl/com/android/launcher3/tapl/TaskbarAllAppsQsb.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/TaskbarAllAppsQsb.java rename to tests/tapl/com/android/launcher3/tapl/TaskbarAllAppsQsb.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/TaskbarAppIcon.java b/tests/tapl/com/android/launcher3/tapl/TaskbarAppIcon.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/TaskbarAppIcon.java rename to tests/tapl/com/android/launcher3/tapl/TaskbarAppIcon.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/TaskbarAppIconMenu.java b/tests/tapl/com/android/launcher3/tapl/TaskbarAppIconMenu.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/TaskbarAppIconMenu.java rename to tests/tapl/com/android/launcher3/tapl/TaskbarAppIconMenu.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/TaskbarAppIconMenuItem.java b/tests/tapl/com/android/launcher3/tapl/TaskbarAppIconMenuItem.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/TaskbarAppIconMenuItem.java rename to tests/tapl/com/android/launcher3/tapl/TaskbarAppIconMenuItem.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/TaskbarSearchWebSuggestion.java b/tests/tapl/com/android/launcher3/tapl/TaskbarSearchWebSuggestion.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/TaskbarSearchWebSuggestion.java rename to tests/tapl/com/android/launcher3/tapl/TaskbarSearchWebSuggestion.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/TestHelpers.java b/tests/tapl/com/android/launcher3/tapl/TestHelpers.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/TestHelpers.java rename to tests/tapl/com/android/launcher3/tapl/TestHelpers.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/Widget.java b/tests/tapl/com/android/launcher3/tapl/Widget.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/Widget.java rename to tests/tapl/com/android/launcher3/tapl/Widget.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/WidgetResizeFrame.java b/tests/tapl/com/android/launcher3/tapl/WidgetResizeFrame.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/WidgetResizeFrame.java rename to tests/tapl/com/android/launcher3/tapl/WidgetResizeFrame.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/Widgets.java b/tests/tapl/com/android/launcher3/tapl/Widgets.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/Widgets.java rename to tests/tapl/com/android/launcher3/tapl/Widgets.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/Workspace.java b/tests/tapl/com/android/launcher3/tapl/Workspace.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/Workspace.java rename to tests/tapl/com/android/launcher3/tapl/Workspace.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/WorkspaceAppIcon.java b/tests/tapl/com/android/launcher3/tapl/WorkspaceAppIcon.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/WorkspaceAppIcon.java rename to tests/tapl/com/android/launcher3/tapl/WorkspaceAppIcon.java diff --git a/tests/multivalentTests/tapl/com/android/launcher3/tapl/WorkspaceDragSource.java b/tests/tapl/com/android/launcher3/tapl/WorkspaceDragSource.java similarity index 100% rename from tests/multivalentTests/tapl/com/android/launcher3/tapl/WorkspaceDragSource.java rename to tests/tapl/com/android/launcher3/tapl/WorkspaceDragSource.java