| commit | 50a9b83554decb4913fc8eac9862edf902149265 | [log] [tgz] |
|---|---|---|
| author | Luan Nguyen <luann@google.com> | Wed Mar 11 17:18:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 11 17:18:43 2015 +0000 |
| tree | 2fc12ca742d63a8dc40312f8619b4a18569bb7db | |
| parent | 8ab872dba1eff1477cb12da63d1f882260a271ae [diff] | |
| parent | 42ee70aac023da26a6dc4dee5856871372e792e8 [diff] |
am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs * commit '42ee70aac023da26a6dc4dee5856871372e792e8': docs: Update auto landing and design page image assets
diff --git a/docs/html/auto/images/assets/landing/01.gif b/docs/html/auto/images/assets/landing/01.gif index 34c9fa8..7a75f87 100644 --- a/docs/html/auto/images/assets/landing/01.gif +++ b/docs/html/auto/images/assets/landing/01.gif Binary files differ
diff --git a/docs/html/auto/images/assets/landing/02.gif b/docs/html/auto/images/assets/landing/02.gif index d50e06b..655c5bc 100644 --- a/docs/html/auto/images/assets/landing/02.gif +++ b/docs/html/auto/images/assets/landing/02.gif Binary files differ
diff --git a/docs/html/auto/images/assets/landing/03.gif b/docs/html/auto/images/assets/landing/03.gif index 7992021..195315a 100644 --- a/docs/html/auto/images/assets/landing/03.gif +++ b/docs/html/auto/images/assets/landing/03.gif Binary files differ
diff --git a/docs/html/auto/images/assets/landing/04.png b/docs/html/auto/images/assets/landing/04.png index a0e75f3..aecdb58 100644 --- a/docs/html/auto/images/assets/landing/04.png +++ b/docs/html/auto/images/assets/landing/04.png Binary files differ
diff --git a/docs/html/auto/images/assets/landing/05.png b/docs/html/auto/images/assets/landing/05.png index f3d2ab8..a3baba4 100644 --- a/docs/html/auto/images/assets/landing/05.png +++ b/docs/html/auto/images/assets/landing/05.png Binary files differ
diff --git a/docs/html/auto/images/assets/landing/06.png b/docs/html/auto/images/assets/landing/06.png index b19a6bb..fe74a49 100644 --- a/docs/html/auto/images/assets/landing/06.png +++ b/docs/html/auto/images/assets/landing/06.png Binary files differ
diff --git a/docs/html/auto/images/assets/landing/07.png b/docs/html/auto/images/assets/landing/07.png index 380e8da..f51d526 100644 --- a/docs/html/auto/images/assets/landing/07.png +++ b/docs/html/auto/images/assets/landing/07.png Binary files differ
diff --git a/docs/html/auto/images/assets/landing/08.png b/docs/html/auto/images/assets/landing/08.png index 9889b39..cc65ff3 100644 --- a/docs/html/auto/images/assets/landing/08.png +++ b/docs/html/auto/images/assets/landing/08.png Binary files differ
diff --git a/docs/html/auto/images/logos/apps/TextMe.png b/docs/html/auto/images/logos/apps/TextMe.png deleted file mode 100644 index b96f81a..0000000 --- a/docs/html/auto/images/logos/apps/TextMe.png +++ /dev/null Binary files differ
diff --git a/docs/html/auto/images/logos/apps/contacts.png b/docs/html/auto/images/logos/apps/contacts.png new file mode 100644 index 0000000..f1e1e30 --- /dev/null +++ b/docs/html/auto/images/logos/apps/contacts.png Binary files differ
diff --git a/docs/html/auto/images/logos/apps/icq.png b/docs/html/auto/images/logos/apps/icq.png new file mode 100644 index 0000000..3e14bd4 --- /dev/null +++ b/docs/html/auto/images/logos/apps/icq.png Binary files differ
diff --git a/docs/html/auto/images/logos/apps/iheartradio.png b/docs/html/auto/images/logos/apps/iheartradio.png index 8feb38d..da625df 100644 --- a/docs/html/auto/images/logos/apps/iheartradio.png +++ b/docs/html/auto/images/logos/apps/iheartradio.png Binary files differ
diff --git a/docs/html/auto/images/logos/apps/joyride.png b/docs/html/auto/images/logos/apps/joyride.png index 8c2897e..10ba931 100644 --- a/docs/html/auto/images/logos/apps/joyride.png +++ b/docs/html/auto/images/logos/apps/joyride.png Binary files differ
diff --git a/docs/html/auto/images/logos/apps/kik.png b/docs/html/auto/images/logos/apps/kik.png index 056ef7e..718b0ee 100644 --- a/docs/html/auto/images/logos/apps/kik.png +++ b/docs/html/auto/images/logos/apps/kik.png Binary files differ
diff --git a/docs/html/auto/images/logos/apps/mlb.png b/docs/html/auto/images/logos/apps/mlb.png deleted file mode 100644 index ddde4cd..0000000 --- a/docs/html/auto/images/logos/apps/mlb.png +++ /dev/null Binary files differ
diff --git a/docs/html/auto/images/logos/apps/npr.png b/docs/html/auto/images/logos/apps/npr.png index 5234201..33de546 100644 --- a/docs/html/auto/images/logos/apps/npr.png +++ b/docs/html/auto/images/logos/apps/npr.png Binary files differ
diff --git a/docs/html/auto/images/logos/apps/pandora.png b/docs/html/auto/images/logos/apps/pandora.png deleted file mode 100644 index 13fa1d3..0000000 --- a/docs/html/auto/images/logos/apps/pandora.png +++ /dev/null Binary files differ
diff --git a/docs/html/auto/images/logos/apps/pocketcasts.png b/docs/html/auto/images/logos/apps/pocketcasts.png index 5227937..44129f1 100644 --- a/docs/html/auto/images/logos/apps/pocketcasts.png +++ b/docs/html/auto/images/logos/apps/pocketcasts.png Binary files differ
diff --git a/docs/html/auto/images/logos/apps/skype.png b/docs/html/auto/images/logos/apps/skype.png new file mode 100644 index 0000000..0012b58 --- /dev/null +++ b/docs/html/auto/images/logos/apps/skype.png Binary files differ
diff --git a/docs/html/auto/images/logos/apps/songza.png b/docs/html/auto/images/logos/apps/songza.png deleted file mode 100644 index 3bd7107..0000000 --- a/docs/html/auto/images/logos/apps/songza.png +++ /dev/null Binary files differ
diff --git a/docs/html/auto/images/logos/apps/soundcloud.png b/docs/html/auto/images/logos/apps/soundcloud.png deleted file mode 100644 index a5bdbe3..0000000 --- a/docs/html/auto/images/logos/apps/soundcloud.png +++ /dev/null Binary files differ
diff --git a/docs/html/auto/images/logos/apps/spotify.png b/docs/html/auto/images/logos/apps/spotify.png index d039fd3..8b55ff5 100644 --- a/docs/html/auto/images/logos/apps/spotify.png +++ b/docs/html/auto/images/logos/apps/spotify.png Binary files differ
diff --git a/docs/html/auto/images/logos/apps/stitcher.png b/docs/html/auto/images/logos/apps/stitcher.png index b77da12..c05cb3d 100644 --- a/docs/html/auto/images/logos/apps/stitcher.png +++ b/docs/html/auto/images/logos/apps/stitcher.png Binary files differ
diff --git a/docs/html/auto/images/logos/apps/talkray.png b/docs/html/auto/images/logos/apps/talkray.png new file mode 100644 index 0000000..0f170c7 --- /dev/null +++ b/docs/html/auto/images/logos/apps/talkray.png Binary files differ
diff --git a/docs/html/auto/images/logos/apps/textme.png b/docs/html/auto/images/logos/apps/textme.png new file mode 100644 index 0000000..24efb85 --- /dev/null +++ b/docs/html/auto/images/logos/apps/textme.png Binary files differ
diff --git a/docs/html/auto/images/logos/apps/textplus.png b/docs/html/auto/images/logos/apps/textplus.png index 2a640c4..3482181 100644 --- a/docs/html/auto/images/logos/apps/textplus.png +++ b/docs/html/auto/images/logos/apps/textplus.png Binary files differ
diff --git a/docs/html/auto/images/logos/apps/threema.png b/docs/html/auto/images/logos/apps/threema.png new file mode 100644 index 0000000..012cbdc --- /dev/null +++ b/docs/html/auto/images/logos/apps/threema.png Binary files differ
diff --git a/docs/html/auto/images/logos/apps/tunein.png b/docs/html/auto/images/logos/apps/tunein.png index 137ba81..db3b75c 100644 --- a/docs/html/auto/images/logos/apps/tunein.png +++ b/docs/html/auto/images/logos/apps/tunein.png Binary files differ
diff --git a/docs/html/auto/images/logos/apps/umano.png b/docs/html/auto/images/logos/apps/umano.png index 7b59f95..478e268 100644 --- a/docs/html/auto/images/logos/apps/umano.png +++ b/docs/html/auto/images/logos/apps/umano.png Binary files differ
diff --git a/docs/html/auto/images/logos/apps/whatsapp.png b/docs/html/auto/images/logos/apps/whatsapp.png deleted file mode 100644 index fb5866e..0000000 --- a/docs/html/auto/images/logos/apps/whatsapp.png +++ /dev/null Binary files differ
diff --git a/docs/html/auto/images/ui/gearhead_custom_UI.png b/docs/html/auto/images/ui/gearhead_custom_UI.png index 345db12..a3baba4 100644 --- a/docs/html/auto/images/ui/gearhead_custom_UI.png +++ b/docs/html/auto/images/ui/gearhead_custom_UI.png Binary files differ
diff --git a/docs/html/auto/images/ui/gearhead_custom_user_actions.png b/docs/html/auto/images/ui/gearhead_custom_user_actions.png index 6cc0dcb..8e65ee04 100644 --- a/docs/html/auto/images/ui/gearhead_custom_user_actions.png +++ b/docs/html/auto/images/ui/gearhead_custom_user_actions.png Binary files differ
diff --git a/docs/html/auto/images/ui/gearhead_day.png b/docs/html/auto/images/ui/gearhead_day.png index 81ead75..a3baba4 100644 --- a/docs/html/auto/images/ui/gearhead_day.png +++ b/docs/html/auto/images/ui/gearhead_day.png Binary files differ
diff --git a/docs/html/auto/images/ui/gearhead_drawer_generic.png b/docs/html/auto/images/ui/gearhead_drawer_generic.png index d203aed..94dd305 100644 --- a/docs/html/auto/images/ui/gearhead_drawer_generic.png +++ b/docs/html/auto/images/ui/gearhead_drawer_generic.png Binary files differ
diff --git a/docs/html/auto/images/ui/gearhead_drawers_customized.png b/docs/html/auto/images/ui/gearhead_drawers_customized.png index 44915b5..fe74a49 100644 --- a/docs/html/auto/images/ui/gearhead_drawers_customized.png +++ b/docs/html/auto/images/ui/gearhead_drawers_customized.png Binary files differ
diff --git a/docs/html/auto/images/ui/gearhead_generic_UI.png b/docs/html/auto/images/ui/gearhead_generic_UI.png index beb0701..d7cd53d 100644 --- a/docs/html/auto/images/ui/gearhead_generic_UI.png +++ b/docs/html/auto/images/ui/gearhead_generic_UI.png Binary files differ
diff --git a/docs/html/auto/images/ui/gearhead_lens_switching.png b/docs/html/auto/images/ui/gearhead_lens_switching.png index 9dbfe6c..9fb8b65 100644 --- a/docs/html/auto/images/ui/gearhead_lens_switching.png +++ b/docs/html/auto/images/ui/gearhead_lens_switching.png Binary files differ
diff --git a/docs/html/auto/images/ui/gearhead_night.png b/docs/html/auto/images/ui/gearhead_night.png index 3f8c593..8f1ecdd 100644 --- a/docs/html/auto/images/ui/gearhead_night.png +++ b/docs/html/auto/images/ui/gearhead_night.png Binary files differ
diff --git a/docs/html/auto/images/ui/gearhead_overview.png b/docs/html/auto/images/ui/gearhead_overview.png index 4332ddf3..00b35ce 100644 --- a/docs/html/auto/images/ui/gearhead_overview.png +++ b/docs/html/auto/images/ui/gearhead_overview.png Binary files differ
diff --git a/docs/html/auto/index.jd b/docs/html/auto/index.jd index d113a7d..6d5d594 100644 --- a/docs/html/auto/index.jd +++ b/docs/html/auto/index.jd
@@ -238,74 +238,72 @@ width="120" height="120" class="img-logo" style="margin-top:30px" /> </div> <div class="col-4"> - <img src="{@docRoot}auto/images/logos/apps/mlb.png" - width="160" height="160" class="img-logo" /> + <img src="{@docRoot}auto/images/logos/apps/tunein.png" + width="160" height="160" class="img-logo" + /> </div> </div> <div class="cols"> <div class="col-4"> - <img src="{@docRoot}auto/images/logos/apps/pandora.png" - width="160" height="160" class="img-logo" /> + <img src="{@docRoot}auto/images/logos/apps/talkray.png" + width="120" height="44" class="img-logo" style="margin-top:40px" + /> </div> <div class="col-4"> - <img src="{@docRoot}auto/images/logos/apps/pocketcasts.png" - width="160" height="160" class="img-logo" /> + <img src="{@docRoot}auto/images/logos/apps/icq.png" + width="150" height="53" class="img-logo" style="margin-top:40px" + /> </div> <div class="col-4"> - <img src="{@docRoot}auto/images/logos/apps/songza.png" - width="160" height="160" class="img-logo" /> + <img src="{@docRoot}auto/images/logos/apps/stitcher.png" + width="160" height="160" class="img-logo" style="margin-top:-20px" + /> </div> <div class="col-4"> - <img src="/auto/images/logos/apps/soundcloud.png" - width="100" height="100" class="img-logo" - style="margin-top:30px" /> + <img src="/auto/images/logos/apps/pocketcasts.png" + width="160" height="160" class="img-logo" style="margin-top:-10px" + /> </div> </div> <div class="cols"> <div class="col-4"> + <img src="/auto/images/logos/apps/threema.png" + width="100" height="91" class="img-logo" style="margin-top:30px" + /> + </div> + <div class="col-4"> + <img src="{@docRoot}auto/images/logos/apps/umano.png" + width="160" height="160" class="img-logo" /> + </div> + <div class="col-4"> <img src="/auto/images/logos/apps/spotify.png" width="160" height="160" class="img-logo" /> </div> <div class="col-4"> - <img src="{@docRoot}auto/images/logos/apps/stitcher.png" - width="160" height="160" class="img-logo" /> - </div> - <div class="col-4"> - <img src="/auto/images/logos/apps/TextMe.png" - width="100" height="100" class="img-logo" style="margin-top:30px" /> - </div> - <div class="col-4"> <img src="/auto/images/logos/apps/textplus.png" - width="120" height="24" class="img-logo" style="margin-top:70px" /> + width="120" height="24" class="img-logo" style="margin-top:60px" + /> </div> </div> <div class="cols"> <div class="col-4"> - <img src="{@docRoot}auto/images/logos/apps/tunein.png" - width="160" height="160" class="img-logo" style="margin-left:160px" /> + <img src="{@docRoot}auto/images/logos/apps/contacts.png" + width="160" height="160" class="img-logo" style="margin-left:140px" + /> </div> <div class="col-4"> - <img src="{@docRoot}auto/images/logos/apps/umano.png" - width="160" height="160" class="img-logo" style="margin-left:370px" /> + <img src="{@docRoot}auto/images/logos/apps/skype.png" + width="160" height="70" class="img-logo" style="margin-top:40px; margin-left:160px" + /> </div> - </div> - - <div class="cols" style="margin-top:40px"> - <div class="col-4"> - <img src="/auto/images/logos/apps/whatsapp.png" - width="120" height="120" class="img-logo" /> - </div> - <div class="col-8"> - <p><em> - "We were able to get messaging functionality for text - implemented easily on Android Auto, with minimal development - effort. We're excited to participate in Android Auto which - provides a notification interface for the car that is both - user-friendly and highly safety-minded."</em></p> - </div> + <div class="col-4"> + <img src="{@docRoot}auto/images/logos/apps/textme.png" + width="80" height="80" class="img-logo" style="margin-top:30px;margin-left:200px" + /> + </div> </div> <div class="cols" style="margin-top:60px">
