diff options
Diffstat (limited to 'tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java')
| -rw-r--r-- | tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java b/tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java index 434311dd6..fad06a698 100644 --- a/tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java +++ b/tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java @@ -48,14 +48,15 @@ public class ShortcutsToHomeTest extends AbstractLauncherUiTest { clearHomescreen(); mActivityMonitor.startLauncher(); - LauncherActivityInfo settingsApp = getSettingsApp(); + LauncherActivityInfo testApp = getSettingsApp(); // Open all apps and wait for load complete. final UiObject2 appsContainer = openAllApps(); - assertTrue(Wait.atMost(Condition.minChildCount(appsContainer, 2), DEFAULT_UI_TIMEOUT)); + assertTrue(Wait.atMost(Condition.minChildCount(appsContainer, 2), + DEFAULT_UI_TIMEOUT)); // Find the app and long press it to show shortcuts. - UiObject2 icon = scrollAndFind(appsContainer, By.text(settingsApp.getLabel().toString())); + UiObject2 icon = scrollAndFind(appsContainer, By.text(testApp.getLabel().toString())); // Press icon center until shortcuts appear Point iconCenter = icon.getVisibleCenter(); sendPointer(MotionEvent.ACTION_DOWN, iconCenter); @@ -65,7 +66,7 @@ public class ShortcutsToHomeTest extends AbstractLauncherUiTest { // Drag the first shortcut to the home screen. assertTrue(deepShortcutsContainer.getChildCount() > 0); - UiObject2 shortcut = deepShortcutsContainer.getChildren().get(0) + UiObject2 shortcut = deepShortcutsContainer.getChildren().get(1) .findObject(getSelectorForId(R.id.bubble_text)); String shortcutName = shortcut.getText(); dragToWorkspace(shortcut, false); @@ -74,7 +75,7 @@ public class ShortcutsToHomeTest extends AbstractLauncherUiTest { // (the app opens and has the same text as the shortcut). mDevice.findObject(By.text(shortcutName)).click(); assertTrue(mDevice.wait(Until.hasObject(By.pkg( - settingsApp.getComponentName().getPackageName()) + testApp.getComponentName().getPackageName()) .text(shortcutName)), DEFAULT_UI_TIMEOUT)); } } |