diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-07-24 19:46:47 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-24 19:46:47 +0000 |
commit | df4aaca594953e940dffdc873e96b31fb2bb6474 (patch) | |
tree | b847c2fcd48856b8a18d1da61a59b52fdbca492e /src/com/android/launcher3 | |
parent | f38758de105e584cf6a6a7a9a789fea3b66f33d0 (diff) | |
parent | 0c172151c3cafe4fb99763efed0034bd3e0f23ca (diff) | |
download | android_packages_apps_Trebuchet-df4aaca594953e940dffdc873e96b31fb2bb6474.tar.gz android_packages_apps_Trebuchet-df4aaca594953e940dffdc873e96b31fb2bb6474.tar.bz2 android_packages_apps_Trebuchet-df4aaca594953e940dffdc873e96b31fb2bb6474.zip |
Merge "Fix bug when dragging FolderIcon between Workspace/Hotseat." into ub-launcher3-dorval-polish
Diffstat (limited to 'src/com/android/launcher3')
-rw-r--r-- | src/com/android/launcher3/folder/FolderIcon.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/folder/PreviewItemManager.java | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java index c63eeb345..84ec18410 100644 --- a/src/com/android/launcher3/folder/FolderIcon.java +++ b/src/com/android/launcher3/folder/FolderIcon.java @@ -446,6 +446,8 @@ public class FolderIcon extends FrameLayout implements FolderListener { if (!mBackgroundIsVisible) return; + mPreviewItemManager.recomputePreviewDrawingParams(); + if (!mBackground.drawingDelegated()) { mBackground.drawBackground(canvas); } diff --git a/src/com/android/launcher3/folder/PreviewItemManager.java b/src/com/android/launcher3/folder/PreviewItemManager.java index bb2320774..2ecb54ca8 100644 --- a/src/com/android/launcher3/folder/PreviewItemManager.java +++ b/src/com/android/launcher3/folder/PreviewItemManager.java @@ -90,8 +90,11 @@ public class PreviewItemManager { return animateDrawable; } - private void computePreviewDrawingParams(Drawable d) { - computePreviewDrawingParams(d.getIntrinsicWidth(), mIcon.getMeasuredWidth()); + public void recomputePreviewDrawingParams() { + if (mReferenceDrawable != null) { + computePreviewDrawingParams(mReferenceDrawable.getIntrinsicWidth(), + mIcon.getMeasuredWidth()); + } } private void computePreviewDrawingParams(int drawableSize, int totalSize) { @@ -143,8 +146,6 @@ public class PreviewItemManager { } public void draw(Canvas canvas) { - computePreviewDrawingParams(mReferenceDrawable); - float firstPageItemsTransX = 0; if (mShouldSlideInFirstPage) { drawParams(canvas, mCurrentPageParams, mCurrentPageItemsTransX); |