diff options
author | Dirk Dougherty <ddougherty@google.com> | 2013-01-15 09:37:04 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-15 09:37:04 -0800 |
commit | fef45db2aa3271bc414794ffb9c34d7659dccb1a (patch) | |
tree | 6aea8a80477fc0e3147cd0f7e9acb3326071ad53 | |
parent | 4ed11353b351ae1de817298d8480811858d8518a (diff) | |
parent | f37d9c07b258ceeea991801f9223ecf071debd08 (diff) | |
download | frameworks_base-fef45db2aa3271bc414794ffb9c34d7659dccb1a.zip frameworks_base-fef45db2aa3271bc414794ffb9c34d7659dccb1a.tar.gz frameworks_base-fef45db2aa3271bc414794ffb9c34d7659dccb1a.tar.bz2 |
am f37d9c07: am b78714b5: am 5941ff03: am 9af5cf2b: am 20d47ca8: Doc change: add developer video to carousel and spotlight pages.
* commit 'f37d9c07b258ceeea991801f9223ecf071debd08':
Doc change: add developer video to carousel and spotlight pages.
-rw-r--r-- | docs/html/develop/index.jd | 26 | ||||
-rw-r--r-- | docs/html/distribute/googleplay/spotlight/index.jd | 29 | ||||
-rw-r--r-- | docs/html/guide/topics/renderscript/index.jd | 9 | ||||
-rw-r--r-- | docs/html/index.jd | 46 |
4 files changed, 96 insertions, 14 deletions
diff --git a/docs/html/develop/index.jd b/docs/html/develop/index.jd index b4faa58..b9c7fa1 100644 --- a/docs/html/develop/index.jd +++ b/docs/html/develop/index.jd @@ -121,25 +121,25 @@ more</a></p> <div class="feed-frame"> <!-- DEVELOPER NEWS --> <ul> - <li><a href="http://android-developers.blogspot.com/2012/12/localize-your-promotional-graphics-on.html"> - <div class="feed-image" style="background:url('{@docRoot}images/home/play_logo.png') no-repeat 0 0"></div> - <h4>Localized Promo Graphics on Google Play</h4> - <p>Google Play now lets you provide different promotional graphics, screenshots, and videos for each language you support...</p> + <li><a href="//android-developers.blogspot.com/2013/01/verifying-back-end-calls-from-android.html"> + <div class="feed-image" style="background:url('//lh4.ggpht.com/7z4NItEg-X21zvFGAarKonk-VaysBYthJ30u1JjaQ0-5fjyHNawnmoNeG--4FCACog=w124') no-repeat 0 0"></div> + <h4>Verifying Back-End Calls from Android Apps</h4> + <p>You can take advantage of the auth APIs in Google Play services to let your back end know which app is calling and for which user....</p> </a></li> - <li><a href="//android-developers.blogspot.com/2012/12/in-app-billing-version-3.html"> - <div class="feed-image" style="background:url('{@docRoot}images/iab-thumb.png') no-repeat 0 0;background-position:center right;"></div> - <h4>In-app Billing Version 3 Now Available</h4> - <p>A new version of In-app Billing is available that lets you sell digital goods in your app with just a few lines of code...</p> + <li><a href="//android-developers.blogspot.com/2012/12/daydream-interactive-screen-savers.html"> + <div class="feed-image" style="background:url('//3.bp.blogspot.com/-wVsUOo4xGE0/UNy9mZ1nmMI/AAAAAAAAB4w/f6rhyLn5KbI/s1600/daydream-example.jpg') no-repeat 0 0;background-position:right top;"></div> + <h4>Daydream: Interactive Screen Savers</h4> + <p>Daydream is an interactive screen-saver mode introduced in Android 4.2. Learn how to add Daydreams to your apps...</p> </a></li> <li><a href="//android-developers.blogspot.com/2012/11/designing-for-tablets-were-here-to-help.html"> - <div class="feed-image" style="background:url('{@docRoot}design/media/multipane_expand.png') no-repeat 0 0; background-position:right top;"></div> + <div class="feed-image" style="background:url('//developer.android.com/design/media/multipane_expand.png') no-repeat 0 0; background-position:right top;"></div> <h4>Designing for Tablets?</h4> <p>Essential resources for everyone in the app development pipeline—from product managers, to designers, to developers, and QA engineers...</p> </a></li> - <li><a href="//developer.android.com/google/play-services/index.html"> - <div class="feed-image" style="background:url('//lh4.ggpht.com/7z4NItEg-X21zvFGAarKonk-VaysBYthJ30u1JjaQ0-5fjyHNawnmoNeG--4FCACog=w124') no-repeat 0 0"></div> - <h4>Google Play services and OAuth Tools</h4> - <p>The rollout of Google Play services to all Android 2.2+ devices worldwide is now complete, and all of those devices now have new tools for working with OAuth 2.0 tokens...</p> + <li><a href="//android-developers.blogspot.com/2012/12/in-app-billing-version-3.html"> + <div class="feed-image" style="background:url('//developer.android.com/images/iab-thumb.png') no-repeat 0 0;background-position:center right;"></div> + <h4>In-app Billing Version 3 Now Available</h4> + <p>A new version of In-app Billing is available that lets you sell digital goods in your app with just a few lines of code...</p> </a></li> </ul> <!-- FEATURED DOCS --> diff --git a/docs/html/distribute/googleplay/spotlight/index.jd b/docs/html/distribute/googleplay/spotlight/index.jd index 6acd914..a248dea 100644 --- a/docs/html/distribute/googleplay/spotlight/index.jd +++ b/docs/html/distribute/googleplay/spotlight/index.jd @@ -7,7 +7,34 @@ header.hide=0 <p>Android developers, their apps, and their successes with Android and Google Play. </p> - +<div style="background: #F0F0F0; + border-top: 1px solid #DDD; + padding: 0px 0 24px 0; + overflow: auto; + clear:both; + margin-bottom:40px; + margin-top:30px;""> + <div style="padding:0 0 0 29px;"> + <h4>Developer Story: Smule</h4> + <img alt="" class="screenshot thumbnail" style="-webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px height:78px; + width: 78px; + float: left; + margin: 17px 20px 9px 0;" src= + "//lh6.ggpht.com/z5wl9PuHl9JfO54uefjRTUX70SuLY-1DRpPxQ5mg7XEDfnYhBDssh1RrPZjN1tbwzhg=w124"> + <div style="width:700px;"> + <p style="margin-top:26px; + margin-bottom:12px;"> + The creators of <a href="//play.google.com/store/apps/details?id=com.smule.autorap">AutoRap</a>, <a href="//play.google.com/store/apps/details?id=com.smule.magicpiano">Magic Piano</a>, and <a href="//play.google.com/store/apps/details?id=com.smule.songify">Songify</a> talk about their experiences launching on Android, the explosive global growth they’ve seen on Google Play, and some of the techniques they use to market and monetize their products effectively across the world.</p> + </div> + <iframe style="float:left; + margin-right:24px; + margin-top:14px;" width="700" height="394" src= + "http://www.youtube.com/embed/RRelFvc6Czo?HD=1;rel=0;origin=developer.android.com;" frameborder="0" allowfullscreen> + </iframe> + </div> +</div> <div style="background: #F0F0F0; border-top: 1px solid #DDD; diff --git a/docs/html/guide/topics/renderscript/index.jd b/docs/html/guide/topics/renderscript/index.jd index 4c22e72..b5c53ff 100644 --- a/docs/html/guide/topics/renderscript/index.jd +++ b/docs/html/guide/topics/renderscript/index.jd @@ -9,6 +9,15 @@ page.landing.image= <div> <h3>Blog Articles</h3> + + <a +href="http://android-developers.blogspot.com/2013/01/evolution-of-renderscript-performance.html"> + <h4>Evolution of Renderscript Performance</h4> + <p>It’s been a year since the last blog post on Renderscript, and with the release + of Android 4.2, it’s a good time to talk about the performance work that we’ve done + since then. One of the major goals of this past year was to improve the performance + of common image-processing operations with Renderscript.</p> </a> + <a href="http://android-developers.blogspot.com/2012/01/levels-in-renderscript.html"> <h4>Levels in Renderscript</h4> diff --git a/docs/html/index.jd b/docs/html/index.jd index e91b68c..cf06324 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -13,6 +13,50 @@ page.metaDescription=The official site for Android developers. Provides the Andr <div class="frame"> <ul> <li class="item carousel-home"> + <div class="content-left col-11" style="padding-top:65px;"> + <script src="//ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js"></script> + <div style="box-shadow: 3px 10px 18px 1px #999;width:600px;height:338px"> + <div id="ytapiplayer"> + You need Flash player 8+ and JavaScript enabled to view this video. + </div> + <script type="text/javascript"> + var params = { allowScriptAccess: "always" }; + var atts = { id: "ytapiplayer" }; + swfobject.embedSWF("http://www.youtube.com/v/RRelFvc6Czo?enablejsapi=1&playerapiid=ytplayer&version=3&HD=1;rel=0;showinfo=0;modestbranding;origin=developer.android.com;autohide=1", + "ytapiplayer", "600", "338", "8", null, null, params, atts); + + // Callback used to pause/resume carousel based on video state + function onytplayerStateChange(newState) { + var isPaused = $("#pauseButton").hasClass("paused"); + if ((newState == 1) || (newState == 3)) { + // if playing or buffering, pause the carousel + if (!isPaused) { + $("#pauseButton").click(); + } + } else { + // otherwise, make sure carousel is running + if (isPaused) { + $("#pauseButton").click(); + } + } + } + + // Callback received when YouTube player loads to setup callback (above) + function onYouTubePlayerReady(playerId) { + var ytplayer = document.getElementById("ytapiplayer"); + ytplayer.addEventListener("onStateChange", "onytplayerStateChange"); + } + + </script> + </div> + </div> + <div class="content-right col-4"> + <h1 style="white-space:nowrap;line-height:1em;">Developer Story: Smule</h1> + <p>The creators of AutoRap, Magic Piano, and Songify talk about launching on + Android and the explosive global growth they’ve seen on Google Play.</p> + </div> + </li> + <li class="item carousel-home"> <div class="content-left col-9"> <a href="{@docRoot}about/versions/jelly-bean.html"><img src="{@docRoot}images/home/android-jellybean.png" ></a> </div> @@ -63,6 +107,8 @@ class="button">Watch the Android sessions</a></p> </div> <!-- /End slideshow --> + <a href="" id="pauseButton" style="display:none">pause</a> + </div> <div class="wrap" style="padding-bottom:20px"> |