Merge "enable custom shortcut test" into ub-launcher3-master (43968167) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/Launcher.java

+1 −8

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ import static com.android.launcher3.popup.SystemShortcut.DISMISS_PREDICTION;
		import static com.android.launcher3.popup.SystemShortcut.INSTALL;
		import static com.android.launcher3.popup.SystemShortcut.WIDGETS;
		import static com.android.launcher3.states.RotationHelper.REQUEST_NONE;
		import static com.android.launcher3.testing.TestProtocol.CRASH_ADD_CUSTOM_SHORTCUT;

		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		@@ -121,7 +120,6 @@ import com.android.launcher3.popup.PopupDataProvider;
		import com.android.launcher3.popup.SystemShortcut;
		import com.android.launcher3.qsb.QsbContainerView;
		import com.android.launcher3.states.RotationHelper;
		import com.android.launcher3.testing.TestProtocol;
		import com.android.launcher3.touch.AllAppsSwipeController;
		import com.android.launcher3.touch.ItemClickHandler;
		import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
		@@ -1210,13 +1208,8 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
		*/
		private void completeAddShortcut(Intent data, int container, int screenId, int cellX,
		int cellY, PendingRequestArgs args) {
		if (data == null
		\|\| args.getRequestCode() != REQUEST_CREATE_SHORTCUT
		if (args.getRequestCode() != REQUEST_CREATE_SHORTCUT
		\|\| args.getPendingIntent().getComponent() == null) {
		if (data == null && TestProtocol.sDebugTracing) {
		Log.d(CRASH_ADD_CUSTOM_SHORTCUT,
		"Failed to add custom shortcut: Intent is null, args = " + args);
		}
		return;
		}

src/com/android/launcher3/testing/TestProtocol.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -84,5 +84,4 @@ public final class TestProtocol {
		public static final String NO_BACKGROUND_TO_OVERVIEW_TAG = "b/138251824";
		public static final String NO_DRAG_TO_WORKSPACE = "b/138729456";
		public static final String APP_NOT_DISABLED = "b/139891609";
		public static final String CRASH_ADD_CUSTOM_SHORTCUT = "b/141568904";
		}

tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -356,9 +356,9 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
		* Custom shortcuts are replaced by deep shortcuts after api 25.
		*/
		@Test
		@Ignore("Temporarily disabled to unblock merging to master")
		@PortraitLandscape
		public void testDragCustomShortcut() {
		if (!TestHelpers.isInLauncherProcess()) return; // b/143725213
		mLauncher.getWorkspace().openAllWidgets()
		.getWidget("com.android.launcher3.testcomponent.CustomShortcutConfigActivity")
		.dragToWorkspace();