Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa5f8fa8 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix safezone and getAlpha b/38361276 Test:... 

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

graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java

+2 −18
Original line number Diff line number Diff line
@@ -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;

    }