summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Luan Nguyen <luann@google.com> 2015-05-27 18:22:38 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-05-27 18:22:39 +0000
commit27ce77acfda17b04d14e70d5f30c160f72ad8733 (patch)
tree17ca47827ab9138e94935a117383429f717c022f
parentf0560097eef030d3bf65132c974dbc2f6b1cb681 (diff)
parent16944016823f711e10f82fb22064ec0099ebf97c (diff)
Merge "docs: Update instructions to download samples in Android Studio." into mnc-preview-docs
-rw-r--r--docs/html/preview/samples.jd27
1 files changed, 8 insertions, 19 deletions
diff --git a/docs/html/preview/samples.jd b/docs/html/preview/samples.jd
index 21d421544ee2..4a4554fdcd64 100644
--- a/docs/html/preview/samples.jd
+++ b/docs/html/preview/samples.jd
@@ -3,8 +3,8 @@ page.image=images/cards/samples-new_2x.png
@jd:body
<p>
- The following code samples are provided for the M Developer Preview. You can download them in the
- Android SDK Manager under the <b>SDK Samples</b> component for the M Developer Preview.
+ The following code samples are provided for the M Developer Preview. To download
+ the samples in Android Studio, select the <b>File > Import Samples</b> menu option.
</p>
<img src="{@docRoot}images/cards/card-google-cloud-messaging_16-9_2x" class="figure">
@@ -24,13 +24,13 @@ page.image=images/cards/samples-new_2x.png
<p><a href="https://github.com/googlesamples/android-RuntimePermissions">Get it on GitHub</a></p>
-<h3 id="ConfirmCredentials">Confirm Device Credentials</h3>
+<h3 id="ConfirmCredentials">Confirm Credentials</h3>
<p>
This sample demonstrates how to use device credentials as an authentication method in your app.
</p>
-<p><a href="https://github.com/googlesamples/android-ConfirmDeviceCredentials">Get it on
+<p><a href="https://github.com/googlesamples/android-ConfirmCredentials">Get it on
GitHub</a></p>
<h3 id="FingerprintDialog">Fingerprint Dialog</h3>
@@ -42,14 +42,14 @@ GitHub</a></p>
<p><a href="https://github.com/googlesamples/android-FingerprintDialog">Get it on GitHub</a></p>
-<h3 id="AutomaticBackup">Automatic Backup</h3>
+<h3 id="AutomaticBackup">Auto Backup for Apps</h3>
<p>
Android M introduces automatic backup for app settings. This sample demonstrates how to add
filtering rules to an app in order to manage settings backup.
</p>
-<p><a href="https://github.com/googlesamples/android-AutomaticBackup">Get it on GitHub</a></p>
+<p><a href="https://github.com/googlesamples/android-AutoBackupForApps">Get it on GitHub</a></p>
<h3 id="VoiceCamera">Voice Camera</h3>
@@ -69,7 +69,7 @@ GitHub</a></p>
<p><a href="https://github.com/googlesamples/android-Camera2Raw">Get it on GitHub</a></p>
-<h3 id="ActiveNotification">Active Notification</h3>
+<h3 id="ActiveNotification">Active Notifications</h3>
<p>
This sample demonstrates how the
@@ -77,15 +77,4 @@ GitHub</a></p>
can tell you how many notifications your app is currently showing.
</p>
-<p><a href="https://github.com/googlesamples/android-ActiveNotification">Get it on GitHub</a></p>
-
-<h3 id="VoiceSynthesizer">Voice Synthesizer</h3>
-
-<p>
- This sample demonstrates how to use the <code>NativeAudio</code> APIs to demonstrate low-latency
- audio processing.
-</p>
-
-<p><a href="https://github.com/googlesamples/android-VoiceSynthesizer">Get it on GitHub</a></p>
-
-
+<p><a href="https://github.com/googlesamples/android-ActiveNotifications">Get it on GitHub</a></p>