am cc0faef0: am 0d15cf0e: am c2239291: Merge "Docs: Adding Branding Guidelines"

* commit 'cc0faef0f686bca5f545ce21608c8b645baa11bd':
  Docs: Adding Branding Guidelines

7 files changed, 144 insertions, 38 deletions

diff --git a/src/images/8100-TM-example.png b/src/images/8100-TM-example.png
new file mode 100644
index 00000000..b347e6cc
--- /dev/null
+++ b/src/images/8100-TM-example.png
diff --git a/src/images/JB-TM-example.png b/src/images/JB-TM-example.png
new file mode 100644
index 00000000..0df3c6d0
--- /dev/null
+++ b/src/images/JB-TM-example.png
diff --git a/src/images/XBrand-TM-example.jpg b/src/images/XBrand-TM-example.jpg
new file mode 100644
index 00000000..8a3ab590
--- /dev/null
+++ b/src/images/XBrand-TM-example.jpg
diff --git a/src/index.jd b/src/index.jd
index ebc200cb..282c1db1 100644
--- a/src/index.jd
+++ b/src/index.jd
@@ -42,6 +42,13 @@ header.hide=1
     <div class="col-8">
     <h3>What's New</h3>
 
+<a href="{@docRoot}source/brands.html">
+        <h4>Brand guidelines published</h4></a>
+        <p>Manufacturers now have their own set of <strong><a
+href="{@docRoot}source/brands.html">guidelines for Android brand use</a></strong>.</p>
+
+<img border="0" src="images/Android_Robot_100.png" alt="Android Partner icon" style="display:inline;float:right;margin:5px 10px">
+
 <a href="{@docRoot}compatibility/downloads.html">
         <h4>Android 4.1 CTS packages updated</h4></a>
         <p>Release 4 of the Android 4.1 Compatibility Test Suite (CTS) and
@@ -56,30 +63,12 @@ href="{@docRoot}source/build-numbers.html#source-code-tags-and-builds">Source
 Code Tags and Builds</a></strong> table on <strong>Codenames, Tags, and Build
 Numbers</strong> for the new builds, tags, and devices supported.</p>
 
-<img border="0" src="images/Android_Robot_100.png" alt="Android Partner icon" style="display:inline;float:right;margin:5px 10px">
-
 <a href="{@docRoot}devices/graphics/architecture.html">
  <h4>Graphics architecture document published</h4></a>
         <p>Android engineering describes the system-level <strong><a
 href="{@docRoot}devices/graphics/architecture.html">Graphics
 Architecture</a></strong> in great detail.</p>
 
-<a href="{@docRoot}source/building.html">
-        <h4>Build information updated and improved</h4></a>
-<p>The recommended version of Java is now 7 and Ubuntu is now 12.04, as noted on <strong><a
-href="{@docRoot}source/building.html">Downloading and Building</a></strong> and <strong><a
-href="{@docRoot}source/initializing.html">Initializing a Build
-Environment</a></strong>. And the subdomain to download Repo is now
-"storage.googleapis.com" on <strong><a
-href="{@docRoot}source/downloading.html">Downloading the
-Source</a></strong>.</p>
-
-	<p>The lists of Android devices and associated builds have been
-reordered and made unique. See <strong><a
-href="{@docRoot}source/build-numbers.html#source-code-tags-and-builds">Source
-Code Tags and Builds</a></strong> and <strong><a
-href="{@docRoot}source/building-devices.html#picking-and-building-the-configuration-that-matches-a-device">Picking
-and building the configuration that matches a device</a></strong>.</p>
     </div>
 
     <div class="col-8">
diff --git a/src/legal.jd b/src/legal.jd
index b15a3b26..f5c22f40 100644
--- a/src/legal.jd
+++ b/src/legal.jd
@@ -1,3 +1,4 @@
+page.title=Legal Notice
 fullpage=true
 landing.page=true
 page.metaDescription=Legal Notice for source.android.com
@@ -36,33 +37,16 @@ header.hide=1
 
 <p>The "Android" name, the <img src="{@docRoot}assets/images/sac_logo.png" alt="Android"
 style="margin:0;padding:0 2px;vertical-align:baseline" /> logo, and
-<a href="http://www.google.com/permissions/">other trademarks</a> are property of Google Inc.
-You may not use the logo or the logo's custom typeface.</p>
+<a href="http://www.google.com/permissions/">other trademarks</a> are property of Google Inc.</p>
 
-<p>You may use the word "Android" in a product name only as a descriptor, such as "for Android"
-and the first instance should be followed by a TM symbol, "for Android&trade;." In other
-messaging, the word "Android" may be used in text as a descriptor, as long as it is followed by a
-proper generic term (for example, "Android&trade; application"). Any use of the Android name
-must include footer attribution in your communications: "Android is a trademark of Google Inc."</p>
-
-<p>The Android Robot logo <img src="http://developer.android.com/images/robot-tiny.png" alt=""
-style="margin:0;padding:0;vertical-align:baseline" /> can be used, reproduced, and modified freely
-in marketing communications. Our standard color value for print is PMS 376C. Our online hex color is
-#A4C639. The Android Robot logo is licensed under the terms of the <a
-href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution</a> license and any
-use of it must be attributed as such.</p>
-
-<p>For more information about Android brands, see the <a
-href="http://developer.android.com/distribute/googleplay/promote/brand.html">Brand Guidelines</a>.</p>
-
-<p>All other trademarks are the property of their respective owners.</p>
+<p>See the <a href="{@docRoot}source/brands.html">Brand Guidelines</a> for additional details.</p>
 
 <h2 id="WebSite">Web Site Content</h2>
 
 <p>We are pleased to license the Android documentation and sample code on this web site under terms
 that encourage you to take, modify, reuse, re-purpose, and remix the content as you see fit. The
 documentation content on this web site is made available to you as part of the <a
-href="http://source.android.com">Android Open Source Project</a>. This documentation, including any
+href="https://android.googlesource.com/">Android Open Source Project</a>. This documentation, including any
 code shown in it, is licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
 2.0 license</a>. All other content on this site, except the license documents themselves and as
 otherwise noted, is licensed under the <a
diff --git a/src/source/brands.jd b/src/source/brands.jd
new file mode 100644
index 00000000..dfb3cb17
--- /dev/null
+++ b/src/source/brands.jd
@@ -0,0 +1,132 @@
+page.title=Brand Guidelines
+@jd:body
+
+<!--
+    Copyright 2014 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<div id="qv-wrapper">
+  <div id="qv">
+    <h2>In this document</h2>
+    <ol id="auto-toc">
+    </ol>
+  </div>
+</div>
+
+<p>The "Android" name, the <img src="{@docRoot}assets/images/sac_logo.png"
+alt="Android" style="margin:0;padding:0 2px;vertical-align:baseline" /> logo,
+the "Google Play" brand and other trademarks are property of Google Inc. and
+thus not part of the assets we make available through the Android Open Source
+Project.</p>
+
+<p>
+If you are interested in using these brands to indicate their association with your
+device, you should adhere to the guidelines on this page. Please note, these
+guidelines correspond to and complement the <a
+href="http://developer.android.com/distribute/tools/promote/brand.html">Brand
+Guidelines for Android App Developers</a> and <a
+href="http://www.google.com/permissions/">Google Brand Permissions</a>.
+</p>
+
+<h2 id="brand-android">Android</h2>
+
+<p>Here are manufacturer guidelines for the Android brand and related
+assets.</p>
+
+  <h3 id="text-android" style="clear:right">Android in text</h3>
+    <ul>
+    <li>Android&trade; should have a trademark symbol the first time it appears in a creative.</li>
+    <li>"Android" should always be capitalized and is never plural or possessive.</li>
+    <li>The use of “Android” on hardware, packaging or marketing materials of a
+        device is restricted to <a
+        href="{@docRoot}compatibility/index.html">Android-compatible</a> devices
+        only.</li>
+    <li>“Android” should never be used in the name of your product or as
+the primary or dominant mark on your packaging or device.</li>
+    <li>"Android” should be used only as a term to refer to the operating
+system (OS) of your device. If you are unsure whether your use meets our
+guidelines, please follow this simple test: If you can replace "Android" with
+"the Android platform" and the text still makes sense, then you may use this
+term.
+      <ul>
+        <li><span style="color:red">Incorrect</span>: "Android XBrand Phone"</li>
+        <li><span style="color:green">Correct</span>: "XBrand phone on Android"</li>
+      </ul>
+    </li>
+   <li>You may use “with Android” in plain black text with your logo.
+If used with your logo, "with Android" should be no larger than 90% of your logo’s size.
+First or most prominent instance of this use should be followed by a
+&trade; symbol.</li>
+    <li>Android may be used <em>only as a descriptor</em>, as long as it is
+followed by a proper generic term. It cannot be framed as the product name or
+brand of your device.
+      <ul>
+        <li><span style="color:red">Incorrect</span>: "Android XBrand Phone"</li>
+        <li><span style="color:green">Correct</span>: "Android mobile device"</li>
+      </ul>
+
+    <p><strong>Any use of the Android name needs to include this attribution in your
+communication</strong>:</p>
+    <blockquote><em>Android is a trademark of Google Inc.</em></blockquote></p>
+
+    <p>Here are acceptable examples:</p>
+<img src="{@docRoot}images/JB-TM-example.png" alt="Jelly Bean trademark example" />
+<img src="{@docRoot}images/8100-TM-example.png" alt="8100 series trademark example" />
+<img src="{@docRoot}images/XBrand-TM-example.jpg" alt="XBrand trademark example" />
+    </li>
+    </ul>
+
+  <div style="float:right;width:200px;margin-left:30px">
+    <img alt="" src="{@docRoot}images/Android_Robot_100.png"
+      style="margin-left:50px">
+    <p style="text-align:center">
+       <a href="http://developer.android.com/images/brand/Android_Robot_100.png">100x118</a> |
+       <a href="http://developer.android.com/images/brand/Android_Robot_200.png">200x237</a><br>
+       <a href="http://developer.android.com/downloads/brand/Android_Robot_outlined.ai">Illustrator (.ai)</a></p>
+  </div>
+
+ <h3 id="robot-android">Android robot</h3>
+
+    <p>The Android robot can be used, reproduced, and modified freely in marketing
+    communications with proper attribution. See the <a
+href="http://developer.android.com/distribute/tools/promote/brand.html">App Developers Brand
+Guidelines</a> and the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons license</a>
+for additional details.</p>
+
+<h3 id="logo-android" style="clear:right">Android logo</h3>
+
+<div style="float:right;width:210px;margin-left:30px;margin-top:-10px">
+  <img alt="No Logo" src="http://developer.android.com/images/brand/android_logo_no.png">
+</div>
+
+<p>Unless expressly authorized by Google through written agreement, the Android
+logo and custom typeface may not be used. Nor can these images be used with the
+Android robot.</p>
+
+<h2 id="brand-google_play">Google Play</h2>
+
+<p>Use of the “Google Play” name and the Google Play Store icon on the
+packaging of the hardware, marketing materials of the hardware, or the hardware
+itself is allowed only on devices <a
+href="{@docRoot}source/faqs.html#if-my-device-is-compatible-does-it-automatically-have-access-to-google-play-and-branding">licensed to access Google Play</a>.</p>
+
+<p>See the <a
+href="https://support.google.com/googleplay/answer/1727131">Supported
+devices</a> list for devices licensed to use Google Play.</p>
+
+<h2 id="Questions">Questions</h2>
+
+<p>For additional brand usage information, please contact our Android Partner
+Marketing team at <a
+href="mailto:android-brand-approvals@google.com">android-brand-approvals@google.com</a>.</p>
diff --git a/src/source/source_toc.cs b/src/source/source_toc.cs
index 175a96ff..f1b54b67 100644
--- a/src/source/source_toc.cs
+++ b/src/source/source_toc.cs
@@ -24,6 +24,7 @@
       <li><a href="<?cs var:toroot ?>source/code-lines.html">Codelines, Branches, and Releases</a></li>
       <li><a href="<?cs var:toroot ?>source/build-numbers.html">Codenames, Tags, and Build Numbers</a></li>
       <li><a href="<?cs var:toroot ?>source/roles.html">Project Roles</a></li>
+      <li><a href="<?cs var:toroot ?>source/brands.html">Brand Guidelines</a></li>
       <li><a href="<?cs var:toroot ?>source/licenses.html">Licenses</a></li>
       <li><a href="<?cs var:toroot ?>source/faqs.html">FAQ</a></li>
     </ul>