diff options
| author | John Spurlock <jspurlock@google.com> | 2014-04-04 19:28:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-04 19:28:09 +0000 |
| commit | 642421aa7f284817cc1a972a7f9c7a64696a0116 (patch) | |
| tree | e51a5b2c212bd95c4a052fcbd6b0bb0f0fce4976 /docs/html | |
| parent | 8f81d29558bb0c97187d5ae3a7ee696ec13b264a (diff) | |
| parent | 5c31e487c4577e1c47ee7c949325d6a13f0d462e (diff) | |
| download | frameworks_base-642421aa7f284817cc1a972a7f9c7a64696a0116.zip frameworks_base-642421aa7f284817cc1a972a7f9c7a64696a0116.tar.gz frameworks_base-642421aa7f284817cc1a972a7f9c7a64696a0116.tar.bz2 | |
am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev
* commit '5c31e487c4577e1c47ee7c949325d6a13f0d462e':
Introduce new UI_MODE_TYPE_WATCH and qualifier.
Diffstat (limited to 'docs/html')
| -rw-r--r-- | docs/html/guide/topics/resources/providing-resources.jd | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/html/guide/topics/resources/providing-resources.jd b/docs/html/guide/topics/resources/providing-resources.jd index aec7fa7..bf16630 100644 --- a/docs/html/guide/topics/resources/providing-resources.jd +++ b/docs/html/guide/topics/resources/providing-resources.jd @@ -562,6 +562,7 @@ which indicates the current device orientation.</p> <code>desk</code><br/> <code>television<br/> <code>appliance</code> + <code>watch</code> </td> <td> <ul class="nolist"> @@ -573,8 +574,9 @@ which indicates the current device orientation.</p> non-pointer interaction</li> <li>{@code appliance}: Device is serving as an appliance, with no display</li> + <li>{@code watch}: Device has a display and is worn on the wrist</li> </ul> - <p><em>Added in API level 8, television added in API 13.</em></p> + <p><em>Added in API level 8, television added in API 13, watch added in API 20.</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 |