diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-09-26 12:43:16 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2017-09-27 09:10:05 -0700 |
commit | aa3a2baab60e874a410fed6e958e1fb63c75fa37 (patch) | |
tree | b9967617a081dbed458ea165685c7a2c80617ce8 /src/com/android/launcher3/shortcuts | |
parent | f00c5b5fd484969ebd5c177563f0a23f7aff1731 (diff) | |
download | android_packages_apps_Trebuchet-aa3a2baab60e874a410fed6e958e1fb63c75fa37.tar.gz android_packages_apps_Trebuchet-aa3a2baab60e874a410fed6e958e1fb63c75fa37.tar.bz2 android_packages_apps_Trebuchet-aa3a2baab60e874a410fed6e958e1fb63c75fa37.zip |
Simplifying drag preview generation
> Fixing wrong icon normalization when dragging a folder icon
> Reusing the preview bitmap for creating dragOutline
> Generating drag outline on the background thread
Bug: 35428783
Change-Id: I01e724ba63404302090ee1e562f6c2fc7147ba2f
Diffstat (limited to 'src/com/android/launcher3/shortcuts')
-rw-r--r-- | src/com/android/launcher3/shortcuts/ShortcutDragPreviewProvider.java | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/src/com/android/launcher3/shortcuts/ShortcutDragPreviewProvider.java b/src/com/android/launcher3/shortcuts/ShortcutDragPreviewProvider.java index e9d2b50ea..cfb9258dd 100644 --- a/src/com/android/launcher3/shortcuts/ShortcutDragPreviewProvider.java +++ b/src/com/android/launcher3/shortcuts/ShortcutDragPreviewProvider.java @@ -26,7 +26,6 @@ import android.view.View; import com.android.launcher3.Launcher; import com.android.launcher3.Utilities; import com.android.launcher3.graphics.DragPreviewProvider; -import com.android.launcher3.graphics.HolographicOutlineHelper; /** * Extension of {@link DragPreviewProvider} which generates bitmaps scaled to the default icon size. @@ -40,35 +39,17 @@ public class ShortcutDragPreviewProvider extends DragPreviewProvider { mPositionShift = shift; } - @Override - public Bitmap createDragOutline(Canvas canvas) { - Bitmap b = drawScaledPreview(canvas, Bitmap.Config.ALPHA_8); - - HolographicOutlineHelper.getInstance(mView.getContext()) - .applyExpensiveOutlineWithBlur(b, canvas); - canvas.setBitmap(null); - return b; - } - - @Override - public Bitmap createDragBitmap(Canvas canvas) { - Bitmap b = drawScaledPreview(canvas, Bitmap.Config.ARGB_8888); - canvas.setBitmap(null); - return b; - } - - private Bitmap drawScaledPreview(Canvas canvas, Bitmap.Config config) { + public Bitmap createDragBitmap() { Drawable d = mView.getBackground(); Rect bounds = getDrawableBounds(d); int size = Launcher.getLauncher(mView.getContext()).getDeviceProfile().iconSizePx; - final Bitmap b = Bitmap.createBitmap( size + blurSizeOutline, size + blurSizeOutline, - config); + Bitmap.Config.ARGB_8888); - canvas.setBitmap(b); + Canvas canvas = new Canvas(b); canvas.save(Canvas.MATRIX_SAVE_FLAG); canvas.translate(blurSizeOutline / 2, blurSizeOutline / 2); canvas.scale(((float) size) / bounds.width(), ((float) size) / bounds.height(), 0, 0); |