Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c49acf02: Merge "docs: Update Android TV home for L announcement" into lmp-dev

Browse Source 
* commit 'c49acf029e65928d07815631a0160fe179458add':
  docs:  Update Android TV home for L announcement
This commit is contained in:
Joe Fernandez
2014-10-17 07:29:00 +00:00
committed by Android Git Automerger
parent 4e5ebb994a c49acf029e
commit be09752318
7 changed files with 137 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
docs/html/legal.jd
View File

@@ -4,9 +4,9 @@ fullpage=1
@jd:body
<div class="wrap" style="width:940px;">
<h1>Legal Notice</h1>
<p>Android is an open platform that's freely available to you as an app developer. You can
immediately download the Android SDK, develop apps, and distribute them to the world without any
registration or fees.</p>
@@ -107,7 +107,7 @@ must agree to the terms of a legal agreement between you and Google. Registratio
<p><a href="https://developers.google.com/android/c2dm/terms">Android Cloud to Device
Messaging Terms of Service</a></p>
</dd>
<dt>Android Backup Service</dt>
<dd>Android Backup Service is integrated with Android's data backup framework to perform data
backup and restore for most devices running Android 2.2 or greater, using Google servers and a
@@ -124,4 +124,8 @@ documented on their respective web sites. </p>
</div>
</div> <!-- end.class.wrap -->
<div class="layout-content-col col-16" style="padding-top:1px">
<!-- layout div, so auto-gen footer sits correctly; do not remove -->
</div>

18
docs/html/preview/tv/adt-1/index.jd → docs/html/tv/adt-1/index.jd
View File

@@ -1,8 +1,14 @@
page.title=ADT-1 Developer Kit
page.tags="emote","e-mote","adt"
fullpage=1
@jd:body
<div class="wrap" style="width:940px;">
<h1>ADT-1 Developer Kit</h1>
<div id="qv-wrapper">
<div id="qv">
<h2>In this document</h2>
@@ -29,9 +35,9 @@ Android TV platform.</p>
<p class="note">
<strong>Note:</strong> The ADT-1 kit <em>is not required</em> for building and testing apps
for Android TV. You can build apps for TV and test them using an emulator for TV devices. The
L Developer Preview includes all the software needed to build TV apps and an emulator for running
Android SDK includes all the software needed to build TV apps and an emulator for running
and testing them. For more information, see the
<a href="{@docRoot}preview/tv/start/index.html">Get Started</a> guide for TV apps.
<a href="{@docRoot}training/tv/start/index.html">Get Started</a> guide for TV apps.
</p>
<h2 id="faq">ADT-1 Frequently Asked Questions</h2>
@@ -280,7 +286,7 @@ $ adb connect &lt;ip-address-for-adt-1&gt;:4321
<h2 id="emote">Android TV Remote Control App</h2>
<div class="figure" style="width:250px;margin-top:0">
<img src="/preview/tv/images/android-tv-remote.png" alt="Android TV Remote Screenshots">
<img src="{@docRoot}tv/images/android-tv-remote.png" alt="Android TV Remote Screenshots">
</div>
<p>A remote control app is available for Android phones and tablets that allows you to interact
@@ -308,3 +314,9 @@ read this information before using the device:</p>
<li><a href="regulatory.html">Regulatory Disclosures</a></li>
<li><a href="safety.html">Important Safety Information</a></li>
</ul>
</div> <!-- end.class.wrap -->
<div class="layout-content-col col-16" style="padding-top:1px">
<!-- layout div, so auto-gen footer sits correctly; do not remove -->
</div>

13
docs/html/preview/tv/adt-1/regulatory.jd → docs/html/tv/adt-1/regulatory.jd
View File

@@ -1,9 +1,12 @@
page.title=Regulatory Disclosures for ADT-1
parent.title=ADT-1 Developer Kit
parent.link=index.html
fullpage=1
@jd:body
<div class="wrap" style="width:940px;">
<h1>Regulatory Disclosures for ADT-1</h1>
<p>Disclosures for the <a href="index.html">ADT-1</a> device.</p>
<p>
@@ -77,3 +80,9 @@ parent.link=index.html
doit être utilisé de sorte que la possibilité d'un contact humain pendant le fonctionnement
normal soit limitée.
</p>
</div> <!-- end.class.wrap -->
<div class="layout-content-col col-16" style="padding-top:1px">
<!-- layout div, so auto-gen footer sits correctly; do not remove -->
</div>

14
docs/html/preview/tv/adt-1/safety.jd → docs/html/tv/adt-1/safety.jd
View File

@@ -1,9 +1,12 @@
page.title=Important Safety Instructions for ADT-1
parent.title=ADT-1 Developer Kit
parent.link=index.html
fullpage=1
@jd:body
<div class="wrap" style="width:940px;">
<h1>Important Safety Instructions for ADT-1</h1>
<p>Safety information for the <a href="index.html">ADT-1</a> device.</p>
<p>
@@ -138,3 +141,10 @@ parent.link=index.html
<p>Le défaut de suivre ces instructions de sécurité pourrait provoquer un feu, un choc
électrique, un dommage à l’Appareil ou à d’autres objets ou des lésions corporelles.</p>
</div> <!-- end.class.wrap -->
<div class="layout-content-col col-16" style="padding-top:1px">
<!-- layout div, so auto-gen footer sits correctly; do not remove -->
</div>

0
docs/html/preview/tv/images/android-tv-remote.png → docs/html/tv/images/android-tv-remote.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 520 KiB

After

Width:  |  Height:  |  Size: 520 KiB

BIN
docs/html/tv/images/atv-framed.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 648 KiB

After

Width:  |  Height:  |  Size: 525 KiB

154
docs/html/tv/index.jd
View File

@@ -36,7 +36,7 @@ page.type=about
</div>
<div class="landing-body">
<a href="{@docRoot}preview/tv/start/index.html" class="landing-button
<a href="{@docRoot}training/tv/index.html" class="landing-button
landing-primary" style="margin-top: 40px;">
Get Started
</a>
@@ -73,7 +73,7 @@ page.type=about
effort.
</p>
<p class="landing-small">
<a href="{@docRoot}preview/tv/design/index.html">Learn about design for TV</a>
<a href="{@docRoot}design/tv/index.html">Learn about design for TV</a>
</p>
</div>
@@ -104,7 +104,7 @@ page.type=about
catalogs.
</p>
<p class="landing-small">
<a href="{@docRoot}preview/tv/ui/browse.html">Learn pre-built fragments</a>
<a href="{@docRoot}training/tv/playback/index.html">Learn pre-built fragments</a>
</p>
</div>
@@ -117,7 +117,7 @@ page.type=about
Help users find your content quickly with in-app searching.
</p>
<p class="landing-small">
<a href="{@docRoot}preview/tv/ui/in-app-search.html">Learn about app search</a>
<a href="{@docRoot}training/tv/discovery/in-app-search.html">Learn about app search</a>
</p>
</div>
@@ -130,7 +130,7 @@ page.type=about
Suggest content from your app to keep your users coming back.
</p>
<p class="landing-small">
<a href="{@docRoot}preview/tv/ui/recommendations.html">Learn about
<a href="{@docRoot}training/tv/discovery/recommendations.html">Learn about
recommendations</a>
</p>
</div>
@@ -141,78 +141,106 @@ page.type=about
</div> <!-- end .wrap -->
</div> <!-- end .landing-section -->
<div class="landing-section landing-red-background" id="start">
<div class="landing-section landing-red-background">
<div class="wrap">
<div class="landing-section-header">
<div class="landing-h1 landing-align-left">Get Started with Android TV</div>
<div class="landing-body">
<p>Begin building TV apps right away using these developer resources:</p>
<div class="landing-subhead landing-subhead-red">
<p>
Set up your development environment to build apps for TV.
Start creating your big-screen experience!
</p>
</div>
</div>
<div class="landing-body">
<div class="landing-breakout cols">
<div class="col-8" style="margin-left: -8px;">
<p style="font-size: 24px;">L Developer Preview</p>
<p>
Get all the tools you need to build and test TV apps. Download the preview and
start creating your big-screen experience.
</p>
</div>
<div class="col-8">
<p style="font-size: 24px;">ADT-1 Developer Kit</p>
<p>
Request an <a href="{@docRoot}preview/tv/adt-1/index.html"
style="color: white;"><u>ADT-1 Developer Kit</u></a>, a compact and powerful
streaming media player and gamepad, ideal for developing and testing apps for TV.
</p>
</div>
</div>
<a href="{@docRoot}training/tv/start/index.html" class="landing-button landing-primary"
style="margin-top: 20px;">
Get Started
</a>
</div>
<div class="landing-body">
<div class="landing-breakout cols">
<div class="col-8">
<a href="{@docRoot}preview/tv/start/index.html" class="landing-button landing-primary">
Get Started
</a>
</div>
<div class="col-8">
<a href="https://support.google.com/googleplay/android-developer/contact/adt_request"
class="landing-button landing-primary">
Request the ADT-1 Developer Kit
</a>
</div>
</div>
</div>
</div> <!-- end .wrap -->
</div> <!-- end .landing-section -->
<div class="landing-section">
<div class="wrap">
<div class="cols">
<div class="landing-body">
<div class="col-3-wide">
<a target="_blank" href="http://android-developers.blogspot.com/2014/06/android-tv-and-google-cast.html">
<img class="landing-social-image" src="{@docRoot}wear/images/blogger.png" alt="">
</a>
<div class="landing-social-copy">
<p>Blog Post</p>
<p class="landing-small">
Read more about Android TV development
on our blog. Just search for "Android TV".
</p>
<p class="landing-small">
<a target="_blank" href="http://android-developers.blogspot.com">Android
Developers Blog</a>
</p>
<p></p>
</div>
</div>
<div class="col-3-wide">
<a target="_blank" href="http://g.co/androidtvdev">
<img class="landing-social-image" src="//www.google.com/images/icons/product/gplus-128.png" alt="+Android Wear Developers">
</a>
<div class="landing-social-copy">
<p>G+ Community</p>
<p class="landing-small">
Follow us on Google+ to stay up-to-date with Android TV development and to
join the discussion!
</p>
<p class="landing-small">
<a target="_blank" href="http://g.co/androidtvdev">+Android TV Developers</a>
</p>
</div>
</div>
<div class="col-3-wide">
<a target="_blank" href="{@docRoot}tv/adt-1/index.html">
<img class="landing-social-image" src="{@docRoot}wear/images/blogger.png" alt="">
</a>
<div class="landing-social-copy">
<p>ADT-1 Kit</p>
<p class="landing-small">
Get information about the streaming media player
for developing and testing apps for TV.
</p>
<p class="landing-small">
<a target="_blank" href="{@docRoot}tv/adt-1/index.html">ADT-1 Development
Kit</a>
</p>
</div>
</div>
</div>
</div>
</div> <!-- end .wrap -->
</div> <!-- end .landing-section -->
</div> <!-- end .landing-rest-of-page -->
<div class="content-footer wrap" itemscope="" itemtype="http://schema.org/SiteNavigationElement"
style="border-top: none;">
<div class="layout-content-col col-16" style="padding-top:4px">
<style>#___plusone_0 {float:right !important;}</style>
<div class="g-plusone" data-size="medium"></div>
</div>
<div class="content-footer wrap" itemscope="" itemtype="http://schema.org/SiteNavigationElement">
<div class="layout-content-col col-16" style="padding-top:4px">
<style>#___plusone_0 {float:right !important;}</style>
<div class="g-plusone" data-size="medium"></div>
</div>
<div id="footer" class="wrap" style="width:940px;position:relative;top:-35px;z-index:-1">
<div id="copyright">
Except as noted, this content is
licensed under <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>. For details and
restrictions, see the <a href="/license.html">Content
License</a>.
</div>
</div>
<div id="footer" class="wrap" style="width:940px;position:relative;top:-35px;z-index:-1">
<div id="copyright">
Except as noted, this content is
licensed under <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>. For details and
restrictions, see the <a href="/license.html">Content
License</a>.
</div>
</div>
</div> <!-- end .landing-hero-container -->