summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuan Nguyen <luann@google.com>2015-05-26 21:30:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-26 21:30:03 +0000
commitf4f455cca4673664780eefeba15b180d32ea0d4f (patch)
tree4b53c2514aaebb2bd2b0a73a99fb5801e979b009
parentc03c11e584abf1e61a902ea441818912f912fda7 (diff)
parentb1cc82b7f32218b3a2e5e88f9e31767d741c4439 (diff)
downloadframeworks_base-f4f455cca4673664780eefeba15b180d32ea0d4f.zip
frameworks_base-f4f455cca4673664780eefeba15b180d32ea0d4f.tar.gz
frameworks_base-f4f455cca4673664780eefeba15b180d32ea0d4f.tar.bz2
am b1cc82b7: Merge "docs: Replace Umano with WhatsApp icon" into lmp-mr1-ub-docs
* commit 'b1cc82b7f32218b3a2e5e88f9e31767d741c4439': docs: Replace Umano with WhatsApp icon
-rw-r--r--docs/html/auto/images/logos/apps/umano.pngbin3980 -> 0 bytes
-rw-r--r--docs/html/auto/images/logos/apps/whatsapp.pngbin0 -> 4752 bytes
-rw-r--r--docs/html/auto/index.jd14
3 files changed, 7 insertions, 7 deletions
diff --git a/docs/html/auto/images/logos/apps/umano.png b/docs/html/auto/images/logos/apps/umano.png
deleted file mode 100644
index 478e268..0000000
--- a/docs/html/auto/images/logos/apps/umano.png
+++ /dev/null
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..a180d7a
--- /dev/null
+++ b/docs/html/auto/images/logos/apps/whatsapp.png
Binary files differ
diff --git a/docs/html/auto/index.jd b/docs/html/auto/index.jd
index 66ea15a..bf36995 100644
--- a/docs/html/auto/index.jd
+++ b/docs/html/auto/index.jd
@@ -272,8 +272,9 @@ page.image=/images/cards/android-auto_2x.png
/>
</div>
<div class="col-4">
- <img src="{@docRoot}auto/images/logos/apps/umano.png"
- width="160" height="160" class="img-logo" />
+ <img src="{@docRoot}auto/images/logos/apps/skype.png"
+ width="160" height="70" class="img-logo" style="margin-top:40px"
+ />
</div>
<div class="col-4">
<img src="/auto/images/logos/apps/spotify.png"
@@ -293,15 +294,14 @@ page.image=/images/cards/android-auto_2x.png
/>
</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"
- />
- </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 class="col-4">
+ <img src="{@docRoot}auto/images/logos/apps/whatsapp.png"
+ width="120" height="120" class="img-logo" style="margin-top:10px;margin-left:180px" />
+ </div>
</div>
<div class="cols" style="margin-top:60px">