Merge "Docs: Changed" into jb-mr2-docs
diff --git a/docs/html/google/index.jd b/docs/html/google/index.jd
index 4020cf4..ce30bce 100644
--- a/docs/html/google/index.jd
+++ b/docs/html/google/index.jd
@@ -39,6 +39,7 @@
+
<div style="margin-top:10px">
<div class="col-6 normal-links" style="margin-left:0">
@@ -48,7 +49,7 @@
</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
+ <p>Include the power of Google Maps in 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>
@@ -68,6 +69,17 @@
<div class="landing-cell">
<div class="cell-icon">
+ <img src="{@docRoot}images/google/cloud-platform.png" width="40" >
+ </div>
+ <h4><a class="external-link" href="https://cloud.google.com/solutions/mobile"
+ >Google Cloud Platform</a></h4>
+ <p>Build and host the backend for your Android app at Google-scale. With an infrastructure
+ that is managed automatically, you can focus on your app. Then, scale to support
+ millions of users.</p>
+</div>
+
+<div class="landing-cell">
+ <div class="cell-icon">
<img src="{@docRoot}images/google/gcm-cloud.png" width="40" >
</div>
<h4><a href="{@docRoot}google/gcm/index.html"
@@ -98,6 +110,18 @@
<div class="landing-cell">
<div class="cell-icon">
+ <img src="{@docRoot}images/google/wallet.png" width="40" />
+ </div>
+ <h4><a class="external-link" href="https://developers.google.com/commerce/wallet/instant-buy/"
+ >Google Wallet Instant Buy</a></h4>
+ <p>Provide fast and easy checkout in your app when selling physical goods and services.
+ Increase conversions by streamlining your purchase flow and reducing the amount of
+ information your customers need to enter.
+ </p>
+</div>
+
+<div class="landing-cell">
+ <div class="cell-icon">
<img src="{@docRoot}images/google/analytics.png" width="40" />
</div>
<h4><a class="external-link"
diff --git a/docs/html/guide/topics/ui/controls/checkbox.jd b/docs/html/guide/topics/ui/controls/checkbox.jd
index 99140b5..2a64e38 100644
--- a/docs/html/guide/topics/ui/controls/checkbox.jd
+++ b/docs/html/guide/topics/ui/controls/checkbox.jd
@@ -94,7 +94,7 @@
android.view.View} that was clicked)</li>
</ul>
-<p class="note"><strong>Tip:</strong> If you need to change the radio button state
+<p class="note"><strong>Tip:</strong> If you need to change the checkbox state
yourself (such as when loading a saved {@link android.preference.CheckBoxPreference}),
use the {@link android.widget.CompoundButton#setChecked(boolean)} or {@link
android.widget.CompoundButton#toggle()} method.</p>
\ No newline at end of file
diff --git a/docs/html/images/google/cloud-platform.png b/docs/html/images/google/cloud-platform.png
new file mode 100644
index 0000000..90df8ed
--- /dev/null
+++ b/docs/html/images/google/cloud-platform.png
Binary files differ
diff --git a/docs/html/images/google/wallet.png b/docs/html/images/google/wallet.png
new file mode 100644
index 0000000..34cc11e
--- /dev/null
+++ b/docs/html/images/google/wallet.png
Binary files differ
diff --git a/docs/html/training/articles/security-ssl.jd b/docs/html/training/articles/security-ssl.jd
index d3f68e2..f52865a 100644
--- a/docs/html/training/articles/security-ssl.jd
+++ b/docs/html/training/articles/security-ssl.jd
@@ -250,7 +250,7 @@
This is similar to an unknown certificate authority, so you can use the
same approach from the previous section.</p>
-<p>You can create yout own {@link javax.net.ssl.TrustManager},
+<p>You can create your own {@link javax.net.ssl.TrustManager},
this time trusting the server certificate directly. This has all of the
downsides discussed earlier of tying your app directly to a certificate, but can be done
securely. However, you should be careful to make sure your self-signed certificate has a
diff --git a/docs/html/training/articles/smp.jd b/docs/html/training/articles/smp.jd
index 0f667d7..7240eec 100644
--- a/docs/html/training/articles/smp.jd
+++ b/docs/html/training/articles/smp.jd
@@ -1057,7 +1057,7 @@
fix them. Before we do that, we need to discuss the use of a basic language
feature.</p>
-<h4 id="volatile">C/C+++ and "volatile"</h4>
+<h4 id="volatile">C/C++ and "volatile"</h4>
<p>When writing single-threaded code, declaring a variable “volatile” can be
very useful. The compiler will not omit or reorder accesses to volatile
diff --git a/docs/html/training/monitoring-device-state/connectivity-monitoring.jd b/docs/html/training/monitoring-device-state/connectivity-monitoring.jd
index 11a05e1..fb5096d 100644
--- a/docs/html/training/monitoring-device-state/connectivity-monitoring.jd
+++ b/docs/html/training/monitoring-device-state/connectivity-monitoring.jd
@@ -49,7 +49,8 @@
(ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
-boolean isConnected = activeNetwork.isConnectedOrConnecting();</pre>
+boolean isConnected = activeNetwork != null &&
+ activeNetwork.isConnectedOrConnecting();</pre>
<h2 id="DetermineType">Determine the Type of your Internet Connection</h2>
diff --git a/media/java/android/media/SoundPool.java b/media/java/android/media/SoundPool.java
index 587af47..acbf03a 100644
--- a/media/java/android/media/SoundPool.java
+++ b/media/java/android/media/SoundPool.java
@@ -410,7 +410,7 @@
* Called when a sound has completed loading.
*
* @param soundPool SoundPool object from the load() method
- * @param soundPool the sample ID of the sound loaded.
+ * @param sampleId the sample ID of the sound loaded.
* @param status the status of the load operation (0 = success)
*/
public void onLoadComplete(SoundPool soundPool, int sampleId, int status);
