Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0007472e authored by Adam Cohen's avatar Adam Cohen
Browse files

Fix issue with extra empty screen left over after widget add cancel (issue 10865959) 

Change-Id: Iee72fe1b296e81a5f2d04f6edcbf9cac19aff992
parent f7d45854

src/com/android/launcher3/Launcher.java

+3 −0
Original line number Diff line number Diff line
@@ -736,6 +736,7 @@ public class Launcher extends Activity 
                Log.e(TAG, "Error: appWidgetId (EXTRA_APPWIDGET_ID) was not returned from the \\" +

                        "widget configuration activity.");

                completeTwoStageWidgetDrop(RESULT_CANCELED, appWidgetId);

                mWorkspace.stripEmptyScreens();

            } else {

                completeTwoStageWidgetDrop(resultCode, appWidgetId);

            }
@@ -760,6 +761,8 @@ public class Launcher extends Activity 
            } else {

                delayExitSpringLoadedMode = completeAdd(args);

            }

        } else if (resultCode == RESULT_CANCELED) {

            mWorkspace.stripEmptyScreens();

        }

        mDragLayer.clearAnimatedView();

        // Exit spring loaded mode if necessary after cancelling the configuration of a widget