am cc212d35: am 339f437d: Additional doc fixes for WearableExtender (6b5f93e9) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -3716,7 +3716,7 @@ public class Notification implements Parcelable
		* 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 action's
		* <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.
		*
		@@ -3731,16 +3731,18 @@ public class Notification implements Parcelable
		}

		/**
		* Get the action index from this notification's actions to be clickable with the
		* content of this notification. This action will no longer display separately
		* 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 action's
		* <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.
		*
		* <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.
		*
		* @return the action index or {@link #UNSET_ACTION_INDEX} if no action was selected.
		*/
		public int getContentAction() {
		return mContentActionIndex;