diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/develop/index.jd | 12 | ||||
| -rw-r--r-- | docs/html/guide/topics/location/strategies.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/topics/resources/more-resources.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/topics/resources/string-resource.jd | 2 | ||||
| -rw-r--r-- | docs/html/index.jd | 2 | ||||
| -rw-r--r-- | docs/html/training/articles/smp.jd | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/docs/html/develop/index.jd b/docs/html/develop/index.jd index b9c7fa1..57fa498 100644 --- a/docs/html/develop/index.jd +++ b/docs/html/develop/index.jd @@ -51,7 +51,7 @@ href="{@docRoot}google/play-services/maps.html" class="button">Read more</a></p> <li class="item carousel-home"> <div class="col-8"> <img -src="http://4.bp.blogspot.com/-lfjzgG5Dqrk/UHMThRtpRwI/AAAAAAAABpk/h4d3nsmkgPM/s400/mint.png" +src="//lh4.ggpht.com/-lfjzgG5Dqrk/UHMThRtpRwI/AAAAAAAABpk/h4d3nsmkgPM/s400/mint.png" class="play no-shadow no-transform" /> </div> <div class="content-right col-6"> @@ -65,7 +65,7 @@ more</a></p> <li class="item carousel-home"> <div class="col-8"> <img -src="http://1.bp.blogspot.com/-6K1kfNOdek8/T72bXvtTSQI/AAAAAAAABmw/kYzmJt0_328/s1600/google-play-subscriptions.png" class="play"></div> +src="//lh4.ggpht.com/-6K1kfNOdek8/T72bXvtTSQI/AAAAAAAABmw/kYzmJt0_328/s1600/google-play-subscriptions.png" class="play"></div> <div class="content-right col-6"> <h2>In-app Subscriptions with Trials</h2> <p>You can now set up a <strong>free trial period</strong> for any Google Play in-app subscription, making it easy for users try your subscriber content before automatically converting to a full subscription. Free trials give you a new way to bring users into your products and engage them effectively. </p> @@ -77,7 +77,7 @@ more</a></p> <li class="item carousel-home"> <div class="col-8"> <img -src="http://2.bp.blogspot.com/-MgN5DnoO5XU/UHYGYzTcAOI/AAAAAAAABs4/jTS7sKkfBcM/s1600/pubsites.png" class="play"></div> +src="//lh4.ggpht.com/-MgN5DnoO5XU/UHYGYzTcAOI/AAAAAAAABs4/jTS7sKkfBcM/s1600/pubsites.png" class="play"></div> <div class="content-right col-6"> <p class="title-intro">From the blog:</p> <h2>New Google Play Developer Console</h2> @@ -90,7 +90,7 @@ more</a></p> <li class="item carousel-home"> <div class="col-8"> <img -src="http://4.bp.blogspot.com/-g05If_eKKRQ/UAcrVLI-OYI/AAAAAAAAAr8/AWvunVb5S-w/s320/nexus7.png" +src="//lh4.ggpht.com/-g05If_eKKRQ/UAcrVLI-OYI/AAAAAAAAAr8/AWvunVb5S-w/s320/nexus7.png" class="play no-shadow no-transform" /> </div> <div class="content-right col-6"> @@ -127,7 +127,7 @@ more</a></p> <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/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> + <div class="feed-image" style="background:url('//lh4.ggpht.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> @@ -344,7 +344,7 @@ function showVideosPlaylists() { /* Request the playlist feeds from YouTube */ function showDevelopersLivePlaylist() { - var playlistId = "PLB7B9B23D864A55C3"; /* The App Clinic */ + var playlistId = "PLWz5rJ2EKKc_XOgcRukSoKKjewFJZrKV0"; /* DevBytes */ var script = "<script type='text/javascript' src='//gdata.youtube.com/feeds/api/playlists/" + playlistId + "?v=2&alt=json-in-script&max-results=10&callback=renderDevelopersLivePlaylist&orderby=published'><\/script > "; diff --git a/docs/html/guide/topics/location/strategies.jd b/docs/html/guide/topics/location/strategies.jd index 404b797..6cc8f1a 100644 --- a/docs/html/guide/topics/location/strategies.jd +++ b/docs/html/guide/topics/location/strategies.jd @@ -204,7 +204,7 @@ android.location.LocationManager#requestLocationUpdates requestLocationUpdates() <pre> String locationProvider = LocationManager.NETWORK_PROVIDER; // Or, use GPS location data: -// LocationProvider locationProvider = LocationManager.GPS_PROVIDER; +// String locationProvider = LocationManager.GPS_PROVIDER; locationManager.requestLocationUpdates(locationProvider, 0, 0, locationListener); </pre> diff --git a/docs/html/guide/topics/resources/more-resources.jd b/docs/html/guide/topics/resources/more-resources.jd index 9fa1a2d..b5f449a 100644 --- a/docs/html/guide/topics/resources/more-resources.jd +++ b/docs/html/guide/topics/resources/more-resources.jd @@ -575,7 +575,7 @@ ID to reference the array.</dd> </dl> </dd> <dt id="integer-array-item-element"><code><item></code></dt> - <dd>An integer. The value can be a referenced to another + <dd>An integer. The value can be a reference to another integer resource. Must be a child of a {@code <integer-array>} element. <p>No attributes.</p> </dd> diff --git a/docs/html/guide/topics/resources/string-resource.jd b/docs/html/guide/topics/resources/string-resource.jd index 27761e2..5a96ba1 100644 --- a/docs/html/guide/topics/resources/string-resource.jd +++ b/docs/html/guide/topics/resources/string-resource.jd @@ -303,7 +303,7 @@ resource ID.</dd> </dd> <dt id="plurals-item-element"><code><item></code></dt> - <dd>A plural or singular string. The value can be a referenced to another + <dd>A plural or singular string. The value can be a reference to another string resource. Must be a child of a {@code <plurals>} element. Beware that you must escape apostrophes and quotation marks. See <a href="#FormattingAndStyling">Formatting and Styling</a>, below, for information about to properly style and format your strings. diff --git a/docs/html/index.jd b/docs/html/index.jd index cf06324..afda7a9 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -22,7 +22,7 @@ page.metaDescription=The official site for Android developers. Provides the Andr <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", + swfobject.embedSWF("//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 diff --git a/docs/html/training/articles/smp.jd b/docs/html/training/articles/smp.jd index 53d7879..d46787d 100644 --- a/docs/html/training/articles/smp.jd +++ b/docs/html/training/articles/smp.jd @@ -628,7 +628,7 @@ array.</p> <p>The “loop_until” seen in previous examples has been expanded to show the load of B into reg0. reg1 is assigned the numeric value 8, and reg2 is loaded from -the address [A+reg1] (same location that thread 1 is accessing).</p> +the address [A+reg1] (the same location that thread 1 is accessing).</p> <p>This will not behave correctly because the load from B could be observed after the load from [A+reg1]. We can fix this with a load/load barrier after @@ -640,7 +640,7 @@ the loop, but on ARM we can also just do this:</p> <th>Thread 2</th> </tr> <tr> -<td><code>A = 41<br /> +<td><code>[A+8] = 41<br /> <em>store/store barrier</em><br /> B = 1 // “A is ready”</code></td> <td><code>loop:<br /> |