summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kevin Hufnagle <khufnagle@google.com> 2016-09-26 23:11:20 +0000
committer android-build-merger <android-build-merger@google.com> 2016-09-26 23:11:20 +0000
commit6ecc62010a3d3b0e02822849270d2983158bc76c (patch)
tree9aa4461ece333f8ea4e7c0c59c12588084d396fa
parentb065cbe3564728ffe6b597cfe245cb1a7ec145d5 (diff)
parent3b63a38d3666b2abd668e10cefd2d537c0b93667 (diff)
docs: Updated Android logo on "Brand Guidelines" page
am: 3b63a38d36 Change-Id: I244f4fb1860970f7a45aaf9b59a0b767dcb42df0
-rw-r--r--docs/html/distribute/tools/promote/brand.jd4
-rw-r--r--docs/html/images/brand/android_logo_no.pngbin7115 -> 11992 bytes
-rw-r--r--docs/html/images/brand/android_logo_no_2x.pngbin0 -> 25336 bytes
-rw-r--r--docs/image_sources/brand/android_logo_no.graffle/data.plistbin0 -> 1983 bytes
-rw-r--r--docs/image_sources/brand/android_logo_no.graffle/image1.jpgbin0 -> 315345 bytes
5 files changed, 3 insertions, 1 deletions
diff --git a/docs/html/distribute/tools/promote/brand.jd b/docs/html/distribute/tools/promote/brand.jd
index eb3d9fb947d3..ba2bed7d7059 100644
--- a/docs/html/distribute/tools/promote/brand.jd
+++ b/docs/html/distribute/tools/promote/brand.jd
@@ -101,7 +101,9 @@ used according to terms described in the Creative Commons 3.0 Attribution Licens
<h4 style="clear:right">Android logo</h4>
<div style="float:right;width:210px;margin-left:30px;margin-top:-10px">
- <img alt="" src="{@docRoot}images/brand/android_logo_no.png">
+ <img alt="" src="{@docRoot}images/brand/android_logo_no.png"
+ srcset="{@docRoot}images/brand/android_logo_no.png 1x,
+ {@docRoot}images/brand/android_logo_no_2x.png 2x">
</div>
<p>The Android logo may not be used.</p>
diff --git a/docs/html/images/brand/android_logo_no.png b/docs/html/images/brand/android_logo_no.png
index 8de22d87d9a2..946bc49a4c78 100644
--- a/docs/html/images/brand/android_logo_no.png
+++ b/docs/html/images/brand/android_logo_no.png
Binary files differ
diff --git a/docs/html/images/brand/android_logo_no_2x.png b/docs/html/images/brand/android_logo_no_2x.png
new file mode 100644
index 000000000000..8434c795ab79
--- /dev/null
+++ b/docs/html/images/brand/android_logo_no_2x.png
Binary files differ
diff --git a/docs/image_sources/brand/android_logo_no.graffle/data.plist b/docs/image_sources/brand/android_logo_no.graffle/data.plist
new file mode 100644
index 000000000000..1132a5977241
--- /dev/null
+++ b/docs/image_sources/brand/android_logo_no.graffle/data.plist
Binary files differ
diff --git a/docs/image_sources/brand/android_logo_no.graffle/image1.jpg b/docs/image_sources/brand/android_logo_no.graffle/image1.jpg
new file mode 100644
index 000000000000..ff2959958de4
--- /dev/null
+++ b/docs/image_sources/brand/android_logo_no.graffle/image1.jpg
Binary files differ