diff options
author | Adam Cohen <adamcohen@google.com> | 2013-10-31 15:03:35 -0700 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2014-06-05 23:35:03 -0700 |
commit | b2af81a33cd23d2c92ce09b83b97db08e8cb6942 (patch) | |
tree | c4e90a562b2743294546e191a16a410ec09aa318 | |
parent | 86e2ac3bb6119d730521ac8ff5cab11d77ee28e1 (diff) | |
download | android_packages_apps_Trebuchet-b2af81a33cd23d2c92ce09b83b97db08e8cb6942.tar.gz android_packages_apps_Trebuchet-b2af81a33cd23d2c92ce09b83b97db08e8cb6942.tar.bz2 android_packages_apps_Trebuchet-b2af81a33cd23d2c92ce09b83b97db08e8cb6942.zip |
Fix issue with adding widget with config activity to empty screen (issue 11381059)
Change-Id: Ic7eecb30422e7a6cf35ebe8470d9eba8752d406e
-rw-r--r-- | src/com/android/launcher3/CellLayout.java | 9 | ||||
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 4 | ||||
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 3 |
3 files changed, 15 insertions, 1 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 9f4693242..aac281af2 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -74,6 +74,7 @@ public class CellLayout extends ViewGroup { private int mHeightGap; private int mMaxGap; private boolean mScrollingTransformsDirty = false; + private boolean mDropPending = false; private final Rect mRect = new Rect(); private final CellInfo mCellInfo = new CellInfo(); @@ -330,6 +331,14 @@ public class CellLayout extends ViewGroup { mShortcutsAndWidgets.setInvertIfRtl(invert); } + public void setDropPending(boolean pending) { + mDropPending = pending; + } + + public boolean isDropPending() { + return mDropPending; + } + private void invalidateBubbleTextView(BubbleTextView icon) { final int padding = icon.getPressedOrFocusedBackgroundPadding(); invalidate(icon.getLeft() + getPaddingLeft() - padding, diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 57097ede9..cd58464f8 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -790,10 +790,14 @@ public class Launcher extends Activity }; } else { result = resultCode; + final CellLayout dropLayout = + (CellLayout) mWorkspace.getScreenWithId(mPendingAddInfo.screenId); + dropLayout.setDropPending(true); onComplete = new Runnable() { @Override public void run() { completeTwoStageWidgetDrop(result, appWidgetId); + dropLayout.setDropPending(false); } }; } diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 806129e73..f1287aa1d 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -716,7 +716,8 @@ public class Workspace extends SmoothPagedView CellLayout finalScreen = mWorkspaceScreens.get(finalScreenId); // If the final screen is empty, convert it to the extra empty screen - if (finalScreen.getShortcutsAndWidgets().getChildCount() == 0) { + if (finalScreen.getShortcutsAndWidgets().getChildCount() == 0 && + !finalScreen.isDropPending()) { mWorkspaceScreens.remove(finalScreenId); mScreenOrder.remove(finalScreenId); |