diff options
Diffstat (limited to 'docs')
-rw-r--r-- | docs/html/google/gcm/ccs.jd | 12 | ||||
-rw-r--r-- | docs/html/google/play/billing/billing_overview.jd | 164 | ||||
-rw-r--r-- | docs/html/guide/topics/resources/drawable-resource.jd | 2 | ||||
-rw-r--r-- | docs/html/preview/setup-sdk.jd | 11 | ||||
-rw-r--r-- | docs/html/sdk/index.jd | 8 | ||||
-rw-r--r-- | docs/html/sdk/installing/index.jd | 9 | ||||
-rw-r--r-- | docs/html/sdk/installing/installing-adt.jd | 8 | ||||
-rw-r--r-- | docs/html/sdk/installing/studio-build.jd | 4 | ||||
-rw-r--r-- | docs/html/tools/sdk/eclipse-adt.jd | 35 | ||||
-rw-r--r-- | docs/html/tools/sdk/tools-notes.jd | 32 | ||||
-rw-r--r-- | docs/html/training/basics/fragments/fragment-ui.jd | 6 |
11 files changed, 186 insertions, 105 deletions
diff --git a/docs/html/google/gcm/ccs.jd b/docs/html/google/gcm/ccs.jd index 1c7c802..2faf97f 100644 --- a/docs/html/google/gcm/ccs.jd +++ b/docs/html/google/gcm/ccs.jd @@ -81,10 +81,14 @@ Java sample using the Smack library</a>.</p> <p>The CCS XMPP endpoint runs at {@code gcm.googleapis.com:5235}. When testing functionality (with non-production users), you should instead connect to -{@code gcm-staging.googleapis.com:5236} (note the different port). Testing on -staging (a smaller environment where the latest CCS builds run) is beneficial -both for isolating real users from test code, as well as for early detection of -unexpected behavior changes.</p> +{@code gcm-preprod.googleapis.com:5236} (note the different port). Regular +testing on preprod (a smaller environment where the latest CCS builds run) is +beneficial both for isolating real users from test code, as well as for early +detection of unexpected behavior changes. Note that a connection receives upstream +messages destined for its GCM sender ID, regardless of which environment (gcm or +gcm-preprod) it is connected to. Therefore, test code connecting to +{@code gcm-preprod.googleapis.com:5236} should use a different GCM sender ID to +avoid upstream messages from production traffic being sent over test connections.</p> <p>The connection has two important requirements:</p> diff --git a/docs/html/google/play/billing/billing_overview.jd b/docs/html/google/play/billing/billing_overview.jd index 12f8c9a..1c20d78 100644 --- a/docs/html/google/play/billing/billing_overview.jd +++ b/docs/html/google/play/billing/billing_overview.jd @@ -7,11 +7,11 @@ parent.link=index.html <div id="qv"> <h2>Quickview</h2> <ul> - <li>Use In-app Billing to sell digital goods, including one-time items and + <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 + <li>Supported for any app published on Google Play. You only need a Google Play Developer Console account and a Google Wallet merchant account.</li> - <li>Checkout processing is automatically handled by Google Play, with the + <li>Checkout processing is automatically handled by Google Play, with the same look-and-feel as for app purchases.</li> </ul> <h2>In this document</h2> @@ -24,18 +24,18 @@ same look-and-feel as for app purchases.</li> </li> <li><a href="#console">Google Play Developer Console</a></li> <li><a href="#checkout">Google Play Purchase Flow</a></li> - <li><a href="#samples">Sample App</a></li> + <li><a href="#samples">Sample App</a></li> <li><a href="#migration">Migration Considerations</a></li> </ol> <h2>Related Samples</h2> <ol> <li><a href="{@docRoot}training/in-app-billing/preparing-iab-app.html#GetSample">Sample Application (V3)</a></li> - </ol> + </ol> </div> </div> -<p>This documentation describes the fundamental In-app Billing components and -features that you need to understand in order to add In-app +<p>This documentation describes the fundamental In-app Billing components and +features that you need to understand in order to add In-app Billing features into your application.</p> <p class="note"><b>Note</b>: Ensure that you comply with applicable laws in the countries where you @@ -49,130 +49,132 @@ of the EU consumer protection authorities</a> for more information on this and o </p> <h2 id="api">In-app Billing API</h2> -<p>Your application accesses the In-app Billing service using an API that is -exposed by the Google Play app that is installed on the device. The Google Play -app then conveys billing requests and responses between your -application and the Google Play server. In practice, your application never -directly communicates with the Google Play server. Instead, your application -sends billing requests to the Google Play application over interprocess -communication (IPC) and receives responses from the Google Play app. -Your application does not manage any network connections between itself and +<p>Your application accesses the In-app Billing service using an API that is +exposed by the Google Play app that is installed on the device. The Google Play +app then conveys billing requests and responses between your +application and the Google Play server. In practice, your application never +directly communicates with the Google Play server. Instead, your application +sends billing requests to the Google Play application over interprocess +communication (IPC) and receives responses from the Google Play app. +Your application does not manage any network connections between itself and the Google Play server.</p> -<p>In-app Billing can be implemented only in applications that you publish -through Google Play. To complete in-app purchase requests, the Google Play app +<p>In-app Billing can be implemented only in applications that you publish +through Google Play. To complete in-app purchase requests, the Google Play app must be able to access the Google Play server over the network.</p> -<p>In-app billing Version 3 is the latest version, and maintains very broad -compatibility across the range of Android devices. In-app Billing Version 3 is -supported on devices running Android 2.2 or higher that have the latest version +<p>In-app billing Version 3 is the latest version, and maintains very broad +compatibility across the range of Android devices. In-app Billing Version 3 is +supported on devices running Android 2.2 or higher that have the latest version of the Google Play store installed (<a href="{@docRoot}about/dashboards/index.html">a vast majority</a> of active devices).</p> <h4>Version 3 features</h4> <ul> -<li>Requests are sent through a streamlined API that allows you to easily request -product details from Google Play, order in-app products, and quickly restore +<li>Requests are sent through a streamlined API that allows you to easily request +product details from Google Play, order in-app products, and quickly restore items based on users' product ownership</li> -<li>Order information is synchronously propagated to the device on purchase +<li>Order information is synchronously propagated to the device on purchase completion</li> -<li>All purchases are “managed” (that is, Google Play keeps track of the user's -ownership of in-app products). The user cannot own multiple copies of an in-app +<li>All purchases are “managed” (that is, Google Play keeps track of the user's +ownership of in-app products). The user cannot own multiple copies of an in-app item; only one copy can be owned at any point in time</li> -<li>Purchased items can be consumed. When consumed, the item reverts to the +<li>Purchased items can be consumed. When consumed, the item reverts to the "unowned" state and can be purchased again from Google Play</li> <li>Provides support for <a href="{@docRoot}google/play/billing/billing_subscriptions.html">subscriptions</a></li> </ul> -<p>For details about other versions of In-app Billing, see the +<p>For details about other versions of In-app Billing, see the <a href="{@docRoot}google/play/billing/versions.html">Version Notes</a>.</p> <h2 id="products">In-app Products</h2> -<p>In-app products are the digital goods that you offer for sale from inside your -application to users. Examples of digital goods includes in-game currency, -application feature upgrades that enhance the user experience, and new content +<p>In-app products are the digital goods that you offer for sale from inside your +application to users. Examples of digital goods includes in-game currency, +application feature upgrades that enhance the user experience, and new content for your application.</p> -<p>You can use In-app Billing to sell only digital content. -You cannot use In-app Billing to sell physical goods, personal services, or -anything that requires physical delivery. Unlike with priced applications, once +<p>You can use In-app Billing to sell only digital content. +You cannot use In-app Billing to sell physical goods, personal services, or +anything that requires physical delivery. Unlike with priced applications, once the user has purchased an in-app product there is no refund window.</p> -<p>Google Play does not provide any form of content delivery. You are -responsible for delivering the digital content that you sell in your -applications. In-app products are always explicitly associated with one and -only one app. That is, one application cannot purchase an in-app product +<p>Google Play does not provide any form of content delivery. You are +responsible for delivering the digital content that you sell in your +applications. In-app products are always explicitly associated with one and +only one app. That is, one application cannot purchase an in-app product published for another app, even if they are from the same developer.</p> <h3 id="prodtypes">Product types</h3> -<p>In-app Billing supports different product types to give you flexibility in -how you monetize your application. In all cases, you define your products using +<p>In-app Billing supports different product types to give you flexibility in +how you monetize your application. In all cases, you define your products using the Google Play Developer Console.</p> -<p>You can specify these types of products for your In-app Billing application -— <em>managed in-app products</em> and <em>subscriptions</em>. Google Play -handles and tracks ownership for in-app products and subscriptions on your +<p>You can specify these types of products for your In-app Billing application +— <em>managed in-app products</em> and <em>subscriptions</em>. Google Play +handles and tracks ownership for in-app products and subscriptions on your application on a per user account basis. <a href="{@docRoot}google/play/billing/api.html#producttypes">Learn more about the product types supported by In-app Billing Version 3</a>.</p> <h2 id="console">Google Play Developer Console</h2> -<p>The Developer Console is where you can publish your -In-app Billing application, and manage the various in-app products that are +<p>The Developer Console is where you can publish your +In-app Billing application, and manage the various in-app products that are available for purchase from your application.</p> -<p>You can create a product list of -digital goods that are associated with your application, including items for -one-time purchase and recurring subscriptions. For each item, you can define -information such as the item’s unique product ID (also called its SKU), product -type, pricing, description, and how Google Play should handle and track +<p>You can create a product list of +digital goods that are associated with your application, including items for +one-time purchase and recurring subscriptions. For each item, you can define +information such as the item’s unique product ID (also called its SKU), product +type, pricing, description, and how Google Play should handle and track purchases for that product.</p> -<p>You can also create test accounts to authorize +<p>You can also create test accounts to authorize access for testing applications that are unpublished.</p> -<p>To learn how to use the Developer Console to configure your in-app -products and product list, see -<a href="{@docRoot}google/play/billing/billing_admin.html">Administering +<p>To learn how to use the Developer Console to configure your in-app +products and product list, see +<a href="{@docRoot}google/play/billing/billing_admin.html">Administering 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 +<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 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 -processing the financial transaction.</p> -<p>When the checkout process is complete, -Google Play sends your application the purchase details, such as the order -number, the order date and time, and the price paid. At no point does your -application have to handle any financial transactions; that role is provided by +<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 +processing the financial transaction.</p> +<p>When the checkout process is complete, +Google Play sends your application the purchase details, such as the order +number, the order date and time, and the price paid. At no point does your +application have to handle any financial transactions; that role is provided by Google Play.</p> <h2 id="samples">Sample Application</h2> -<p>To help you integrate In-app Billing into your application, the Android SDK -provides a sample application that demonstrates how to sell in-app products and subscriptions +<p>To help you integrate In-app Billing into your application, the Android SDK +provides a sample application that demonstrates how to sell in-app products and subscriptions from inside an app.</p> -<p>The <a href="{@docRoot}training/in-app-billing/preparing-iab-app.html#GetSample">TrivialDrive sample for the Version 3 API</a> sample shows how to use the In-app Billing Version 3 API -to implement in-app product and subscription purchases for a driving game. The -application demonstrates how to send In-app Billing requests, and handle -synchronous responses from Google Play. The application also shows how to record -item consumption with the API. The Version 3 sample includes convenience classes -for processing In-app Billing operations as well as perform automatic signature +<p>The <a href="{@docRoot}training/in-app-billing/preparing-iab-app.html#GetSample">TrivialDrive sample for the Version 3 API</a> sample shows how to use the In-app Billing Version 3 API +to implement in-app product and subscription purchases for a driving game. The +application demonstrates how to send In-app Billing requests, and handle +synchronous responses from Google Play. The application also shows how to record +item consumption with the API. The Version 3 sample includes convenience classes +for processing In-app Billing operations as well as perform automatic signature verification.</p> -<p class="caution"><strong>Recommendation</strong>: Make sure to obfuscate the +<p class="caution"><strong>Recommendation</strong>: Make sure to obfuscate the code in your application before you publish it. For more information, see -<a href="{@docRoot}google/play/billing/billing_best_practices.html">Security +<a href="{@docRoot}google/play/billing/billing_best_practices.html">Security and Design</a>.</p> <h2 id="migration">Migration Considerations</h2> -<p>If you have an existing In-app Billing implementation that uses Version 2 or -earlier, it is strongly recommended that you migrate to <a href="{@docRoot}google/play/billing/api.html">In-app Billing Version 3</a> at your earliest convenience.</p> +<p>The In-app Billing Version 2 API is deprecated and will be discontinued in January 2015. +If you have an existing In-app Billing implementation that uses API Version 2 or +earlier, you must migrate to <a href="{@docRoot}google/play/billing/api.html">In-app Billing Version +3</a>.</p> <p>If you have published apps selling in-app products, note that:</p> <ul> -<li>Managed items and subscriptions that you have previously defined in the Developer Console will +<li>Managed items and subscriptions that you have previously defined in the Developer Console will work with Version 3 as before.</li> -<li>Unmanaged items that you have defined for existing applications will be -treated as managed products if you make a purchase request for these items using -the Version 3 API. You do not need to create a new product entry in Developer -Console for these items, and you can use the same product IDs to purchase these -items. They will still continue to be treated as unmanaged items if you make a -purchase request for them using the Version 2 or earlier API. +<li>Unmanaged items that you have defined for existing applications will be +treated as managed products if you make a purchase request for these items using +the Version 3 API. You do not need to create a new product entry in Developer +Console for these items, and you can use the same product IDs to purchase these +items. They will still continue to be treated as unmanaged items if you make a +purchase request for them using the Version 2 or earlier API. </ul> diff --git a/docs/html/guide/topics/resources/drawable-resource.jd b/docs/html/guide/topics/resources/drawable-resource.jd index dee28fe..06bd2d0 100644 --- a/docs/html/guide/topics/resources/drawable-resource.jd +++ b/docs/html/guide/topics/resources/drawable-resource.jd @@ -67,7 +67,7 @@ android:drawable="@color/green"}).</p> <h2 id="Bitmap">Bitmap</h2> -<p>A bitmap image. Android supports bitmap files in a three formats: +<p>A bitmap image. Android supports bitmap files in three formats: {@code .png} (preferred), {@code .jpg} (acceptable), {@code .gif} (discouraged).</p> <p>You can reference a bitmap file directly, using the filename as the resource ID, or create an diff --git a/docs/html/preview/setup-sdk.jd b/docs/html/preview/setup-sdk.jd index af466ab..a05baa7 100644 --- a/docs/html/preview/setup-sdk.jd +++ b/docs/html/preview/setup-sdk.jd @@ -202,10 +202,16 @@ to flash the following devices: <li>Nexus 7 Wi-Fi (version 2, released in 2013)</li> </ul> -<p>In addition, you also get the emulator system images, which includes +<p>In addition, you also get the emulator system images, which include experimental 64-bit system images along with standard 32-bit system images. </p> +<p class="note"><strong>Note:</strong> The 64-bit system images require the +Intel x86 Emulator Accelerator (HAXM) Rev.5 which can be downloaded from the +<a href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a><em>Extras</em> +folder.</p> + + <h3 id="installImage">Install the L Preview System Image</h3> <p class="warning"><b>Warning:</b> This is a preview version of the Android @@ -218,6 +224,7 @@ can cause your phone and installed services and applications to stop working. </p> + <ol> <li>Download and uncompress the Android Developer Preview package. <table style="width:860px"> @@ -361,4 +368,4 @@ sure that you theme extends the material theme:</p> } }); -</script>
\ No newline at end of file +</script> diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd index 2bbdfc8..9ed70ed 100644 --- a/docs/html/sdk/index.jd +++ b/docs/html/sdk/index.jd @@ -246,11 +246,9 @@ This is the Android Software Development Kit License Agreement <p>The Android SDK provides you the API libraries and developer tools necessary to build, test, and debug apps for Android.</p> -<p>If you're a new Android developer, we recommend you download the ADT Bundle -to quickly start developing apps. It includes the essential -Android SDK components and a version of the Eclipse IDE with built-in -<b>ADT (Android Developer Tools)</b> to -streamline your Android app development.</p> +<p>Download the ADT Bundle to quickly start developing apps. It includes the essential Android +SDK components and a version of the Eclipse IDE with built-in <b>ADT (Android Developer Tools)</b> +to streamline your Android app development.</p> <!-- this appears when viewing the online docs --> diff --git a/docs/html/sdk/installing/index.jd b/docs/html/sdk/installing/index.jd index 304b53d..e98446b 100644 --- a/docs/html/sdk/installing/index.jd +++ b/docs/html/sdk/installing/index.jd @@ -112,7 +112,7 @@ style="float:right;font-size:13px"><a href='' onclick='showAll();return false;' your JDK folder, for example <code>C:\Program Files\Java\jdk1.7.0_21</code>.</p> </p> </li> - + </ol> @@ -416,6 +416,9 @@ function getUrlParam(param) { } } - - +/* direct link to ubuntu troubleshooting */ +if ( document.location.href.indexOf('#ubuntu-trouble') > -1 ) { + $(".linux.docs").show(); + toggleExpandable(this,'#ubuntu-trouble'); +} </script> diff --git a/docs/html/sdk/installing/installing-adt.jd b/docs/html/sdk/installing/installing-adt.jd index 5a433d4..c8200aa 100644 --- a/docs/html/sdk/installing/installing-adt.jd +++ b/docs/html/sdk/installing/installing-adt.jd @@ -1,8 +1,8 @@ page.title=Installing the Eclipse Plugin -adt.zip.version=23.0.3 -adt.zip.download=ADT-23.0.3.zip -adt.zip.bytes=103321934 -adt.zip.checksum=ab2f5e2fbbdddeeb7dfd02cd4046538a +adt.zip.version=23.0.4 +adt.zip.download=ADT-23.0.4.zip +adt.zip.bytes=103336810 +adt.zip.checksum=91a43dcf686ab73dec2c08b77243492b @jd:body diff --git a/docs/html/sdk/installing/studio-build.jd b/docs/html/sdk/installing/studio-build.jd index 29ba12d..bff3bc0 100644 --- a/docs/html/sdk/installing/studio-build.jd +++ b/docs/html/sdk/installing/studio-build.jd @@ -454,8 +454,8 @@ with the default local certificate, so that you can install it on the emulator a for debugging purposes.</p> <p>After you build the project, the output APK for the app module is located in -<code>app/build/apk/</code>, and the output AAR for the lib module is located in -<code>lib/build/libs/</code>.</p> +<code>app/build/outputs/apk/</code>, and the output AAR for the lib module is located in +<code>lib/build/outputs/libs/</code>.</p> <p>To see a list of all available build tasks for your project, type this command:</p> diff --git a/docs/html/tools/sdk/eclipse-adt.jd b/docs/html/tools/sdk/eclipse-adt.jd index cf33200..469d11f 100644 --- a/docs/html/tools/sdk/eclipse-adt.jd +++ b/docs/html/tools/sdk/eclipse-adt.jd @@ -53,9 +53,44 @@ the ADT Plugin, as denoted by revision number. </p> <p>For a summary of all known issues in ADT, see <a href="http://tools.android.com/knownissues">http://tools.android.com/knownissues</a>.</p> + <div class="toggle-content opened"> <p><a href="#" onclick="return toggleContent(this)"> <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img" + alt=""/>ADT 23.0.4</a> <em>(October 2014)</em> + </p> + + <div class="toggle-content-toggleme"> +<dl> + <dt>Dependencies:</dt> + + <dd> + <ul> + <li>Java 7 or higher is required if you are targeting the L Developer Preview.</li> + <li>Java 1.6 or higher is required if you are targeting other releases.</li> + <li>Eclipse Indigo (Version 3.7.2) or higher is required.</li> + <li>This version of ADT is designed for use with + <a href="{@docRoot}tools/sdk/tools-notes.html">SDK Tools r23.0.4</a>. + If you haven't already installed SDK Tools r23.0.4 into your SDK, use the + Android SDK Manager to do so.</li> + </ul> + </dd> + + <dt>General Notes:</dt> + <dd> + <ul> + <li>Fixed duplicate devices in AVD for Wear and TV.</li> + </ul> + </dd> +</dl> +</div> +</div> + + + +<div class="toggle-content closed"> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" alt=""/>ADT 23.0.3</a> <em>(August 2014)</em> </p> diff --git a/docs/html/tools/sdk/tools-notes.jd b/docs/html/tools/sdk/tools-notes.jd index c2aaae8..ce6a920 100644 --- a/docs/html/tools/sdk/tools-notes.jd +++ b/docs/html/tools/sdk/tools-notes.jd @@ -28,6 +28,38 @@ href="http://tools.android.com/knownissues">http://tools.android.com/knownissues <div class="toggle-content opened"> <p><a href="#" onclick="return toggleContent(this)"> <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img" + alt=""/>SDK Tools, Revision 23.0.4</a> <em>(October 2014)</em> + </p> + + <div class="toggle-content-toggleme"> + + <dl> + <dt>Dependencies:</dt> + + <dd> + <ul> + <li>Android SDK Platform-tools revision 19 or later.</li> + <li>If you are developing in Eclipse with ADT, note that this version of SDK Tools is + designed for use with ADT 23.0.4 and later. If you haven't already, update your + <a href="{@docRoot}tools/sdk/eclipse-adt.html">ADT Plugin</a> to 23.0.4.</li> + <li>If you are developing outside Eclipse, you must have + <a href="http://ant.apache.org/">Apache Ant</a> 1.8 or later.</li> + </ul> + </dd> + + <dt>General Notes:</dt> + <dd> + <ul> + <li>Fixed duplicate devices in AVD for Wear and TV.</li> + </ul> + </dd> + </div> +</div> + + +<div class="toggle-content closed"> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" alt=""/>SDK Tools, Revision 23.0.2</a> <em>(July 2014)</em> </p> diff --git a/docs/html/training/basics/fragments/fragment-ui.jd b/docs/html/training/basics/fragments/fragment-ui.jd index 14469bf..4fa5b70 100644 --- a/docs/html/training/basics/fragments/fragment-ui.jd +++ b/docs/html/training/basics/fragments/fragment-ui.jd @@ -66,9 +66,9 @@ and perform other fragment transactions.</p> initial fragment(s) to the activity during the activity's {@link android.app.Activity#onCreate onCreate()} method.</p> -<p>An important rule when dealing with fragments—especially those that you add at -runtime—is that the fragment must have a container {@link android.view.View} in the layout in -which the fragment's layout will reside.</p> +<p>An important rule when dealing with fragments—especially when adding fragments at +runtime—is that your activity layout must include a container {@link android.view.View} +in which you can insert the fragment.</p> <p>The following layout is an alternative to the layout shown in the <a href="creating.html">previous lesson</a> that shows only one fragment at a time. In order to replace |