Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Fix safezone and getAlpha b/38361276 Test: frameworks/base/core/tests/coretests/src/android/graphics/drawable/IconTest.java" into oc-dev am: cca181bfbb" into oc-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2017-05-25 23:13:04 +00:00
committed by Android (Google) Code Review
parent f5fb04573b 47336be855
commit fa5f8fa8a8
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java
View File

@@ -84,7 +84,7 @@ public class AdaptiveIconDrawable extends Drawable implements Drawable.Callback
/** /**
* Launcher icons design guideline * 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 * 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 @Override
public int getAlpha() { public int getAlpha() {
final Drawable dr = getFirstNonNullDrawable(); return PixelFormat.TRANSLUCENT;
if (dr != null) {
return dr.getAlpha();
} else {
return super.getAlpha();
}
} }
@Override @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) { public void setOpacity(int opacity) {
mLayerState.mOpacityOverride = opacity; mLayerState.mOpacityOverride = opacity;
} }