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

Commit be8835e8 authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

Change MaskableIconDrawable to AdaptiveIconDrawable 

Test: $ make -j31 dist

Bug: 35399620
Change-Id: I5e54f75b3df21ffe546e0e54dbd7ea29499d1789
parent 2ec8d840

api/current.txt

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














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 {















    method public abstract boolean isRunning();















    method public abstract void start();










@@ -13879,21 +13894,6 @@ package android.graphics.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 {















    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);










@@ -24029,12 +24029,12 @@ package android.media.tv {













    field public static final java.lang.String COLUMN_DISPLAY_NAME = "display_name";















    field public static final java.lang.String COLUMN_DISPLAY_NUMBER = "display_number";















    field public static final java.lang.String COLUMN_INPUT_ID = "input_id";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";















    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";















    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";















    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";















    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";















    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";















    field public static final java.lang.String COLUMN_NETWORK_AFFILIATION = "network_affiliation";















    field public static final java.lang.String COLUMN_ORIGINAL_NETWORK_ID = "original_network_id";















    field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";

























api/system-current.txt



+16
−16




























Original line number
Diff line number
Diff line








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



























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 {















    method public abstract boolean isRunning();















    method public abstract void start();










@@ -14472,21 +14487,6 @@ package android.graphics.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 {















    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);










@@ -25817,12 +25817,12 @@ package android.media.tv {













    field public static final java.lang.String COLUMN_DISPLAY_NAME = "display_name";















    field public static final java.lang.String COLUMN_DISPLAY_NUMBER = "display_number";















    field public static final java.lang.String COLUMN_INPUT_ID = "input_id";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";















    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";















    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";















    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";















    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";















    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";















    field public static final java.lang.String COLUMN_LOCKED = "locked";















    field public static final java.lang.String COLUMN_NETWORK_AFFILIATION = "network_affiliation";















    field public static final java.lang.String COLUMN_ORIGINAL_NETWORK_ID = "original_network_id";

























api/test-current.txt



+17
−17




























Original line number
Diff line number
Diff line








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



























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 {















    method public abstract boolean isRunning();















    method public abstract void start();










@@ -13916,22 +13932,6 @@ package android.graphics.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 {















    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);










@@ -24125,12 +24125,12 @@ package android.media.tv {













    field public static final java.lang.String COLUMN_DISPLAY_NAME = "display_name";















    field public static final java.lang.String COLUMN_DISPLAY_NUMBER = "display_number";















    field public static final java.lang.String COLUMN_INPUT_ID = "input_id";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";















    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";















    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";















    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";















    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";















    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";















    field public static final java.lang.String COLUMN_NETWORK_AFFILIATION = "network_affiliation";















    field public static final java.lang.String COLUMN_ORIGINAL_NETWORK_ID = "original_network_id";















    field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";

























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



+2
−2




























Original line number
Diff line number
Diff line








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













import android.graphics.drawable.BitmapDrawable;















import android.graphics.drawable.Drawable;















import android.graphics.drawable.Icon;













import android.graphics.drawable.MaskableIconDrawable;













import android.graphics.drawable.AdaptiveIconDrawable;















import android.os.Bundle;















import android.os.Handler;















import android.os.Looper;










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













                if (bmp != null) {















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















                    if (shortcut.hasMaskableBitmap()) {













                        return new MaskableIconDrawable(null, dr);













                        return new AdaptiveIconDrawable(null, dr);















                    } else {















                        return dr;















                    }

































core/res/res/values/attrs.xml



+2
−2




























Original line number
Diff line number
Diff line








@@ -5844,8 +5844,8 @@













        <attr name="color" />















    </declare-styleable>





























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













    <declare-styleable name="MaskableIconDrawableLayer">













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













    <declare-styleable name="AdaptiveIconDrawableLayer">















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















        <attr name="drawable" />















     </declare-styleable>