am 5376e7a8: Merge "Ensuring that the widget drag outline is padded by the default widget padding. (Bug 10881814)" into jb-ub-now-indigo-rose

* commit '5376e7a86fd9e87681584871b62c66cf31b5c262':
  Ensuring that the widget drag outline is padded by the default widget padding. (Bug 10881814)

src/com/android/launcher3/Launcher.java

@@ -3928,8 +3928,7 @@ public class Launcher extends Activity
                 mIntentsOnWorkspaceFromUpgradePath = null;
             }
         } else {
-            if (!AppsCustomizePagedView.DISABLE_ALL_APPS &&
-                    mAppsCustomizeContent != null) {
+            if (mAppsCustomizeContent != null) {
                 mAppsCustomizeContent.setApps(apps);
             }
         }

src/com/android/launcher3/Workspace.java

@@ -338,7 +338,8 @@ public class Workspace extends SmoothPagedView
             ItemInfo itemInfo, boolean springLoaded) {
         int[] size = new int[2];
         if (getChildCount() > 0) {
-            CellLayout cl = (CellLayout) mLauncher.getWorkspace().getChildAt(0);
+            // Use the first non-custom page to estimate the child position
+            CellLayout cl = (CellLayout) getChildAt(numCustomPages());
             Rect r = estimateItemPosition(cl, itemInfo, 0, 0, hSpan, vSpan);
             size[0] = r.width();
             size[1] = r.height();