summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2013-02-14 12:09:16 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-02-14 12:09:16 -0800
commitf16de3f3f622a04d48cd595c76165ac60a3efcfa (patch)
tree65f44eabe376629e88a9dd40fcd2109819f5f4ff /docs
parent6b4d73c985996cf3fd1333edc073b5260c9d897e (diff)
parent0f4a378dc7da59a4fe45c111c09f52696dbb6476 (diff)
downloadframeworks_base-f16de3f3f622a04d48cd595c76165ac60a3efcfa.zip
frameworks_base-f16de3f3f622a04d48cd595c76165ac60a3efcfa.tar.gz
frameworks_base-f16de3f3f622a04d48cd595c76165ac60a3efcfa.tar.bz2
am 0f4a378d: am da9ac596: am 9a93e079: am f857c51d: Doc change: add notice for iab v3 subscriptions launch.
# Via Android Git Automerger (3) and Dirk Dougherty (1) * commit '0f4a378dc7da59a4fe45c111c09f52696dbb6476': Doc change: add notice for iab v3 subscriptions launch.
Diffstat (limited to 'docs')
-rw-r--r--docs/html/google/play/billing/billing_overview.jd3
-rw-r--r--docs/html/google/play/billing/billing_subscriptions.jd21
2 files changed, 22 insertions, 2 deletions
diff --git a/docs/html/google/play/billing/billing_overview.jd b/docs/html/google/play/billing/billing_overview.jd
index bda9237..14cbfdf 100644
--- a/docs/html/google/play/billing/billing_overview.jd
+++ b/docs/html/google/play/billing/billing_overview.jd
@@ -69,7 +69,8 @@ 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
"unowned" state and can be purchased again from Google Play</li>
-<li>Provides support for subscriptions</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
<a href="{@docRoot}google/play/billing/versions.html">Version Notes</a>.</p>
diff --git a/docs/html/google/play/billing/billing_subscriptions.jd b/docs/html/google/play/billing/billing_subscriptions.jd
index 2840dbc..c2bbb49 100644
--- a/docs/html/google/play/billing/billing_subscriptions.jd
+++ b/docs/html/google/play/billing/billing_subscriptions.jd
@@ -3,7 +3,26 @@ parent.title=In-app Billing
parent.link=index.html
@jd:body
-<div id="qv-wrapper">
+<!--notice block -->
+ <div style="background-color:#fffbd9;width:100%;margin-bottom:1em;padding:8px 8px 1px;">
+ <p><em>15 February 2013</em></p>
+ <p>In-app Billing V3 now supports subscriptions and you can get
+ started developing today. A small app update is currently being
+ rolled out to Android devices. This process is automatic and
+ most devices will get the update in the next few days. However,
+ if you wish to get the update today to start developing right
+ away, simply reboot your device. </p>
+
+ <p>However, we recommend that you <em>do not publish</em> an app with
+ V3 subscriptions until all Android devices have received the update. We'll
+ notify you here that all devices have received the update and its safe
+ to publish your apps that use V3 subscriptions. </p>
+ </div>
+
+<!-- Use non-standard wrapper to support notice block. Restore standard
+ wrapper when notice is removed. -->
+<!--<div id="qv-wrapper"> -->
+<div id="qv-wrapper" style="margin-top:.25em;">
<div id="qv">
<h2>Quickview</h2>
<ul>