diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-02-02 16:37:21 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2017-02-06 10:43:27 -0800 |
commit | 96ac68a481ce5b794b5227e09ace7c30d6dd5e7b (patch) | |
tree | 9ea46cdeccfce02fbe0830d7430f9f95c64557b6 /src/com/android/launcher3/folder | |
parent | e1fa0145d36fbefeb397f952cba2689ce537d786 (diff) | |
download | android_packages_apps_Trebuchet-96ac68a481ce5b794b5227e09ace7c30d6dd5e7b.tar.gz android_packages_apps_Trebuchet-96ac68a481ce5b794b5227e09ace7c30d6dd5e7b.tar.bz2 android_packages_apps_Trebuchet-96ac68a481ce5b794b5227e09ace7c30d6dd5e7b.zip |
Updating the PreloadIconDrawable
> The drawable gets the path from MaskIconDrawable path, instead of
using a circle
> The progress changes are animated as well
Bug: 34831873
Change-Id: I4e7f0b610f4fd94de8e0cfcf8b179b775cf0b4d8
Diffstat (limited to 'src/com/android/launcher3/folder')
-rw-r--r-- | src/com/android/launcher3/folder/FolderIcon.java | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java index 973245b92..5dc963311 100644 --- a/src/com/android/launcher3/folder/FolderIcon.java +++ b/src/com/android/launcher3/folder/FolderIcon.java @@ -53,13 +53,11 @@ import com.android.launcher3.DropTarget.DragObject; import com.android.launcher3.FastBitmapDrawable; import com.android.launcher3.FolderInfo; import com.android.launcher3.FolderInfo.FolderListener; -import com.android.launcher3.IconCache; import com.android.launcher3.ItemInfo; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAnimUtils; import com.android.launcher3.LauncherSettings; import com.android.launcher3.OnAlarmListener; -import com.android.launcher3.PreloadIconDrawable; import com.android.launcher3.R; import com.android.launcher3.ShortcutInfo; import com.android.launcher3.SimpleOnStylusPressListener; @@ -245,7 +243,7 @@ public class FolderIcon extends FrameLayout implements FolderListener { }; public Drawable prepareCreate(final View destView) { - Drawable animateDrawable = getTopDrawable((TextView) destView); + Drawable animateDrawable = ((TextView) destView).getCompoundDrawables()[1]; computePreviewDrawingParams(animateDrawable.getIntrinsicWidth(), destView.getMeasuredWidth()); return animateDrawable; @@ -270,7 +268,7 @@ public class FolderIcon extends FrameLayout implements FolderListener { } public void performDestroyAnimation(final View finalView, Runnable onCompleteRunnable) { - Drawable animateDrawable = getTopDrawable((TextView) finalView); + Drawable animateDrawable = ((TextView) finalView).getCompoundDrawables()[1]; computePreviewDrawingParams(animateDrawable.getIntrinsicWidth(), finalView.getMeasuredWidth()); @@ -771,11 +769,6 @@ public class FolderIcon extends FrameLayout implements FolderListener { } } - private Drawable getTopDrawable(TextView v) { - Drawable d = v.getCompoundDrawables()[1]; - return (d instanceof PreloadIconDrawable) ? ((PreloadIconDrawable) d).mIcon : d; - } - class FolderPreviewItemAnim { ValueAnimator mValueAnimator; float finalScale; @@ -892,7 +885,7 @@ public class FolderIcon extends FrameLayout implements FolderListener { for (int i = 0; i < mDrawingParams.size(); i++) { PreviewItemDrawingParams p = mDrawingParams.get(i); - p.drawable = getTopDrawable((TextView) items.get(i)); + p.drawable = ((TextView) items.get(i)).getCompoundDrawables()[1]; if (!animate || FeatureFlags.LAUNCHER3_LEGACY_FOLDER_ICON) { computePreviewItemDrawingParams(i, nItemsInPreview, p); |