Merge "Delete @removed-at-birth Bubble APIs" into main (6565e1b3) · Commits · e / os / android_frameworks_base

core/api/removed.txt

+0 −10

Original line number	Diff line number	Diff line
		@@ -8,16 +8,6 @@ package android.app {
		method @Deprecated public void setLatestEventInfo(android.content.Context, CharSequence, CharSequence, android.app.PendingIntent);
		}

		public static final class Notification.BubbleMetadata implements android.os.Parcelable {
		method @Deprecated @Nullable public android.graphics.drawable.Icon getBubbleIcon();
		method @Deprecated @Nullable public android.app.PendingIntent getBubbleIntent();
		}

		public static final class Notification.BubbleMetadata.Builder {
		method @Deprecated @NonNull public android.app.Notification.BubbleMetadata.Builder createIntentBubble(@NonNull android.app.PendingIntent, @NonNull android.graphics.drawable.Icon);
		method @Deprecated @NonNull public android.app.Notification.BubbleMetadata.Builder createShortcutBubble(@NonNull String);
		}

		public static class Notification.Builder {
		method @Deprecated public android.app.Notification.Builder setChannel(String);
		method @Deprecated public android.app.Notification.Builder setTimeout(long);

core/java/android/app/Notification.java

+0 −62

Original line number	Diff line number	Diff line
		@@ -10382,16 +10382,6 @@ public class Notification implements Parcelable
		return mPendingIntent;
		}

		/**
		* @deprecated use {@link #getIntent()} instead.
		* @removed Removed from the R SDK but was never publicly stable.
		*/
		@Nullable
		@Deprecated
		public PendingIntent getBubbleIntent() {
		return mPendingIntent;
		}

		/**
		* @return the pending intent to send when the bubble is dismissed by a user, if one exists.
		*/
		@@ -10410,16 +10400,6 @@ public class Notification implements Parcelable
		return mIcon;
		}

		/**
		* @deprecated use {@link #getIcon()} instead.
		* @removed Removed from the R SDK but was never publicly stable.
		*/
		@Nullable
		@Deprecated
		public Icon getBubbleIcon() {
		return mIcon;
		}

		/**
		* @return the ideal height, in DPs, for the floating window that app content defined by
		* {@link #getIntent()} for this bubble. A value of 0 indicates a desired height has
		@@ -10676,48 +10656,6 @@ public class Notification implements Parcelable
		mIcon = icon;
		}

		/**
		* @deprecated use {@link Builder#Builder(String)} instead.
		* @removed Removed from the R SDK but was never publicly stable.
		*/
		@NonNull
		@Deprecated
		public BubbleMetadata.Builder createShortcutBubble(@NonNull String shortcutId) {
		if (!TextUtils.isEmpty(shortcutId)) {
		// If shortcut id is set, we don't use these if they were previously set.
		mPendingIntent = null;
		mIcon = null;
		}
		mShortcutId = shortcutId;
		return this;
		}

		/**
		* @deprecated use {@link Builder#Builder(PendingIntent, Icon)} instead.
		* @removed Removed from the R SDK but was never publicly stable.
		*/
		@NonNull
		@Deprecated
		public BubbleMetadata.Builder createIntentBubble(@NonNull PendingIntent intent,
		@NonNull Icon icon) {
		if (intent == null) {
		throw new IllegalArgumentException("Bubble requires non-null pending intent");
		}
		if (icon == null) {
		throw new IllegalArgumentException("Bubbles require non-null icon");
		}
		if (icon.getType() != TYPE_URI_ADAPTIVE_BITMAP
		&& icon.getType() != TYPE_URI) {
		Log.w(TAG, "Bubbles work best with icons of TYPE_URI or "
		+ "TYPE_URI_ADAPTIVE_BITMAP. "
		+ "In the future, using an icon of this type will be required.");
		}
		mShortcutId = null;
		mPendingIntent = intent;
		mIcon = icon;
		return this;
		}

		/**
		* Sets the intent for the bubble.
		*