diff options
Diffstat (limited to 'docs/html')
13 files changed, 42 insertions, 42 deletions
diff --git a/docs/html/distribute/googleplay/about/monetizing.jd b/docs/html/distribute/googleplay/about/monetizing.jd index 8233a31..9a5c6d7 100644 --- a/docs/html/distribute/googleplay/about/monetizing.jd +++ b/docs/html/distribute/googleplay/about/monetizing.jd @@ -138,7 +138,7 @@ Google Play Developer Console.</p> <h2 id="payouts">Monthly payouts in your local currency</h2> <p>To sell products in Google Play, all you have to do is register for a Google -Checkout merchant account and link it to your Google Play Android Developer +Wallet merchant account and link it to your Google Play Android Developer Console account (see <a href="{@docRoot}distribute/googleplay/publish/register.html">Get Started with Publishing</a> for details). Once you’ve set up your account and published your @@ -159,4 +159,4 @@ transaction.</p> <p>At the close of the month, you can download a complete sales report that gives you the final details of all transactions that closed in the month, including the payout amounts and other data. Additional financial reports are -available in your Google Checkout merchant account.</p> +available in your Google Wallet merchant account.</p> diff --git a/docs/html/distribute/googleplay/publish/console.jd b/docs/html/distribute/googleplay/publish/console.jd index 0bf5e78..3831e51 100644 --- a/docs/html/distribute/googleplay/publish/console.jd +++ b/docs/html/distribute/googleplay/publish/console.jd @@ -64,8 +64,8 @@ create the store listing page for a specific app.</p> <h3 id="merchant">Linking your Merchant Account</h3> <p>If you want to sell apps or in-app products, you can link your Google -Checkout Merchant account to your developer profile. Google Play uses the linked -Checkout account for financial and tax identification and monthly payouts of +Wallet merchant account to your developer profile. Google Play uses the linked +merchant account for financial and tax identification and monthly payouts of sales. </p> <h3 id="details">Your store listing details</h3> diff --git a/docs/html/distribute/googleplay/publish/preparing.jd b/docs/html/distribute/googleplay/publish/preparing.jd index 416f02e..b4b8c22 100644 --- a/docs/html/distribute/googleplay/publish/preparing.jd +++ b/docs/html/distribute/googleplay/publish/preparing.jd @@ -278,7 +278,7 @@ priced). You can also sell in-app products and subscriptions. </li> </ul> <p> If your app is be priced, or if you'll be selling in-app products, -you need set up a Checkout Merchant Account before you can publish.</p> +you need set up a Google Wallet merchant account before you can publish.</p> <table> <tr> @@ -560,7 +560,7 @@ final checks.</p> <p>Make sure that: </p> <ul> -<li>Your developer profile has the correct information and is linked to the proper Google Checkout Merchant account (if you are selling products).</li> +<li>Your developer profile has the correct information and is linked to the proper Google Wallet merchant account (if you are selling products).</li> <li>You have the right version of the app uploaded.</li> <li>All parts of your Product Details are ready, including all graphic assets, screenshots, video, localized descriptions, and so on. </li> <li>You have set your app's pricing to free or priced.</li> diff --git a/docs/html/distribute/googleplay/publish/register.jd b/docs/html/distribute/googleplay/publish/register.jd index 5f1f2ea..faade81 100644 --- a/docs/html/distribute/googleplay/publish/register.jd +++ b/docs/html/distribute/googleplay/publish/register.jd @@ -53,8 +53,8 @@ name, email address, and so on. You can modify this information later.</li> <li>Read and accept the <strong>Developer Distribution Agreement</strong> that applies to your country or region. Note that apps and store listings that you publish on Google Play must comply with the Developer Program Policies and US export law,</li> -<li>Pay a <strong>$25 USD registration fee</strong> using Google Checkout. If you don't have -a Google Checkout account, you can quickly set one up during the process.</li> +<li>Pay a <strong>$25 USD registration fee</strong> using Google Wallet. If you don't have +a Google Wallet account, you can quickly set one up during the process.</li> </ol> <p>When your registration is verified, you’ll be notified at the email address you specified during registration.</p> diff --git a/docs/html/google/play/billing/billing_admin.jd b/docs/html/google/play/billing/billing_admin.jd index 91883da1..f1e4ec4 100755 --- a/docs/html/google/play/billing/billing_admin.jd +++ b/docs/html/google/play/billing/billing_admin.jd @@ -29,15 +29,15 @@ few administrative tasks, including setting up and maintaining your product list Developer Console, registering test accounts, and handling refunds when necessary.</p> <p>You must have a Google Play publisher account to register test accounts. And you must have a -Google Checkout merchant account to create a product list and issue refunds to your users. If you +Google Wallet merchant account to create a product list and issue refunds to your users. If you already have a publisher account on Google Play, you can use your existing account. You do not need to register for a new account to support in-app billing.</p> <p>If you do not have a publisher account, you can register as a Google Play developer and set up a publisher account at the <a href="http://play.google.com/apps/publish">Google Play Developer Console</a>. If you do not -have a Google Checkout merchant account, you can register for one at the <a -href="http://checkout.google.com">Google Checkout site</a>.</p> +have a Google Wallet merchant account, you can register for one through the +Developer Console.</p> <h2 id="billing-list-setup">Creating a Product List</h2> @@ -48,7 +48,7 @@ items that are listed in another application's product list.</p> <p>You can access an application's product list by clicking the <strong>In-App Products</strong> link in applications listed in your developer account (see -figure 1). The <strong>In-App Products</strong> link appears only if you have a Google Checkout +figure 1). The <strong>In-App Products</strong> link appears only if you have a Google Wallet merchant account and the application's manifest includes the <code>com.android.vending.BILLING</code> permission.</p> @@ -67,7 +67,7 @@ storing and delivering the digital content that you sell in your applications.</ </div> <p>You can create a product list for any published application or any draft application that's been -uploaded and saved to the Developer Console. However, you must have a Google Checkout merchant +uploaded and saved to the Developer Console. However, you must have a Google Wallet merchant account and the application's manifest must include the <code>com.android.vending.BILLING</code> permission. If an application's manifest does not include this permission, you will be able to edit existing items in the product list but you will not be able to add new items to the list. For more @@ -401,22 +401,22 @@ Billing Version 2</a>. <p>In-app billing does not allow users to send a refund request to Google Play. Refunds for in-app purchases must be directed to you (the application developer). You can then process the -refund through your Google Checkout merchant account. When you do this, Google Play receives a -refund notification from Google Checkout, and Google Play sends a refund message to your +refund through your Google Wallet merchant account. When you do this, Google Play receives a +refund notification from Google Wallet, and Google Play sends a refund message to your application. For more information, see <a href="{@docRoot}google/play/billing/v2/api.html#billing-action-notify">Handling IN_APP_NOTIFY messages</a> and <a href="http://support.google.com/googleplay/android-developer/bin/answer.py?hl=en&answer=1153485">In-app Billing Pricing</a>.</p> -<p class="caution"><strong>Important:</strong> You cannot use the Google Checkout API to issue +<p class="caution"><strong>Important:</strong> You cannot use the Google Wallet API to issue refunds or cancel In-app Billing transactions. You must do this manually through your Google -Checkout merchant account. However, you can use the Google Checkout API to retrieve order +Wallet merchant account. However, you can use the Google Wallet API to retrieve order information.</p> <h2 id="orderId">Working with Order Numbers</h2> -<p>When a user purchases an in-app item, Google Checkout assigns the transaction +<p>When a user purchases an in-app item, Google Wallet assigns the transaction a unique and permanent order number. Google Play provides that order number to you at the conclusion of the purchase flow, as the value of the <code>orderId</code> field of the <code>PURCHASE_STATE_CHANGED</code> @@ -428,9 +428,9 @@ number as a means of tracking the transaction in reconciliation reports and for customer support.</p> <p>The order number itself is a string consisting of numbers only, with a format -assigned and managed by Google Checkout.</p> +assigned and managed by Google Wallet.</p> -<p>For transactions dated 5 December 2012 or later, Google Checkout assigns a +<p>For transactions dated 5 December 2012 or later, Google Wallet assigns a Merchant Order Number (rather than a Google Order Number) and reports the Merchant Order Number as the value of <code>orderID</code>. Here's an example:</p> diff --git a/docs/html/google/play/billing/billing_overview.jd b/docs/html/google/play/billing/billing_overview.jd index 14cbfdf..581c648 100755 --- a/docs/html/google/play/billing/billing_overview.jd +++ b/docs/html/google/play/billing/billing_overview.jd @@ -10,7 +10,7 @@ parent.link=index.html <li>Use In-app Billing to sell digital goods, including one-time items and recurring subscriptions.</li> <li>Supported for any app published on Google Play. You only need a Google -Play Developer Console account and a Google Checkout Merchant account.</li> +Play Developer Console account and a Google Wallet merchant account.</li> <li>Checkout processing is automatically handled by Google Play, with the same look-and-feel as for app purchases.</li> </ul> @@ -119,8 +119,8 @@ In-app Billing</a>.</p> <h2 id="checkout">Google Play Purchase Flow</h2> <p>Google Play uses the same checkout backend service as is used for application purchases, so your users experience a consistent and familiar purchase flow.</p> -<p class="note"><strong>Important:</strong> You must have a Google Checkout -Merchant account to use the In-app Billing service on Google Play.</p> +<p class="note"><strong>Important:</strong> You must have a Google Wallet +merchant account to use the In-app Billing service on Google Play.</p> <p>To initiate a purchase, your application sends a billing request for a specific in-app product. Google Play then handles all of the checkout details for the transaction, including requesting and validating the form of payment and diff --git a/docs/html/google/play/billing/billing_subscriptions.jd b/docs/html/google/play/billing/billing_subscriptions.jd index 2840dbc..92725cf 100644 --- a/docs/html/google/play/billing/billing_subscriptions.jd +++ b/docs/html/google/play/billing/billing_subscriptions.jd @@ -53,7 +53,7 @@ publish. For more information about using the Developer Console, see <p>When users purchase subscriptions in your apps, Google Play handles all checkout details so your apps never have to directly process any financial transactions. Google Play processes all payments for subscriptions through -Google Checkout, just as it does for standard in-app products and app purchases. +Google Wallet, just as it does for standard in-app products and app purchases. This ensures a consistent and familiar purchase flow for your users.</p> <img src="{@docRoot}images/in-app-billing/v3/billing_subscription_v3.png" style="float:right; border:4px solid ddd;"> @@ -137,10 +137,10 @@ original price, but new users will be charged at the new price.</p> automated recurring billing at either of two intervals:</p> <ul> - <li>Monthly — Google Play bills the customer’s Google Checkout account at + <li>Monthly — Google Play bills the customer’s Google Wallet account at the time of purchase and monthly subsequent to the purchase date (exact billing intervals can vary slightly over time)</li> - <li>Annually — Google Play bills the customer's Google Checkout account at + <li>Annually — Google Play bills the customer's Google Wallet account at the time of purchase and again on the same date in subsequent years.</li> </ul> @@ -154,7 +154,7 @@ cycles will always match subscription cycles, based on the purchase date.</p> or by Direct Carrier Billing) that was originally used to purchase the subscription.</p> -<p>When the subscription payment is approved by Google Checkout, Google Play +<p>When the subscription payment is approved by Google Wallet, Google Play provides a purchase token back to the purchasing app through the In-app Billing API. Your apps can store the token locally or pass it to your backend servers, which can then use it to validate or cancel the subscription remotely using the <a @@ -291,7 +291,7 @@ subscriptions are not available at this time.</p> <h2 id="payment">Payment Processing and Policies</h2> <p>In general, the terms of Google Play allow you to sell in-app subscriptions -only through the standard payment processor, Google Checkout. For purchases of +only through the standard payment processor, Google Wallet. For purchases of any subscription products, the transaction fee is the same as the transaction fee for application purchases (30%).</p> @@ -306,7 +306,7 @@ document</a>.</p> <h3 id="orderId">Subscription order numbers</h3> <p>To help you track transactions relating to a given subscription, Google -Checkout provides a base Merchant Order Number for all recurrences of the +Wallet provides a base Merchant Order Number for all recurrences of the subscription and denotes each recurring transaction by appending an integer as follows: </p> diff --git a/docs/html/google/play/billing/billing_testing.jd b/docs/html/google/play/billing/billing_testing.jd index 8dcaa86..241d45e 100755 --- a/docs/html/google/play/billing/billing_testing.jd +++ b/docs/html/google/play/billing/billing_testing.jd @@ -77,8 +77,8 @@ reserved product IDs.</p> <p>When you make an In-app Billing request with this product ID, Google Play responds as though the purchase was refunded. Refunds cannot be initiated through Google Play's in-app billing service. Refunds must be initiated by you (the merchant). After you process a refund - request through your Google Checkout account, a refund message is sent to your application by - Google Play. This occurs only when Google Play gets notification from Google Checkout that + request through your Google Wallet merchant account, a refund message is sent to your application by + Google Play. This occurs only when Google Play gets notification from Google Wallet that a refund has been made. For more information about refunds, see <a href="{@docRoot}google/play/billing/v2/api.html#billing-action-notify">Handling IN_APP_NOTIFY messages</a> and <a href="http://support.google.com/googleplay/android-developer/bin/answer.py?hl=en&answer=1153485">In-app Billing Pricing</a>.</p> @@ -200,7 +200,7 @@ testing.</p> <p>To test your In-app Billing implementation with actual in-app purchases, you will need to register at least one test account on the Google Play Developer Console. You cannot use your -developer account to test the complete in-app purchase process because Google Checkout does not let +developer account to test the complete in-app purchase process because Google Wallet does not let you buy items from yourself. If you have not set up test accounts before, see <a href="{@docRoot}google/play/billing/billing_admin.html#billing-testing-setup">Setting up test accounts</a>.</p> @@ -208,8 +208,8 @@ accounts</a>.</p> <p>Also, a test account can purchase an item in your product list only if the item is published. The application does not need to be published, but the item does need to be published.</p> -<p>When you use a test account to purchase items, the test account is billed through Google Checkout -and your Google Checkout Merchant account receives a payout for the purchase. Therefore, you may +<p>When you use a test account to purchase items, the test account is billed through Google Wallet +and your Google Wallet merchant account receives a payout for the purchase. Therefore, you may want to refund purchases that are made with test accounts, otherwise the purchases will show up as actual payouts to your merchant account.</p> diff --git a/docs/html/google/play/billing/index.jd b/docs/html/google/play/billing/index.jd index 44aa001..1969154 100755 --- a/docs/html/google/play/billing/index.jd +++ b/docs/html/google/play/billing/index.jd @@ -31,7 +31,7 @@ familiar purchase flow.</p> <p>Any application that you publish through Google Play can implement In-app Billing. No special account or registration is required other than a Google Play Developer Console account and a Google -Checkout merchant account.</p> +Wallet merchant account.</p> <p>To help you integrate in-app billing into your application, the Android SDK provides a sample application that demonstrates how to sell standard in-app diff --git a/docs/html/google/play/billing/v2/billing_integrate.jd b/docs/html/google/play/billing/v2/billing_integrate.jd index 1581315..ca41e0b 100755 --- a/docs/html/google/play/billing/v2/billing_integrate.jd +++ b/docs/html/google/play/billing/v2/billing_integrate.jd @@ -226,7 +226,7 @@ how to do this.</p> List</a>.</p> <p class="note"><strong>Note:</strong> You must publish the items in your product list (<code>sword_001</code> and <code>potion_001</code>) even though you are not publishing the - sample application. Also, you must have a Google Checkout Merchant account to add items to the + sample application. Also, you must have a Google Wallet merchant account to add items to the sample application's product list.</p> </li> </ol> @@ -239,7 +239,7 @@ onto a device to run it. To run the sample application, do the following:</p> <ol> <li><strong>Make sure you have at least one test account registered under your Google Play publisher account.</strong> - <p>You cannot purchase items from yourself (Google Checkout prohibits this), so you need to + <p>You cannot purchase items from yourself (Google Wallet prohibits this), so you need to create at least one test account that you can use to purchase items in the sample application. To learn how to set up a test account, see <a href="{@docRoot}google/play/billing/billing_testing.html#billing-testing-setup">Setting up Test @@ -278,7 +278,7 @@ onto a device to run it. To run the sample application, do the following:</p> </li> <li><strong>Run the application and purchase the sword or the potion.</strong> <p>When you use a test account to purchase items, the test account is billed through Google - Wallet and your Google Checkout Merchant account receives a payout for the purchase. + Wallet and your Google Wallet merchant account receives a payout for the purchase. Therefore, you may want to refund purchases that are made with test accounts, otherwise the purchases will show up as actual payouts to your merchant account.</p> </ol> diff --git a/docs/html/google/play/billing/v2/billing_subscriptions.jd b/docs/html/google/play/billing/v2/billing_subscriptions.jd index 3bcf212..db18a53 100755 --- a/docs/html/google/play/billing/v2/billing_subscriptions.jd +++ b/docs/html/google/play/billing/v2/billing_subscriptions.jd @@ -65,7 +65,7 @@ responses. Inside the requests and responses are two new fields described below. token, a string value that uniquely identifies (and associates) a user ID and a subscription ID. Google Play generates the purchase token when the user completes the purchase of a subscription product (and payment is approved by -Google Checkout) and then sends it to the purchasing app on the device through the +Google Wallet) and then sends it to the purchasing app on the device through the In-app Billing API. </p> <p>At the conclusion of a <code>PURCHASE_REQUEST</code> message flow, your app diff --git a/docs/html/tools/workflow/publishing/publishing.jd b/docs/html/tools/workflow/publishing/publishing.jd index 649e80d..ab6321c 100644 --- a/docs/html/tools/workflow/publishing/publishing.jd +++ b/docs/html/tools/workflow/publishing/publishing.jd @@ -83,7 +83,7 @@ to the <a href="http://www.android.com/us/developer-distribution-agreement.html" Developer Distribution Agreement</a>. After you register you can access the Developer Console, where you can upload applications, configure publishing options, and monitor publishing data. If you want to sell your applications or use the in-app billing feature, you will also need -to set up a Google Checkout merchant account. For more information about the registration process, +to set up a Google Wallet merchant account. For more information about the registration process, see <a href="https://support.google.com/androidmarket/developer/bin/answer.py?hl=en&answer=113468"> Developer Registration</a>.</p> @@ -271,7 +271,7 @@ in-app purchases is the same as the transaction fee for application purchases (3 <p>Any application that you publish through Google Play can implement in-app billing. No special account or registration is required other than a Google Play publisher account and a Google -Checkout Merchant account. Also, because the service uses no dedicated framework APIs, you can add +Wallet merchant account. Also, because the service uses no dedicated framework APIs, you can add in-app billing to any application that uses a minimum API level of 4 or higher.</p> <p>To help you integrate in-app billing into your application, the Android SDK provides a <a diff --git a/docs/html/training/in-app-billing/preparing-iab-app.jd b/docs/html/training/in-app-billing/preparing-iab-app.jd index de2dac5..4698cf7 100644 --- a/docs/html/training/in-app-billing/preparing-iab-app.jd +++ b/docs/html/training/in-app-billing/preparing-iab-app.jd @@ -47,7 +47,7 @@ next.link=list-iab-products.html <p>The Google Play Developer Console is where you publish your In-app Billing application and manage the various digital goods that are available for purchase from your application. When you create a new application entry in the Developer Console, it automatically generates a public license key for your application. You will need this key to establish a trusted connection from your application to the Google Play servers. You only need to generate this key once per application, and don’t need to repeat these steps when you update the APK file for your application.</p> <p>To add your application to the Developer Console:</p> <ol> -<li>Go to the <a href="http://play.google.com/apps/publish">Google Play Developer Console</a> site and log in. You will need to register for a new developer account, if you have not registered previously. To sell in-app items, you also need to have a <a href="http://www.google.com/wallet/merchants.html">Google Checkout Merchant</a> account.</li> +<li>Go to the <a href="http://play.google.com/apps/publish">Google Play Developer Console</a> site and log in. You will need to register for a new developer account, if you have not registered previously. To sell in-app items, you also need to have a <a href="http://www.google.com/wallet/merchants.html">Google Wallet</a> merchant account.</li> <li>Click on <strong>Try the new design</strong> to access the preview version of the Developer Console, if you are not already logged on to that version. </li> <li>In the <strong>All Applications</strong> tab, add a new application entry. <ol type="a"> |