summaryrefslogtreecommitdiffstats
path: root/docs/html/training
diff options
context:
space:
mode:
authorRicardo Cervera <rcervera@google.com>2014-01-16 15:33:34 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-16 15:33:34 +0000
commitf12fa0122000acaa4728163475adce1bb5aaf3c7 (patch)
tree1bfffbf4ca83a9160846e978704a1fa07502c923 /docs/html/training
parent307023f5500a038d77b4e9c7ddb2f76b0cc8a56c (diff)
parent72e2c2a0b4df1d48e19b055d353094000c021c22 (diff)
downloadframeworks_base-f12fa0122000acaa4728163475adce1bb5aaf3c7.zip
frameworks_base-f12fa0122000acaa4728163475adce1bb5aaf3c7.tar.gz
frameworks_base-f12fa0122000acaa4728163475adce1bb5aaf3c7.tar.bz2
am 72e2c2a0: am bb6c94f9: am 8f8a6145: am 294d5f79: am 1d2a4e7b: 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
* commit '72e2c2a0b4df1d48e19b055d353094000c021c22': docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html
Diffstat (limited to 'docs/html/training')
-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>