diff options
| author | Peter Ng <petergng@google.com> | 2012-07-30 18:38:22 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-30 18:39:41 -0700 |
| commit | a5d929681a64fff76dcfc7b0ce3f03666cf98337 (patch) | |
| tree | b611e71146cc900e56b4eb0ff3ba0cc0dfea9ab9 | |
| parent | 27855accec6557dade0a9cb647a235620881e946 (diff) | |
| parent | 6443ca4cd9406ed8e9ba55461d4b2eb677aad17a (diff) | |
| download | frameworks_base-a5d929681a64fff76dcfc7b0ce3f03666cf98337.zip frameworks_base-a5d929681a64fff76dcfc7b0ce3f03666cf98337.tar.gz frameworks_base-a5d929681a64fff76dcfc7b0ce3f03666cf98337.tar.bz2 | |
Merge "actionbar and tabs image updates" into jb-dev
| -rw-r--r-- | docs/html/design/media/actionbar_drawer.png | bin | 0 -> 49964 bytes | |||
| -rw-r--r-- | docs/html/design/media/tabs_youtube.png | bin | 68907 -> 28414 bytes | |||
| -rw-r--r-- | docs/html/design/patterns/actionbar.jd | 7 |
3 files changed, 1 insertions, 6 deletions
diff --git a/docs/html/design/media/actionbar_drawer.png b/docs/html/design/media/actionbar_drawer.png Binary files differnew file mode 100644 index 0000000..95e04f5 --- /dev/null +++ b/docs/html/design/media/actionbar_drawer.png diff --git a/docs/html/design/media/tabs_youtube.png b/docs/html/design/media/tabs_youtube.png Binary files differindex 69e9268..31c626c 100644 --- a/docs/html/design/media/tabs_youtube.png +++ b/docs/html/design/media/tabs_youtube.png diff --git a/docs/html/design/patterns/actionbar.jd b/docs/html/design/patterns/actionbar.jd index 21e8583..80aa77d 100644 --- a/docs/html/design/patterns/actionbar.jd +++ b/docs/html/design/patterns/actionbar.jd @@ -234,12 +234,7 @@ tabs. Fixed tabs in the main action bar can move to the top bar when the screen </div> <div class="layout-content-col span-7"> - - <img src="{@docRoot}design/media/action_bar_pattern_default_tabs.png"> - <div class="figure-caption"> - Default fixed tabs shown in Holo Dark & Light. - </div> - + <img src="{@docRoot}design/media/actionbar_drawer.png"> </div> </div> |
