Merge "Deprecates methods on WearableExtender.Builder which have not been honored since Wear 1.0." (9c095130) · Commits · e / os / android_frameworks_base

api/current.txt

+24 −24

Original line number	Diff line number	Diff line
		@@ -5349,18 +5349,18 @@ package android.app {
		ctor public Notification.Action.WearableExtender(android.app.Notification.Action);
		method public android.app.Notification.Action.WearableExtender clone();
		method public android.app.Notification.Action.Builder extend(android.app.Notification.Action.Builder);
		method public java.lang.CharSequence getCancelLabel();
		method public java.lang.CharSequence getConfirmLabel();
		method public deprecated java.lang.CharSequence getCancelLabel();
		method public deprecated java.lang.CharSequence getConfirmLabel();
		method public boolean getHintDisplayActionInline();
		method public boolean getHintLaunchesActivity();
		method public java.lang.CharSequence getInProgressLabel();
		method public deprecated java.lang.CharSequence getInProgressLabel();
		method public boolean isAvailableOffline();
		method public android.app.Notification.Action.WearableExtender setAvailableOffline(boolean);
		method public android.app.Notification.Action.WearableExtender setCancelLabel(java.lang.CharSequence);
		method public android.app.Notification.Action.WearableExtender setConfirmLabel(java.lang.CharSequence);
		method public deprecated android.app.Notification.Action.WearableExtender setCancelLabel(java.lang.CharSequence);
		method public deprecated android.app.Notification.Action.WearableExtender setConfirmLabel(java.lang.CharSequence);
		method public android.app.Notification.Action.WearableExtender setHintDisplayActionInline(boolean);
		method public android.app.Notification.Action.WearableExtender setHintLaunchesActivity(boolean);
		method public android.app.Notification.Action.WearableExtender setInProgressLabel(java.lang.CharSequence);
		method public deprecated android.app.Notification.Action.WearableExtender setInProgressLabel(java.lang.CharSequence);
		}

		public static class Notification.BigPictureStyle extends android.app.Notification.Style {
		@@ -5583,39 +5583,39 @@ package android.app {
		method public android.graphics.Bitmap getBackground();
		method public java.lang.String getBridgeTag();
		method public int getContentAction();
		method public int getContentIcon();
		method public int getContentIconGravity();
		method public deprecated int getContentIcon();
		method public deprecated int getContentIconGravity();
		method public boolean getContentIntentAvailableOffline();
		method public int getCustomContentHeight();
		method public int getCustomSizePreset();
		method public deprecated int getCustomContentHeight();
		method public deprecated int getCustomSizePreset();
		method public java.lang.String getDismissalId();
		method public android.app.PendingIntent getDisplayIntent();
		method public int getGravity();
		method public deprecated int getGravity();
		method public boolean getHintAmbientBigPicture();
		method public boolean getHintAvoidBackgroundClipping();
		method public deprecated boolean getHintAvoidBackgroundClipping();
		method public boolean getHintContentIntentLaunchesActivity();
		method public boolean getHintHideIcon();
		method public int getHintScreenTimeout();
		method public boolean getHintShowBackgroundOnly();
		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 boolean getStartScrollBottom();
		method public 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 android.app.Notification.WearableExtender setContentIcon(int);
		method public android.app.Notification.WearableExtender setContentIconGravity(int);
		method public deprecated android.app.Notification.WearableExtender setContentIcon(int);
		method public deprecated android.app.Notification.WearableExtender setContentIconGravity(int);
		method public android.app.Notification.WearableExtender setContentIntentAvailableOffline(boolean);
		method public android.app.Notification.WearableExtender setCustomContentHeight(int);
		method public android.app.Notification.WearableExtender setCustomSizePreset(int);
		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 android.app.Notification.WearableExtender setGravity(int);
		method public deprecated android.app.Notification.WearableExtender setGravity(int);
		method public android.app.Notification.WearableExtender setHintAmbientBigPicture(boolean);
		method public android.app.Notification.WearableExtender setHintAvoidBackgroundClipping(boolean);
		method public deprecated android.app.Notification.WearableExtender setHintAvoidBackgroundClipping(boolean);
		method public android.app.Notification.WearableExtender setHintContentIntentLaunchesActivity(boolean);
		method public android.app.Notification.WearableExtender setHintHideIcon(boolean);
		method public android.app.Notification.WearableExtender setHintScreenTimeout(int);
		method public android.app.Notification.WearableExtender setHintShowBackgroundOnly(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

core/java/android/app/Notification.java

+24 −0

Original line number	Diff line number	Diff line
		@@ -1825,6 +1825,7 @@ public class Notification implements Parcelable
		* @param label the label to display while the action is being prepared to execute
		* @return this object for method chaining
		*/
		@Deprecated
		public WearableExtender setInProgressLabel(CharSequence label) {
		mInProgressLabel = label;
		return this;
		@@ -1836,6 +1837,7 @@ public class Notification implements Parcelable
		*
		* @return the label to display while the action is being prepared to execute
		*/
		@Deprecated
		public CharSequence getInProgressLabel() {
		return mInProgressLabel;
		}
		@@ -1847,6 +1849,7 @@ public class Notification implements Parcelable
		* @param label the label to confirm the action should be executed
		* @return this object for method chaining
		*/
		@Deprecated
		public WearableExtender setConfirmLabel(CharSequence label) {
		mConfirmLabel = label;
		return this;
		@@ -1858,6 +1861,7 @@ public class Notification implements Parcelable
		*
		* @return the label to confirm the action should be executed
		*/
		@Deprecated
		public CharSequence getConfirmLabel() {
		return mConfirmLabel;
		}
		@@ -1869,6 +1873,7 @@ public class Notification implements Parcelable
		* @param label the label to display to cancel the action
		* @return this object for method chaining
		*/
		@Deprecated
		public WearableExtender setCancelLabel(CharSequence label) {
		mCancelLabel = label;
		return this;
		@@ -1880,6 +1885,7 @@ public class Notification implements Parcelable
		*
		* @return the label to display to cancel the action
		*/
		@Deprecated
		public CharSequence getCancelLabel() {
		return mCancelLabel;
		}
		@@ -8082,6 +8088,7 @@ public class Notification implements Parcelable
		/**
		* Set an icon that goes with the content of this notification.
		*/
		@Deprecated
		public WearableExtender setContentIcon(int icon) {
		mContentIcon = icon;
		return this;
		@@ -8090,6 +8097,7 @@ public class Notification implements Parcelable
		/**
		* Get an icon that goes with the content of this notification.
		*/
		@Deprecated
		public int getContentIcon() {
		return mContentIcon;
		}
		@@ -8100,6 +8108,7 @@ public class Notification implements Parcelable
		* {@link android.view.Gravity#END}. The default value is {@link android.view.Gravity#END}.
		* @see #setContentIcon
		*/
		@Deprecated
		public WearableExtender setContentIconGravity(int contentIconGravity) {
		mContentIconGravity = contentIconGravity;
		return this;
		@@ -8111,6 +8120,7 @@ public class Notification implements Parcelable
		* {@link android.view.Gravity#END}. The default value is {@link android.view.Gravity#END}.
		* @see #getContentIcon
		*/
		@Deprecated
		public int getContentIconGravity() {
		return mContentIconGravity;
		}
		@@ -8158,6 +8168,7 @@ public class Notification implements Parcelable
		* {@link android.view.Gravity#CENTER_VERTICAL} and {@link android.view.Gravity#BOTTOM}.
		* The default value is {@link android.view.Gravity#BOTTOM}.
		*/
		@Deprecated
		public WearableExtender setGravity(int gravity) {
		mGravity = gravity;
		return this;
		@@ -8169,6 +8180,7 @@ public class Notification implements Parcelable
		* {@link android.view.Gravity#CENTER_VERTICAL} and {@link android.view.Gravity#BOTTOM}.
		* The default value is {@link android.view.Gravity#BOTTOM}.
		*/
		@Deprecated
		public int getGravity() {
		return mGravity;
		}
		@@ -8182,6 +8194,7 @@ public class Notification implements Parcelable
		* documentation for the preset in question. See also
		* {@link #setCustomContentHeight} and {@link #getCustomSizePreset}.
		*/
		@Deprecated
		public WearableExtender setCustomSizePreset(int sizePreset) {
		mCustomSizePreset = sizePreset;
		return this;
		@@ -8195,6 +8208,7 @@ public class Notification implements Parcelable
		* using {@link #setDisplayIntent}. Check the documentation for the preset in question.
		* See also {@link #setCustomContentHeight} and {@link #setCustomSizePreset}.
		*/
		@Deprecated
		public int getCustomSizePreset() {
		return mCustomSizePreset;
		}
		@@ -8206,6 +8220,7 @@ public class Notification implements Parcelable
		* {@link android.app.Notification.WearableExtender#setCustomSizePreset} and
		* {@link #getCustomContentHeight}.
		*/
		@Deprecated
		public WearableExtender setCustomContentHeight(int height) {
		mCustomContentHeight = height;
		return this;
		@@ -8217,6 +8232,7 @@ public class Notification implements Parcelable
		* using {@link #setDisplayIntent}. See also {@link #setCustomSizePreset} and
		* {@link #setCustomContentHeight}.
		*/
		@Deprecated
		public int getCustomContentHeight() {
		return mCustomContentHeight;
		}
		@@ -8267,6 +8283,7 @@ public class Notification implements Parcelable
		* @param hintHideIcon {@code true} to hide the icon, {@code false} otherwise.
		* @return this object for method chaining
		*/
		@Deprecated
		public WearableExtender setHintHideIcon(boolean hintHideIcon) {
		setFlag(FLAG_HINT_HIDE_ICON, hintHideIcon);
		return this;
		@@ -8277,6 +8294,7 @@ public class Notification implements Parcelable
		* @return {@code true} if this icon should not be displayed, false otherwise.
		* The default value is {@code false} if this was never set.
		*/
		@Deprecated
		public boolean getHintHideIcon() {
		return (mFlags & FLAG_HINT_HIDE_ICON) != 0;
		}
		@@ -8286,6 +8304,7 @@ public class Notification implements Parcelable
		* displayed, and other semantic content should be hidden. This hint is only applicable
		* to sub-pages added using {@link #addPage}.
		*/
		@Deprecated
		public WearableExtender setHintShowBackgroundOnly(boolean hintShowBackgroundOnly) {
		setFlag(FLAG_HINT_SHOW_BACKGROUND_ONLY, hintShowBackgroundOnly);
		return this;
		@@ -8296,6 +8315,7 @@ public class Notification implements Parcelable
		* displayed, and other semantic content should be hidden. This hint is only applicable
		* to sub-pages added using {@link android.app.Notification.WearableExtender#addPage}.
		*/
		@Deprecated
		public boolean getHintShowBackgroundOnly() {
		return (mFlags & FLAG_HINT_SHOW_BACKGROUND_ONLY) != 0;
		}
		@@ -8307,6 +8327,7 @@ public class Notification implements Parcelable
		* @param hintAvoidBackgroundClipping {@code true} to avoid clipping if possible.
		* @return this object for method chaining
		*/
		@Deprecated
		public WearableExtender setHintAvoidBackgroundClipping(
		boolean hintAvoidBackgroundClipping) {
		setFlag(FLAG_HINT_AVOID_BACKGROUND_CLIPPING, hintAvoidBackgroundClipping);
		@@ -8320,6 +8341,7 @@ public class Notification implements Parcelable
		* @return {@code true} if it's ok if the background is clipped on the screen, false
		* otherwise. The default value is {@code false} if this was never set.
		*/
		@Deprecated
		public boolean getHintAvoidBackgroundClipping() {
		return (mFlags & FLAG_HINT_AVOID_BACKGROUND_CLIPPING) != 0;
		}
		@@ -8331,6 +8353,7 @@ public class Notification implements Parcelable
		* {@link #SCREEN_TIMEOUT_SHORT} or {@link #SCREEN_TIMEOUT_LONG}.
		* @return this object for method chaining
		*/
		@Deprecated
		public WearableExtender setHintScreenTimeout(int timeout) {
		mHintScreenTimeout = timeout;
		return this;
		@@ -8342,6 +8365,7 @@ public class Notification implements Parcelable
		* @return the duration in milliseconds if > 0, or either one of the sentinel values
		* {@link #SCREEN_TIMEOUT_SHORT} or {@link #SCREEN_TIMEOUT_LONG}.
		*/
		@Deprecated
		public int getHintScreenTimeout() {
		return mHintScreenTimeout;
		}