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

Commit d89cf81f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change MaskableIconDrawable to AdaptiveIconDrawable"

parents 8922f5db be8835e8

api/current.txt

+15 −15
Original line number Original line Diff line number Diff line
@@ -13491,6 +13491,21 @@ package android.graphics { 
















package android.graphics.drawable {







package android.graphics.drawable {






























  public class AdaptiveIconDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {














    method public void draw(android.graphics.Canvas);














    method public android.graphics.drawable.Drawable getBackground();














    method public static float getExtraInsetPercentage();














    method public android.graphics.drawable.Drawable getForeground();














    method public android.graphics.Path getIconMask();














    method public int getOpacity();














    method public void invalidateDrawable(android.graphics.drawable.Drawable);














    method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long);














    method public void setAlpha(int);














    method public void setColorFilter(android.graphics.ColorFilter);














    method public void setOpacity(int);














    method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);














  }
























  public abstract interface Animatable {







  public abstract interface Animatable {











    method public abstract boolean isRunning();







    method public abstract boolean isRunning();











    method public abstract void start();







    method public abstract void start();










@@ -13880,21 +13895,6 @@ package android.graphics.drawable {









    method public void addLevel(int, int, android.graphics.drawable.Drawable);







    method public void addLevel(int, int, android.graphics.drawable.Drawable);











  }







  }



























  public class MaskableIconDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {














    method public void draw(android.graphics.Canvas);














    method public android.graphics.drawable.Drawable getBackground();














    method public static float getExtraInsetPercentage();














    method public android.graphics.drawable.Drawable getForeground();














    method public android.graphics.Path getIconMask();














    method public int getOpacity();














    method public void invalidateDrawable(android.graphics.drawable.Drawable);














    method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long);














    method public void setAlpha(int);














    method public void setColorFilter(android.graphics.ColorFilter);














    method public void setOpacity(int);














    method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);














  }



























  public class NinePatchDrawable extends android.graphics.drawable.Drawable {







  public class NinePatchDrawable extends android.graphics.drawable.Drawable {











    ctor public deprecated NinePatchDrawable(android.graphics.Bitmap, byte[], android.graphics.Rect, java.lang.String);







    ctor public deprecated NinePatchDrawable(android.graphics.Bitmap, byte[], android.graphics.Rect, java.lang.String);











    ctor public NinePatchDrawable(android.content.res.Resources, android.graphics.Bitmap, byte[], android.graphics.Rect, java.lang.String);







    ctor public NinePatchDrawable(android.content.res.Resources, android.graphics.Bitmap, byte[], android.graphics.Rect, java.lang.String);

























api/system-current.txt



+15
−15




























Original line number
Original line
Diff line number
Diff line








@@ -14087,6 +14087,21 @@ package android.graphics {

























package android.graphics.drawable {







package android.graphics.drawable {






























  public class AdaptiveIconDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {














    method public void draw(android.graphics.Canvas);














    method public android.graphics.drawable.Drawable getBackground();














    method public static float getExtraInsetPercentage();














    method public android.graphics.drawable.Drawable getForeground();














    method public android.graphics.Path getIconMask();














    method public int getOpacity();














    method public void invalidateDrawable(android.graphics.drawable.Drawable);














    method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long);














    method public void setAlpha(int);














    method public void setColorFilter(android.graphics.ColorFilter);














    method public void setOpacity(int);














    method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);














  }
























  public abstract interface Animatable {







  public abstract interface Animatable {











    method public abstract boolean isRunning();







    method public abstract boolean isRunning();











    method public abstract void start();







    method public abstract void start();










@@ -14476,21 +14491,6 @@ package android.graphics.drawable {









    method public void addLevel(int, int, android.graphics.drawable.Drawable);







    method public void addLevel(int, int, android.graphics.drawable.Drawable);











  }







  }



























  public class MaskableIconDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {














    method public void draw(android.graphics.Canvas);














    method public android.graphics.drawable.Drawable getBackground();














    method public static float getExtraInsetPercentage();














    method public android.graphics.drawable.Drawable getForeground();














    method public android.graphics.Path getIconMask();














    method public int getOpacity();














    method public void invalidateDrawable(android.graphics.drawable.Drawable);














    method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long);














    method public void setAlpha(int);














    method public void setColorFilter(android.graphics.ColorFilter);














    method public void setOpacity(int);














    method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);














  }



























  public class NinePatchDrawable extends android.graphics.drawable.Drawable {







  public class NinePatchDrawable extends android.graphics.drawable.Drawable {











    ctor public deprecated NinePatchDrawable(android.graphics.Bitmap, byte[], android.graphics.Rect, java.lang.String);







    ctor public deprecated NinePatchDrawable(android.graphics.Bitmap, byte[], android.graphics.Rect, java.lang.String);











    ctor public NinePatchDrawable(android.content.res.Resources, android.graphics.Bitmap, byte[], android.graphics.Rect, java.lang.String);







    ctor public NinePatchDrawable(android.content.res.Resources, android.graphics.Bitmap, byte[], android.graphics.Rect, java.lang.String);

























api/test-current.txt



+16
−16




























Original line number
Original line
Diff line number
Diff line








@@ -13528,6 +13528,22 @@ package android.graphics {

























package android.graphics.drawable {







package android.graphics.drawable {






























  public class AdaptiveIconDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {














    method public void draw(android.graphics.Canvas);














    method public android.graphics.drawable.Drawable getBackground();














    method public static float getExtraInsetPercentage();














    method public android.graphics.drawable.Drawable getForeground();














    method public android.graphics.Path getIconMask();














    method public int getOpacity();














    method public android.graphics.Region getSafeZone();














    method public void invalidateDrawable(android.graphics.drawable.Drawable);














    method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long);














    method public void setAlpha(int);














    method public void setColorFilter(android.graphics.ColorFilter);














    method public void setOpacity(int);














    method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);














  }
























  public abstract interface Animatable {







  public abstract interface Animatable {











    method public abstract boolean isRunning();







    method public abstract boolean isRunning();











    method public abstract void start();







    method public abstract void start();










@@ -13917,22 +13933,6 @@ package android.graphics.drawable {









    method public void addLevel(int, int, android.graphics.drawable.Drawable);







    method public void addLevel(int, int, android.graphics.drawable.Drawable);











  }







  }



























  public class MaskableIconDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {














    method public void draw(android.graphics.Canvas);














    method public android.graphics.drawable.Drawable getBackground();














    method public static float getExtraInsetPercentage();














    method public android.graphics.drawable.Drawable getForeground();














    method public android.graphics.Path getIconMask();














    method public int getOpacity();














    method public android.graphics.Region getSafeZone();














    method public void invalidateDrawable(android.graphics.drawable.Drawable);














    method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long);














    method public void setAlpha(int);














    method public void setColorFilter(android.graphics.ColorFilter);














    method public void setOpacity(int);














    method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);














  }



























  public class NinePatchDrawable extends android.graphics.drawable.Drawable {







  public class NinePatchDrawable extends android.graphics.drawable.Drawable {











    ctor public deprecated NinePatchDrawable(android.graphics.Bitmap, byte[], android.graphics.Rect, java.lang.String);







    ctor public deprecated NinePatchDrawable(android.graphics.Bitmap, byte[], android.graphics.Rect, java.lang.String);











    ctor public NinePatchDrawable(android.content.res.Resources, android.graphics.Bitmap, byte[], android.graphics.Rect, java.lang.String);







    ctor public NinePatchDrawable(android.content.res.Resources, android.graphics.Bitmap, byte[], android.graphics.Rect, java.lang.String);

























core/java/android/content/pm/LauncherApps.java



+2
−2




























Original line number
Original line
Diff line number
Diff line








@@ -37,7 +37,7 @@ import android.graphics.Rect;









import android.graphics.drawable.BitmapDrawable;







import android.graphics.drawable.BitmapDrawable;











import android.graphics.drawable.Drawable;







import android.graphics.drawable.Drawable;











import android.graphics.drawable.Icon;







import android.graphics.drawable.Icon;











import android.graphics.drawable.MaskableIconDrawable;







import android.graphics.drawable.AdaptiveIconDrawable;











import android.os.Bundle;







import android.os.Bundle;











import android.os.Handler;







import android.os.Handler;











import android.os.Looper;







import android.os.Looper;










@@ -807,7 +807,7 @@ public class LauncherApps {









                if (bmp != null) {







                if (bmp != null) {











                    BitmapDrawable dr = new BitmapDrawable(mContext.getResources(), bmp);







                    BitmapDrawable dr = new BitmapDrawable(mContext.getResources(), bmp);











                    if (shortcut.hasMaskableBitmap()) {







                    if (shortcut.hasMaskableBitmap()) {











                        return new MaskableIconDrawable(null, dr);







                        return new AdaptiveIconDrawable(null, dr);











                    } else {







                    } else {











                        return dr;







                        return dr;











                    }







                    }

































core/res/res/values/attrs.xml



+2
−2




























Original line number
Original line
Diff line number
Diff line








@@ -5855,8 +5855,8 @@









        <attr name="color" />







        <attr name="color" />











    </declare-styleable>







    </declare-styleable>































    <!-- Drawable used to draw masked icons with foreground and background layers. -->







    <!-- Drawable used to draw adaptive icons with foreground and background layers. -->











    <declare-styleable name="MaskableIconDrawableLayer">







    <declare-styleable name="AdaptiveIconDrawableLayer">











        <!-- The drawable to use for the layer. -->







        <!-- The drawable to use for the layer. -->











        <attr name="drawable" />







        <attr name="drawable" />











     </declare-styleable>







     </declare-styleable>