Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs
diff --git a/docs/html/distribute/googleplay/about.jd b/docs/html/distribute/googleplay/about.jd
index c7c91ac..c25a9cf 100644
--- a/docs/html/distribute/googleplay/about.jd
+++ b/docs/html/distribute/googleplay/about.jd
@@ -25,7 +25,7 @@
<p>
Google Play is the premier store for distributing Android apps. When you
publish on Google Play, you put your apps in front of Android's huge base of
- active customers, in more than 130 countries and territories across the
+ active customers, in more than 190 countries and territories across the
world.
</p>
diff --git a/docs/html/distribute/monetize/ecommerce.jd b/docs/html/distribute/monetize/ecommerce.jd
index 65e2b20..dc56d46 100644
--- a/docs/html/distribute/monetize/ecommerce.jd
+++ b/docs/html/distribute/monetize/ecommerce.jd
@@ -16,7 +16,7 @@
physical goods and services, such as clothing or movie tickets, through your
apps using <a href=
"https://developers.google.com/wallet/instant-buy/">Instant Buy for
- Android</a> in the US.
+ Android</a> <strong>(US Only)</strong>.
</p>
<p>
diff --git a/docs/html/distribute/stories/games.jd b/docs/html/distribute/stories/games.jd
index 1a482b1..2351eed 100644
--- a/docs/html/distribute/stories/games.jd
+++ b/docs/html/distribute/stories/games.jd
@@ -1,246 +1,28 @@
page.title=Developer Stories: Google Play Game Services
-meta.tags="google play, developer story, games, global"
+meta.tags="google play, story, stories, games, global"
page.image=/images/distribute/glu-ew-gpgames.jpg
-page.metaDescription=How gaming studios are using Google Play game services to deliver new gaming experiences for their users.
+page.metaDescription=How game studios are using Google Play game services to deliver new gaming experiences for their users.
@jd:body
-<p>One of the goals of <a href="https://developers.google.com/games/">Google
-Play game services</a> is to allow developers to focus on what they’re good at
-as game developers — creating great gaming experiences for their users, by
-building on top of what Google is good at: mobile and cloud services. Integral
-to that is an easy integration process, one that provides a whole host of
-features with little engineering work required.</p>
+<p>
+ <a href="https://developers.google.com/games/">Google Play game services</a>
+ lets you add great social features to your games quickly, without having to
+ build them yourself. You can add multiplayer, game invites, quests, and a
+ variety of other features — all from within your app. Google provides
+ cross-platform game and player infrastructure for you, as well as insights
+ and analytics to help you understand the activities of users in your games.
+</p>
-<p>The gaming studios below understood the opportunity that Google Play game
-services unlocked, and are starting to see real results following their
-successful integrations. </p>
+<p>
+ The case study presentations below highlight how top game studios are taking
+ advantage of Google Play game services — the features they've added and
+ the results they are seeing. Each deck (PDF) is focused on a single game and
+ how it uses a specific Google Play gemes feature.
+</p>
-<div style="margin-bottom:2em;"><!-- START STORY -->
-
-<h3>Concrete Software — Straightforward, easy to implement</h3>
-
-<img alt="" class="screenshot thumbnail" style="-webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px height:78px;
- width: 78px;
- float: left;
- margin: 12px 20px 9px 20px;"
- src="http://lh6.ggpht.com/_UOay5HBxf077suKYzmikU2IbnYOJub3X0inz-LoUsVh4TX758BEyArjoR7owXijkAA=w124">
-
-<div style="list-style: none;height:100%;
- float: right;
- border-top: 1px solid #9C0;
- width: 220px;
- margin: 4px 20px;padding: .5em;">
-
- <h5>About the developer</h5>
- <ul>
- <li><a href="https://play.google.com/store/apps/developer?id=Concrete%20Software%2C%20Inc.">Concrete Software</a>,
- makers of <a href="https://play.google.com/store/apps/details?id=com.concretesoftware.pbachallenge_androidmarket&hl=en">PBA
- Bowling Challenge</a></li>
- <li>Added support for multiplayer, leaderboards and achievements through Google Play game
- services</li>
- </ul>
-
- <h5>Results</h5>
- <ul>
- <li>Session lengths have increased more than 15%</li>
- </ul>
-
- <div style="padding:.5em 0 0 1em;">
- <a href="https://play.google.com/store/apps/details?id=com.concretesoftware.pbachallenge_androidmarket&hl=en">
- <img alt="Android app on Google Play" src="{@docRoot}images/brand/en_generic_rgb_wo_45.png" />
- </a>
- </div>
-</div>
-
-<div style="line-height:1.4em;">
-<p style="margin-top:0;margin-bottom:12px;">Concrete Software added several
-features from Google Play game services into one of their top titles,
-<a href="https://play.google.com/store/apps/details?id=com.concretesoftware.pbachallenge_androidmarket">PBA
-Bowling Challenge</a>, including support for multiplayer, leaderboards, and
-achievements.</p>
-
-<p>So far, their users have loved the new additions: average session length
-is up more than 15%. Keith Pichelman, CEO of Concrete Software, explains: </p>
-
-<p>"The Google Play game services were straightforward and easy to implement. We
-had been researching options for multiplayer services, so when Google Play game
-services came out, it was an easy decision for us. Not only were they easy to
-integrate, but the features have worked flawlessly. </p>
-
-<p>"PBA Bowling Challenge now has real-time multiplayer which our users instantly
-were thrilled with; you can see in the reviews how people immediately raved about
-the new game experience. </p>
-
-<p>"We also included achievements, leaderboards, and most recently cloud
-synchronization from the Google Play game services as well. Using the game
-services in PBA Bowling Challenge was a huge success, enough so that we are now
-going back to our other titles, adding the features to them as well."</p>
-</div>
-
-<div style="clear:both;margin-top:40px;width:auto;">
-
- <img src="{@docRoot}images/distribute/concrete-pbc-gpgames.jpg">
-
- <div style="width:600px;margin-top:0px;padding:0 90px;">
- <p class="image-caption"><span style="font-weight:500;">Session lengths up:</span>
- After adding support for multiplayer with Google Play game services, Concrete
- Software saw an increase in session lengths of more than 15% for PBA Bowling
- Challenge.</p>
- </div>
-</div>
-</div> <!-- END STORY -->
-
-<div style="margin:3em auto"><!-- START STORY -->
-
-<h3>Glu: It’s a must-have for all titles</h3>
-
-<img alt="" class="screenshot thumbnail" style="-webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px height:78px;
- width: 78px;
- float: left;
- margin: 12px 20px 30px 20px;"
- src="http://lh4.ggpht.com/Q7mQJsdhulW4_s039R9aaRhQkGnyzLkhF00j5EnyhHOivijnyi7P7b5A8qG0xk1r-jQ=w124">
-
-<div style="list-style: none;height:100%;
- float: right;
- border-top: 1px solid #9C0;
- width: 220px;
- margin: 4px 20px;padding: .5em;">
-
- <h5>About the developer</h5>
- <ul>
- <li><a href="https://play.google.com/store/apps/developer?id=Glu+Mobile">Glu
- Mobile</a>, creators of <a href="https://play.google.com/store/apps/details?id=com.glu.ewarriors2">Eternity
- Warriors 2</a></li>
- <li>Has already integrated 5 titles with Google Play game services</li>
- </ul>
-
- <h5>Results</h5>
- <ul>
- <li>In Eternity Warriors 2, 7-day user retention is up 40%</li>
- <li>20% increase in play sessions per day as well</li>
- </ul>
-
- <div style="padding:.5em 0 0 1em;">
- <a href="https://play.google.com/store/apps/details?id=com.glu.ewarriors2">
- <img alt="Android app on Google Play" src="{@docRoot}images/brand/en_generic_rgb_wo_45.png" />
- </a>
- </div>
-</div>
-
-<div style="line-height:1.4em;">
-<p style="margin-top:0;margin-bottom:12px;">Glu was one of the first developers
-to integrate Google Play game services, with
-<a href="https://play.google.com/store/apps/details?id=com.glu.ewarriors2">Eternity
-Warriors 2</a>. Based on this first success, Glu has integrated game services
-into several more games, including Samurai vs. Zombies 2, Frontline Commando:
-D-Day, Contract Killer 2, and Zombies Ate My Friends.</p>
-
-<p>Already supported in Eternity Warriors 2, they’ve seen a 40% increase in 7-day
-user retention and a 20% increase in play sessions per day. Sourabh Ahuja, Glu's
-Vice President of Android Development, explains:</p>
-
-<p>“Multiplayer, leaderboards, achievements — these are all things that we
-had to build individually for our titles. The availability of these features in
-Google Play game services helps us make our games stickier, and it’s awesome that
-it comes directly from Google. </p>
-
-<p>"It’s flexible enough that we were able to make it interoperable with our
-in-house systems. We look forward to utilizing game services extensively across
-our portfolio."</p>
-</div>
-
-<div style="clear:both;margin-top:40px;width:auto;">
-
- <img src="{@docRoot}images/distribute/glu-ew-gpgames.jpg"></a>
-
- <div style="width:600px;margin-top:0px;padding:0 90px;">
- <p class="image-caption"><span style="font-weight:500;">User retention up:</span>
- Glu saw a 40% increase in 7-day user retention for Eternity Warriors 2 after
- integrating with Google Play game services.</p>
- </div>
-</div>
-</div> <!-- END STORY -->
-
-
-<div style="margin-bottom:2em;"><!-- START STORY -->
-
-<h3>Vector-Unit: An awesome multiplayer experience</h3>
-
-<img alt="" class="screenshot thumbnail" style="-webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px height:78px;
- width: 78px;
- float: left;
- margin: 12px 20px 9px 20px;" src=
- "http://lh3.ggpht.com/dTUrKLffqXHJtPuIlp8fjDhROuzrTcpidbNFprugR65hMrPLX7Omd8SGop0xMXXKzcw=w124">
-
-<div style="list-style: none;height:100%;
- float: right;
- border-top: 1px solid #9C0;
- width: 220px;
- margin: 4px 20px;padding: .5em;">
-
- <h5>About the developer</h5>
- <ul>
- <li><a href="https://play.google.com/store/apps/developer?id=Vector+Unit">Vector
- Unit</a>, creators of <a href="https://play.google.com/store/apps/details?id=com.vectorunit.red">Riptide
- GP2</a></li>
- <li>Added multiplayer to Riptide GP2 through Google Play game services </li>
- </ul>
-
- <h5>Results</h5>
- <ul>
- <li>With an easy multiplayer solution, they were able to focus on the
- gameplay</li>
- <li>Early reviews of Riptide GP2 called multiplayer “one of the sweetest
- cherries on top!”</li>
- </ul>
-
- <div style="padding:.5em 0 0 1em;">
- <a href="https://play.google.com/store/apps/details?id=com.vectorunit.red">
- <img alt="Android app on Google Play" src="{@docRoot}images/brand/en_generic_rgb_wo_45.png" />
- </a>
- </div>
-</div>
-
-<div style="line-height:1.4em;">
-<p style="margin-top:0;margin-bottom:12px;">Vector Unit just launched their
-latest title, <a href="https://play.google.com/store/apps/details?id=com.vectorunit.red">Riptide
-GP2</a>, with Google Play game services integration, and it has one of the strongest
-integrations of multiplayer yet. Early reviews call multiplayer “one of the sweetest
-cherries on top!”.</p>
-
-<p>Ralf Knoesel, CTO of Vector Unit, tells more about how they've used Google Play game
-services:</p>
-
-<p>“We wanted to provide a really compelling multiplayer experience for our users, and
-Google Play game services allowed us to do just that. With multiplayer, you can show off
-your skills and your custom-tuned hydro jet in 4-way online battles with friends and
-players around the world. </p>
-
-<p>"By providing an easy way to power this multiplayer experience, we were able to focus
-on making the gameplay come alive — like the stunts, which are more daring and
-slicker than ever (with more of them to master), or the realistic detail of the water
-splashing against the camera lens.”</p>
-
-</div>
-
-<div style="clear:both;margin-top:40px;width:auto;">
-
- <img src="{@docRoot}images/distribute/vector-unit-rt-gpgames.jpg"></a>
-
- <div style="width:600px;margin-top:0px;padding:0 90px;">
- <p class="image-caption"><span style="font-weight:500;">Multiplayer and more:</span>
- Google Play game services helped Vector Unit pack an awesome multiplayer experience
- into Riptide GP 2, so they could focus on building a great gaming experience.</p>
- </div>
-</div>
-</div> <!-- END STORY -->
-
-
-
+<div class="resource-widget resource-flow-layout col-13"
+ data-query="collection:distribute/stories/games"
+ data-sortOrder="-timestamp"
+ data-cardSizes="18x12"
+ data-maxResults="32"></div>
\ No newline at end of file
diff --git a/docs/html/distribute/tools/localization-checklist.jd b/docs/html/distribute/tools/localization-checklist.jd
index 08a8143..e640243 100644
--- a/docs/html/distribute/tools/localization-checklist.jd
+++ b/docs/html/distribute/tools/localization-checklist.jd
@@ -529,21 +529,6 @@
<strong>Purchase professional translations through Google Play</strong>
</h4>
-<div class="sidebox-wrapper">
- <div class="sidebox">
- <h2>
- App Translations Service
- </h2>
-
- <p>
- To make it easy to export your app's strings and import the finished
- translations into your project, try the <a href=
- "{@docRoot}sdk/installing/installing-adt.html#tmgr">ADT Translation
- Manager Plugin</a>.
- </p>
- </div>
-</div>
-
<p>
Google Play App Translation Service can help you quickly find and purchase
translations of your app. In the Developer Console, you can browse a list of
diff --git a/docs/html/distribute/users/build-buzz.jd b/docs/html/distribute/users/build-buzz.jd
index 412589f..bfdc095 100644
--- a/docs/html/distribute/users/build-buzz.jd
+++ b/docs/html/distribute/users/build-buzz.jd
@@ -126,7 +126,7 @@
also easy to make and available in multiple languages.
</p>
-<div class="headerLine">
+<div class="headerLine" style="clear:both">
<h2 id="cross-promote-from-your-other-apps">
Cross-Promote from Your Other Apps
</h2>
@@ -262,7 +262,7 @@
Sign up for an AdMob account</a> to get started.
</p>
-<div class="headerLine">
+<div class="headerLine" style="clear:both">
<h2 id="maximize-your-marketing-spend">
Maximize your Marketing Spend
</h2>
@@ -285,7 +285,7 @@
platforms simultaneously helps you maximize your return on investment.
</p>
-<div class="headerLine">
+<div class="headerLine" style="clear:both">
<h2 id="related-resources">
Related Resources
</h2>
diff --git a/docs/html/distribute/users/your-listing.jd b/docs/html/distribute/users/your-listing.jd
index f869950..5d2f885 100644
--- a/docs/html/distribute/users/your-listing.jd
+++ b/docs/html/distribute/users/your-listing.jd
@@ -87,11 +87,10 @@
<p>
Choosing the right featured image is important, it needs to convey as much
about the features of your apps and what makes them special as possible,
- without being cluttered and confusing. Check out the <a href=
- "http://android-developers.blogspot.com/">Android Developers blog</a> post
- for more <a href=
- "http://android-developers.blogspot.com/2011/10/android-market-featured-image.html">
- Featured-Image Guidelines</a>.
+ without being cluttered and confusing. To get started with the featured
+ image specs, read the <a
+ href="https://support.google.com/googleplay/android-developer/answer/1078870">featured
+ image guidelines</a> in the Help Center.
</p>
<div class="headerLine">
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 @@
<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 @@
<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 @@
</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 @@
</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/google/play/billing/index.jd b/docs/html/google/play/billing/index.jd
index e1326d7..bdbf5c7 100644
--- a/docs/html/google/play/billing/index.jd
+++ b/docs/html/google/play/billing/index.jd
@@ -14,6 +14,7 @@
<div class="sidebox">
<h2><strong>New in In-App Billing</strong></h2>
<ul>
+ <li><strong>IAB v2 shutdown</strong>—In-app Billing v2 API is deprecated and will be shut down in January 2015. If your app is still using In-app Billing v2, please migrate to the v3 API as soon as possible.</li>
<li><strong>Seasonal subscriptions</strong>—You can now set up a
recurring <a href="billing_subscriptions.html#user-billing">seasonal
subscription</a> that starts and ends on the same date each year (for
@@ -41,7 +42,7 @@
<ul>
<li>Standard in-app products (one-time billing), or</li>
-<li>Subscriptions, (recurring, automated billing)</li>
+<li>Subscriptions (recurring, automated billing)</li>
</ul>
<p>When you use the in-app billing service to sell an item,
diff --git a/docs/html/google/play/billing/v2/api.jd b/docs/html/google/play/billing/v2/api.jd
index 9501555..36a9017 100644
--- a/docs/html/google/play/billing/v2/api.jd
+++ b/docs/html/google/play/billing/v2/api.jd
@@ -2,7 +2,28 @@
excludeFromSuggestions=true
@jd:body
-<div style="background-color:#fffdeb;width:100%;margin-bottom:1em;padding:.5em;">In-app Billing Version 2 is superseded. Please <a href="{@docRoot}google/play/billing/billing_overview.html#migration">migrate to Version 3</a> at your earliest convenience.</div>
+<p class="caution" style=
+"background-color:#fffdeb;width:100%;margin-bottom:1em;padding:.5em;">
+ The <strong>In-app Billing Version 2 API</strong> has been deprecated in
+ favor of the Version 3 API. If your app is using In-app Billing, please
+ <strong>make sure that it is using the Version 3 API</strong>. If your app is
+ still using the Version 2 API, you must <strong>migrate to the Version 3 API
+ as soon as possible</strong>.<br>
+ <br>
+ We plan to turn off the In-app Billing Version 2 service on <strong>January
+ 27, 2015</strong>, after which time users will <strong>no longer be able to
+ purchase in-app items and subscriptions through the Version 2 API</strong>.
+ We strongly encourage and recommend you migrate your apps to use Version 3
+ API by November 2014, to provide ample time for users to update their apps to
+ the new version.<br>
+ <br>
+ For more information, please see the <a href=
+ "http://support.google.com/googleplay/android-developer/answer/6090268">Help Center
+ article</a>. For common questions about transitioning your implementation to
+ In-app Billing Version 3, please see <a href=
+ "{@docRoot}google/play/billing/billing_overview.html#migration">Migration
+ Considerations</a>.
+</p>
<div id="qv-wrapper" style="margin-top:0;">
<div id="qv">
diff --git a/docs/html/google/play/billing/v2/billing_integrate.jd b/docs/html/google/play/billing/v2/billing_integrate.jd
index 5eb17d5..c264271 100644
--- a/docs/html/google/play/billing/v2/billing_integrate.jd
+++ b/docs/html/google/play/billing/v2/billing_integrate.jd
@@ -2,7 +2,28 @@
excludeFromSuggestions=true
@jd:body
-<div style="background-color:#fffdeb;width:100%;margin-bottom:1em;padding:.5em;">In-app Billing Version 2 is superseded. Please <a href="{@docRoot}google/play/billing/billing_overview.html#migration">migrate to Version 3</a> at your earliest convenience.</div>
+<p class="caution" style=
+"background-color:#fffdeb;width:100%;margin-bottom:1em;padding:.5em;">
+ The <strong>In-app Billing Version 2 API</strong> has been deprecated in
+ favor of the Version 3 API. If your app is using In-app Billing, please
+ <strong>make sure that it is using the Version 3 API</strong>. If your app is
+ still using the Version 2 API, you must <strong>migrate to the Version 3 API
+ as soon as possible</strong>.<br>
+ <br>
+ We plan to turn off the In-app Billing Version 2 service on <strong>January
+ 27, 2015</strong>, after which time users will <strong>no longer be able to
+ purchase in-app items and subscriptions through the Version 2 API</strong>.
+ We strongly encourage and recommend you migrate your apps to use Version 3
+ API by November 2014, to provide ample time for users to update their apps to
+ the new version.<br>
+ <br>
+ For more information, please see the <a href=
+ "http://support.google.com/googleplay/android-developer/answer/6090268">Help Center
+ article</a>. For common questions about transitioning your implementation to
+ In-app Billing Version 3, please see <a href=
+ "{@docRoot}google/play/billing/billing_overview.html#migration">Migration
+ Considerations</a>.
+</p>
<div id="qv-wrapper" style="margin-top:0;">
<div id="qv">
<h2>In this document</h2>
diff --git a/docs/html/google/play/billing/v2/billing_reference.jd b/docs/html/google/play/billing/v2/billing_reference.jd
index 4587dee..32e00cf 100644
--- a/docs/html/google/play/billing/v2/billing_reference.jd
+++ b/docs/html/google/play/billing/v2/billing_reference.jd
@@ -2,7 +2,28 @@
excludeFromSuggestions=true
@jd:body
-<div style="background-color:#fffdeb;width:100%;margin-bottom:1em;padding:.5em;">In-app Billing Version 2 is superseded. Please <a href="{@docRoot}google/play/billing/billing_overview.html#migration">migrate to Version 3</a> at your earliest convenience.</div>
+<p class="caution" style=
+"background-color:#fffdeb;width:100%;margin-bottom:1em;padding:.5em;">
+ The <strong>In-app Billing Version 2 API</strong> has been deprecated in
+ favor of the Version 3 API. If your app is using In-app Billing, please
+ <strong>make sure that it is using the Version 3 API</strong>. If your app is
+ still using the Version 2 API, you must <strong>migrate to the Version 3 API
+ as soon as possible</strong>.<br>
+ <br>
+ We plan to turn off the In-app Billing Version 2 service on <strong>January
+ 27, 2015</strong>, after which time users will <strong>no longer be able to
+ purchase in-app items and subscriptions through the Version 2 API</strong>.
+ We strongly encourage and recommend you migrate your apps to use Version 3
+ API by November 2014, to provide ample time for users to update their apps to
+ the new version.<br>
+ <br>
+ For more information, please see the <a href=
+ "http://support.google.com/googleplay/android-developer/answer/6090268">Help Center
+ article</a>. For common questions about transitioning your implementation to
+ In-app Billing Version 3, please see <a href=
+ "{@docRoot}google/play/billing/billing_overview.html#migration">Migration
+ Considerations</a>.
+</p>
<div id="qv-wrapper" style="margin-top:0;">
<div id="qv">
<h2>In this document</h2>
diff --git a/docs/html/google/play/billing/v2/billing_subscriptions.jd b/docs/html/google/play/billing/v2/billing_subscriptions.jd
index f8051a9..01e39ac 100644
--- a/docs/html/google/play/billing/v2/billing_subscriptions.jd
+++ b/docs/html/google/play/billing/v2/billing_subscriptions.jd
@@ -2,7 +2,28 @@
excludeFromSuggestions=true
@jd:body
-<div style="background-color:#fffdeb;width:100%;margin-bottom:1em;padding:.5em;">In-app Billing Version 2 is superseded. Please <a href="{@docRoot}google/play/billing/billing_overview.html#migration">migrate to Version 3</a> at your earliest convenience.</div>
+<p class="caution" style=
+"background-color:#fffdeb;width:100%;margin-bottom:1em;padding:.5em;">
+ The <strong>In-app Billing Version 2 API</strong> has been deprecated in
+ favor of the Version 3 API. If your app is using In-app Billing, please
+ <strong>make sure that it is using the Version 3 API</strong>. If your app is
+ still using the Version 2 API, you must <strong>migrate to the Version 3 API
+ as soon as possible</strong>.<br>
+ <br>
+ We plan to turn off the In-app Billing Version 2 service on <strong>January
+ 27, 2015</strong>, after which time users will <strong>no longer be able to
+ purchase in-app items and subscriptions through the Version 2 API</strong>.
+ We strongly encourage and recommend you migrate your apps to use Version 3
+ API by November 2014, to provide ample time for users to update their apps to
+ the new version.<br>
+ <br>
+ For more information, please see the <a href=
+ "http://support.google.com/googleplay/android-developer/answer/6090268">Help Center
+ article</a>. For common questions about transitioning your implementation to
+ In-app Billing Version 3, please see <a href=
+ "{@docRoot}google/play/billing/billing_overview.html#migration">Migration
+ Considerations</a>.
+</p>
<div id="qv-wrapper" style="margin-top:0;">
<div id="qv">
<h2>In this document</h2>
diff --git a/docs/html/images/gp-build-buzz-uplift-1.png b/docs/html/images/gp-build-buzz-uplift-1.png
new file mode 100644
index 0000000..4319b5b
--- /dev/null
+++ b/docs/html/images/gp-build-buzz-uplift-1.png
Binary files differ
diff --git a/docs/html/images/gp-build-buzz-uplift-2.png b/docs/html/images/gp-build-buzz-uplift-2.png
new file mode 100644
index 0000000..fd6d1f5
--- /dev/null
+++ b/docs/html/images/gp-build-buzz-uplift-2.png
Binary files differ
diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js
index 852db1f..15564e0 100644
--- a/docs/html/jd_collections.js
+++ b/docs/html/jd_collections.js
@@ -743,4 +743,19 @@
"https://support.google.com/googleplay/answer/2651410"
]
},
+ "distribute/stories/games": {
+ "title": "",
+ "resources": [
+ "http://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_Deerhunter2014_gpgs.pdf",
+ "http://storage.googleapis.com/androiddevelopers/shareables/stories/ConcreteSoftware_PBABowling_gpgs.pdf",
+ "http://storage.googleapis.com/androiddevelopers/shareables/stories/Dragonplay_DragonplaySlots_gpgs.pdf",
+ "http://storage.googleapis.com/androiddevelopers/shareables/stories/Gameloft_Asphalt8_gpgs.pdf",
+ "http://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_EternityWarriors3_gpgs.pdf",
+ "http://storage.googleapis.com/androiddevelopers/shareables/stories/HotheadGames_RivalsatWar_gpgs.pdf",
+ "http://storage.googleapis.com/androiddevelopers/shareables/stories/TMSOFT_Compulsive_gpgs.pdf",
+ "http://storage.googleapis.com/androiddevelopers/shareables/stories/Noodlecake_SuperStickmanGolf2_gpgs.pdf",
+ "http://storage.googleapis.com/androiddevelopers/shareables/stories/TinyRebel_DoctorWhoLegacy_gpgs.pdf",
+ "http://storage.googleapis.com/androiddevelopers/shareables/stories/Senri_LeosFortune_gpgs.pdf"
+ ]
+ }
}
diff --git a/docs/html/jd_extras.js b/docs/html/jd_extras.js
index 62d18d6..89d9761 100644
--- a/docs/html/jd_extras.js
+++ b/docs/html/jd_extras.js
@@ -1264,5 +1264,135 @@
"keywords": [],
"type": "",
"titleFriendly": ""
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
+ "url": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_Deerhunter2014_gpgs.pdf",
+ "timestamp": null,
+ "image": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_Deerhunter2014_gpgs.png",
+ "title": "Deer Hunter 2014 by Glu — Sign-in",
+ "summary": "Glu finds that Google Play Game Services helps improve the user experience which leads to increased player happiness. They also find that Play Games Services signed in users tend to play longer and have a higher lifetime value.",
+ "keywords": ["stories"],
+ "type": "Case Study Deck",
+ "titleFriendly": ""
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
+ "url": "http://storage.googleapis.com/androiddevelopers/shareables/stories/ConcreteSoftware_PBABowling_gpgs.pdf",
+ "timestamp": null,
+ "image": "http://storage.googleapis.com/androiddevelopers/shareables/stories/ConcreteSoftware_PBABowling_gpgs.png",
+ "title": "PBA® Bowling Challenge by Concrete Software — Quests",
+ "summary": "Concrete Software finds that Google Play Game Services' quests are a great way to create new content for users that leads to higher engagement.",
+ "keywords": ["stories"],
+ "type": "Case Study Deck",
+ "titleFriendly": ""
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
+ "url": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Dragonplay_DragonplaySlots_gpgs.pdf",
+ "timestamp": null,
+ "image": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Dragonplay_DragonplaySlots_gpgs.png",
+ "title": "Dragonplay Slots by Dragonplay — Sign-in",
+ "summary": "Dragonplay finds that players who sign in with Google Play Games services tend to be high quality users who were highly engaged. They also tend to be easier to convert to paying users.",
+ "keywords": ["stories"],
+ "type": "Case Study Deck",
+ "titleFriendly": ""
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
+ "url": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Gameloft_Asphalt8_gpgs.pdf",
+ "timestamp": null,
+ "image": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Gameloft_Asphalt8_gpgs.png",
+ "title": "Asphalt 8 by Gameloft — Friends invitations",
+ "summary": "Gameloft finds that Google Play Game Services users are more engaged than the average Android user and more likely to convert to paying players.",
+ "keywords": ["stories"],
+ "type": "Case Study Deck",
+ "titleFriendly": ""
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
+ "url": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_EternityWarriors3_gpgs.pdf",
+ "timestamp": null,
+ "image": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Glu_EternityWarriors3_gpgs.png",
+ "title": "Eternity Warriors 3 by Glu — Gifting",
+ "summary": "Glu finds that Google Play Game Services gifting outperforms other implementations (including those with incentives) because of its seamless flow and consistent performance.",
+ "keywords": ["stories"],
+ "type": "Case Study Deck",
+ "titleFriendly": ""
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
+ "url": "http://storage.googleapis.com/androiddevelopers/shareables/stories/HotheadGames_RivalsatWar_gpgs.pdf",
+ "timestamp": null,
+ "image": "http://storage.googleapis.com/androiddevelopers/shareables/stories/HotheadGames_RivalsatWar_gpgs.jpg",
+ "title": "Rivals at War: Firefight by Hothead Games — Leaderboards",
+ "summary": "Hothead Games is planning to include Google Play Game Services features in all their games going forwards after seeing that players that signed in with Play Games Services tend to show higher retention and a higher average revenue.",
+ "keywords": ["stories"],
+ "type": "Case Study Deck",
+ "titleFriendly": ""
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
+ "url": "http://storage.googleapis.com/androiddevelopers/shareables/stories/TMSOFT_Compulsive_gpgs.pdf",
+ "timestamp": null,
+ "image": "http://storage.googleapis.com/androiddevelopers/shareables/stories/TMSOFT_Compulsive_gpgs.png",
+ "title": "Compulsive by TMSOFT — Cross-platform",
+ "summary": "TMSOFT finds that users who authenticate with Play Games Services on Android and iOS play Compulsive twice as much and purchase in-app products over four times as much.",
+ "keywords": ["stories"],
+ "type": "Case Study Deck",
+ "titleFriendly": ""
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
+ "url": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Noodlecake_SuperStickmanGolf2_gpgs.pdf",
+ "timestamp": null,
+ "image": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Noodlecake_SuperStickmanGolf2_gpgs.png",
+ "title": "Super Stickman Golf 2 by Noodlecake Studios — Multiplayer",
+ "summary": "Noodlecake Studios finds that Google Play Game Services’ multiplayer feature helps reduce attrition.",
+ "keywords": ["stories"],
+ "type": "Case Study Deck",
+ "titleFriendly": ""
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
+ "url": "http://storage.googleapis.com/androiddevelopers/shareables/stories/TinyRebel_DoctorWhoLegacy_gpgs.pdf",
+ "timestamp": null,
+ "image": "http://storage.googleapis.com/androiddevelopers/shareables/stories/TinyRebelGames_DrWhoLegacy_pgps.png",
+ "title": "Dr. Doctor Who: Legacy by Tiny Rebel Games — Achievements",
+ "summary": "After integrating achievements and cloud services from Google Play Game Services, Tiny Rebel Games saw a dramatic increase in daily revenues as a result of an increase in daily installs and an increase in the average revenue per install.",
+ "keywords": ["stories"],
+ "type": "Case Study Deck",
+ "titleFriendly": ""
+ },
+ {
+ "lang": "en",
+ "group": "",
+ "tags": [],
+ "url": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Senri_LeosFortune_gpgs.pdf",
+ "timestamp": null,
+ "image": "http://storage.googleapis.com/androiddevelopers/shareables/stories/Senri_LeosFortune_gpgs.png",
+ "title": "Leo’s Fortune by 1337 & Senri — Saved games",
+ "summary": "1337 + Senri finds that Google Play Game Services is easy to integrate and provides essential game functions like cloud saved games, achievements and leaderboards which have a very large adoption rate amongst players.",
+ "keywords": ["stories"],
+ "type": "Case Study Deck",
+ "titleFriendly": ""
}
]);
diff --git a/docs/html/sdk/download.jd b/docs/html/sdk/download.jd
index 4329102..52432cf 100644
--- a/docs/html/sdk/download.jd
+++ b/docs/html/sdk/download.jd
@@ -14,9 +14,9 @@
if (location.indexOf('?v=') != -1) {
var filename = location.substring(location.indexOf('=')+1,location.length);
if (document.getElementById('checkbox').checked) {
- document.location = "http://dl.google.com/android/" + filename;
+ document.location = "https://dl.google.com/android/" + filename;
}
- document.getElementById('click-download').setAttribute("href", "http://dl.google.com/android/"
+ document.getElementById('click-download').setAttribute("href", "https://dl.google.com/android/"
+ filename);
$("#terms-form").hide(500);
$("#next-steps").show(500);
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd
index edee360..70410c1 100644
--- a/docs/html/sdk/index.jd
+++ b/docs/html/sdk/index.jd
@@ -246,11 +246,9 @@
<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..ec0e2f8 100644
--- a/docs/html/sdk/installing/index.jd
+++ b/docs/html/sdk/installing/index.jd
@@ -112,7 +112,7 @@
your JDK folder, for example <code>C:\Program Files\Java\jdk1.7.0_21</code>.</p>
</p>
</li>
-
+
</ol>
@@ -260,10 +260,10 @@
<h5 id="Troubleshooting" style="margin-bottom:15px"><a href='' class="expandable"
- onclick="toggleExpandable(this,'#ubuntu-trouble');return false;"
+ onclick="toggleExpandable(this,'#UbuntuTrouble');return false;"
>Troubleshooting Ubuntu</a></h5>
-<div id="ubuntu-trouble" style="display:none">
+<div id="UbuntuTrouble" style="display:none">
<ul>
<li>If you need help installing and configuring Java on your
development machine, you might find these resources helpful:
@@ -416,6 +416,9 @@
}
}
-
-
+/* direct link to ubuntu troubleshooting */
+if ( document.location.href.indexOf('#UbuntuTrouble') > -1 ) {
+ $(".linux.docs").show();
+ toggleExpandable(this,'#UbuntuTrouble');
+}
</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 @@
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..deafed5 100644
--- a/docs/html/tools/sdk/eclipse-adt.jd
+++ b/docs/html/tools/sdk/eclipse-adt.jd
@@ -53,9 +53,44 @@
<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.2</a>.
+ If you haven't already installed SDK Tools r23.0.2 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>
