diff --git a/docs/html/design/static/ico_styleguide.png b/docs/html/design/static/ico_styleguide.png new file mode 100644 index 0000000000000..c12907c8f2a04 Binary files /dev/null and b/docs/html/design/static/ico_styleguide.png differ diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index a9c4d307b7a03..7f3894dd33a28 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -751,20 +751,20 @@ applications
  • Icon Design - updated
    + +
    +

    Navigation Design

    +

    For more about how app navigation works on Android, read Android Design's Navigation guide.

    +
    + +

    Saving Activity State

    As discussed above, the system's default behavior preserves the state of an activity when it is diff --git a/docs/html/guide/topics/ui/actionbar.jd b/docs/html/guide/topics/ui/actionbar.jd index 1bb4fa46b79c4..b83bde75dd2a3 100644 --- a/docs/html/guide/topics/ui/actionbar.jd +++ b/docs/html/guide/topics/ui/actionbar.jd @@ -73,8 +73,10 @@ href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/inde API Demos

    • -

    See also

    item +

    See also

      +
    1. Android Design: Action Bar
    2. Menus
    3. Supporting Tablets and Handsets
      4. @@ -124,6 +126,14 @@ landscape handset), showing the logo on the left, navigation tabs, and an action right (plus the overflow menu button).

      +
      +

      Action Bar Design

      +

      For design guidelines, read Android Design's Action Bar guide.

      +
      + + +

      Remaining backward-compatible

      @@ -536,6 +546,12 @@ the email application, but presses the action bar icon to navigate up, rather th

      Figure 6. Example behavior for UP navigation after entering the Email app from the People app.

      +
      +

      Navigation Design

      +

      For more about how Up and Back navigation differ, read Android Design's Navigation guide.

      +
      +

      To enable the icon for up navigation (which displays the "up" indicator next to the icon), call {@link android.app.ActionBar#setDisplayHomeAsUpEnabled setDisplayHomeAsUpEnabled(true)} on your {@link android.app.ActionBar}:

      diff --git a/docs/html/guide/topics/ui/dialogs.jd b/docs/html/guide/topics/ui/dialogs.jd index 16f14cbc7ae4f..82cbfd161b6b4 100644 --- a/docs/html/guide/topics/ui/dialogs.jd +++ b/docs/html/guide/topics/ui/dialogs.jd @@ -37,6 +37,11 @@ DatePicker
    4. Hello TimePicker
    + +

    See also

    +
      +
    1. Android Design: Dialogs
      2. +
    @@ -70,6 +75,13 @@ of the following subclasses:

    base {@link android.app.Dialog} object or any of the subclasses listed above and define a new layout. See the section on Creating a Custom Dialog below.

    +
    +

    Dialog Design

    +

    For design guidelines, read Android Design's Dialogs guide.

    +
    + +

    Showing a Dialog

    diff --git a/docs/html/guide/topics/ui/notifiers/notifications.jd b/docs/html/guide/topics/ui/notifiers/notifications.jd index 7bc1cde3ff367..71aa2fecd2d8b 100644 --- a/docs/html/guide/topics/ui/notifiers/notifications.jd +++ b/docs/html/guide/topics/ui/notifiers/notifications.jd @@ -33,6 +33,12 @@ user clicks it
  • {@link android.app.Notification}
  • {@link android.app.NotificationManager}
    • + +

    See also

    +
      +
    1. Android +Design: Notifications
      2. +
    @@ -61,6 +67,14 @@ when selected by the user.

    Figure 2. The notifications window.

    +
    +

    Notification Design

    +

    For design guidelines, read Android Design's Notifications guide.

    +
    + + +

    The Basics

    An {@link android.app.Activity} or {@link android.app.Service} can initiate a status bar