summaryrefslogtreecommitdiffstats
path: root/docs/html/resources
diff options
context:
space:
mode:
Diffstat (limited to 'docs/html/resources')
-rw-r--r--docs/html/resources/articles/zipalign.jd2
-rw-r--r--docs/html/resources/resources-data.js36
-rw-r--r--docs/html/resources/samples/images/ActionBarCompat1.pngbin0 -> 19637 bytes
-rw-r--r--docs/html/resources/samples/images/ActionBarCompat2.pngbin0 -> 22271 bytes
-rw-r--r--docs/html/resources/samples/images/WifiDirect.pngbin0 -> 33285 bytes
5 files changed, 34 insertions, 4 deletions
diff --git a/docs/html/resources/articles/zipalign.jd b/docs/html/resources/articles/zipalign.jd
index 9e767aa..d3c68a6 100644
--- a/docs/html/resources/articles/zipalign.jd
+++ b/docs/html/resources/articles/zipalign.jd
@@ -67,7 +67,7 @@ when building in debug mode.</li>
information to sign the packages, since aligning has to happen after signing. In
order to be able to sign packages, and therefore to align them, <em>Ant</em>
needs to know the location of the keystore and the name of the key in
-<code>build.properties</code>. The name of the properties are
+<code>ant.properties</code>. The name of the properties are
<code>key.store</code> and <code>key.alias</code> respectively. If those
properties are present, the signing tool will prompt to enter the store/key
passwords during the build, and the script will sign and then align the apk
diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js
index d7700ee..3e673a5 100644
--- a/docs/html/resources/resources-data.js
+++ b/docs/html/resources/resources-data.js
@@ -408,6 +408,16 @@ var ANDROID_RESOURCES = [
}
},
{
+ tags: ['sample', 'new', 'ui', 'compatibility', 'newfeature'],
+ path: 'samples/ActionBarCompat/index.html',
+ title: {
+ en: 'Action Bar Compatibility'
+ },
+ description: {
+ en: 'Shows how to use the action bar on both pre-API 11 and API 11+ devices, maximizing code re-use.'
+ }
+ },
+ {
tags: ['sample', 'new'],
path: 'samples/AndroidBeam/index.html',
title: {
@@ -568,13 +578,13 @@ var ANDROID_RESOURCES = [
}
},
{
- tags: ['sample', 'media' ],
+ tags: ['sample', 'media', 'updated'],
path: 'samples/RandomMusicPlayer/index.html',
title: {
en: 'Random Music Player'
},
description: {
- en: 'Demonstrates how to write a multimedia application that plays music from the device and from URLs. It manages media playback from a service and can play music in the background, respecting audio focus changes.'
+ en: 'Demonstrates how to write a multimedia application that plays music from the device and from URLs. It manages media playback from a service and can play music in the background, respecting audio focus changes. Also shows how to use the new Remote Control APIs in API level 14.'
}
},
{
@@ -588,6 +598,16 @@ var ANDROID_RESOURCES = [
}
},
{
+ tags: ['sample', 'input', 'new'],
+ path: 'samples/SampleSpellCheckerService/index.html',
+ title: {
+ en: 'Spell Checker'
+ },
+ description: {
+ en: 'An example spell checker service, using the <a href="'+toRoot+'reference/android/service/textservice/SpellCheckerService.html"><code>SpellCheckerservice</code></a>.'
+ }
+ },
+ {
tags: ['sample', 'accountsync'],
path: 'samples/SampleSyncAdapter/index.html',
title: {
@@ -701,13 +721,23 @@ var ANDROID_RESOURCES = [
tags: ['sample', 'data', 'new'],
path: 'samples/VoicemailProviderDemo/index.html',
title: {
- en: 'Voicemail Provider Demo'
+ en: 'Voicemail Provider'
},
description: {
en: 'A sample application to demonstrate how to use voicemail content provider APIs in Android 4.0.'
}
},
{
+ tags: ['sample','newfeature', 'new'],
+ path: 'samples/WiFiDirectDemo/index.html',
+ title: {
+ en: 'Wi-Fi Direct Demo'
+ },
+ description: {
+ en: 'A demo application to demonstrate how to use Wi-Fi Direct APIs.'
+ }
+ },
+ {
tags: ['sample', 'ui', 'widgets'],
path: 'samples/Wiktionary/index.html',
title: {
diff --git a/docs/html/resources/samples/images/ActionBarCompat1.png b/docs/html/resources/samples/images/ActionBarCompat1.png
new file mode 100644
index 0000000..64d3e66
--- /dev/null
+++ b/docs/html/resources/samples/images/ActionBarCompat1.png
Binary files differ
diff --git a/docs/html/resources/samples/images/ActionBarCompat2.png b/docs/html/resources/samples/images/ActionBarCompat2.png
new file mode 100644
index 0000000..04a7e6c
--- /dev/null
+++ b/docs/html/resources/samples/images/ActionBarCompat2.png
Binary files differ
diff --git a/docs/html/resources/samples/images/WifiDirect.png b/docs/html/resources/samples/images/WifiDirect.png
new file mode 100644
index 0000000..86f7f2f
--- /dev/null
+++ b/docs/html/resources/samples/images/WifiDirect.png
Binary files differ