diff options
author | Jonathan Miranda <jonmiranda@google.com> | 2017-07-26 17:41:02 +0000 |
---|---|---|
committer | Jon Miranda <jonmiranda@google.com> | 2017-07-26 11:05:29 -0700 |
commit | 9ad87463a8e62cb620c4a738ed9f534b9e9dfb9b (patch) | |
tree | 9586edea8f1a0704212e56baa0bb3b6765265052 /src/com/android/launcher3/folder | |
parent | df4aaca594953e940dffdc873e96b31fb2bb6474 (diff) | |
download | android_packages_apps_Trebuchet-9ad87463a8e62cb620c4a738ed9f534b9e9dfb9b.tar.gz android_packages_apps_Trebuchet-9ad87463a8e62cb620c4a738ed9f534b9e9dfb9b.tar.bz2 android_packages_apps_Trebuchet-9ad87463a8e62cb620c4a738ed9f534b9e9dfb9b.zip |
Revert "Update Folders to match spec."
This reverts commit fd8fa136f5cec15302bf48bdd60761e057f960c4.
Change-Id: Ifb8ce81e23f38df2eb2c26f93376eca19caae5b1
Diffstat (limited to 'src/com/android/launcher3/folder')
-rw-r--r-- | src/com/android/launcher3/folder/FolderAnimationManager.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java index d7f5c2b64..69705d594 100644 --- a/src/com/android/launcher3/folder/FolderAnimationManager.java +++ b/src/com/android/launcher3/folder/FolderAnimationManager.java @@ -120,7 +120,6 @@ public class FolderAnimationManager { final DragLayer.LayoutParams lp = (DragLayer.LayoutParams) mFolder.getLayoutParams(); FolderIcon.PreviewLayoutRule rule = mFolderIcon.getLayoutRule(); final List<BubbleTextView> itemsInPreview = mFolderIcon.getPreviewItems(); - BubbleTextView btv = itemsInPreview.get(0); // Match position of the FolderIcon final Rect folderIconPos = new Rect(); @@ -132,7 +131,7 @@ public class FolderAnimationManager { // Match size/scale of icons in the preview float previewScale = rule.scaleForItem(0, itemsInPreview.size()); float previewSize = rule.getIconSize() * previewScale; - float initialScale = previewSize / btv.getIconSize() + float initialScale = previewSize / itemsInPreview.get(0).getIconSize() * scaleRelativeToDragLayer; final float finalScale = 1f; float scale = mIsOpening ? initialScale : finalScale; @@ -149,12 +148,10 @@ public class FolderAnimationManager { previewItemOffsetX = (int) (lp.width * initialScale - initialSize - previewItemOffsetX); } - // Note that we do not include btv.getPaddingLeft() in the calculation, since it is - // handled in addPreviewItemAnimators as part of iconOffsetX. final int paddingOffsetX = (int) ((mFolder.getPaddingLeft() + mContent.getPaddingLeft()) * initialScale); - final int paddingOffsetY = (int) ((mFolder.getPaddingTop() + mContent.getPaddingTop() - + btv.getPaddingTop()) * initialScale); + final int paddingOffsetY = (int) ((mFolder.getPaddingTop() + mContent.getPaddingTop()) + * initialScale); int initialX = folderIconPos.left + mPreviewBackground.getOffsetX() - paddingOffsetX - previewItemOffsetX; |