summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-05-15 14:58:32 -0700
committerDianne Hackborn <hackbod@google.com>2012-05-15 14:58:32 -0700
commite302a162359e191633e966520a6bab4ad569390c (patch)
treedb60c3db01e336141f0d453f62b2b8c309e0bd4d /docs
parentbea7afc52cc85e35b7fc200912246c62d3791198 (diff)
downloadframeworks_base-e302a162359e191633e966520a6bab4ad569390c.zip
frameworks_base-e302a162359e191633e966520a6bab4ad569390c.tar.gz
frameworks_base-e302a162359e191633e966520a6bab4ad569390c.tar.bz2
A few odds and ends.
- Add documentation on "television" UI mode. - Tweak new documentation and implementation around propagating URI grants through choosers. - Add new activity launch flag for closing system dialogs. Change-Id: I978c05f0dc3d16e1c55d43631828b9efa6335b19
Diffstat (limited to 'docs')
-rw-r--r--docs/html/guide/topics/resources/providing-resources.jd16
1 files changed, 9 insertions, 7 deletions
diff --git a/docs/html/guide/topics/resources/providing-resources.jd b/docs/html/guide/topics/resources/providing-resources.jd
index b33a097..847681b 100644
--- a/docs/html/guide/topics/resources/providing-resources.jd
+++ b/docs/html/guide/topics/resources/providing-resources.jd
@@ -528,20 +528,22 @@ how this affects your application during runtime.</p>
which indicates the current device orientation.</p>
</td>
</tr>
- <tr id="DockQualifier">
- <td>Dock mode</td>
+ <tr id="UiModeQualifier">
+ <td>UI mode</td>
<td>
<code>car</code><br/>
- <code>desk</code>
+ <code>desk</code><br/>
+ <code>television</code>
</td>
<td>
<ul class="nolist">
- <li>{@code car}: Device is in a car dock</li>
- <li>{@code desk}: Device is in a desk dock</li>
+ <li>{@code car}: Device is displaying in a car dock</li>
+ <li>{@code desk}: Device is displaying in a desk dock</li>
+ <li>{@code television}: Device is displaying on a television</li>
</ul>
- <p><em>Added in API level 8.</em></p>
+ <p><em>Added in API level 8, television added in API 13.</em></p>
<p>This can change during the life of your application if the user places the device in a
-dock. You can enable or disable this mode using {@link
+dock. You can enable or disable some of these modes using {@link
android.app.UiModeManager}. See <a href="runtime-changes.html">Handling Runtime Changes</a> for
information about how this affects your application during runtime.</p>
</td>