Skip to content

Commit 05fc9f6

Browse files
scottamainAndroid (Google) Code Review
scottamain
authored and
Android (Google) Code Review
committed
Merge "docs: add links to Android Design from dev docs" into ics-mr1
2 parents 548972d + eb5dacd commit 05fc9f6

File tree

16 files changed

+141
-13
lines changed

16 files changed

+141
-13
lines changed

‎docs/html/design/static/ico_styleguide.png‎

697 Bytes
Loading

‎docs/html/guide/guide_toc.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -751,20 +751,20 @@ localized titles are added in the language order specified below.
751751
<li class="toggle-list">
752752
<div><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/icon_design.html">
753753
<span class="en">Icon Design</span>
754-
</a> <span class="new">updated</span></div>
754+
</a></div>
755755
<ul>
756756
<li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/icon_design_launcher.html">
757757
<span class="en">Launcher Icons</span>
758-
</a> <span class="new">updated</span></li>
758+
</a></li>
759759
<li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/icon_design_menu.html">
760760
<span class="en">Menu Icons</span>
761761
</a></li>
762762
<li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/icon_design_action_bar.html">
763763
<span class="en">Action Bar Icons</span>
764-
</a> <span class="new">new!</span></li>
764+
</a></li>
765765
<li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/icon_design_status_bar.html">
766766
<span class="en">Status Bar Icons</span>
767-
</a> <span class="new">updated</span></li>
767+
</a></li>
768768
<li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/icon_design_tab.html">
769769
<span class="en">Tab Icons</span>
770770
</a></li>

‎docs/html/guide/practices/ui_guidelines/icon_design.jd‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,16 @@ Screens</a></li>
5757
</div>
5858
</div>
5959

60+
61+
<div class="design-announce">
62+
<p><strong>New Guides for App Designers!</strong></p>
63+
<p>Check out the new documents for designers at <strong><a
64+
href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
65+
for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
66+
</div>
67+
68+
69+
6070
<p>Creating a unified look and feel throughout a user interface adds value to
6171
your product. Streamlining the graphic style will also make the UI seem more
6272
professional to users.</p>

‎docs/html/guide/practices/ui_guidelines/icon_design_action_bar.jd‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@ Screens</a></li>
2929
</div>
3030
</div>
3131

32+
<div class="design-announce">
33+
<p><strong>New Guides for App Designers!</strong></p>
34+
<p>Check out the new documents for designers at <strong><a
35+
href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
36+
for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
37+
</div>
3238

3339

3440
<p>Action Bar icons are graphical elements placed in the <a

‎docs/html/guide/practices/ui_guidelines/icon_design_dialog.jd‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ Screens</a></li>
2727
</div>
2828
</div>
2929

30+
<div class="design-announce">
31+
<p><strong>New Guides for App Designers!</strong></p>
32+
<p>Check out the new documents for designers at <strong><a
33+
href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
34+
for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
35+
</div>
3036

3137

3238
<p>Dialog icons are shown in pop-up dialog boxes that prompt the user for

‎docs/html/guide/practices/ui_guidelines/icon_design_launcher.jd‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,15 @@ Screens</a></li>
2626
</div>
2727

2828

29+
<div class="design-announce">
30+
<p><strong>New Guides for App Designers!</strong></p>
31+
<p>Check out the new documents for designers at <strong><a
32+
href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
33+
for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
34+
</div>
35+
36+
37+
2938
<p>A launcher icon is a graphic that represents your application. Launcher icons are used by
3039
Launcher applications and appear on the user’s Home screen. Launcher icons can also be used to
3140
represent shortcuts into your application (for example, a contact shortcut icon that opens detail

‎docs/html/guide/practices/ui_guidelines/icon_design_list.jd‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ Screens</a></li>
2828
</div>
2929

3030

31+
<div class="design-announce">
32+
<p><strong>New Guides for App Designers!</strong></p>
33+
<p>Check out the new documents for designers at <strong><a
34+
href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
35+
for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
36+
</div>
37+
3138

3239
<p>List view icons look a lot like dialog icons, but they use an inner shadow
3340
effect where the light source is above the object. They are also designed to be

‎docs/html/guide/practices/ui_guidelines/icon_design_menu.jd‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ Screens</a></li>
3232
</div>
3333

3434

35+
<div class="design-announce">
36+
<p><strong>New Guides for App Designers!</strong></p>
37+
<p>Check out the new documents for designers at <strong><a
38+
href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
39+
for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
40+
</div>
41+
3542

3643
<p>Menu icons are graphical elements placed in the options menu shown to users
3744
when they press the Menu button. They are drawn in a flat-front perspective and

‎docs/html/guide/practices/ui_guidelines/icon_design_status_bar.jd‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@ Screens</a></li>
4040
</div>
4141

4242

43+
<div class="design-announce">
44+
<p><strong>New Guides for App Designers!</strong></p>
45+
<p>Check out the new documents for designers at <strong><a
46+
href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
47+
for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
48+
</div>
49+
4350

4451
<p>Status bar icons are used to represent notifications from your application in
4552
the status bar.</p>

‎docs/html/guide/practices/ui_guidelines/icon_design_tab.jd‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ Screens</a></li>
3232
</div>
3333

3434

35+
<div class="design-announce">
36+
<p><strong>New Guides for App Designers!</strong></p>
37+
<p>Check out the new documents for designers at <strong><a
38+
href="{@docRoot}design/index.html">Android Design</a></strong>, including more guidelines
39+
for <a href="{@docRoot}design/style/iconography.html">Iconography</a>.</p>
40+
</div>
41+
3542

3643
<p>Tab icons are graphical elements used to represent individual tabs in a
3744
multi-tab interface. Each tab icon has two states: unselected and selected.</p>

0 commit comments

Comments
 (0)