diff options
| -rw-r--r-- | graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java b/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java index ab10e978b0f7..8616d58a0319 100644 --- a/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java +++ b/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java @@ -84,7 +84,7 @@ public class AdaptiveIconDrawable extends Drawable implements Drawable.Callback /** * Launcher icons design guideline */ - private static final float SAFEZONE_SCALE = 72f/66f; + private static final float SAFEZONE_SCALE = 66f/72f; /** * All four sides of the layers are padded with extra inset so as to provide @@ -676,12 +676,7 @@ public class AdaptiveIconDrawable extends Drawable implements Drawable.Callback @Override public int getAlpha() { - final Drawable dr = getFirstNonNullDrawable(); - if (dr != null) { - return dr.getAlpha(); - } else { - return super.getAlpha(); - } + return PixelFormat.TRANSLUCENT; } @Override @@ -719,17 +714,6 @@ public class AdaptiveIconDrawable extends Drawable implements Drawable.Callback } } - private Drawable getFirstNonNullDrawable() { - final ChildDrawable[] array = mLayerState.mChildren; - for (int i = 0; i < mLayerState.N_CHILDREN; i++) { - final Drawable dr = array[i].mDrawable; - if (dr != null) { - return dr; - } - } - return null; - } - public void setOpacity(int opacity) { mLayerState.mOpacityOverride = opacity; } |