diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-06-30 20:31:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-30 20:31:26 +0000 |
| commit | 40fab055bb030c489469437fbcfa8e79fc89ded7 (patch) | |
| tree | 40c97c765d771c437f64fbf53444288900af0f89 /docs | |
| parent | 32ddd5346672339fe225ad16224a4498fef65ac3 (diff) | |
| parent | f178066925ae7266c6bd89494ba93333c5875f12 (diff) | |
| download | frameworks_base-40fab055bb030c489469437fbcfa8e79fc89ded7.zip frameworks_base-40fab055bb030c489469437fbcfa8e79fc89ded7.tar.gz frameworks_base-40fab055bb030c489469437fbcfa8e79fc89ded7.tar.bz2 | |
Merge "Add round/notround qualifier to docs" into mnc-dev
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/guide/topics/resources/providing-resources.jd | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/docs/html/guide/topics/resources/providing-resources.jd b/docs/html/guide/topics/resources/providing-resources.jd index b06da56..63eee96 100644 --- a/docs/html/guide/topics/resources/providing-resources.jd +++ b/docs/html/guide/topics/resources/providing-resources.jd @@ -549,6 +549,22 @@ is not related to the screen orientation.</p> which indicates whether the screen is long.</p> </td> </tr> + <tr id="ScreenRoundQualifier"> + <td>Round screen</td> + <td> + <code>round</code><br/> + <code>notround</code> + </td> + <td> + <ul class="nolist"> + <li>{@code round}: Round screens, such as a round wearable device</li> + <li>{@code notround}: Rectangular screens, such as phones or tablets</li> + </ul> + <p><em>Added in API level 23.</em></p> + <p>Also see the {@link android.content.res.Configuration#isScreenRound()} configuration +method, which indicates whether the screen is round.</p> + </td> + </tr> <tr id="OrientationQualifier"> <td>Screen orientation</td> <td> |