summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsatok <satok@google.com>2011-10-20 08:42:50 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-20 08:42:50 -0700
commit1301f092e5bd520821c54c788a07cbdfda49df7b (patch)
tree49be5f95e4d250decb5217139dd1c010ca73cfea
parent9397f5807b5377c5edef99820614694cc7e05160 (diff)
parent44619d3e087138775fb19fbd5d7b9f497a0805f4 (diff)
downloadframeworks_base-1301f092e5bd520821c54c788a07cbdfda49df7b.zip
frameworks_base-1301f092e5bd520821c54c788a07cbdfda49df7b.tar.gz
frameworks_base-1301f092e5bd520821c54c788a07cbdfda49df7b.tar.bz2
Merge "Update links for SampleSpellCheckerService for I938ba499" into ics-mr0
-rw-r--r--Android.mk4
-rw-r--r--core/java/android/service/textservice/package.html2
-rw-r--r--docs/html/resources/resources-data.js2
-rw-r--r--docs/html/sdk/android-4.0.jd4
4 files changed, 6 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk
index f41130b..07380bc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -434,8 +434,8 @@ web_docs_sample_code_flags := \
resources/samples/NFCDemo "NFC Demo" \
-samplecode $(sample_dir)/NotePad \
resources/samples/NotePad "Note Pad" \
- -samplecode $(sample_dir)/SampleSpellCheckerService \
- resources/samples/SampleSpellCheckerService "Spell Checker" \
+ -samplecode $(sample_dir)/SpellChecker/SampleSpellCheckerService \
+ resources/samples/SpellChecker/SampleSpellCheckerService "Spell Checker" \
-samplecode $(sample_dir)/SampleSyncAdapter \
resources/samples/SampleSyncAdapter "Sample Sync Adapter" \
-samplecode $(sample_dir)/RandomMusicPlayer \
diff --git a/core/java/android/service/textservice/package.html b/core/java/android/service/textservice/package.html
index 89c6dbc..b498719 100644
--- a/core/java/android/service/textservice/package.html
+++ b/core/java/android/service/textservice/package.html
@@ -32,7 +32,7 @@ checker. For example:</p>
</pre>
<p>For example code, see the <a
-href="{@docRoot}resources/samples/SampleSpellCheckerService/index.html">Spell
+href="{@docRoot}resources/samples/SpellChecker/SampleSpellCheckerService/index.html">Spell
Checker</a> sample app.</p>
</BODY>
</HTML>
diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js
index 310310e..38357ef 100644
--- a/docs/html/resources/resources-data.js
+++ b/docs/html/resources/resources-data.js
@@ -599,7 +599,7 @@ var ANDROID_RESOURCES = [
},
{
tags: ['sample', 'input', 'new'],
- path: 'samples/SampleSpellCheckerService/index.html',
+ path: 'samples/SpellChecker/SampleSpellCheckerService/index.html',
title: {
en: 'Spell Checker'
},
diff --git a/docs/html/sdk/android-4.0.jd b/docs/html/sdk/android-4.0.jd
index 9031987..68f9507 100644
--- a/docs/html/sdk/android-4.0.jd
+++ b/docs/html/sdk/android-4.0.jd
@@ -957,8 +957,8 @@ android:name="android.service.textservice.SpellCheckerService" />} as the intent
include a {@code &lt;meta-data&gt;} element that declares configuration information for the spell
checker. </p>
-<p>See the <a href="{@docRoot}resources/samples/SampleSpellCheckerService/index.html">Spell
-Checker</a> sample app for example code.</p>
+<p>See the <a href="{@docRoot}resources/samples/SpellChecker/SampleSpellCheckerService/index.html">
+Spell Checker</a> sample app for example code.</p>