diff options
Diffstat (limited to 'tests/tapl')
-rw-r--r-- | tests/tapl/com/android/launcher3/tapl/AddToHomeScreenPrompt.java | 41 | ||||
-rw-r--r-- | tests/tapl/com/android/launcher3/tapl/Folder.java (renamed from tests/tapl/com/android/launcher3/tapl/WidgetCell.java) | 17 | ||||
-rw-r--r-- | tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java | 4 | ||||
-rw-r--r-- | tests/tapl/com/android/launcher3/tapl/Workspace.java | 8 |
4 files changed, 62 insertions, 8 deletions
diff --git a/tests/tapl/com/android/launcher3/tapl/AddToHomeScreenPrompt.java b/tests/tapl/com/android/launcher3/tapl/AddToHomeScreenPrompt.java new file mode 100644 index 000000000..7f561a2af --- /dev/null +++ b/tests/tapl/com/android/launcher3/tapl/AddToHomeScreenPrompt.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher3.tapl; + +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.UiObject2; + +public class AddToHomeScreenPrompt { + private final LauncherInstrumentation mLauncher; + private final UiObject2 mWidgetCell; + + AddToHomeScreenPrompt(LauncherInstrumentation launcher) { + mLauncher = launcher; + mWidgetCell = launcher.waitForLauncherObject(By.clazz( + "com.android.launcher3.widget.WidgetCell")); + mLauncher.assertNotNull("Can't find widget cell object", mWidgetCell); + } + + public void addAutomatically() { + mLauncher.waitForObjectInContainer( + mWidgetCell.getParent().getParent().getParent().getParent(), + By.text(LauncherInstrumentation.isAvd() + ? "ADD AUTOMATICALLY" + : "Add automatically")). + click(); + } +} diff --git a/tests/tapl/com/android/launcher3/tapl/WidgetCell.java b/tests/tapl/com/android/launcher3/tapl/Folder.java index adb69ec5b..6e6734d81 100644 --- a/tests/tapl/com/android/launcher3/tapl/WidgetCell.java +++ b/tests/tapl/com/android/launcher3/tapl/Folder.java @@ -16,13 +16,20 @@ package com.android.launcher3.tapl; +import android.widget.FrameLayout; + import androidx.test.uiautomator.By; +import androidx.test.uiautomator.BySelector; import androidx.test.uiautomator.UiObject2; -public class WidgetCell { - WidgetCell(LauncherInstrumentation launcher) { - final UiObject2 widgetCell = launcher.waitForLauncherObject(By.clazz( - "com.android.launcher3.widget.WidgetCell")); - launcher.assertNotNull("Can't find widget cell object", widgetCell); +/** + * App folder in workspace/ + */ +public final class Folder { + Folder(LauncherInstrumentation launcher, UiObject2 icon) { + } + + static BySelector getSelector(String folderName, LauncherInstrumentation launcher) { + return By.clazz(FrameLayout.class).desc(folderName).pkg(launcher.getLauncherPackageName()); } } diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index 671e8fdf9..a7e633619 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -503,9 +503,9 @@ public final class LauncherInstrumentation { } @NonNull - public WidgetCell getWidgetCell() { + public AddToHomeScreenPrompt getAddToHomeScreenPrompt() { try (LauncherInstrumentation.Closable c = addContextLayer("want to get widget cell")) { - return new WidgetCell(this); + return new AddToHomeScreenPrompt(this); } } diff --git a/tests/tapl/com/android/launcher3/tapl/Workspace.java b/tests/tapl/com/android/launcher3/tapl/Workspace.java index fc0a79329..b01b6f363 100644 --- a/tests/tapl/com/android/launcher3/tapl/Workspace.java +++ b/tests/tapl/com/android/launcher3/tapl/Workspace.java @@ -143,11 +143,17 @@ public final class Workspace extends Home { } @NonNull - private AppIcon getHotseatAppIcon(String appName) { + public AppIcon getHotseatAppIcon(String appName) { return new AppIcon(mLauncher, mLauncher.getObjectInContainer( mHotseat, AppIcon.getAppIconSelector(appName, mLauncher))); } + @NonNull + public Folder getHotseatFolder(String appName) { + return new Folder(mLauncher, mLauncher.getObjectInContainer( + mHotseat, Folder.getSelector(appName, mLauncher))); + } + static void dragIconToWorkspace( LauncherInstrumentation launcher, Launchable launchable, Point dest, String longPressIndicator) { |