diff --git a/docs/html/legal.jd b/docs/html/legal.jd index c6143daa537a3..5ee6b5c314952 100644 --- a/docs/html/legal.jd +++ b/docs/html/legal.jd @@ -4,9 +4,9 @@ fullpage=1 @jd:body
- +

Legal Notice

- +

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.

@@ -107,7 +107,7 @@ must agree to the terms of a legal agreement between you and Google. Registratio

Android Cloud to Device Messaging Terms of Service

- +
Android Backup Service
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.

-
\ No newline at end of file + + +
+ +
diff --git a/docs/html/preview/tv/adt-1/index.jd b/docs/html/tv/adt-1/index.jd similarity index 95% rename from docs/html/preview/tv/adt-1/index.jd rename to docs/html/tv/adt-1/index.jd index b37a55a1e6ef2..82760ed5b359a 100644 --- a/docs/html/preview/tv/adt-1/index.jd +++ b/docs/html/tv/adt-1/index.jd @@ -1,8 +1,14 @@ page.title=ADT-1 Developer Kit page.tags="emote","e-mote","adt" +fullpage=1 @jd:body + +
+ +

ADT-1 Developer Kit

+

In this document

@@ -29,9 +35,9 @@ Android TV platform.

Note: The ADT-1 kit is not required 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 - Get Started guide for TV apps. + Get Started guide for TV apps.

ADT-1 Frequently Asked Questions

@@ -280,7 +286,7 @@ $ adb connect <ip-address-for-adt-1>:4321

Android TV Remote Control App

-Android TV Remote Screenshots +Android TV Remote Screenshots

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:

  • Regulatory Disclosures
  • Important Safety Information
  • + +
    + +
    + +
    diff --git a/docs/html/preview/tv/adt-1/regulatory.jd b/docs/html/tv/adt-1/regulatory.jd similarity index 94% rename from docs/html/preview/tv/adt-1/regulatory.jd rename to docs/html/tv/adt-1/regulatory.jd index 2f5bf7e6f6625..f92ce3e003c46 100644 --- a/docs/html/preview/tv/adt-1/regulatory.jd +++ b/docs/html/tv/adt-1/regulatory.jd @@ -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 +
    + +

    Regulatory Disclosures for ADT-1

    +

    Disclosures for the ADT-1 device.

    @@ -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.

    + +
    + +
    + +
    diff --git a/docs/html/preview/tv/adt-1/safety.jd b/docs/html/tv/adt-1/safety.jd similarity index 95% rename from docs/html/preview/tv/adt-1/safety.jd rename to docs/html/tv/adt-1/safety.jd index 1984853063361..79a97362a076a 100644 --- a/docs/html/preview/tv/adt-1/safety.jd +++ b/docs/html/tv/adt-1/safety.jd @@ -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 +
    + +

    Important Safety Instructions for ADT-1

    +

    Safety information for the ADT-1 device.

    @@ -138,3 +141,10 @@ parent.link=index.html

    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.

    + + +
    + +
    + +
    diff --git a/docs/html/preview/tv/images/android-tv-remote.png b/docs/html/tv/images/android-tv-remote.png similarity index 100% rename from docs/html/preview/tv/images/android-tv-remote.png rename to docs/html/tv/images/android-tv-remote.png diff --git a/docs/html/tv/images/atv-framed.png b/docs/html/tv/images/atv-framed.png index 4cedab2ca1eba..bec27e858dd0f 100644 Binary files a/docs/html/tv/images/atv-framed.png and b/docs/html/tv/images/atv-framed.png differ diff --git a/docs/html/tv/index.jd b/docs/html/tv/index.jd index ff70977132901..71e177bade472 100644 --- a/docs/html/tv/index.jd +++ b/docs/html/tv/index.jd @@ -36,7 +36,7 @@ page.type=about
    - Get Started @@ -73,7 +73,7 @@ page.type=about effort.

    - Learn about design for TV + Learn about design for TV

    @@ -104,7 +104,7 @@ page.type=about catalogs.

    - Learn pre-built fragments + Learn pre-built fragments

    @@ -117,7 +117,7 @@ page.type=about Help users find your content quickly with in-app searching.

    - Learn about app search + Learn about app search

    @@ -130,7 +130,7 @@ page.type=about Suggest content from your app to keep your users coming back.

    - Learn about + Learn about recommendations

    @@ -141,78 +141,106 @@ page.type=about -
    + +
    Get Started with Android TV
    -
    -

    Begin building TV apps right away using these developer resources:

    + +
    +

    + Set up your development environment to build apps for TV. + Start creating your big-screen experience! +

    -
    -
    -
    -

    L Developer Preview

    -

    - Get all the tools you need to build and test TV apps. Download the preview and - start creating your big-screen experience. -

    - -
    - -
    -

    ADT-1 Developer Kit

    -

    - Request an ADT-1 Developer Kit, a compact and powerful - streaming media player and gamepad, ideal for developing and testing apps for TV. -

    - -
    - -
    + + Get Started +
    - - -
    +
    +
    +
    +
    + +
    + + + +
    +

    Blog Post

    +

    + Read more about Android TV development + on our blog. Just search for "Android TV". +

    +

    + Android + Developers Blog +

    +

    +
    +
    + +
    + + +Android Wear Developers + +
    +

    G+ Community

    +

    + Follow us on Google+ to stay up-to-date with Android TV development and to + join the discussion! +

    +

    + +Android TV Developers +

    +
    +
    + +
    + + + +
    +

    ADT-1 Kit

    +

    + Get information about the streaming media player + for developing and testing apps for TV. +

    +

    + ADT-1 Development + Kit +

    +
    +
    + +
    +
    +
    +
    +
    -