summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2017-04-06 23:04:19 -0700
committerHyunyoung Song <hyunyoungs@google.com>2017-04-12 16:06:45 -0700
commit92e3da2354484d1dce64413c97d4605addb7f64a (patch)
treec375015867f666efa285a8f9f85b28055595f5d2 /core/java/android
parentc922c4827a94fe436d2005c63e8b8d51a6bbb159 (diff)
Update API, add more documentation on AdaptiveIconDrawable
and fix multiple miscellaneous bugs. Bug: 37079814 Bug: 37100106 Bug: 34829216 Test: $ runtest --path=frameworks/base/core/tests/coretests/src/android/graphics/drawable/IconTest.java Test: $ runtest --path=frameworks/base/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java Test: $ runtest --path=frameworks/base/core/tests/coretests/src/android/grpahics/drawable/AdaptiveIconDrawableTest.java Change-Id: I0f5b2232853031bf3860ebea2736e894d17e4d2e
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/util/LauncherIcons.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/core/java/android/util/LauncherIcons.java b/core/java/android/util/LauncherIcons.java
index e5aa2b5b4ce7..89b9646e54b3 100644
--- a/core/java/android/util/LauncherIcons.java
+++ b/core/java/android/util/LauncherIcons.java
@@ -20,11 +20,8 @@ import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
-import android.graphics.Matrix;
import android.graphics.Paint;
import android.graphics.PaintFlagsDrawFilter;
-import android.graphics.Path;
-import android.graphics.RectF;
import android.graphics.drawable.AdaptiveIconDrawable;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
@@ -49,7 +46,7 @@ public final class LauncherIcons {
public LauncherIcons(Context context) {
mRes = context.getResources();
DisplayMetrics metrics = mRes.getDisplayMetrics();
- mShadowInset = (int) metrics.density / DisplayMetrics.DENSITY_DEFAULT;
+ mShadowInset = (int)(2 * metrics.density);
mCanvas.setDrawFilter(new PaintFlagsDrawFilter(Paint.DITHER_FLAG,
Paint.FILTER_BITMAP_FLAG));
mIconSize = (int) mRes.getDimensionPixelSize(android.R.dimen.app_icon_size);
@@ -91,7 +88,6 @@ public final class LauncherIcons {
return mShadowBitmap;
}
- int shadowSize = mIconSize - mShadowInset;
mShadowBitmap = Bitmap.createBitmap(mIconSize, mIconSize, Bitmap.Config.ALPHA_8);
mCanvas.setBitmap(mShadowBitmap);