diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-12-08 00:46:10 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-08 00:46:10 +0000 |
commit | 621e2006473899c2047d66e3ef4b49c6d0db5a13 (patch) | |
tree | 80fe0a5265f2cdf0f5187101753837fb43f80807 /src/com/android/launcher3/folder | |
parent | b4a192b5dacd7cf327032d01443665a5e6124182 (diff) | |
parent | d5462aa31b53eb690a3f57c7c6c0cc4021271de6 (diff) | |
download | android_packages_apps_Trebuchet-621e2006473899c2047d66e3ef4b49c6d0db5a13.tar.gz android_packages_apps_Trebuchet-621e2006473899c2047d66e3ef4b49c6d0db5a13.tar.bz2 android_packages_apps_Trebuchet-621e2006473899c2047d66e3ef4b49c6d0db5a13.zip |
Merge "Simplifyling widget inflation and addition flow." into ub-launcher3-master
Diffstat (limited to 'src/com/android/launcher3/folder')
-rw-r--r-- | src/com/android/launcher3/folder/Folder.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index e813bb450..a81b4caba 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java @@ -1225,8 +1225,7 @@ public class Folder extends AbstractFloatingView implements DragSource, View.OnC // We add the child after removing the folder to prevent both from existing // at the same time in the CellLayout. We need to add the new item with // addInScreenFromBind() to ensure that hotseat items are placed correctly. - mLauncher.getWorkspace().addInScreenFromBind(newIcon, mInfo.container, - mInfo.screenId, mInfo.cellX, mInfo.cellY, mInfo.spanX, mInfo.spanY); + mLauncher.getWorkspace().addInScreenFromBind(newIcon, mInfo); // Focus the newly created child newIcon.requestFocus(); |