Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev
diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml
index 0afc74f..8496daf 100644
--- a/core/res/res/values-cs/strings.xml
+++ b/core/res/res/values-cs/strings.xml
@@ -1030,7 +1030,7 @@
<string name="whichApplication" msgid="4533185947064773386">"Dokončit akci pomocí aplikace"</string>
<string name="alwaysUse" msgid="4583018368000610438">"Použít jako výchozí nastavení pro tuto činnost."</string>
<string name="clearDefaultHintMsg" msgid="3252584689512077257">"Výchozí nastavení vymažete v sekci Nastavení systému > Aplikace > Stažené."</string>
- <string name="chooseActivity" msgid="7486876147751803333">"Vyberte činnost"</string>
+ <string name="chooseActivity" msgid="7486876147751803333">"Vyberte akci"</string>
<string name="chooseUsbActivity" msgid="6894748416073583509">"Vyberte aplikaci pro zařízení USB"</string>
<string name="noApplications" msgid="2991814273936504689">"Tuto činnost nemohou provádět žádné aplikace."</string>
<string name="aerr_title" msgid="1905800560317137752"></string>
@@ -1065,7 +1065,7 @@
<string name="old_app_description" msgid="2082094275580358049">"Nespouštět novou aplikaci."</string>
<string name="new_app_action" msgid="5472756926945440706">"Spustit aplikaci <xliff:g id="OLD_APP">%1$s</xliff:g>"</string>
<string name="new_app_description" msgid="1932143598371537340">"Zastavit starou aplikaci bez uložení."</string>
- <string name="sendText" msgid="5209874571959469142">"Vyberte činnost s textem"</string>
+ <string name="sendText" msgid="5209874571959469142">"Vyberte akci pro text"</string>
<string name="volume_ringtone" msgid="6885421406845734650">"Hlasitost vyzvánění"</string>
<string name="volume_music" msgid="5421651157138628171">"Hlasitost médií"</string>
<string name="volume_music_hint_playing_through_bluetooth" msgid="9165984379394601533">"Přehrávání pomocí rozhraní Bluetooth"</string>
diff --git a/docs/html/develop/index.jd b/docs/html/develop/index.jd
index 86c04a7..61617eb 100644
--- a/docs/html/develop/index.jd
+++ b/docs/html/develop/index.jd
@@ -32,6 +32,24 @@
<ul>
<li class="item carousel-home">
<div class="col-8">
+ <img src="{@docRoot}images/google/maps-v2-trulia-n7.png"
+class="play no-shadow no-transform" style="margin:0 0 0 40px;max-height:250px;height:250px;
+ max-width:403px;width:403px" />
+ </div>
+ <div class="content-right col-6" style="width:350px">
+ <h2>New MapView APIs!</h2>
+ <p>Google Maps Android API version 2 is now available with enhanced
+ features such as 3D buildings, vector-based map tiles, rich overlay capabilities,
+ indoor maps, support for fragments, and much more.</p>
+
+ <p>The APIs are bundled with Google Play services and are
+ compatible with Android 2.2 and higher.</p>
+ <p><a
+href="{@docRoot}google/play-services/maps.html" class="button">Read more</a></p>
+ </div>
+ </li>
+ <li class="item carousel-home">
+ <div class="col-8">
<img
src="http://4.bp.blogspot.com/-lfjzgG5Dqrk/UHMThRtpRwI/AAAAAAAABpk/h4d3nsmkgPM/s400/mint.png"
class="play no-shadow no-transform" />
@@ -350,4 +368,4 @@
showDevelopersLivePlaylist();
showVideosPlaylists();
-</script>
\ No newline at end of file
+</script>
diff --git a/docs/html/images/google/gps-googleplus.png b/docs/html/images/google/gps-googleplus.png
index 383445b..e91747a 100644
--- a/docs/html/images/google/gps-googleplus.png
+++ b/docs/html/images/google/gps-googleplus.png
Binary files differ
diff --git a/docs/html/images/google/maps-v2-trulia-n7.png b/docs/html/images/google/maps-v2-trulia-n7.png
new file mode 100644
index 0000000..f3246a6
--- /dev/null
+++ b/docs/html/images/google/maps-v2-trulia-n7.png
Binary files differ
diff --git a/docs/html/index.jd b/docs/html/index.jd
index 97f12b3..e91b68c 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -20,7 +20,7 @@
<h1>Android 4.2 Jelly Bean!</h1>
<p>The latest version of Jelly Bean is here, with performance optimizations, a refreshed UI, and great new features for developers. </p>
<p>Android 4.2 includes APIs for developing lock sceen widgets and Daydream screensavers, using external displays, creating RTL layouts, building flexible UI with nested Fragments, and much more.</p>
- <p><a href="/about/versions/jelly-bean.html" class="button">Learn More</a></p>
+ <p><a href="{@docRoot}about/versions/jelly-bean.html" class="button">Learn More</a></p>
</div>
</li>
<li class="item carousel-home">
@@ -78,4 +78,3 @@
</div>
<!-- /Section links -->
</div>
-
