aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-02 17:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflicts of 26b174659 to ub-launcher3-master

Browse Source 
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifb24f291b096b979044e5c87ec58c24e9c479728
This commit is contained in:
Tony
2017-03-30 18:10:05 -07:00
parent 917f4a44cb 26b1746593
commit ca4e6b4b59
24 changed files with 491 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java
View File

@@ -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())

2
tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java
View File

@@ -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);