Merge "Deprecates WearableExtender methods not supported by Wear SysUI v3." (5ad85210) · Commits · e / os / android_frameworks_base

api/current.txt

+18 −18

Original line number	Diff line number	Diff line
		@@ -5581,14 +5581,14 @@ package android.app {
		ctor public Notification.WearableExtender(android.app.Notification);
		method public android.app.Notification.WearableExtender addAction(android.app.Notification.Action);
		method public android.app.Notification.WearableExtender addActions(java.util.List<android.app.Notification.Action>);
		method public android.app.Notification.WearableExtender addPage(android.app.Notification);
		method public android.app.Notification.WearableExtender addPages(java.util.List<android.app.Notification>);
		method public deprecated android.app.Notification.WearableExtender addPage(android.app.Notification);
		method public deprecated android.app.Notification.WearableExtender addPages(java.util.List<android.app.Notification>);
		method public android.app.Notification.WearableExtender clearActions();
		method public android.app.Notification.WearableExtender clearPages();
		method public deprecated android.app.Notification.WearableExtender clearPages();
		method public android.app.Notification.WearableExtender clone();
		method public android.app.Notification.Builder extend(android.app.Notification.Builder);
		method public java.util.List<android.app.Notification.Action> getActions();
		method public android.graphics.Bitmap getBackground();
		method public deprecated android.graphics.Bitmap getBackground();
		method public java.lang.String getBridgeTag();
		method public int getContentAction();
		method public deprecated int getContentIcon();
		@@ -5597,17 +5597,17 @@ package android.app {
		method public deprecated int getCustomContentHeight();
		method public deprecated int getCustomSizePreset();
		method public java.lang.String getDismissalId();
		method public android.app.PendingIntent getDisplayIntent();
		method public deprecated android.app.PendingIntent getDisplayIntent();
		method public deprecated int getGravity();
		method public boolean getHintAmbientBigPicture();
		method public deprecated boolean getHintAmbientBigPicture();
		method public deprecated boolean getHintAvoidBackgroundClipping();
		method public boolean getHintContentIntentLaunchesActivity();
		method public deprecated boolean getHintHideIcon();
		method public deprecated int getHintScreenTimeout();
		method public deprecated boolean getHintShowBackgroundOnly();
		method public java.util.List<android.app.Notification> getPages();
		method public deprecated java.util.List<android.app.Notification> getPages();
		method public boolean getStartScrollBottom();
		method public android.app.Notification.WearableExtender setBackground(android.graphics.Bitmap);
		method public deprecated android.app.Notification.WearableExtender setBackground(android.graphics.Bitmap);
		method public android.app.Notification.WearableExtender setBridgeTag(java.lang.String);
		method public android.app.Notification.WearableExtender setContentAction(int);
		method public deprecated android.app.Notification.WearableExtender setContentIcon(int);
		@@ -5616,23 +5616,23 @@ package android.app {
		method public deprecated android.app.Notification.WearableExtender setCustomContentHeight(int);
		method public deprecated android.app.Notification.WearableExtender setCustomSizePreset(int);
		method public android.app.Notification.WearableExtender setDismissalId(java.lang.String);
		method public android.app.Notification.WearableExtender setDisplayIntent(android.app.PendingIntent);
		method public deprecated android.app.Notification.WearableExtender setDisplayIntent(android.app.PendingIntent);
		method public deprecated android.app.Notification.WearableExtender setGravity(int);
		method public android.app.Notification.WearableExtender setHintAmbientBigPicture(boolean);
		method public deprecated android.app.Notification.WearableExtender setHintAmbientBigPicture(boolean);
		method public deprecated android.app.Notification.WearableExtender setHintAvoidBackgroundClipping(boolean);
		method public android.app.Notification.WearableExtender setHintContentIntentLaunchesActivity(boolean);
		method public deprecated android.app.Notification.WearableExtender setHintHideIcon(boolean);
		method public deprecated android.app.Notification.WearableExtender setHintScreenTimeout(int);
		method public deprecated android.app.Notification.WearableExtender setHintShowBackgroundOnly(boolean);
		method public android.app.Notification.WearableExtender setStartScrollBottom(boolean);
		field public static final int SCREEN_TIMEOUT_LONG = -1; // 0xffffffff
		field public static final int SCREEN_TIMEOUT_SHORT = 0; // 0x0
		field public static final int SIZE_DEFAULT = 0; // 0x0
		field public static final int SIZE_FULL_SCREEN = 5; // 0x5
		field public static final int SIZE_LARGE = 4; // 0x4
		field public static final int SIZE_MEDIUM = 3; // 0x3
		field public static final int SIZE_SMALL = 2; // 0x2
		field public static final int SIZE_XSMALL = 1; // 0x1
		field public static final deprecated int SCREEN_TIMEOUT_LONG = -1; // 0xffffffff
		field public static final deprecated int SCREEN_TIMEOUT_SHORT = 0; // 0x0
		field public static final deprecated int SIZE_DEFAULT = 0; // 0x0
		field public static final deprecated int SIZE_FULL_SCREEN = 5; // 0x5
		field public static final deprecated int SIZE_LARGE = 4; // 0x4
		field public static final deprecated int SIZE_MEDIUM = 3; // 0x3
		field public static final deprecated int SIZE_SMALL = 2; // 0x2
		field public static final deprecated int SIZE_XSMALL = 1; // 0x1
		field public static final int UNSET_ACTION_INDEX = -1; // 0xffffffff
		}

api/system-current.txt

+0 −5

Original line number	Diff line number	Diff line
		@@ -365,11 +365,6 @@ package android.app {
		field public static final android.os.Parcelable.Creator<android.app.AppOpsManager.PackageOps> CREATOR;
		}

		public final class AutomaticZenRule implements android.os.Parcelable {
		ctor public AutomaticZenRule(java.lang.String, android.content.ComponentName, android.net.Uri, int, boolean, long);
		ctor public AutomaticZenRule(java.lang.String, android.content.ComponentName, android.net.Uri, int, boolean, long, android.service.notification.ZenPolicy);
		}

		public class BroadcastOptions {
		method public static android.app.BroadcastOptions makeBasic();
		method public void setDontSendToRestrictedApps(boolean);

core/java/android/app/Notification.java

+51 −15

Original line number	Diff line number	Diff line
		@@ -8253,7 +8253,10 @@ public class Notification implements Parcelable
		* <p>For custom display notifications created using {@link #setDisplayIntent},
		* the default is {@link #SIZE_MEDIUM}. All other notifications size automatically based
		* on their content.
		*
		* @deprecated Display intents are no longer supported.
		*/
		@Deprecated
		public static final int SIZE_DEFAULT = 0;

		/**
		@@ -8261,7 +8264,10 @@ public class Notification implements Parcelable
		* with an extra small size.
		* <p>This value is only applicable for custom display notifications created using
		* {@link #setDisplayIntent}.
		*
		* @deprecated Display intents are no longer supported.
		*/
		@Deprecated
		public static final int SIZE_XSMALL = 1;

		/**
		@@ -8269,7 +8275,10 @@ public class Notification implements Parcelable
		* with a small size.
		* <p>This value is only applicable for custom display notifications created using
		* {@link #setDisplayIntent}.
		*
		* @deprecated Display intents are no longer supported.
		*/
		@Deprecated
		public static final int SIZE_SMALL = 2;

		/**
		@@ -8277,7 +8286,10 @@ public class Notification implements Parcelable
		* with a medium size.
		* <p>This value is only applicable for custom display notifications created using
		* {@link #setDisplayIntent}.
		*
		* @deprecated Display intents are no longer supported.
		*/
		@Deprecated
		public static final int SIZE_MEDIUM = 3;

		/**
		@@ -8285,7 +8297,10 @@ public class Notification implements Parcelable
		* with a large size.
		* <p>This value is only applicable for custom display notifications created using
		* {@link #setDisplayIntent}.
		*
		* @deprecated Display intents are no longer supported.
		*/
		@Deprecated
		public static final int SIZE_LARGE = 4;

		/**
		@@ -8293,20 +8308,29 @@ public class Notification implements Parcelable
		* full screen.
		* <p>This value is only applicable for custom display notifications created using
		* {@link #setDisplayIntent}.
		*
		* @deprecated Display intents are no longer supported.
		*/
		@Deprecated
		public static final int SIZE_FULL_SCREEN = 5;

		/**
		* Sentinel value for use with {@link #setHintScreenTimeout} to keep the screen on for a
		* short amount of time when this notification is displayed on the screen. This
		* is the default value.
		*
		* @deprecated This feature is no longer supported.
		*/
		@Deprecated
		public static final int SCREEN_TIMEOUT_SHORT = 0;

		/**
		* Sentinel value for use with {@link #setHintScreenTimeout} to keep the screen on
		* for a longer amount of time when this notification is displayed on the screen.
		*
		* @deprecated This feature is no longer supported.
		*/
		@Deprecated
		public static final int SCREEN_TIMEOUT_LONG = -1;

		/** Notification extra which contains wearable extensions */
		@@ -8556,7 +8580,9 @@ public class Notification implements Parcelable
		* @param intent the {@link PendingIntent} for an activity
		* @return this object for method chaining
		* @see android.app.Notification.WearableExtender#getDisplayIntent
		* @deprecated Display intents are no longer supported.
		*/
		@Deprecated
		public WearableExtender setDisplayIntent(PendingIntent intent) {
		mDisplayIntent = intent;
		return this;
		@@ -8565,7 +8591,10 @@ public class Notification implements Parcelable
		/**
		* Get the intent to launch inside of an activity view when displaying this
		* notification. This {@code PendingIntent} should be for an activity.
		*
		* @deprecated Display intents are no longer supported.
		*/
		@Deprecated
		public PendingIntent getDisplayIntent() {
		return mDisplayIntent;
		}
		@@ -8579,7 +8608,9 @@ public class Notification implements Parcelable
		* @param page the notification to add as another page
		* @return this object for method chaining
		* @see android.app.Notification.WearableExtender#getPages
		* @deprecated Multiple content pages are no longer supported.
		*/
		@Deprecated
		public WearableExtender addPage(Notification page) {
		mPages.add(page);
		return this;
		@@ -8594,7 +8625,9 @@ public class Notification implements Parcelable
		* @param pages a list of notifications
		* @return this object for method chaining
		* @see android.app.Notification.WearableExtender#getPages
		* @deprecated Multiple content pages are no longer supported.
		*/
		@Deprecated
		public WearableExtender addPages(List<Notification> pages) {
		mPages.addAll(pages);
		return this;
		@@ -8604,7 +8637,9 @@ public class Notification implements Parcelable
		* Clear all additional pages present on this builder.
		* @return this object for method chaining.
		* @see #addPage
		* @deprecated Multiple content pages are no longer supported.
		*/
		@Deprecated
		public WearableExtender clearPages() {
		mPages.clear();
		return this;
		@@ -8616,7 +8651,9 @@ public class Notification implements Parcelable
		* subsequent pages. This field can be used to separate a notification into multiple
		* sections.
		* @return the pages for this notification
		* @deprecated Multiple content pages are no longer supported.
		*/
		@Deprecated
		public List<Notification> getPages() {
		return mPages;
		}
		@@ -8629,7 +8666,9 @@ public class Notification implements Parcelable
		* @param background the background bitmap
		* @return this object for method chaining
		* @see android.app.Notification.WearableExtender#getBackground
		* @deprecated Background images are no longer supported.
		*/
		@Deprecated
		public WearableExtender setBackground(Bitmap background) {
		mBackground = background;
		return this;
		@@ -8642,7 +8681,9 @@ public class Notification implements Parcelable
		*
		* @return the background image
		* @see android.app.Notification.WearableExtender#setBackground
		* @deprecated Background images are no longer supported.
		*/
		@Deprecated
		public Bitmap getBackground() {
		return mBackground;
		}
		@@ -8688,15 +8729,11 @@ public class Notification implements Parcelable
		}

		/**
		* Set an action from this notification's actions to be clickable with the content of
		* this notification. This action will no longer display separately from the
		* notification's content.
		*
		* <p>For notifications with multiple pages, child pages can also have content actions
		* set, although the list of available actions comes from the main notification and not
		* from the child page's notification.
		* Set an action from this notification's actions as the primary action. If the action has a
		* {@link RemoteInput} associated with it, shortcuts to the options for that input are shown
		* directly on the notification.
		*
		* @param actionIndex The index of the action to hoist onto the current notification page.
		* @param actionIndex The index of the primary action.
		* If wearable actions were added to the main notification, this index
		* will apply to that list, otherwise it will apply to the regular
		* actions list.
		@@ -8707,13 +8744,8 @@ public class Notification implements Parcelable
		}

		/**
		* Get the index of the notification action, if any, that was specified as being clickable
		* with the content of this notification. This action will no longer display separately
		* from the notification's content.
		*
		* <p>For notifications with multiple pages, child pages can also have content actions
		* set, although the list of available actions comes from the main notification and not
		* from the child page's notification.
		* Get the index of the notification action, if any, that was specified as the primary
		* action.
		*
		* <p>If wearable specific actions were added to the main notification, this index will
		* apply to that list, otherwise it will apply to the regular actions list.
		@@ -8938,7 +8970,9 @@ public class Notification implements Parcelable
		* qr codes, as well as other simple black-and-white tickets.
		* @param hintAmbientBigPicture {@code true} to enable converstion and ambient.
		* @return this object for method chaining
		* @deprecated This feature is no longer supported.
		*/
		@Deprecated
		public WearableExtender setHintAmbientBigPicture(boolean hintAmbientBigPicture) {
		setFlag(FLAG_BIG_PICTURE_AMBIENT, hintAmbientBigPicture);
		return this;
		@@ -8950,7 +8984,9 @@ public class Notification implements Parcelable
		* qr codes, as well as other simple black-and-white tickets.
		* @return {@code true} if it should be displayed in ambient, false otherwise
		* otherwise. The default value is {@code false} if this was never set.
		* @deprecated This feature is no longer supported.
		*/
		@Deprecated
		public boolean getHintAmbientBigPicture() {
		return (mFlags & FLAG_BIG_PICTURE_AMBIENT) != 0;
		}