From 62dbe9827a2d0cfbb40706e22bc63e29e2e5e7bc Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Wed, 12 May 2021 16:19:58 -0700 Subject: [PATCH] Specify REQUEST_RECONFIGURE_APPWIDGET when dropping on Setup target Test: Add a configurable widget to the home screen, drag it to the Setup drop target, and swipe up to home from the setup page Fixes: 187839837 Change-Id: I0912317248a33764d4f2a49db73b8fba44dfeca1 --- src/com/android/launcher3/SecondaryDropTarget.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/SecondaryDropTarget.java b/src/com/android/launcher3/SecondaryDropTarget.java index 05cef386df..6ccfa7e3b5 100644 --- a/src/com/android/launcher3/SecondaryDropTarget.java +++ b/src/com/android/launcher3/SecondaryDropTarget.java @@ -3,6 +3,7 @@ package com.android.launcher3; import static android.appwidget.AppWidgetManager.INVALID_APPWIDGET_ID; import static android.appwidget.AppWidgetProviderInfo.WIDGET_FEATURE_RECONFIGURABLE; +import static com.android.launcher3.Launcher.REQUEST_RECONFIGURE_APPWIDGET; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_DESKTOP; import static com.android.launcher3.accessibility.LauncherAccessibilityDelegate.DISMISS_PREDICTION; import static com.android.launcher3.accessibility.LauncherAccessibilityDelegate.RECONFIGURE; @@ -266,7 +267,8 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList if (mCurrentAccessibilityAction == RECONFIGURE) { int widgetId = getReconfigurableWidgetId(view); if (widgetId != INVALID_APPWIDGET_ID) { - mLauncher.getAppWidgetHost().startConfigActivity(mLauncher, widgetId, -1); + mLauncher.getAppWidgetHost().startConfigActivity(mLauncher, widgetId, + REQUEST_RECONFIGURE_APPWIDGET); } return null; }