diff options
| author | John Spurlock <jspurlock@google.com> | 2014-04-04 19:24:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-04 19:24:09 +0000 |
| commit | 5c31e487c4577e1c47ee7c949325d6a13f0d462e (patch) | |
| tree | 3ea98382d7d3cafd8f6af4fad749111dedc7b48b /docs/html | |
| parent | d10b65431547d66b41e4e282e9261453bb0658ff (diff) | |
| parent | 6c191299a73388cd593809c0b66bafbd08fd2982 (diff) | |
| download | frameworks_base-5c31e487c4577e1c47ee7c949325d6a13f0d462e.zip frameworks_base-5c31e487c4577e1c47ee7c949325d6a13f0d462e.tar.gz frameworks_base-5c31e487c4577e1c47ee7c949325d6a13f0d462e.tar.bz2 | |
Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev
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 |