diff options
| author | Tony <twickham@google.com> | 2017-03-30 18:10:05 -0700 |
|---|---|---|
| committer | Tony <twickham@google.com> | 2017-03-30 18:10:05 -0700 |
| commit | ca4e6b4b5964a8024296fb5de0afd82f6dbe3e4d (patch) | |
| tree | 26607083342c958c73614d11e0dd4935005fc4b4 /tests | |
| parent | 917f4a44cb221ac51784e0bfde3a90e0e73bc46d (diff) | |
| parent | 26b1746593851e239bfff65ae7a69b809ad87b99 (diff) | |
| download | android_packages_apps_Trebuchet-ca4e6b4b5964a8024296fb5de0afd82f6dbe3e4d.tar.gz android_packages_apps_Trebuchet-ca4e6b4b5964a8024296fb5de0afd82f6dbe3e4d.tar.bz2 android_packages_apps_Trebuchet-ca4e6b4b5964a8024296fb5de0afd82f6dbe3e4d.zip | |
resolve merge conflicts of 26b174659 to ub-launcher3-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifb24f291b096b979044e5c87ec58c24e9c479728
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java | 2 | ||||
| -rw-r--r-- | tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java b/tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java index ee3a62803..3a0b6132c 100644 --- a/tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java +++ b/tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java @@ -60,7 +60,7 @@ public class ShortcutsLaunchTest extends LauncherInstrumentationTestCase { // Verify that launching a shortcut opens a page with the same text assertTrue(deepShortcutsContainer.getChildCount() > 0); UiObject2 shortcut = deepShortcutsContainer.getChildren().get(0) - .findObject(getSelectorForId(R.id.deep_shortcut)); + .findObject(getSelectorForId(R.id.bubble_text)); shortcut.click(); assertTrue(mDevice.wait(Until.hasObject(By.pkg( mSettingsApp.getComponentName().getPackageName()) diff --git a/tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java b/tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java index 061e86530..5d86d1ec6 100644 --- a/tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java +++ b/tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java @@ -61,7 +61,7 @@ public class ShortcutsToHomeTest extends LauncherInstrumentationTestCase { // Drag the first shortcut to the home screen. assertTrue(deepShortcutsContainer.getChildCount() > 0); UiObject2 shortcut = deepShortcutsContainer.getChildren().get(0) - .findObject(getSelectorForId(R.id.deep_shortcut)); + .findObject(getSelectorForId(R.id.bubble_text)); String shortcutName = shortcut.getText(); dragToWorkspace(shortcut, false); |