summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2014-01-16 00:23:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-16 00:23:24 +0000
commit2c5dc97a7b444fad5344565ae6efaa09cd25b801 (patch)
tree124062eb88c7b16655964cb5605e31d8b3683273
parent39b41f32b4a8c2ef8b6d0cd6c9f203c42e5afe3f (diff)
parente913f18c5a7088ef69e5f87f75938d3cea2fd337 (diff)
downloadframeworks_base-2c5dc97a7b444fad5344565ae6efaa09cd25b801.zip
frameworks_base-2c5dc97a7b444fad5344565ae6efaa09cd25b801.tar.gz
frameworks_base-2c5dc97a7b444fad5344565ae6efaa09cd25b801.tar.bz2
am e913f18c: am 26f9d980: am 7be6af67: am d7a50a62: am 57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs
* commit 'e913f18c5a7088ef69e5f87f75938d3cea2fd337': Doc change: add Drive API feature page. fix link text on several pages
-rw-r--r--docs/html/google/google_toc.cs5
-rw-r--r--docs/html/google/play-services/ads.jd4
-rw-r--r--docs/html/google/play-services/drive.jd147
-rw-r--r--docs/html/google/play-services/games.jd4
-rw-r--r--docs/html/google/play-services/id.jd4
-rw-r--r--docs/html/google/play-services/maps.jd4
-rw-r--r--docs/html/google/play-services/plus.jd4
-rw-r--r--docs/html/google/play-services/wallet.jd4
-rw-r--r--docs/html/images/google/gps-drive.pngbin0 -> 74765 bytes
9 files changed, 164 insertions, 12 deletions
diff --git a/docs/html/google/google_toc.cs b/docs/html/google/google_toc.cs
index 2ded286..c57cf97 100644
--- a/docs/html/google/google_toc.cs
+++ b/docs/html/google/google_toc.cs
@@ -41,6 +41,11 @@
</a></div>
</li>
<li class="nav-section">
+ <div class="nav-section-header empty"><a href="<?cs var:toroot?>google/play-services/drive.html">
+ <span class="en">Drive</span>
+ </a></div>
+ </li>
+ <li class="nav-section">
<div class="nav-section-header"><a href="<?cs var:toroot ?>google/play-services/ads.html">
<span class="en">Ads</span></a>
</div>
diff --git a/docs/html/google/play-services/ads.jd b/docs/html/google/play-services/ads.jd
index a01fa4d..ed346c6 100644
--- a/docs/html/google/play-services/ads.jd
+++ b/docs/html/google/play-services/ads.jd
@@ -65,8 +65,8 @@ header.hide=1
<h3 style="clear:left">Getting Started</h3>
<h4>1. Get the Google Play services SDK</h4>
<p>The Google Mobile Ads APIs are part of the Google Play services platform.</p>
- <p>To get started, <a href="{@docRoot}google/play-services/setup.html">set up</a>
- the Google Play services SDK.</p>
+ <p>To get started, <a href="{@docRoot}google/play-services/setup.html">set up
+ the Google Play services SDK</a>.</p>
<h4>2. Run the sample</h4>
<p>Once you've installed the Google Play services package, the Google Mobile Ads sample is located
diff --git a/docs/html/google/play-services/drive.jd b/docs/html/google/play-services/drive.jd
new file mode 100644
index 0000000..239b652
--- /dev/null
+++ b/docs/html/google/play-services/drive.jd
@@ -0,0 +1,147 @@
+page.title=Google Drive Android API
+page.tags="storage","files","cloud"
+header.hide=1
+
+@jd:body
+
+ <div class="landing-banner">
+ <div class="col-6">
+ <img src="{@docRoot}images/google/gps-drive.png" alt="">
+ </div>
+
+ <div class="col-6">
+ <h1 itemprop="name" style="margin-bottom:0;">
+ Google Drive Android API
+ </h1>
+
+ <p itemprop="description">
+ Give your users access to their files, wherever they are, on any device.
+ The Google Drive Android API makes it easier than ever to use Drive to
+ store and sync user’s files between their mobile devices and the cloud.
+ Simply use Drive like local file storage and the API will handle the
+ syncing for you.
+ </p>
+
+ <p>
+ Explore the <a href=
+ "{@docRoot}reference/com/google/android/gms/drive/package-summary.html">Google
+ Drive Android API reference</a> or visit <a href=
+ "http://developers.google.com/drive/android">developers.google.com/drive/android</a>
+ for more information about integrating Google Drive into your app.
+ </p>
+ </div>
+ </div>
+
+ <div class="landing-docs">
+ <div class="col-6 normal-links">
+ <h3 style="clear:left">
+ Key Developer Features
+ </h3>
+
+ <h4>
+ Automatic syncing
+ </h4>
+
+ <p>
+ The Google Drive Android API uses the local device storage to create,
+ edit, and open files, then syncs them automatically when the device
+ is connected to the Internet. If a user requests a file that isn’t
+ already cached on the device, the Drive service downloads the file
+ the next time the device connects.<br>
+ <a href="http://developers.google.com/drive/android/files" class=
+ "external-link">Open a file</a>
+ </p>
+
+ <h4>
+ User interface components
+ </h4>
+
+ <p>
+ Building your own user interface for selecting or creating files is a
+ thing of the past. The Drive API includes activity builders for two
+ of the most common user activities: opening files and creating
+ files.<br>
+ <a href="http://developers.google.com/drive/android/create-file"
+ class="external-link">Create a file</a>
+ </p>
+
+ <h4>
+ Easily search for files
+ </h4>
+
+ <p>
+ The query builder allows you to easily construct a query by joining
+ together multiple parameters and filtering based on metadata. This
+ allows you to easily display only relevant files, such as files
+ shared with the user or files with a specific MIME type.<br>
+ <a class="external-link" href=
+ "http://developers.google.com/drive/android/queries">Query for a
+ file</a>
+ </p>
+ </div>
+
+ <div class="col-6 normal-links">
+ <h3 style="clear:left">
+ Getting Started
+ </h3>
+
+ <h4>
+ 1. Get the Google Play services SDK
+ </h4>
+
+ <p>
+ The Google Drive Android API is part of the Google Play services
+ platform.
+ </p>
+
+ <p>
+ To get started, <a href=
+ "{@docRoot}google/play-services/setup.html">set up the Google Play
+ services SDK</a>.
+ </p>
+
+ <h4>
+ 2. Run the sample
+ </h4>
+
+ <p>
+ Once you’ve set up the Google Play services SDK, you can run the
+ Google Drive sample located in
+ <code>&lt;android-sdk&gt;/extras/google-play-services/samples/drive</code>.
+ However, before you can run the sample, you need to register your app
+ in the Google Developers Console.
+ </p>
+
+ <p>
+ See <a class="external-link" href=
+ "http://developers.google.com/drive/android/get-started">Getting
+ Started guide</a> to learn how to get up and running with the Google
+ Drive Android API.
+ </p>
+
+ <h4>
+ 3. Read the documentation
+ </h4>
+
+ <p>
+ For quick access while developing your Android apps, the <a href=
+ "{@docRoot}reference/com/google/android/gms/drive/package-summary.html">
+ Google Drive API reference</a> is available here on
+ developer.android.com.
+ </p>
+
+ <p>
+ Detailed documentation for the Google Drive Android API is available
+ with the rest of the Google Drive Platform documentation at <a class=
+ "external-link" href=
+ "https://developers.google.com/drive/android">developers.google.com/drive</a>.
+ </p>
+ <p class="caution">
+ The Google Drive Android API is currently in <strong>developer
+ preview</strong>. Applications compiled using this version of the API will
+ continue to operate on devices using future versions of Google Play services;
+ however, changes to the API are expected in future releases.
+ </p>
+ </div>
+ </div>
+ \ No newline at end of file
diff --git a/docs/html/google/play-services/games.jd b/docs/html/google/play-services/games.jd
index afbce0d..cf97d05 100644
--- a/docs/html/google/play-services/games.jd
+++ b/docs/html/google/play-services/games.jd
@@ -63,8 +63,8 @@ header.hide=1
<h3 style="clear:left">Getting Started</h3>
<h4>1. Get the Google Play services SDK</h4>
<p>Google Play game services is part of the Google Play services platform.</p>
- <p>To use game services, <a href="{@docRoot}google/play-services/setup.html">set up</a>
- the Google Play services SDK. Then, see the <a class="external-link"
+ <p>To use game services, <a href="{@docRoot}google/play-services/setup.html">set up
+ the Google Play services SDK</a>. Then, see the <a class="external-link"
href="https://developers.google.com/games/services/android/quickstart">
Getting Started guide</a> to set up your app.
</p>
diff --git a/docs/html/google/play-services/id.jd b/docs/html/google/play-services/id.jd
index bd302c0..db50c7f 100644
--- a/docs/html/google/play-services/id.jd
+++ b/docs/html/google/play-services/id.jd
@@ -41,8 +41,8 @@ href="{@docRoot}reference/com/google/android/gms/ads/identifier/package-summary.
<h3 style="clear:left">Getting Started</h3>
<h4>1. Get the Google Play services SDK</h4>
<p>The advertising ID APIs are part of the Google Play services platform.</p>
- <p>To get started, <a href="{@docRoot}google/play-services/setup.html">set up</a>
- the Google Play services SDK. </p>
+ <p>To get started, <a href="{@docRoot}google/play-services/setup.html">set up
+ the Google Play services SDK</a>. </p>
<h4>2. Read the docs and example code</h4>
<p>Once you've installed the Google Play services package, review the <a href="#get_started">overview</a>
diff --git a/docs/html/google/play-services/maps.jd b/docs/html/google/play-services/maps.jd
index 246664e..1dd3a72 100644
--- a/docs/html/google/play-services/maps.jd
+++ b/docs/html/google/play-services/maps.jd
@@ -60,8 +60,8 @@ href="https://developers.google.com/maps/documentation/android/">developers.goog
<h3 style="clear:left">Getting Started</h3>
<h4>1. Get the Google Play services SDK</h4>
<p>The Google Maps Android APIs are part of the Google Play services platform.</p>
- <p>To use Google Maps, <a href="{@docRoot}google/play-services/setup.html">set up</a>
- the Google Play services SDK. Then see the <a class="external-link"
+ <p>To use Google Maps, <a href="{@docRoot}google/play-services/setup.html">set up
+ the Google Play services SDK</a>. Then see the <a class="external-link"
href="https://developers.google.com/maps/documentation/android/start#installing_the_google_maps_android_v2_api">
Getting Started guide</a> to get your API key for Maps and set up your app.
</p>
diff --git a/docs/html/google/play-services/plus.jd b/docs/html/google/play-services/plus.jd
index 00b0488..53c2ace 100644
--- a/docs/html/google/play-services/plus.jd
+++ b/docs/html/google/play-services/plus.jd
@@ -61,8 +61,8 @@ information about integrating Google+ into your app.</p>
<h3 style="clear:left">Getting Started</h3>
<h4>1. Get the Google Play services SDK</h4>
<p>The Google+ Android APIs are part of the Google Play services platform.</p>
- <p>To get started, <a href="{@docRoot}google/play-services/setup.html">set up</a>
- the Google Play services SDK.
+ <p>To get started, <a href="{@docRoot}google/play-services/setup.html">set up
+ the Google Play services SDK</a>.
</p>
<h4>2. Run the sample</h4>
diff --git a/docs/html/google/play-services/wallet.jd b/docs/html/google/play-services/wallet.jd
index 9467be1..9f2b4dd 100644
--- a/docs/html/google/play-services/wallet.jd
+++ b/docs/html/google/play-services/wallet.jd
@@ -61,8 +61,8 @@ header.hide=1
<h3 style="clear:left">Getting Started</h3>
<h4>1. Get the Google Play services SDK</h4>
<p>The Google Wallet Android APIs are part of the Google Play services platform.</p>
- <p>To get started, <a href="{@docRoot}google/play-services/setup.html">set up</a>
- the Google Play services SDK. Then see the <a class="external-link"
+ <p>To get started, <a href="{@docRoot}google/play-services/setup.html">set up
+ the Google Play services SDK</a>. Then see the <a class="external-link"
href="https://developers.google.com/commerce/wallet/instant-buy/android/tutorial">tutorial</a>
to learn how to set up your app.
</p>
diff --git a/docs/html/images/google/gps-drive.png b/docs/html/images/google/gps-drive.png
new file mode 100644
index 0000000..d8e2fb56
--- /dev/null
+++ b/docs/html/images/google/gps-drive.png
Binary files differ