diff options
author | Roman Nurik <romannurik@google.com> | 2012-01-27 21:08:59 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-27 21:08:59 -0800 |
commit | d28ce2140f060f020712efe687b1183b1e1c47ca (patch) | |
tree | b6df8cb8e01712ff13492b8733884cea8a52cd63 /docs | |
parent | 479c96c5758ddd4bb92473bc22b6e366fdfc3114 (diff) | |
parent | 5525a43a9c814faba22adfafc6517fb64259966f (diff) | |
download | frameworks_base-d28ce2140f060f020712efe687b1183b1e1c47ca.zip frameworks_base-d28ce2140f060f020712efe687b1183b1e1c47ca.tar.gz frameworks_base-d28ce2140f060f020712efe687b1183b1e1c47ca.tar.bz2 |
am 5525a43a: am 639b25ea: Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1
* commit '5525a43a9c814faba22adfafc6517fb64259966f':
docs: add NOTICE to action bar icon pack and sprinkle download links
Diffstat (limited to 'docs')
-rw-r--r-- | docs/html/design/patterns/actionbar.html | 18 | ||||
-rw-r--r-- | docs/html/design/static/download/action_bar_icons-v4.0.zip | bin | 1100797 -> 1104707 bytes | |||
-rw-r--r-- | docs/html/design/style/iconography.html | 22 |
3 files changed, 37 insertions, 3 deletions
diff --git a/docs/html/design/patterns/actionbar.html b/docs/html/design/patterns/actionbar.html index 99ae2d7..911c549 100644 --- a/docs/html/design/patterns/actionbar.html +++ b/docs/html/design/patterns/actionbar.html @@ -133,7 +133,7 @@ The app icon establishes your app's identity. It can be replaced with a differen you wish. Important: If the app is currently not displaying the top-level screen, be sure to display the Up caret to the left of the app icon, so the user can navigate up the hierarchy. For more discussion of -Up navigation, see the "Navigation" pattern. +Up navigation, see the <a href="../patterns/navigation.html">Navigation</a> pattern. <div class="figure"> <img src="../static/content/action_bar_pattern_up_app_icon.png"> @@ -369,6 +369,22 @@ action overflow.</p> <p>If either F, I, or T apply, then it's appropriate for the action bar. Otherwise, it belongs in the action overflow.</p> +<p> + +Pre-defined glyphs should be used for certain common actions such as "refresh" and "share." The +download link below provides a package with icons that are scaled for various screen densities and +are suitable for use with the Holo Light and Holo Dark themes. The package also includes unstyled +icons that you can modify to match your theme, in addition to Adobe® Illustrator® source +files for further customization. + +</p> +<p> + +<a href="../static/download/action_bar_icons-v4.0.zip">Download the Action Bar Icon +Pack</a> + +</p> + <div class="layout-content-row"> <div class="layout-content-col span-6"> diff --git a/docs/html/design/static/download/action_bar_icons-v4.0.zip b/docs/html/design/static/download/action_bar_icons-v4.0.zip Binary files differindex e255931..4568894 100644 --- a/docs/html/design/static/download/action_bar_icons-v4.0.zip +++ b/docs/html/design/static/download/action_bar_icons-v4.0.zip diff --git a/docs/html/design/style/iconography.html b/docs/html/design/style/iconography.html index 663770b..5d5d200 100644 --- a/docs/html/design/style/iconography.html +++ b/docs/html/design/style/iconography.html @@ -193,10 +193,28 @@ from above, so that users perceive some depth.</p> <h2 id="actionbar">Action Bar</h2> -<p>Action bar icons are graphic buttons that represent the most important actions people can take +<p> + +Action bar icons are graphic buttons that represent the most important actions people can take within your app. Each one should employ a simple metaphor representing a single concept that most -people can grasp at a glance.</p> +people can grasp at a glance. + +</p> +<p> + +Pre-defined glyphs should be used for certain common actions such as "refresh" and "share." The +download link below provides a package with icons that are scaled for various screen densities and +are suitable for use with the Holo Light and Holo Dark themes. The package also includes unstyled +icons that you can modify to match your theme, in addition to Adobe® Illustrator® source +files for further customization. + +</p> +<p> + +<a href="../static/download/action_bar_icons-v4.0.zip">Download the Action Bar Icon +Pack</a> +</p> <div class="layout-content-row"> <div class="layout-content-col span-4"> |