Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9e868f02: am 5fe3c49a: am 7f83b4a7: am 15d2e768: Merge "docs: Updated Android 5.0 API Overview to reflect that setting the device to RINGER_MODE_NORMAL or RINGER_MODE_VIBRATE causes the device to leave priority mode." into lmp-dev

Browse Source 
* commit '9e868f020074f1387bd519954834da4db1bc9a79':
  docs: Updated Android 5.0 API Overview to reflect that   setting the device to RINGER_MODE_NORMAL or RINGER_MODE_VIBRATE   causes the device to leave priority mode.
This commit is contained in:
Quddus Chong
2014-10-17 19:11:47 +00:00
committed by Android Git Automerger
parent 9c920cec75 9e868f0200
commit b7c0093f8e
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
docs/html/about/versions/android-5.0.jd
View File

@@ -228,10 +228,9 @@ the system can present notifications correctly in
{@link android.app.Notification.Builder} methods to add sounds and {@link android.app.Notification.Builder} methods to add sounds and
vibration.</p> vibration.</p>
<p>Setting the device to <p>Setting a device to {@link android.media.AudioManager#RINGER_MODE_NORMAL RINGER_MODE_NORMAL}
{@link android.media.AudioManager#RINGER_MODE_SILENT RINGER_MODE_SILENT} now or {@link android.media.AudioManager#RINGER_MODE_NORMAL RINGER_MODE_VIBRATE}
causes the device to enter the new priority mode. The device stays in priority causes the device to leave priority mode.</p>
mode when you leave silent mode.</p>
<p>Previously, Android used {@link android.media.AudioManager#STREAM_MUSIC STREAM_MUSIC} <p>Previously, Android used {@link android.media.AudioManager#STREAM_MUSIC STREAM_MUSIC}
as the master stream to control volume on tablet devices. In Android 5.0, the as the master stream to control volume on tablet devices. In Android 5.0, the
@@ -1179,7 +1178,7 @@ provide the features your app needs.</p>
<h3 id="Permissions">User permissions</h3> <h3 id="Permissions">User permissions</h3>
<p>The following permissions are now supported in the <p>The following permission is now supported in the
<a href="{@docRoot}guide/topics/manifest/uses-permission-element.html">{@code &lt;uses-permission&gt;}</a> <a href="{@docRoot}guide/topics/manifest/uses-permission-element.html">{@code &lt;uses-permission&gt;}</a>
element to declare the permissions your app requires to access certain APIs.</p> element to declare the permissions your app requires to access certain APIs.</p>
@@ -1188,10 +1187,4 @@ element to declare the permissions your app requires to access certain APIs.</p>
level 21 and higher, this permission is required by a level 21 and higher, this permission is required by a
<a href="{@docRoot}about/versions/android-4.2.html#Daydream">Daydream</a> service, <a href="{@docRoot}about/versions/android-4.2.html#Daydream">Daydream</a> service,
to ensure that only the system can bind to it.</li> to ensure that only the system can bind to it.</li>
<li>{@link android.Manifest.permission#READ_VOICEMAIL}: Required to allow your
app to read voicemails in the system.</li>
<li>{@link android.Manifest.permission#WRITE_VOICEMAIL}: Required to allow your
app to modify and remove existing voicemails in the system.</li>
</ul> </ul>

11
docs/html/training/tv/tif/index.jd
View File

@@ -1,8 +1,19 @@
page.title=Building Live TV Apps page.title=Building Live TV Apps
page.tags=tif page.tags=tif
page.article=true
@jd:body @jd:body
<div id="tb-wrapper">
<div id="tb">
<h2>You should also read</h2>
<ul>
<li><a href="{@docRoot}reference/android/media/tv/package-summary.html">
android.media.tv</a></li>
</ul>
</div>
</div>
<p> <p>
Watching live television shows and other continuous, channel-based content is a big part of the Watching live television shows and other continuous, channel-based content is a big part of the
TV experience. Android supports receiving and playback of live video content through the TV Input TV experience. Android supports receiving and playback of live video content through the TV Input