Fix widget resizing (Which stopped working at some point)

-> Also, deferring empty screen removal until after the drop animation
   in order to reduce buggy transitions
-> Also fixing workspace layout on tablet

Change-Id: I1ae9fdaf592262f959424f321efa6df4298f85cc

src/com/android/launcher3/Workspace.java

@@ -2384,6 +2384,7 @@ public class Workspace extends SmoothPagedView
                     if (finalResizeRunnable != null) {
                         finalResizeRunnable.run();
                     }
+                    stripEmptyScreens();
                 }
             };
             mAnimatingViewIntoPlace = true;
@@ -3364,6 +3365,10 @@ public class Workspace extends SmoothPagedView
                         mDragController.removeDropTarget((DropTarget) mDragInfo.cell);
                     }
                 }
+                // If we move the item to anything not on the Workspace, check if any empty
+                // screens need to be removed. If we dropped back on the workspace, this will
+                // be done post drop animation.
+                stripEmptyScreens();
             }
         } else if (mDragInfo != null) {
             CellLayout cellLayout;
@@ -3380,8 +3385,6 @@ public class Workspace extends SmoothPagedView
         mDragOutline = null;
         mDragInfo = null;
 
-        stripEmptyScreens();
-
         // Hide the scrolling indicator after you pick up an item
         hideScrollingIndicator(false);
     }