summaryrefslogtreecommitdiffstats
path: root/docs/html/guide
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-09-10 16:29:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-10 16:29:04 -0700
commit4899d6f7cc45268a4f8d734639fb3f03d39d9d4a (patch)
treee4747bba45d033fcf0c5d4df7a260a36aeae2a7c /docs/html/guide
parenta25526ae400641ae414d2dbf03495f54a0c46d2d (diff)
parentcd3ec7a251443db258008f913b856c05b2232478 (diff)
downloadframeworks_base-4899d6f7cc45268a4f8d734639fb3f03d39d9d4a.zip
frameworks_base-4899d6f7cc45268a4f8d734639fb3f03d39d9d4a.tar.gz
frameworks_base-4899d6f7cc45268a4f8d734639fb3f03d39d9d4a.tar.bz2
am cd3ec7a2: am e9e40b43: Merge "add link to device dock lesson" into jb-dev
* commit 'cd3ec7a251443db258008f913b856c05b2232478': add link to device dock lesson
Diffstat (limited to 'docs/html/guide')
-rw-r--r--docs/html/guide/topics/resources/providing-resources.jd4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/html/guide/topics/resources/providing-resources.jd b/docs/html/guide/topics/resources/providing-resources.jd
index b2c95b9..749e458 100644
--- a/docs/html/guide/topics/resources/providing-resources.jd
+++ b/docs/html/guide/topics/resources/providing-resources.jd
@@ -573,6 +573,10 @@ which indicates the current device orientation.</p>
no display</li>
</ul>
<p><em>Added in API level 8, television added in API 13.</em></p>
+ <p>For information about how your app can respond when the device is inserted into or
+ removed from a dock, read <a
+ href="{@docRoot}training/monitoring-device-state/docking-monitoring.html">Determining
+and Monitoring the Docking State and Type</a>.</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 some of these modes using {@link
android.app.UiModeManager}. See <a href="runtime-changes.html">Handling Runtime Changes</a> for