summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGriff Hazen <griff@google.com>2014-05-28 09:13:05 -0700
committerGriff Hazen <griff@google.com>2014-05-28 09:13:05 -0700
commit339f437dc3f7c474d9cf1f963819bab2596e6ad3 (patch)
treef28b21974e58ebf3c4842ba976b528dec07716d6 /core
parenta9cb1e66737f816d643bca03832af719cbdd0f20 (diff)
downloadframeworks_base-339f437dc3f7c474d9cf1f963819bab2596e6ad3.zip
frameworks_base-339f437dc3f7c474d9cf1f963819bab2596e6ad3.tar.gz
frameworks_base-339f437dc3f7c474d9cf1f963819bab2596e6ad3.tar.bz2
Additional doc fixes for WearableExtender
Change-Id: I3764e4d97c0007b905ff0f3eb553234668fd50e1
Diffstat (limited to 'core')
-rw-r--r--core/java/android/app/Notification.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 6b954e2..32284e8 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -3246,7 +3246,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.
*
@@ -3261,16 +3261,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;