diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2014-02-12 19:31:15 -0800 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2014-02-12 19:31:15 -0800 |
| commit | a97e17785714e5155184199161b3d288f13d0134 (patch) | |
| tree | 721d2cc88db8212cc8b58a407d1d52bd89e53e8b /docs/html/design/style | |
| parent | c462073b24ab7c71e4ba5046c1a28ac27a001d60 (diff) | |
| parent | 47d3eaf6b1d1aec8517bef6da9e8c3561f21d7bd (diff) | |
| download | frameworks_base-a97e17785714e5155184199161b3d288f13d0134.zip frameworks_base-a97e17785714e5155184199161b3d288f13d0134.tar.gz frameworks_base-a97e17785714e5155184199161b3d288f13d0134.tar.bz2 | |
Merge commit '47d3eaf6' into manualmerge
Conflicts:
docs/html/design/patterns/accessibility.jd
docs/html/design/patterns/actionbar.jd
docs/html/design/patterns/compatibility.jd
docs/html/design/patterns/multi-pane-layouts.jd
docs/html/design/style/iconography.jd
Change-Id: I349cf8ebc159c0a7ef0796900e2d11fe6e0c888a
Diffstat (limited to 'docs/html/design/style')
| -rw-r--r-- | docs/html/design/style/iconography.jd | 4 | ||||
| -rw-r--r-- | docs/html/design/style/index.jd | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/docs/html/design/style/iconography.jd b/docs/html/design/style/iconography.jd index 5dde600..d8d8c76 100644 --- a/docs/html/design/style/iconography.jd +++ b/docs/html/design/style/iconography.jd @@ -1,5 +1,7 @@ page.title=Iconography -page.tags=icons +page.tags="icons" +meta.tags="icons, googleplay, listing, branding" +page.titleFriendly=Guidelines for creating your app's icons @jd:body <img src="{@docRoot}design/media/iconography_overview.png"> diff --git a/docs/html/design/style/index.jd b/docs/html/design/style/index.jd index 74d085b..f88fdb8 100644 --- a/docs/html/design/style/index.jd +++ b/docs/html/design/style/index.jd @@ -18,7 +18,8 @@ footer.hide=1 <div id="landing-graphic-container"> <div id="text-overlay"> - Build visually compelling apps that look great on any device. + <span itemprop="description">Build visually compelling apps that look great on any + device.</span> <br><br> <a href="{@docRoot}design/style/devices-displays.html" class="landing-page-link">Devices and Displays</a> </div> |