diff options
Diffstat (limited to 'docs/html')
| -rw-r--r-- | docs/html/design/style/iconography.jd | 4 | ||||
| -rw-r--r-- | docs/html/distribute/distribute_toc.cs | 4 | ||||
| -rw-r--r-- | docs/html/distribute/googleplay/promote/badges.jd | 48 | ||||
| -rw-r--r-- | docs/html/distribute/googleplay/promote/brand.jd | 85 | ||||
| -rw-r--r-- | docs/html/guide/appendix/media-formats.jd | 31 | ||||
| -rw-r--r-- | docs/html/guide/faq/security.jd | 4 | ||||
| -rw-r--r-- | docs/html/images/brand/en_app_rgb_wo_45.png | bin | 0 -> 8913 bytes | |||
| -rw-r--r-- | docs/html/images/brand/en_app_rgb_wo_60.png | bin | 0 -> 10486 bytes | |||
| -rw-r--r-- | docs/html/images/brand/en_generic_rgb_wo_45.png | bin | 0 -> 8171 bytes | |||
| -rw-r--r-- | docs/html/images/brand/en_generic_rgb_wo_60.png | bin | 0 -> 9614 bytes |
10 files changed, 86 insertions, 90 deletions
diff --git a/docs/html/design/style/iconography.jd b/docs/html/design/style/iconography.jd index 31274c5..3ba3f71 100644 --- a/docs/html/design/style/iconography.jd +++ b/docs/html/design/style/iconography.jd @@ -109,9 +109,7 @@ files for further customization. </p> <p> - -<a href="{@docRoot}downloads/design/Android_Design_Icons_20120229.zip">Download the Action Bar Icon Pack</a> - +<a href="{@docRoot}downloads/design/Android_Design_Icons_20120814.zip">Download the Action Bar Icon Pack</a> </p> <div class="layout-content-row"> diff --git a/docs/html/distribute/distribute_toc.cs b/docs/html/distribute/distribute_toc.cs index f11e965..76073fb 100644 --- a/docs/html/distribute/distribute_toc.cs +++ b/docs/html/distribute/distribute_toc.cs @@ -72,10 +72,10 @@ <span class="en">Linking to Your Products</a></li> <li><a href="<?cs var:toroot ?>distribute/googleplay/promote/badges.html"> <span class="en">Google Play Badges</a></li> - <li><a href="<?cs var:toroot ?>distribute/googleplay/promote/brand.html"> - <span class="en">Brand Assets and Guidelines</a></li> <li><a href="<?cs var:toroot ?>distribute/promote/device-art.html"> <span class="en">Device Art Generator</a></li> + <li><a href="<?cs var:toroot ?>distribute/googleplay/promote/brand.html"> + <span class="en">Brand Assets and Guidelines</a></li> </ul> </li> diff --git a/docs/html/distribute/googleplay/promote/badges.jd b/docs/html/distribute/googleplay/promote/badges.jd index de12e2a..7b64be3 100644 --- a/docs/html/distribute/googleplay/promote/badges.jd +++ b/docs/html/distribute/googleplay/promote/badges.jd @@ -1,11 +1,20 @@ page.title=Google Play Badges @jd:body -<p>Google Play badges give you an officially branded way of promoting your app to Android users. Use the form below to quickly create badges to link users to your products from web pages, ads, reviews, and more. See <a href="linking.html">Linking to your products</a> for more ways to bring users to your apps.</p> +<p>Google Play badges allow you to promote your app with official branding in your +online ads, promotional materials, or anywhere else you want a link to your app.</p> -<p>Input your app's package or your publisher name, choose the style, size, and language, and click "Build my badge". The form will generate code for an embbeded button that links to your app's product page or a list of your apps. </p> +<p>In the form below, +input your app's package name or publisher name, choose the badge style, +click <em>Build my badge</em>, then paste the HTML into your web content.</p> -<p>Note that you should not modify the Google Play badges after generating them, including colors, size, text, and logo. See <a href="http://www.android.com/branding.html">Android Brand Guidelines</a> for more information.</p> +<p>If you're creating a promotional web page for your app, you should also use the +<a href="{@docRoot}distribute/promote/device-art.html">Device Art Generator</a>, which quickly +wraps your screenshots in real device artwork.</p> + +<p>For guidelines when using the Google Play badge and other brand assets, +see the <a href="{@docRoot}distribute/googleplay/promote/brand.html">Brand Assets and +Guidelines</a>.</p> <style type="text/css"> @@ -34,11 +43,13 @@ div.button-row { } div.button-row input { - vertical-align:120%; + vertical-align:middle; + margin:0 5px 0 0; } #jd-content div.button-row img { margin: 0; + vertical-align:middle; } </style> @@ -46,7 +57,7 @@ div.button-row input { <script type="text/javascript"> // variables for creating 'try it out' demo button -var imagePath = "http://www.android.com/images/brand/" +var imagePath = "http://developer.android.com/images/brand/" var linkStart = "<a href=\"http://play.google.com/store/"; var imageStart = "\">\n" + " <img alt=\""; @@ -167,28 +178,29 @@ $(document).ready(function() { onclick="return clearLabel('publisher','Example, Inc.');">clear</a> <br/><br/> + <div class="button-row"> - <input type="radio" name="buttonStyle" value="get_it_on_play_logo_small" id="ns" checked="checked" /> - <label for="ns"><img src="http://www.android.com/images/brand/get_it_on_play_logo_small.png" -alt="Get it on Google Play (small)" /></label> + <input type="radio" name="buttonStyle" value="en_app_rgb_wo_45" id="ws" checked="checked" /> + <label for="ws"><img src="{@docRoot}images/brand/en_app_rgb_wo_45.png" +alt="Android app on Google Play (small)" /></label> - <input type="radio" name="buttonStyle" value="get_it_on_play_logo_large" id="nm" /> - <label for="nm"><img src="http://www.android.com/images/brand/get_it_on_play_logo_large.png" -alt="Get it on Google Play (large)" /></label> + <input type="radio" name="buttonStyle" value="en_app_rgb_wo_60" id="wm" /> + <label for="wm"><img src="{@docRoot}images/brand/en_app_rgb_wo_60.png" +alt="Android app on Google Play (large)" /></label> </div> <div class="button-row"> - <input type="radio" name="buttonStyle" value="android_app_on_play_logo_small" id="ws" /> - <label for="ws"><img src="http://www.android.com/images/brand/android_app_on_play_logo_small.png" -alt="Android app on Google Play (small)" /></label> + <input type="radio" name="buttonStyle" value="en_generic_rgb_wo_45" id="ns" /> + <label for="ns"><img src="{@docRoot}images/brand/en_generic_rgb_wo_45.png" +alt="Get it on Google Play (small)" /></label> - <input type="radio" name="buttonStyle" value="android_app_on_play_logo_large" id="wm" /> - <label for="wm"><img src="http://www.android.com/images/brand/android_app_on_play_logo_large.png" -alt="Android app on Google Play (large)" /></label> + <input type="radio" name="buttonStyle" value="en_generic_rgb_wo_60" id="nm" /> + <label for="nm"><img src="{@docRoot}images/brand/en_generic_rgb_wo_60.png" +alt="Get it on Google Play (large)" /></label> </div> <input type="button" onclick="return buildButton(this.parentNode)" value="Build my badge" -style="padding:5px" /> +style="padding:10px" /> <br/> </form> diff --git a/docs/html/distribute/googleplay/promote/brand.jd b/docs/html/distribute/googleplay/promote/brand.jd index 76ed619..4051553 100644 --- a/docs/html/distribute/googleplay/promote/brand.jd +++ b/docs/html/distribute/googleplay/promote/brand.jd @@ -88,28 +88,28 @@ any way you want, provided that you follow the guidelines described below.</p> "Android is a trademark of Google Inc."</span> </p> + <h2 id="brand-google_play">Google Play Brand</h2> -<div style="clear:both"> - <div style="float:right;width:50%;padding:1.5em;"> - <p> - <img alt="Google Play logo" src="http://www.android.com/images/brand/google_play_logo_450.png"> - </p> - <p> - <img alt="Get it on Google Play badge, large" src= - "http://www.android.com/images/brand/get_it_on_play_logo_large.png"><br> - Download: <a href="http://www.android.com/images/brand/get_it_on_play_logo_small.png">Small</a> | <a href= - "http://www.android.com/images/brand/get_it_on_play_logo_large.png">Large</a> - </p> - <p> - <img alt="Android App on Google Play badge, large" src= - "http://www.android.com/images/brand/android_app_on_play_logo_large.png"><br> - Download: <a href="http://www.android.com/images/brand/android_app_on_play_logo_small.png">Small</a> | - <a href="http://www.android.com/images/brand/android_app_on_play_large.png">Large</a> - </p> - </div> + <img alt="" src="http://www.android.com/images/brand/google_play_logo_450.png" + style="float:right;"> + + <img alt="Android app on Google Play badge, large" + src="{@docRoot}images/brand/en_app_rgb_wo_60.png" + style="float:right;clear:right;"> + + <img alt="Android app on Google Play badge, small" + src="{@docRoot}images/brand/en_app_rgb_wo_45.png" + style="float:right;margin:0 30px 30px"> + + <img alt="Get it on Google Play badge, large" + src="{@docRoot}images/brand/en_generic_rgb_wo_60.png" + style="float:right;clear:right;"> + + <img alt="Get it on Google Play badge, small" + src="{@docRoot}images/brand/en_generic_rgb_wo_45.png" + style="float:right;margin:0 30px 30px;"> - <div style="width:45%;"> <h4>06/ <em>Get it on Google Play</em> Badge </h4> <p> @@ -118,57 +118,34 @@ any way you want, provided that you follow the guidelines described below.</p> Play. </p> <p> - The logos are available in two sizes: - </p> - <ul> - <li>Large: 60(h) x 172(w)</li> - </li> - <li>Small 45(h) x 129(w) - </li> - </ul> - <p> Guidelines for usage: </p> <ul> - <li>Never separate the phrase “Get it on Google Play” or "Android App on Google Play" - from the Google Play logo, and do not change the color, proportions, spacing or any - other aspect of the logo. + <li>Do not modify the color, proportions, spacing or any other aspect of the badge image. </li> - </ul> - </div> - - <ul> - <li>When used online, the badge logo should be used to direct users to: + <li>When used alongside logos for other application marketplaces, the Google Play logo + should be of equal or greater size.</li> + <li>When used online, the badge should link to either: <ul> - <li>The Google Play landing page: <br /> - <span style="margin-left:1em;">http://play.google.com</span> - </li> - <li>The Google Play Apps landing page: <br /> - <span style="margin-left:1em;">http://play.google.com/store/apps</span> - </li> - <li>A list of products that include your company name, for example, <br /> - <span style="margin-left:1em;">http://play.google.com/store/search?q=<em>yourCompanyName</em></span> - </li> - <li>A list of products published by you, for example,<br /> + <li>A list of products published by you, for example:<br /> <span style="margin-left:1em;">http://play.google.com/store/search?q=<em>publisherName</em></span> </li> - <li>A specific app product details page within Google Play, for example,<br /> + <li>A specific app product details page within Google Play, for example:<br /> <span style="margin-left:1em;">http://play.google.com/store/apps/details?id=<em>packageName</em></span> </li> </ul> </li> - <li>When used alongside logos for other application marketplaces, the Google Play logo - should be of equal or greater size</li> </ul> + + <p>For your convenience, you can use the + <a href="{@docRoot}distribute/googleplay/promote/badges.html">Googe Play badge generator</a> + to create badges that link to your apps on Google Play.</p> - <p>For details on all the ways that you can link to your product details page in Google Play, + <p>For details on all the ways that you can link to your product details page in Google Play, see <a href="{@docRoot}distribute/googleplay/promote/linking.html">Linking to your products</a></p> - <p>For convenience, if you are using the logos online, you can use the - <a href="{@docRoot}distribute/googleplay/promote/badges.html">badge generator</a> - to create the appropriate markup and link to your apps.</p> - <h2>Other Brands</h2> <p>Any other brands or icons depicted on this site are <em>not</em> are the property of their respective owners and usage is reserved. You must seek the developer for appropriate permission to use them.</p> + diff --git a/docs/html/guide/appendix/media-formats.jd b/docs/html/guide/appendix/media-formats.jd index 93e8136..feacdc6 100644 --- a/docs/html/guide/appendix/media-formats.jd +++ b/docs/html/guide/appendix/media-formats.jd @@ -57,7 +57,7 @@ page.title=Android Supported Media Formats <p class="table-caption" id="formats-table"><strong>Table 1.</strong> Core media format and codec support.</p> -<table> +<table style="font-size:12px"> <tbody> <tr> @@ -70,22 +70,22 @@ page.title=Android Supported Media Formats </tr> <tr> -<td rowspan="10">Audio</td> -<td>AAC LC/LTP</td> +<td rowspan="11">Audio</td> +<td>AAC LC</td> <td style="text-align: center;"><big>•</big></td> <td style="text-align: center;"><big>•</big></td> -<td rowspan="3">Mono/Stereo content in any combination of standard bit -rates up to 160 kbps and sampling rates from 8 to 48kHz</td> -<td rowspan="3"> +<td rowspan="2">Support for mono/stereo/5.0/5.1 +content with standard sampling rates from 8 to 48 kHz.</td> +<td rowspan="4"> • 3GPP (.3gp)<br> - • MPEG-4 (.mp4, .m4a)<br> + <nobr>• MPEG-4 (.mp4, .m4a)</nobr><br> • ADTS raw AAC (.aac, decode in Android 3.1+, encode in Android 4.0+, ADIF not supported)<br> • MPEG-TS (.ts, not seekable, Android 3.0+)</td> </tr> <tr> <td>HE-AACv1 (AAC+)</td> -<td> </td> +<td style="text-align: center;"><big>•</big><br><small>(Android 4.1+)</small></td> <td style="text-align: center;"><big>•</big></td> </tr> @@ -93,6 +93,16 @@ rates up to 160 kbps and sampling rates from 8 to 48kHz</td> <td>HE-AACv2 (enhanced AAC+)</td> <td> </td> <td style="text-align: center;"><big>•</big></td> +<td>Support for stereo/5.0/5.1 +content with standard sampling rates from 8 to 48 kHz.</td> +</tr> + +<tr> +<td>AAC ELD (enhanced low delay AAC)</td> +<td style="text-align: center;"><big>•</big><br><small>(Android 4.1+)</small></td> +<td style="text-align: center;"><big>•</big><br><small>(Android 4.1+)</small></td> +<td>Support for mono/stereo content +with standard sampling rates from 16 to 48 kHz</td> </tr> <tr> @@ -160,9 +170,10 @@ no dither applied for 24-bit. <tr> <td>PCM/WAVE</td> -<td> </td> +<td style="text-align: center;"><big>•</big><br><small>(Android 4.1+)</small></td> <td style="text-align: center;"><big>•</big></td> -<td>8- and 16-bit linear PCM (rates up to limit of hardware)</td> +<td>8- and 16-bit linear PCM (rates up to limit of hardware). Sampling +rates for raw PCM recordings at 8000, 16000 and 44100 Hz.</td> <td> WAVE (.wav)</td> </tr> diff --git a/docs/html/guide/faq/security.jd b/docs/html/guide/faq/security.jd index 52ee0d9..a6e07c8 100644 --- a/docs/html/guide/faq/security.jd +++ b/docs/html/guide/faq/security.jd @@ -57,9 +57,7 @@ key</a>.</p> <p>We appreciate researchers practicing responsible disclosure by emailing us with a detailed summary of the issue and keeping the issue confidential while users are at risk. In return, we will make sure to keep the researcher informed -of our progress in issuing a fix and will properly credit the reporter(s) when -we provide the patch. We will always move swiftly to mitigate or fix an -externally-reported flaw and provide updates to users. </p> +of our progress in issuing a fix. </p> <a name="informed" id="informed"></a><h2>How can I stay informed about Android security?</h2> diff --git a/docs/html/images/brand/en_app_rgb_wo_45.png b/docs/html/images/brand/en_app_rgb_wo_45.png Binary files differnew file mode 100644 index 0000000..9891cbb --- /dev/null +++ b/docs/html/images/brand/en_app_rgb_wo_45.png diff --git a/docs/html/images/brand/en_app_rgb_wo_60.png b/docs/html/images/brand/en_app_rgb_wo_60.png Binary files differnew file mode 100644 index 0000000..649e782 --- /dev/null +++ b/docs/html/images/brand/en_app_rgb_wo_60.png diff --git a/docs/html/images/brand/en_generic_rgb_wo_45.png b/docs/html/images/brand/en_generic_rgb_wo_45.png Binary files differnew file mode 100644 index 0000000..73dd393 --- /dev/null +++ b/docs/html/images/brand/en_generic_rgb_wo_45.png diff --git a/docs/html/images/brand/en_generic_rgb_wo_60.png b/docs/html/images/brand/en_generic_rgb_wo_60.png Binary files differnew file mode 100644 index 0000000..9a50aff --- /dev/null +++ b/docs/html/images/brand/en_generic_rgb_wo_60.png |
