summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Bertschler <bmario@google.com>2017-07-21 20:37:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-21 20:37:16 +0000
commitc08f0c28596058b6e5e568bfaeedd03ba1ad466a (patch)
tree3d2c65c70f34e5f566b36bdcb77e8fb6f77d1776
parentfd8fa136f5cec15302bf48bdd60761e057f960c4 (diff)
parent665971c007777f2e740945e35df745b9a360331f (diff)
downloadandroid_packages_apps_Trebuchet-c08f0c28596058b6e5e568bfaeedd03ba1ad466a.tar.gz
android_packages_apps_Trebuchet-c08f0c28596058b6e5e568bfaeedd03ba1ad466a.tar.bz2
android_packages_apps_Trebuchet-c08f0c28596058b6e5e568bfaeedd03ba1ad466a.zip
Merge "Adding ability to set a custom blur mask filter and alphas in shadow generator." into ub-launcher3-dorval-polish
-rw-r--r--src/com/android/launcher3/graphics/ShadowGenerator.java15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/com/android/launcher3/graphics/ShadowGenerator.java b/src/com/android/launcher3/graphics/ShadowGenerator.java
index 3c71c3acc..60eeef5df 100644
--- a/src/com/android/launcher3/graphics/ShadowGenerator.java
+++ b/src/com/android/launcher3/graphics/ShadowGenerator.java
@@ -53,33 +53,38 @@ public class ShadowGenerator {
private final Canvas mCanvas;
private final Paint mBlurPaint;
private final Paint mDrawPaint;
+ private final BlurMaskFilter mDefaultBlurMaskFilter;
private ShadowGenerator(Context context) {
mIconSize = LauncherAppState.getIDP(context).iconBitmapSize;
mCanvas = new Canvas();
mBlurPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
- mBlurPaint.setMaskFilter(new BlurMaskFilter(mIconSize * BLUR_FACTOR, Blur.NORMAL));
mDrawPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
+ mDefaultBlurMaskFilter = new BlurMaskFilter(mIconSize * BLUR_FACTOR, Blur.NORMAL);
}
public synchronized Bitmap recreateIcon(Bitmap icon) {
- return recreateIcon(icon, true);
+ return recreateIcon(icon, true, mDefaultBlurMaskFilter, AMBIENT_SHADOW_ALPHA,
+ KEY_SHADOW_ALPHA);
}
- public synchronized Bitmap recreateIcon(Bitmap icon, boolean resize) {
+ public synchronized Bitmap recreateIcon(Bitmap icon, boolean resize,
+ BlurMaskFilter blurMaskFilter, int ambientAlpha, int keyAlpha) {
int width = resize ? mIconSize : icon.getWidth();
int height = resize ? mIconSize : icon.getHeight();
int[] offset = new int[2];
+
+ mBlurPaint.setMaskFilter(blurMaskFilter);
Bitmap shadow = icon.extractAlpha(mBlurPaint, offset);
Bitmap result = Bitmap.createBitmap(width, height, Config.ARGB_8888);
mCanvas.setBitmap(result);
// Draw ambient shadow
- mDrawPaint.setAlpha(AMBIENT_SHADOW_ALPHA);
+ mDrawPaint.setAlpha(ambientAlpha);
mCanvas.drawBitmap(shadow, offset[0], offset[1], mDrawPaint);
// Draw key shadow
- mDrawPaint.setAlpha(KEY_SHADOW_ALPHA);
+ mDrawPaint.setAlpha(keyAlpha);
mCanvas.drawBitmap(shadow, offset[0], offset[1] + KEY_SHADOW_DISTANCE * mIconSize, mDrawPaint);
// Draw the icon