am 2d9ee707: am 364fe3a8: am b6bc020d: doc change: Samples browsing first changes: Samples dir and file starters.
* commit '2d9ee70703cb52a16d726eb177f6f4e0be4f93e2':
doc change: Samples browsing first changes: Samples dir and file starters.
diff --git a/Android.mk b/Android.mk
index 656e40c..8e59ffa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -538,100 +538,100 @@
# the list here should match the list of samples included in the sdk samples package
# (see development/build/sdk.atree)
# remove htmlified samples for now -- samples are still available through the SDK
-# web_docs_sample_code_flags := \
+web_docs_sample_code_flags := \
-hdf android.hasSamples 1 \
-samplecode $(sample_dir)/AccelerometerPlay \
- resources/samples/AccelerometerPlay "Accelerometer Play" \
+ samples/AccelerometerPlay "Accelerometer Play" \
-samplecode $(sample_dir)/ActionBarCompat \
- resources/samples/ActionBarCompat "Action Bar Compatibility" \
- -samplecode $(sample_dir)/AndroidBeamDemo \
- resources/samples/AndroidBeamDemo "Android Beam Demo" \
- -samplecode $(sample_dir)/ApiDemos \
- resources/samples/ApiDemos "API Demos" \
- -samplecode $(sample_dir)/Support4Demos \
- resources/samples/Support4Demos "API 4+ Support Demos" \
- -samplecode $(sample_dir)/Support13Demos \
- resources/samples/Support13Demos "API 13+ Support Demos" \
- -samplecode $(sample_dir)/BackupRestore \
- resources/samples/BackupRestore "Backup and Restore" \
- -samplecode $(sample_dir)/BluetoothChat \
- resources/samples/BluetoothChat "Bluetooth Chat" \
- -samplecode $(sample_dir)/BluetoothHDP \
- resources/samples/BluetoothHDP "Bluetooth HDP Demo" \
- -samplecode $(sample_dir)/BusinessCard \
- resources/samples/BusinessCard "Business Card" \
- -samplecode $(sample_dir)/ContactManager \
- resources/samples/ContactManager "Contact Manager" \
- -samplecode $(sample_dir)/CubeLiveWallpaper \
- resources/samples/CubeLiveWallpaper "Cube Live Wallpaper" \
- -samplecode $(sample_dir)/Home \
- resources/samples/Home "Home" \
- -samplecode $(sample_dir)/HoneycombGallery \
- resources/samples/HoneycombGallery "Honeycomb Gallery" \
- -samplecode $(sample_dir)/JetBoy \
- resources/samples/JetBoy "JetBoy" \
- -samplecode $(sample_dir)/KeyChainDemo \
- resources/samples/KeyChainDemo "KeyChain Demo" \
- -samplecode $(sample_dir)/LunarLander \
- resources/samples/LunarLander "Lunar Lander" \
- -samplecode $(sample_dir)/training/ads-and-ux \
- resources/samples/training/ads-and-ux "Mobile Advertisement Integration" \
- -samplecode $(sample_dir)/MultiResolution \
- resources/samples/MultiResolution "Multiple Resolutions" \
- -samplecode $(sample_dir)/training/multiscreen/newsreader \
- resources/samples/newsreader "News Reader" \
- -samplecode $(sample_dir)/NotePad \
- resources/samples/NotePad "Note Pad" \
- -samplecode $(sample_dir)/SpellChecker/SampleSpellCheckerService \
- resources/samples/SpellChecker/SampleSpellCheckerService "Spell Checker Service" \
- -samplecode $(sample_dir)/SpellChecker/HelloSpellChecker \
- resources/samples/SpellChecker/HelloSpellChecker "Spell Checker Client" \
- -samplecode $(sample_dir)/SampleSyncAdapter \
- resources/samples/SampleSyncAdapter "Sample Sync Adapter" \
- -samplecode $(sample_dir)/RandomMusicPlayer \
- resources/samples/RandomMusicPlayer "Random Music Player" \
- -samplecode $(sample_dir)/RenderScript \
- resources/samples/RenderScript "RenderScript" \
- -samplecode $(sample_dir)/SearchableDictionary \
- resources/samples/SearchableDictionary "Searchable Dictionary v2" \
- -samplecode $(sample_dir)/SipDemo \
- resources/samples/SipDemo "SIP Demo" \
- -samplecode $(sample_dir)/Snake \
- resources/samples/Snake "Snake" \
- -samplecode $(sample_dir)/SoftKeyboard \
- resources/samples/SoftKeyboard "Soft Keyboard" \
- -samplecode $(sample_dir)/Spinner \
- resources/samples/Spinner "Spinner" \
- -samplecode $(sample_dir)/SpinnerTest \
- resources/samples/SpinnerTest "SpinnerTest" \
- -samplecode $(sample_dir)/StackWidget \
- resources/samples/StackWidget "StackView Widget" \
- -samplecode $(sample_dir)/TicTacToeLib \
- resources/samples/TicTacToeLib "TicTacToeLib" \
- -samplecode $(sample_dir)/TicTacToeMain \
- resources/samples/TicTacToeMain "TicTacToeMain" \
- -samplecode $(sample_dir)/ToyVpn \
- resources/samples/ToyVpn "Toy VPN Client" \
- -samplecode $(sample_dir)/USB \
- resources/samples/USB "USB" \
- -samplecode $(sample_dir)/WeatherListWidget \
- resources/samples/WeatherListWidget "Weather List Widget" \
- -samplecode $(sample_dir)/WiFiDirectDemo \
- resources/samples/WiFiDirectDemo "Wi-Fi Direct Demo" \
- -samplecode $(sample_dir)/Wiktionary \
- resources/samples/Wiktionary "Wiktionary" \
- -samplecode $(sample_dir)/WiktionarySimple \
- resources/samples/WiktionarySimple "Wiktionary (Simplified)" \
- -samplecode $(sample_dir)/VoiceRecognitionService \
- resources/samples/VoiceRecognitionService "Voice Recognition Service" \
- -samplecode $(sample_dir)/VoicemailProviderDemo \
- resources/samples/VoicemailProviderDemo "Voicemail Provider Demo" \
- -samplecode $(sample_dir)/XmlAdapters \
- resources/samples/XmlAdapters "XML Adapters" \
- -samplecode $(sample_dir)/TtsEngine \
- resources/samples/TtsEngine "Text To Speech Engine" \
- -samplecode $(sample_dir)/training/device-management-policy \
- resources/samples/training/device-management-policy "Device Management Policy"
+ samples/ActionBarCompat "Action Bar Compatibility"
+# -samplecode $(sample_dir)/AndroidBeamDemo \
+# samples/AndroidBeamDemo "Android Beam Demo" \
+# -samplecode $(sample_dir)/ApiDemos \
+# samples/ApiDemos "API Demos" \
+# -samplecode $(sample_dir)/Support4Demos \
+# samples/Support4Demos "API 4+ Support Demos" \
+# -samplecode $(sample_dir)/Support13Demos \
+# samples/Support13Demos "API 13+ Support Demos" \
+# -samplecode $(sample_dir)/BackupRestore \
+# samples/BackupRestore "Backup and Restore" \
+# -samplecode $(sample_dir)/BluetoothChat \
+# samples/BluetoothChat "Bluetooth Chat" \
+# -samplecode $(sample_dir)/BluetoothHDP \
+# samples/BluetoothHDP "Bluetooth HDP Demo" \
+# -samplecode $(sample_dir)/BusinessCard \
+# samples/BusinessCard "Business Card" \
+# -samplecode $(sample_dir)/ContactManager \
+# samples/ContactManager "Contact Manager" \
+# -samplecode $(sample_dir)/CubeLiveWallpaper \
+# samples/CubeLiveWallpaper "Cube Live Wallpaper" \
+# -samplecode $(sample_dir)/Home \
+# samples/Home "Home" \
+# -samplecode $(sample_dir)/HoneycombGallery \
+# samples/HoneycombGallery "Honeycomb Gallery" \
+# -samplecode $(sample_dir)/JetBoy \
+# samples/JetBoy "JetBoy" \
+# -samplecode $(sample_dir)/KeyChainDemo \
+# samples/KeyChainDemo "KeyChain Demo" \
+# -samplecode $(sample_dir)/LunarLander \
+# samples/LunarLander "Lunar Lander" \
+# -samplecode $(sample_dir)/training/ads-and-ux \
+# samples/training/ads-and-ux "Mobile Advertisement Integration" \
+# -samplecode $(sample_dir)/MultiResolution \
+# samples/MultiResolution "Multiple Resolutions" \
+# -samplecode $(sample_dir)/training/multiscreen/newsreader \
+# samples/newsreader "News Reader" \
+# -samplecode $(sample_dir)/NotePad \
+# samples/NotePad "Note Pad" \
+# -samplecode $(sample_dir)/SpellChecker/SampleSpellCheckerService \
+# samples/SpellChecker/SampleSpellCheckerService "Spell Checker Service" \
+# -samplecode $(sample_dir)/SpellChecker/HelloSpellChecker \
+# samples/SpellChecker/HelloSpellChecker "Spell Checker Client" \
+# -samplecode $(sample_dir)/SampleSyncAdapter \
+# samples/SampleSyncAdapter "Sample Sync Adapter" \
+# -samplecode $(sample_dir)/RandomMusicPlayer \
+# samples/RandomMusicPlayer "Random Music Player" \
+# -samplecode $(sample_dir)/RenderScript \
+# samples/RenderScript "RenderScript" \
+# -samplecode $(sample_dir)/SearchableDictionary \
+# samples/SearchableDictionary "Searchable Dictionary v2" \
+# -samplecode $(sample_dir)/SipDemo \
+# samples/SipDemo "SIP Demo" \
+# -samplecode $(sample_dir)/Snake \
+# samples/Snake "Snake" \
+# -samplecode $(sample_dir)/SoftKeyboard \
+# samples/SoftKeyboard "Soft Keyboard" \
+# -samplecode $(sample_dir)/Spinner \
+# samples/Spinner "Spinner" \
+# -samplecode $(sample_dir)/SpinnerTest \
+# samples/SpinnerTest "SpinnerTest" \
+# -samplecode $(sample_dir)/StackWidget \
+# samples/StackWidget "StackView Widget" \
+# -samplecode $(sample_dir)/TicTacToeLib \
+# samples/TicTacToeLib "TicTacToeLib" \
+# -samplecode $(sample_dir)/TicTacToeMain \
+# samples/TicTacToeMain "TicTacToeMain" \
+# -samplecode $(sample_dir)/ToyVpn \
+# samples/ToyVpn "Toy VPN Client" \
+# -samplecode $(sample_dir)/USB \
+# samples/USB "USB" \
+# -samplecode $(sample_dir)/WeatherListWidget \
+# samples/WeatherListWidget "Weather List Widget" \
+# -samplecode $(sample_dir)/WiFiDirectDemo \
+# samples/WiFiDirectDemo "Wi-Fi Direct Demo" \
+# -samplecode $(sample_dir)/Wiktionary \
+# samples/Wiktionary "Wiktionary" \
+# -samplecode $(sample_dir)/WiktionarySimple \
+# samples/WiktionarySimple "Wiktionary (Simplified)" \
+# -samplecode $(sample_dir)/VoiceRecognitionService \
+# samples/VoiceRecognitionService "Voice Recognition Service" \
+# -samplecode $(sample_dir)/VoicemailProviderDemo \
+# samples/VoicemailProviderDemo "Voicemail Provider Demo" \
+# -samplecode $(sample_dir)/XmlAdapters \
+# samples/XmlAdapters "XML Adapters" \
+# -samplecode $(sample_dir)/TtsEngine \
+# samples/TtsEngine "Text To Speech Engine" \
+# -samplecode $(sample_dir)/training/device-management-policy \
+# samples/training/device-management-policy "Device Management Policy"
## SDK version identifiers used in the published docs
@@ -763,10 +763,9 @@
LOCAL_DROIDDOC_OPTIONS:= \
$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
- $(web_docs_sample_code_flags) \
-toroot / \
- -hdf android.whichdoc online \
- -hdf template.showLanguageMenu true
+ -hdf android.whichdoc online
+# $(web_docs_sample_code_flags)
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
diff --git a/docs/html/samples/images/ActionBarCompat1.png b/docs/html/samples/images/ActionBarCompat1.png
new file mode 100644
index 0000000..64d3e66
--- /dev/null
+++ b/docs/html/samples/images/ActionBarCompat1.png
Binary files differ
diff --git a/docs/html/samples/images/ActionBarCompat2.png b/docs/html/samples/images/ActionBarCompat2.png
new file mode 100644
index 0000000..04a7e6c
--- /dev/null
+++ b/docs/html/samples/images/ActionBarCompat2.png
Binary files differ
diff --git a/docs/html/samples/index.jd b/docs/html/samples/index.jd
new file mode 100644
index 0000000..028fbe9
--- /dev/null
+++ b/docs/html/samples/index.jd
@@ -0,0 +1,77 @@
+page.title=Samples
+header.hide=1
+@jd:body
+
+<style>
+div.landing-cell,
+div.cell-icon {
+ height:150px;
+}
+div.cell-icon {
+ float:left;
+ margin-right:20px;
+}
+div.cell-icon img {
+ margin:0;
+}
+</style>
+
+<div class="landing-banner">
+
+<div class="col-6" style="min-height:0">
+ <img src="{@docRoot}images/google/google-services.png" alt="" width="340" height="193" />
+</div>
+<div class="col-6">
+
+ <h1 itemprop="name" style="margin-bottom:0;">Samples</h1>
+ <p itemprop="description">Some intro here. Overview of Samples, where to get them,
+ links to related tools and SDK, and what's new in samples. </p>
+
+</div>
+</div>
+<div> </div>
+
+
+
+
+<div style="margin-top:10px">
+<div class="col-6 normal-links" style="margin-left:0">
+
+<div class="landing-cell">
+ <div class="cell-icon">
+ <img src="{@docRoot}images/google/maps-pin.png" width="40" >
+ </div>
+ <h4><a href="{@docRoot}google/play-services/maps.html"
+ >Google Maps</a></h4>
+ <p>The power of Google Maps is available to your app
+ with an embeddable map view. You can customize the map with
+ markers and overlays, control the user's perspective, draw lines
+ and shapes, and much more.</p>
+</div>
+
+</div><!-- col-6 -->
+
+
+
+
+<div class="col-6" style="margin-right:0">
+
+<div class="landing-cell">
+ <div class="cell-icon">
+ <img src="{@docRoot}images/google/iab-99c.png" width="40" />
+ </div>
+ <h4><a href="{@docRoot}google/play/billing/index.html"
+ >Google Play In-App Billing</a></h4>
+ <p>Build an app with a steady revenue stream that keeps users engaged
+ by offering new content or virtual goods directly in your app. All transactions are handled
+ by Google Play Store for a simple user experience.
+ </p>
+</div>
+
+</div><!-- col-6 -->
+
+</div><!-- margin wrapper -->
+
+
+
+
diff --git a/docs/html/samples/samples_toc.cs b/docs/html/samples/samples_toc.cs
new file mode 100644
index 0000000..8fcd676
--- /dev/null
+++ b/docs/html/samples/samples_toc.cs
@@ -0,0 +1,23 @@
+
+<ul id="nav">
+
+<script type="text/javascript">
+<!--
+ buildToggleLists();
+ changeNavLang(getLangPref());
+//-->
+</script>
+ <li class="nav-section">
+ <div class="nav-section-header"><a href="/samples/index.html">
+ <span class="en">About the Samples</span></a>
+ </div>
+
+ </li>
+
+ <li id="samples-tree-list" class="nav-section">
+ <div class="nav-section-header"><a href="/samples/index.html">
+ <span class="en">Root Node (remove)</span></a>
+ </div>
+ </li>
+ </ul>
+
