commit | e72dca4901f361f9312f355e72a64824811beda9 | [log] [tgz] |
---|---|---|
author | Luan Nguyen <luann@google.com> | Fri Mar 13 00:03:06 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 13 00:03:06 2015 +0000 |
tree | 8fe3349d60fd8559f6778bf6c90baace2ed06541 | |
parent | a80ac05f85962949d5072831200d86a7023575fb [diff] | |
parent | 6c881ec9d588202172c45f3152c15fe0069b0ebb [diff] |
am 6c881ec9: am 872a731e: am a0f20621: am dd7d025b: am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs * commit '6c881ec9d588202172c45f3152c15fe0069b0ebb': Revert "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 7a75f87..34c9fa8 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 655c5bc..d50e06b 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 195315a..7992021 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 aecdb58..a0e75f3 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 a3baba4..f3d2ab8 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 fe74a49..b19a6bb 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 f51d526..380e8da 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 cc65ff3..9889b39 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 new file mode 100644 index 0000000..b96f81a --- /dev/null +++ b/docs/html/auto/images/logos/apps/TextMe.png Binary files differ
diff --git a/docs/html/auto/images/logos/apps/contacts.png b/docs/html/auto/images/logos/apps/contacts.png deleted file mode 100644 index f1e1e30..0000000 --- a/docs/html/auto/images/logos/apps/contacts.png +++ /dev/null Binary files differ
diff --git a/docs/html/auto/images/logos/apps/icq.png b/docs/html/auto/images/logos/apps/icq.png deleted file mode 100644 index 3e14bd4..0000000 --- a/docs/html/auto/images/logos/apps/icq.png +++ /dev/null Binary files differ
diff --git a/docs/html/auto/images/logos/apps/iheartradio.png b/docs/html/auto/images/logos/apps/iheartradio.png index da625df..8feb38d 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 10ba931..8c2897e 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 718b0ee..056ef7e 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 new file mode 100644 index 0000000..ddde4cd --- /dev/null +++ b/docs/html/auto/images/logos/apps/mlb.png Binary files differ
diff --git a/docs/html/auto/images/logos/apps/npr.png b/docs/html/auto/images/logos/apps/npr.png index 33de546..5234201 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 new file mode 100644 index 0000000..13fa1d3 --- /dev/null +++ b/docs/html/auto/images/logos/apps/pandora.png Binary files differ
diff --git a/docs/html/auto/images/logos/apps/pocketcasts.png b/docs/html/auto/images/logos/apps/pocketcasts.png index 44129f1..5227937 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 deleted file mode 100644 index 0012b58..0000000 --- a/docs/html/auto/images/logos/apps/skype.png +++ /dev/null Binary files differ
diff --git a/docs/html/auto/images/logos/apps/songza.png b/docs/html/auto/images/logos/apps/songza.png new file mode 100644 index 0000000..3bd7107 --- /dev/null +++ b/docs/html/auto/images/logos/apps/songza.png Binary files differ
diff --git a/docs/html/auto/images/logos/apps/soundcloud.png b/docs/html/auto/images/logos/apps/soundcloud.png new file mode 100644 index 0000000..a5bdbe3 --- /dev/null +++ b/docs/html/auto/images/logos/apps/soundcloud.png Binary files differ
diff --git a/docs/html/auto/images/logos/apps/spotify.png b/docs/html/auto/images/logos/apps/spotify.png index 8b55ff5..d039fd3 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 c05cb3d..b77da12 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 deleted file mode 100644 index 0f170c7..0000000 --- a/docs/html/auto/images/logos/apps/talkray.png +++ /dev/null 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 24efb85..0000000 --- a/docs/html/auto/images/logos/apps/textme.png +++ /dev/null Binary files differ
diff --git a/docs/html/auto/images/logos/apps/textplus.png b/docs/html/auto/images/logos/apps/textplus.png index 3482181..2a640c4 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 deleted file mode 100644 index 012cbdc..0000000 --- a/docs/html/auto/images/logos/apps/threema.png +++ /dev/null Binary files differ
diff --git a/docs/html/auto/images/logos/apps/tunein.png b/docs/html/auto/images/logos/apps/tunein.png index db3b75c..137ba81 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 478e268..7b59f95 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 new file mode 100644 index 0000000..fb5866e --- /dev/null +++ b/docs/html/auto/images/logos/apps/whatsapp.png 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 a3baba4..345db12 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 8e65ee04..6cc0dcb 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 a3baba4..81ead75 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 94dd305..d203aed 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 fe74a49..44915b5 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 d7cd53d..beb0701 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 9fb8b65..9dbfe6c 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 8f1ecdd..3f8c593 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 00b35ce..4332ddf3 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 6d5d594..d113a7d 100644 --- a/docs/html/auto/index.jd +++ b/docs/html/auto/index.jd
@@ -238,72 +238,74 @@ width="120" height="120" class="img-logo" style="margin-top:30px" /> </div> <div class="col-4"> - <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/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/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/stitcher.png" - width="160" height="160" class="img-logo" style="margin-top:-20px" - /> - </div> - <div class="col-4"> - <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" + <img src="{@docRoot}auto/images/logos/apps/mlb.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" /> + </div> + <div class="col-4"> + <img src="{@docRoot}auto/images/logos/apps/pocketcasts.png" + width="160" height="160" class="img-logo" /> + </div> + <div class="col-4"> + <img src="{@docRoot}auto/images/logos/apps/songza.png" + width="160" height="160" class="img-logo" /> + </div> + <div class="col-4"> + <img src="/auto/images/logos/apps/soundcloud.png" + width="100" height="100" class="img-logo" + style="margin-top:30px" /> + </div> + </div> + + <div class="cols"> <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:60px" - /> + width="120" height="24" class="img-logo" style="margin-top:70px" /> </div> </div> <div class="cols"> <div class="col-4"> - <img src="{@docRoot}auto/images/logos/apps/contacts.png" - width="160" height="160" class="img-logo" style="margin-left:140px" - /> + <img src="{@docRoot}auto/images/logos/apps/tunein.png" + width="160" height="160" class="img-logo" style="margin-left:160px" /> </div> <div class="col-4"> - <img src="{@docRoot}auto/images/logos/apps/skype.png" - width="160" height="70" class="img-logo" style="margin-top:40px; margin-left:160px" - /> + <img src="{@docRoot}auto/images/logos/apps/umano.png" + width="160" height="160" class="img-logo" style="margin-left:370px" /> </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: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> <div class="cols" style="margin-top:60px">