From 26b1746593851e239bfff65ae7a69b809ad87b99 Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Mon, 20 Mar 2017 17:12:24 -0700 Subject: Add support for system shortcuts in popup container - Currently the system shortcuts are just widgets and app info - As shortcuts, they live in ShortcutsItemView - They are populated either as icons only (if there are deep shortcuts) or as icons + text - Widgets are disabled until binding them is complete (we request for them to be bound on long-press now). We should revisit this. Bug: 34940468 Change-Id: Ia51d002c3b3ede87658bdab57abfc3eeca1ed242 --- tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java | 2 +- tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/src/com/android') 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); -- cgit v1.2.3