Merge "Adds adaptive bitmap support to URI based icons" (a57f214f) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -15713,6 +15713,8 @@ package android.graphics.drawable {

	public final class Icon implements android.os.Parcelable {		public final class Icon implements android.os.Parcelable {
	method public static android.graphics.drawable.Icon createWithAdaptiveBitmap(android.graphics.Bitmap);		method public static android.graphics.drawable.Icon createWithAdaptiveBitmap(android.graphics.Bitmap);
			method @NonNull public static android.graphics.drawable.Icon createWithAdaptiveBitmapContentUri(@NonNull String);
			method @NonNull public static android.graphics.drawable.Icon createWithAdaptiveBitmapContentUri(@NonNull android.net.Uri);
	method public static android.graphics.drawable.Icon createWithBitmap(android.graphics.Bitmap);		method public static android.graphics.drawable.Icon createWithBitmap(android.graphics.Bitmap);
	method public static android.graphics.drawable.Icon createWithContentUri(String);		method public static android.graphics.drawable.Icon createWithContentUri(String);
	method public static android.graphics.drawable.Icon createWithContentUri(android.net.Uri);		method public static android.graphics.drawable.Icon createWithContentUri(android.net.Uri);
	@@ -15739,6 +15741,7 @@ package android.graphics.drawable {
	field public static final int TYPE_DATA = 3; // 0x3		field public static final int TYPE_DATA = 3; // 0x3
	field public static final int TYPE_RESOURCE = 2; // 0x2		field public static final int TYPE_RESOURCE = 2; // 0x2
	field public static final int TYPE_URI = 4; // 0x4		field public static final int TYPE_URI = 4; // 0x4
			field public static final int TYPE_URI_ADAPTIVE_BITMAP = 6; // 0x6
	}		}

	public static interface Icon.OnDrawableLoadedListener {		public static interface Icon.OnDrawableLoadedListener {

graphics/java/android/graphics/drawable/Icon.java

+82 −24

Original line number	Original line	Diff line number	Diff line
	@@ -92,11 +92,17 @@ public final class Icon implements Parcelable {
	* @see #getType		* @see #getType
	*/		*/
	public static final int TYPE_ADAPTIVE_BITMAP = 5;		public static final int TYPE_ADAPTIVE_BITMAP = 5;
			/**
			* An icon that was created using {@link Icon#createWithAdaptiveBitmapContentUri}.
			* @see #getType
			*/
			public static final int TYPE_URI_ADAPTIVE_BITMAP = 6;

	/**		/**
	* @hide		* @hide
	*/		*/
	@IntDef({TYPE_BITMAP, TYPE_RESOURCE, TYPE_DATA, TYPE_URI, TYPE_ADAPTIVE_BITMAP})		@IntDef({TYPE_BITMAP, TYPE_RESOURCE, TYPE_DATA, TYPE_URI, TYPE_ADAPTIVE_BITMAP,
			TYPE_URI_ADAPTIVE_BITMAP})
	public @interface IconType {		public @interface IconType {
	}		}

	@@ -113,12 +119,14 @@ public final class Icon implements Parcelable {
	// based on the value of mType.		// based on the value of mType.

	// TYPE_BITMAP: Bitmap		// TYPE_BITMAP: Bitmap
			// TYPE_ADAPTIVE_BITMAP: Bitmap
	// TYPE_RESOURCE: Resources		// TYPE_RESOURCE: Resources
	// TYPE_DATA: DataBytes		// TYPE_DATA: DataBytes
	private Object mObj1;		private Object mObj1;

	// TYPE_RESOURCE: package name		// TYPE_RESOURCE: package name
	// TYPE_URI: uri string		// TYPE_URI: uri string
			// TYPE_URI_ADAPTIVE_BITMAP: uri string
	@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
	private String mString1;		private String mString1;

	@@ -141,7 +149,8 @@ public final class Icon implements Parcelable {
	}		}

	/**		/**
	* @return The {@link android.graphics.Bitmap} held by this {@link #TYPE_BITMAP} Icon.		* @return The {@link android.graphics.Bitmap} held by this {@link #TYPE_BITMAP} or
			* {@link #TYPE_ADAPTIVE_BITMAP} Icon.
	* @hide		* @hide
	*/		*/
	@UnsupportedAppUsage		@UnsupportedAppUsage
	@@ -243,11 +252,12 @@ public final class Icon implements Parcelable {
	}		}

	/**		/**
	* @return The URI (as a String) for this {@link #TYPE_URI} Icon.		* @return The URI (as a String) for this {@link #TYPE_URI} or {@link #TYPE_URI_ADAPTIVE_BITMAP}
			* Icon.
	* @hide		* @hide
	*/		*/
	public String getUriString() {		public String getUriString() {
	if (mType != TYPE_URI) {		if (mType != TYPE_URI && mType != TYPE_URI_ADAPTIVE_BITMAP) {
	throw new IllegalStateException("called getUriString() on " + this);		throw new IllegalStateException("called getUriString() on " + this);
	}		}
	return mString1;		return mString1;
	@@ -256,7 +266,7 @@ public final class Icon implements Parcelable {
	/**		/**
	* Gets the uri used to create this icon.		* Gets the uri used to create this icon.
	* <p>		* <p>
	* Only valid for icons of type {@link #TYPE_URI}.		* Only valid for icons of type {@link #TYPE_URI} and {@link #TYPE_URI_ADAPTIVE_BITMAP}.
	* Note: This uri may not be available in the future, and it is		* Note: This uri may not be available in the future, and it is
	* up to the caller to ensure safety if this uri is re-used and/or persisted.		* up to the caller to ensure safety if this uri is re-used and/or persisted.
	*/		*/
	@@ -272,6 +282,7 @@ public final class Icon implements Parcelable {
	case TYPE_DATA: return "DATA";		case TYPE_DATA: return "DATA";
	case TYPE_RESOURCE: return "RESOURCE";		case TYPE_RESOURCE: return "RESOURCE";
	case TYPE_URI: return "URI";		case TYPE_URI: return "URI";
			case TYPE_URI_ADAPTIVE_BITMAP: return "URI_MASKABLE";
	default: return "UNKNOWN";		default: return "UNKNOWN";
	}		}
	}		}
	@@ -380,29 +391,40 @@ public final class Icon implements Parcelable {
	BitmapFactory.decodeByteArray(getDataBytes(), getDataOffset(), getDataLength())		BitmapFactory.decodeByteArray(getDataBytes(), getDataOffset(), getDataLength())
	);		);
	case TYPE_URI:		case TYPE_URI:
			InputStream is = getUriInputStream(context);
			if (is != null) {
			return new BitmapDrawable(context.getResources(),
			BitmapFactory.decodeStream(is));
			}
			break;
			case TYPE_URI_ADAPTIVE_BITMAP:
			is = getUriInputStream(context);
			if (is != null) {
			return new AdaptiveIconDrawable(null, new BitmapDrawable(context.getResources(),
			BitmapFactory.decodeStream(is)));
			}
			break;
			}
			return null;
			}

			private InputStream getUriInputStream(Context context) {
	final Uri uri = getUri();		final Uri uri = getUri();
	final String scheme = uri.getScheme();		final String scheme = uri.getScheme();
	InputStream is = null;
	if (ContentResolver.SCHEME_CONTENT.equals(scheme)		if (ContentResolver.SCHEME_CONTENT.equals(scheme)
	\|\| ContentResolver.SCHEME_FILE.equals(scheme)) {		\|\| ContentResolver.SCHEME_FILE.equals(scheme)) {
	try {		try {
	is = context.getContentResolver().openInputStream(uri);		return context.getContentResolver().openInputStream(uri);
	} catch (Exception e) {		} catch (Exception e) {
	Log.w(TAG, "Unable to load image from URI: " + uri, e);		Log.w(TAG, "Unable to load image from URI: " + uri, e);
	}		}
	} else {		} else {
	try {		try {
	is = new FileInputStream(new File(mString1));		return new FileInputStream(new File(mString1));
	} catch (FileNotFoundException e) {		} catch (FileNotFoundException e) {
	Log.w(TAG, "Unable to load image from path: " + uri, e);		Log.w(TAG, "Unable to load image from path: " + uri, e);
	}		}
	}		}
	if (is != null) {
	return new BitmapDrawable(context.getResources(),
	BitmapFactory.decodeStream(is));
	}
	break;
	}
	return null;		return null;
	}		}

	@@ -475,6 +497,7 @@ public final class Icon implements Parcelable {
	dataStream.writeInt(getResId());		dataStream.writeInt(getResId());
	break;		break;
	case TYPE_URI:		case TYPE_URI:
			case TYPE_URI_ADAPTIVE_BITMAP:
	dataStream.writeUTF(getUriString());		dataStream.writeUTF(getUriString());
	break;		break;
	}		}
	@@ -513,6 +536,9 @@ public final class Icon implements Parcelable {
	case TYPE_URI:		case TYPE_URI:
	final String uriOrPath = inputStream.readUTF();		final String uriOrPath = inputStream.readUTF();
	return createWithContentUri(uriOrPath);		return createWithContentUri(uriOrPath);
			case TYPE_URI_ADAPTIVE_BITMAP:
			final String uri = inputStream.readUTF();
			return createWithAdaptiveBitmapContentUri(uri);
	}		}
	}		}
	return null;		return null;
	@@ -545,6 +571,7 @@ public final class Icon implements Parcelable {
	return getResId() == otherIcon.getResId()		return getResId() == otherIcon.getResId()
	&& Objects.equals(getResPackage(), otherIcon.getResPackage());		&& Objects.equals(getResPackage(), otherIcon.getResPackage());
	case TYPE_URI:		case TYPE_URI:
			case TYPE_URI_ADAPTIVE_BITMAP:
	return Objects.equals(getUriString(), otherIcon.getUriString());		return Objects.equals(getUriString(), otherIcon.getUriString());
	}		}
	return false;		return false;
	@@ -665,11 +692,39 @@ public final class Icon implements Parcelable {
	if (uri == null) {		if (uri == null) {
	throw new IllegalArgumentException("Uri must not be null.");		throw new IllegalArgumentException("Uri must not be null.");
	}		}
	final Icon rep = new Icon(TYPE_URI);		return createWithContentUri(uri.toString());
	rep.mString1 = uri.toString();		}

			/**
			* Create an Icon pointing to an image file specified by URI. Image file should follow the icon
			* design guideline defined by {@link AdaptiveIconDrawable}.
			*
			* @param uri A uri referring to local content:// or file:// image data.
			*/
			@NonNull
			public static Icon createWithAdaptiveBitmapContentUri(@NonNull String uri) {
			if (uri == null) {
			throw new IllegalArgumentException("Uri must not be null.");
			}
			final Icon rep = new Icon(TYPE_URI_ADAPTIVE_BITMAP);
			rep.mString1 = uri;
	return rep;		return rep;
	}		}

			/**
			* Create an Icon pointing to an image file specified by URI. Image file should follow the icon
			* design guideline defined by {@link AdaptiveIconDrawable}.
			*
			* @param uri A uri referring to local content:// or file:// image data.
			*/
			@NonNull
			public static Icon createWithAdaptiveBitmapContentUri(@NonNull Uri uri) {
			if (uri == null) {
			throw new IllegalArgumentException("Uri must not be null.");
			}
			return createWithAdaptiveBitmapContentUri(uri.toString());
			}

	/**		/**
	* Store a color to use whenever this Icon is drawn.		* Store a color to use whenever this Icon is drawn.
	*		*
	@@ -758,6 +813,7 @@ public final class Icon implements Parcelable {
	}		}
	break;		break;
	case TYPE_URI:		case TYPE_URI:
			case TYPE_URI_ADAPTIVE_BITMAP:
	sb.append(" uri=").append(getUriString());		sb.append(" uri=").append(getUriString());
	break;		break;
	}		}
	@@ -809,6 +865,7 @@ public final class Icon implements Parcelable {
	mObj1 = a;		mObj1 = a;
	break;		break;
	case TYPE_URI:		case TYPE_URI:
			case TYPE_URI_ADAPTIVE_BITMAP:
	final String uri = in.readString();		final String uri = in.readString();
	mString1 = uri;		mString1 = uri;
	break;		break;
	@@ -840,6 +897,7 @@ public final class Icon implements Parcelable {
	dest.writeBlob(getDataBytes(), getDataOffset(), getDataLength());		dest.writeBlob(getDataBytes(), getDataOffset(), getDataLength());
	break;		break;
	case TYPE_URI:		case TYPE_URI:
			case TYPE_URI_ADAPTIVE_BITMAP:
	dest.writeString(getUriString());		dest.writeString(getUriString());
	break;		break;
	}		}