Merge "Ensure that we update the preview layout rule when not animating." into ub-launcher3-calgary (2f88ef34) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/Workspace.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -2584,6 +2584,7 @@ public class Workspace extends PagedView
		fi.performCreateAnimation(destInfo, v, sourceInfo, dragView, folderLocation, scale,
		postAnimationRunnable);
		} else {
		fi.prepareCreate(v);
		fi.addItem(destInfo);
		fi.addItem(sourceInfo);
		}

+8 −3

Original line number	Diff line number	Diff line
		@@ -262,14 +262,19 @@ public class FolderIcon extends FrameLayout implements FolderListener {
		}
		};

		public Drawable prepareCreate(final View destView) {
		Drawable animateDrawable = getTopDrawable((TextView) destView);
		computePreviewDrawingParams(animateDrawable.getIntrinsicWidth(),
		destView.getMeasuredWidth());
		return animateDrawable;
		}

		public void performCreateAnimation(final ShortcutInfo destInfo, final View destView,
		final ShortcutInfo srcInfo, final DragView srcView, Rect dstRect,
		float scaleRelativeToDragLayer, Runnable postAnimationRunnable) {

		// These correspond two the drawable and view that the icon was dropped _onto_
		Drawable animateDrawable = getTopDrawable((TextView) destView);
		computePreviewDrawingParams(animateDrawable.getIntrinsicWidth(),
		destView.getMeasuredWidth());
		Drawable animateDrawable = prepareCreate(destView);

		mReferenceDrawable = animateDrawable;

+1 −1

Original line number	Diff line number	Diff line
		@@ -197,7 +197,7 @@ public class FolderPagedView extends PagedView {
		*/
		public int allocateRankForNewItem(ShortcutInfo info) {
		int rank = getItemCount();
		ArrayList<View> views = new ArrayList<View>(mFolder.getItemsInReadingOrder());
		ArrayList<View> views = new ArrayList<>(mFolder.getItemsInReadingOrder());
		views.add(rank, null);
		arrangeChildren(views, views.size(), false);
		setCurrentPage(rank / mMaxItemsPerPage);