aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-04 09:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug when dragging FolderIcon between Workspace/Hotseat.

Browse Source 
Bug: 63902464
Change-Id: I7995295d5c350720030abc6651af681c880464f8
This commit is contained in:
Jon Miranda
2017-07-24 11:39:38 -07:00
parent 1091e538b4
commit 0c172151c3
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/launcher3/folder/FolderIcon.java
View File

@@ -446,6 +446,8 @@ public class FolderIcon extends FrameLayout implements FolderListener {
if (!mBackgroundIsVisible) return;
mPreviewItemManager.recomputePreviewDrawingParams();
if (!mBackground.drawingDelegated()) {
mBackground.drawBackground(canvas);
}

9
src/com/android/launcher3/folder/PreviewItemManager.java
View File

@@ -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);