diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2014-05-14 14:47:28 -0700 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2014-05-14 14:50:13 -0700 |
| commit | 9a6672beb1c53559180596ce6b49f9da0c8a0ed7 (patch) | |
| tree | b4693ae211a34491a7e98247ff9c115ae7933110 /docs/html/design/style | |
| parent | f8c940733ed0aaa95a66cb80181f08e39e4592fa (diff) | |
| parent | 93ccd1a2eb16cf4fdd678e3d5b61f73d1bd0de88 (diff) | |
| download | frameworks_base-9a6672beb1c53559180596ce6b49f9da0c8a0ed7.zip frameworks_base-9a6672beb1c53559180596ce6b49f9da0c8a0ed7.tar.gz frameworks_base-9a6672beb1c53559180596ce6b49f9da0c8a0ed7.tar.bz2 | |
resolved conflices for merge of 93ccd1a2 to master
Change-Id: Ic77367cb9c90027e036a461697295fd604b50014
Diffstat (limited to 'docs/html/design/style')
| -rw-r--r-- | docs/html/design/style/devices-displays.jd | 4 | ||||
| -rw-r--r-- | docs/html/design/style/metrics-grids.jd | 5 | ||||
| -rw-r--r-- | docs/html/design/style/typography.jd | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/docs/html/design/style/devices-displays.jd b/docs/html/design/style/devices-displays.jd index a8f9d6f..6a7234b 100644 --- a/docs/html/design/style/devices-displays.jd +++ b/docs/html/design/style/devices-displays.jd @@ -1,7 +1,9 @@ page.title=Devices and Displays +page.metaDescription=Take advantage of Android's flexible layout system and create apps that gracefully scale from phones to tablets and beyond. + @jd:body -<p>Android powers millions of phones, tablets, and other devices in a wide variety of screen sizes and +<p>Android powers hundreds of millions of phones, tablets, and other devices in a wide variety of screen sizes and form factors. By taking advantage of Android's flexible layout system, you can create apps that gracefully scale from large tablets to smaller phones.</p> diff --git a/docs/html/design/style/metrics-grids.jd b/docs/html/design/style/metrics-grids.jd index a553475..e92d57e 100644 --- a/docs/html/design/style/metrics-grids.jd +++ b/docs/html/design/style/metrics-grids.jd @@ -1,5 +1,8 @@ page.title=Metrics and Grids -page.tags=layout,screens +page.metaDescription=Optimize your app's UI by designing layouts based on density-independent grids. +page.tags="layout","screens" +meta.tags="multiple screens, layout, tablets" +page.image=/design/media/metrics_closeup.png @jd:body <p>Devices vary not only in physical size, but also in screen density (<acronym title="Dots per diff --git a/docs/html/design/style/typography.jd b/docs/html/design/style/typography.jd index ec6fba2..6923f0b 100644 --- a/docs/html/design/style/typography.jd +++ b/docs/html/design/style/typography.jd @@ -1,5 +1,6 @@ page.title=Typography -page.tags=textview,font +page.tags="textview","font" +page.metaDescription=How to use typography in your Android apps. @jd:body <div class="layout-content-row"> |