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

Change MaskableBitmap to AdaptiveBitmap

Browse Source 
Test: $ make dist -j30
b/35399620

Change-Id: I96d6eaceaf7ce9dec7de21634a5fa2bd40b0deba
This commit is contained in:
Hyunyoung Song
2017-03-01 12:51:26 -08:00
parent 1ea593325f
commit e4179e2c4e
11 changed files with 44 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/pm/LauncherApps.java
View File

@@ -829,7 +829,7 @@ public class LauncherApps {
final Bitmap bmp = BitmapFactory.decodeFileDescriptor(pfd.getFileDescriptor());
if (bmp != null) {
BitmapDrawable dr = new BitmapDrawable(mContext.getResources(), bmp);
if (shortcut.hasMaskableBitmap()) {
if (shortcut.hasAdaptiveBitmap()) {
return new AdaptiveIconDrawable(null, dr);
} else {
return dr;
@@ -854,7 +854,7 @@ public class LauncherApps {
icon.getResId(), shortcut.getUserHandle(), density);
}
case Icon.TYPE_BITMAP:
case Icon.TYPE_BITMAP_MASKABLE: {
case Icon.TYPE_ADAPTIVE_BITMAP: {
return icon.loadDrawable(mContext);
}
default:

15
core/java/android/content/pm/ShortcutInfo.java
View File

@@ -96,7 +96,7 @@ public final class ShortcutInfo implements Parcelable {
public static final int FLAG_IMMUTABLE = 1 << 8;
/** @hide */
public static final int FLAG_MASKABLE_BITMAP = 1 << 9;
public static final int FLAG_ADAPTIVE_BITMAP = 1 << 9;
/** @hide */
public static final int FLAG_CHOOSER = 1 << 10;
@@ -118,7 +118,7 @@ public final class ShortcutInfo implements Parcelable {
FLAG_DISABLED,
FLAG_STRINGS_RESOLVED,
FLAG_IMMUTABLE,
FLAG_MASKABLE_BITMAP,
FLAG_ADAPTIVE_BITMAP,
FLAG_CHOOSER,
})
@Retention(RetentionPolicy.SOURCE)
@@ -784,7 +784,7 @@ public final class ShortcutInfo implements Parcelable {
switch (icon.getType()) {
case Icon.TYPE_RESOURCE:
case Icon.TYPE_BITMAP:
case Icon.TYPE_BITMAP_MASKABLE:
case Icon.TYPE_ADAPTIVE_BITMAP:
break; // OK
default:
throw getInvalidIconException();
@@ -917,7 +917,7 @@ public final class ShortcutInfo implements Parcelable {
* and will be ignored.
*
* <p>Only icons created with {@link Icon#createWithBitmap(Bitmap)},
* {@link Icon#createWithMaskableBitmap(Bitmap)}
* {@link Icon#createWithAdaptiveBitmap(Bitmap)}
* and {@link Icon#createWithResource} are supported.
* Other types, such as URI-based icons, are not supported.
*
@@ -1615,12 +1615,13 @@ public final class ShortcutInfo implements Parcelable {
}
/**
* Return whether a shortcut's icon is maskable.
* Return whether a shortcut's icon is adaptive bitmap following design guideline
* defined in {@link AdaptiveIconDrawable}.
*
* @hide internal/unit tests only
*/
public boolean hasMaskableBitmap() {
return hasFlags(FLAG_MASKABLE_BITMAP);
public boolean hasAdaptiveBitmap() {
return hasFlags(FLAG_ADAPTIVE_BITMAP);
}
/**