diff options
Diffstat (limited to 'docs/html/sdk/android-4.0.jd')
| -rw-r--r-- | docs/html/sdk/android-4.0.jd | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/html/sdk/android-4.0.jd b/docs/html/sdk/android-4.0.jd index 7161b03..e3b13c8 100644 --- a/docs/html/sdk/android-4.0.jd +++ b/docs/html/sdk/android-4.0.jd @@ -660,14 +660,14 @@ your application’s package name. When the other device receives the NDEF messa application record and multiple applications contain activities that handle the specified intent, the system always delivers the message to the activity in your application (based on the matching application record). If the target device does not currently have your application installed, the -system uses the Android application record to launch Android Market and take the user to the +system uses the Android application record to launch Google Play and take the user to the application in order to install it.</p> <p>If your application doesn’t use NFC APIs to perform NDEF Push messaging, then Android provides a default behavior: When your application is in the foreground on one device and Android Beam is invoked with another Android-powered device, then the other device receives an NDEF message with an Android application record that identifies your application. If the receiving device has the -application installed, the system launches it; if it’s not installed, Android Market opens and takes +application installed, the system launches it; if it’s not installed, Google Play opens and takes the user to your application in order to install it.</p> <p>You can read more about Android Beam and other NFC features in the <a @@ -1292,9 +1292,9 @@ public boolean onCreateOptionsMenu(Menu menu) { } </pre> -<p>For an example using the {@link android.widget.ShareActionProvider}, see the <a -href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/ActionBarActionProviderActivity.html" ->ActionBarActionProviderActivity</a> class in ApiDemos.</p> +<p>For an example using the {@link android.widget.ShareActionProvider}, see <a +href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/ActionBarShareActionProviderActivity.html" +>ActionBarShareActionProviderActivity</a> in ApiDemos.</p> <h4>Collapsible action views</h4> @@ -1963,7 +1963,7 @@ image are listed below (with <em>language</em>_<em>country/region</em> locale de <li>English, New Zealand (en_NZ)</li> <li>English, Singapore(en_SG)</li> <li>English, US (en_US)</li> -<li>English, Zimbabwe (en_ZA)</li> +<li>English, South Africa (en_ZA)</li> <li>Spanish (es_ES)</li> <li>Spanish, US (es_US)</li> <li>Finnish, Finland (fi_FI)</li> |