summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author RoboErik <epastern@google.com> 2014-08-28 15:22:55 -0700
committer Erik Pasternak <roboerik@android.com> 2014-08-28 22:53:34 +0000
commitfd63dd0ce20dbb4170d675938671f07a276ccd8f (patch)
treecd03dedfdc9ade6f9128e2be3b8208a725956b1d
parent09daab204c4121138b77d43c3c56632474612a4d (diff)
Add javadoc to Window.set/getMediaController
Fleshes out the javadoc a bit more instead of just a reference to the description of the methods in Activity. bug:17198774 Change-Id: I24afe1c5d9f2e46e201c84072a6b34a619867889
-rw-r--r--core/java/android/view/Window.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java
index 2c7ea3e58a97..9b6f200b4698 100644
--- a/core/java/android/view/Window.java
+++ b/core/java/android/view/Window.java
@@ -1304,12 +1304,22 @@ public abstract class Window {
public abstract int getVolumeControlStream();
/**
+ * Sets a {@link MediaController} to send media keys and volume changes to.
+ * If set, this should be preferred for all media keys and volume requests
+ * sent to this window.
+ *
+ * @param controller The controller for the session which should receive
+ * media keys and volume changes.
* @see android.app.Activity#setMediaController(android.media.session.MediaController)
*/
public void setMediaController(MediaController controller) {
}
/**
+ * Gets the {@link MediaController} that was previously set.
+ *
+ * @return The controller which should receive events.
+ * @see #setMediaController(android.media.session.MediaController)
* @see android.app.Activity#getMediaController()
*/
public MediaController getMediaController() {