summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cervera <rcervera@google.com>2014-01-16 01:26:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-01-16 01:26:14 +0000
commit1d2a4e7b9fddf57e2d8e562ad691653332ea0a4c (patch)
tree2f20a46affa4acd2fc5ec94cf533afad61ba44e8
parent3126ce6e096bebf4e21aea73d2bb872dcedb0d16 (diff)
parentd400ba6efb292a32d6d251ae4455e1a406d2d1f4 (diff)
downloadframeworks_base-1d2a4e7b9fddf57e2d8e562ad691653332ea0a4c.zip
frameworks_base-1d2a4e7b9fddf57e2d8e562ad691653332ea0a4c.tar.gz
frameworks_base-1d2a4e7b9fddf57e2d8e562ad691653332ea0a4c.tar.bz2
Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs
-rw-r--r--docs/html/training/managing-audio/audio-focus.jd4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/training/managing-audio/audio-focus.jd b/docs/html/training/managing-audio/audio-focus.jd
index 33f04e9..6dcaa7f 100644
--- a/docs/html/training/managing-audio/audio-focus.jd
+++ b/docs/html/training/managing-audio/audio-focus.jd
@@ -68,7 +68,7 @@ int result = am.requestAudioFocus(afChangeListener,
AudioManager.AUDIOFOCUS_GAIN);
if (result == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
- am.unregisterMediaButtonEventReceiver(RemoteControlReceiver);
+ am.registerMediaButtonEventReceiver(RemoteControlReceiver);
// Start playback.
}
</pre>
@@ -118,7 +118,7 @@ app requests it. How your app responds to a loss of audio focus depends on the m
loss.</p>
<p>The {@link android.media.AudioManager.OnAudioFocusChangeListener#onAudioFocusChange
-onAudioFocusChange()} callback method of they audio focus change listener you registered when
+onAudioFocusChange()} callback method of the audio focus change listener you registered when
requesting audio focus receives a parameter that describes the focus change event. Specifically,
the possible focus loss events mirror the focus request types from the previous
section&mdash;permanent loss, transient loss, and transient with ducking permitted.</p>