diff options
author | Adam Cohen <adamcohen@google.com> | 2013-10-31 15:03:35 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2013-10-31 15:04:59 -0700 |
commit | 917e38851cbc6caffe1f8dade4db452bace522ba (patch) | |
tree | 86b3ec601f02ece219acf412509182cb26bdd392 | |
parent | 3b185e2513bcc3318753c21d3909d8dab2291e31 (diff) | |
download | android_packages_apps_Trebuchet-917e38851cbc6caffe1f8dade4db452bace522ba.tar.gz android_packages_apps_Trebuchet-917e38851cbc6caffe1f8dade4db452bace522ba.tar.bz2 android_packages_apps_Trebuchet-917e38851cbc6caffe1f8dade4db452bace522ba.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 bf1e9c931..df16d4194 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -76,6 +76,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(); @@ -332,6 +333,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 f721571c2..3290d8e02 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -754,10 +754,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 8e29b4055..5bd0bc6c2 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -671,7 +671,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); |