Doc change: String changes for Android Market

Change-Id: I823812a4fd24021bec906ad856479c92a8d2a759

Author: ddougherty

core/java/android/app/ApplicationErrorReport.java

@@ -98,7 +98,7 @@ public class ApplicationErrorReport implements Parcelable {
     /**
      * Package name of the application which installed the application this
      * report pertains to.
-     * This identifies which Market the application came from.
+     * This identifies which market the application came from.
      */
     public String installerPackageName;
 

core/java/android/content/Intent.java

@@ -1136,7 +1136,7 @@ public static Intent createChooser(Intent target, CharSequence title) {
     /**
      * Activity Action: The user pressed the "Report" button in the crash/ANR dialog.
      * This intent is delivered to the package which installed the application, usually
-     * the Market.
+     * Google Play.
      * <p>Input: No data is specified. The bug report is passed in using
      * an {@link #EXTRA_BUG_REPORT} field.
      * <p>Output: Nothing.

core/java/android/nfc/NdefRecord.java

@@ -364,7 +364,7 @@ public static Uri parseWellKnownUriRecord(NdefRecord record) throws FormatExcept
      * Ice Cream Sandwich.
      * <p>
      * If none of the applications are installed on the device,
-     * a Market link will be opened to the first application.
+     * a Google Play link to the first application will be opened.
      * <p>
      * Note that Android application records do not overrule
      * applications that have called

core/java/android/os/StrictMode.java

@@ -106,7 +106,7 @@
  * effort mechanism.  Notably, disk or network access from JNI calls
  * won't necessarily trigger it.  Future versions of Android may catch
  * more (or fewer) operations, so you should never leave StrictMode
- * enabled in shipping applications on the Android Market.
+ * enabled in applications distributed on Google Play.
  */
 public final class StrictMode {
     private static final String TAG = "StrictMode";

core/java/android/provider/Settings.java

@@ -2593,10 +2593,10 @@ public static final String getBluetoothInputDevicePriorityKey(String address) {
 
         /**
          * Whether the package installer should allow installation of apps downloaded from
-         * sources other than the Android Market (vending machine).
+         * sources other than Google Play.
          *
          * 1 = allow installing from other sources
-         * 0 = only allow installing from the Android Market
+         * 0 = only allow installing from Google Play
          */
         public static final String INSTALL_NON_MARKET_APPS = "install_non_market_apps";
 

docs/html/design/building-blocks/progress.html

@@ -147,7 +147,7 @@ <h2 id="activity">Activity</h2>
       <li class="value-1"><h4>Activity bar (shown with the Holo Dark theme)</h4>
         <p>
 
-An indeterminate activity bar is used at the start of an application download because Market hasn't
+An indeterminate activity bar is used at the start of an application download because Google Play hasn't
 been able to contact the server yet, and it's not possible to determine how long it will take for
 the download to begin.
 

docs/html/design/building-blocks/tabs.html

@@ -130,7 +130,7 @@ <h2 id="scrollable">Scrollable Tabs</h2>
       <source src="../static/content/tabs_scrolly.ogv" type="video/ogg">
     </video>
     <div class="figure-caption">
-      Scrolling tabs in Android Market.
+      Scrolling tabs on Google Play.
       <div class="video-instructions">&nbsp;</div>
     </div>
 

docs/html/design/patterns/actionbar.html

@@ -281,7 +281,7 @@ <h4>Scrollable tabs</h4>
       <source src="../static/content/tabs_scrolly.ogv" type="video/ogg">
     </video>
     <div class="figure-caption">
-      Scrolling tabs in Android Market.
+      Scrolling tabs on Google Play.
       <div class="video-instructions">&nbsp;</div>
     </div>
 

docs/html/design/patterns/app-structure.html

@@ -112,7 +112,7 @@ <h2>Application Structure</h2>
   single screen</li>
 <li>Apps such as Phone whose main purpose is to switch between different activities without deeper
   navigation</li>
-<li>Apps such as Gmail or Market that combine a broad set of data views with deep navigation</li>
+<li>Apps such as Gmail and Google Play that combine a broad set of data views with deep navigation</li>
 </ul>
 <p>Your app's structure depends largely on the content and tasks you want to surface for your users.</p>
 <h2 id="general-structure">General Structure</h2>
@@ -165,7 +165,7 @@ <h4>Put content forward</h4>
 
     <img src="../static/content/app_structure_market.png">
     <div class="figure-caption">
-      Market's start screen primarily allows navigation into the stores for Apps, Music, Books,
+      The Google Play app's start screen primarily allows navigation into the stores for Apps, Music, Books,
       Movies and Games. It is also enriched with tailored recommendations and promotions that
       surface content of interest to the user. Search is readily available from the action bar.
     </div>
@@ -250,7 +250,7 @@ <h4>Use tabs to combine category selection and data display</h4>
 
     <img src="../static/content/app_structure_scrolltabs.png">
     <div class="figure-caption">
-      Market uses tabs to simultaneously show category choice and content. To navigate between
+      Google Play uses tabs to simultaneously show category choice and content. To navigate between
       categories, users can swipe left/right on the content.
     </div>
 

docs/html/design/patterns/navigation.html

@@ -167,7 +167,7 @@ <h4>Navigating between sibling screens</h4>
 <img src="../static/content/navigation_between_siblings_gmail.png">
 
 <p>However, a notable exception to this occurs when browsing between "related" detail views not tied
-together by the referring list&mdash;for example, when browsing in the Market between apps from
+together by the referring list&mdash;for example, when browsing on Google Play between apps from
 the same developer, or albums by the same artist. In these cases, following each link does create
 history, causing the Back button to step through each screen of related content which has been
 viewed. Up should continue to bypass these related screens and navigate to the most recently viewed
@@ -176,7 +176,7 @@ <h4>Navigating between sibling screens</h4>
 <img src="../static/content/navigation_between_siblings_market1.png">
 
 <p>You have the ability to make the Up behavior even smarter based on your knowledge of detail
-view. If we extend our Market sample from above, imagine the user has navigated from the last Book
+view. If we extend our Google Play sample from above, imagine the user has navigated from the last Book
 viewed to the details for the Movie adaptation. In that case, Up can return to a container (Movies)
 which the user had not previously navigated through.</p>
 
@@ -200,10 +200,10 @@ <h4>App-to-app navigation</h4>
 - If the destination screen is typically reached from one particular screen within your app, Up
   should navigate to that screen.
 - Otherwise, Up should navigate to the topmost ("Home") screen of your app.</p>
-<p>For example, after choosing to share a book being viewed in Market, the user navigates directly to
+<p>For example, after choosing to share a book being viewed on Google Play, the user navigates directly to
 Gmail's compose screen. From there, Up returns to the Inbox (which happens to be both the
 typical referrer to compose, as well as the topmost screen of the app), while Back returns to
-Market.</p>
+Google Play.</p>
 
 <img src="../static/content/navigation_from_outside_up.png">