summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2019-07-24 00:07:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-07-24 00:07:18 +0000
commitb2e6a77b0d43d947badb83f3c93374cc9be8454f (patch)
tree816333841f178bac7e5cdcd64ea64b25866b0e43 /src/com
parent8578309f1bc12080fb1c7f4bf52e83bf9a420c49 (diff)
parentd418f3c3fa17c4c4a0ae552541ca78acd42917ff (diff)
downloadandroid_packages_apps_Trebuchet-b2e6a77b0d43d947badb83f3c93374cc9be8454f.tar.gz
android_packages_apps_Trebuchet-b2e6a77b0d43d947badb83f3c93374cc9be8454f.tar.bz2
android_packages_apps_Trebuchet-b2e6a77b0d43d947badb83f3c93374cc9be8454f.zip
Merge "Set FastBitmapDrawable scale=1 before drawing it in DragView" into ub-launcher3-qt-r1-dev
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/launcher3/graphics/DragPreviewProvider.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher3/graphics/DragPreviewProvider.java b/src/com/android/launcher3/graphics/DragPreviewProvider.java
index 7eb4015bf..9263a2ac9 100644
--- a/src/com/android/launcher3/graphics/DragPreviewProvider.java
+++ b/src/com/android/launcher3/graphics/DragPreviewProvider.java
@@ -29,6 +29,7 @@ import android.os.Handler;
import android.view.View;
import com.android.launcher3.BubbleTextView;
+import com.android.launcher3.FastBitmapDrawable;
import com.android.launcher3.Launcher;
import com.android.launcher3.R;
import com.android.launcher3.config.FeatureFlags;
@@ -87,6 +88,9 @@ public class DragPreviewProvider {
Rect bounds = getDrawableBounds(d);
destCanvas.translate(blurSizeOutline / 2 - bounds.left,
blurSizeOutline / 2 - bounds.top);
+ if (d instanceof FastBitmapDrawable) {
+ ((FastBitmapDrawable) d).setScale(1);
+ }
d.draw(destCanvas);
} else {
final Rect clipRect = mTempRect;