Commit Graph

546 Commits

Author SHA1 Message Date
Joe Fernandez
68fb46153f Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am: 9e823c7048
am: 1a045584d4

* commit '1a045584d44030947793f2a48953ce54ff2df0c6':
  docs: Remove Advertising ID page and redirect to GMS reference docs

Change-Id: If2ede00cf1ab2bdb178eed09ec6f9cd6d28f8820
2016-05-26 04:47:34 +00:00
Joe Fernandez
e8a0b488dc docs: Remove Advertising ID page and redirect to GMS reference docs
b/28965089

Change-Id: I16141cf5711358c1b38f7e28a8150e2281990eb6
2016-05-25 18:36:12 -07:00
Hemal Patel
99a9b165e8 Merge "Docs: Fixed a wrong file name" into mnc-io-docs am: 06a9fbcdd6
am: a18a3d3211

* commit 'a18a3d32118872907e0979856f5906752360b058':
  Docs: Fixed a wrong file name

Change-Id: I93ac53610c9c1b0aad68e525eed3d8703bfde613
2016-05-20 00:25:49 +00:00
Hemal Patel
06a9fbcdd6 Merge "Docs: Fixed a wrong file name" into mnc-io-docs 2016-05-20 00:15:09 +00:00
Dirk Dougherty
f339170837 Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 am: 5fb577e6bc
am: 8053c79246

* commit '8053c79246f14a78158b6476169299999299d6d8':
  Remove outdated google services links.

Change-Id: I4c85952e4962381261e42d3ecf1c3408a57ab55e
2016-05-19 23:19:12 +00:00
Dirk Dougherty
5fb577e6bc Merge "Remove outdated google services links." into mnc-mr-docs
am: dc40b80ae9

* commit 'dc40b80ae930ac80fd7067e7e9ecc78454e847c5':
  Remove outdated google services links.

Change-Id: I534cae19e16547cac3f34436f38f86ababcbeaca
2016-05-19 23:07:10 +00:00
Dirk Dougherty
dc40b80ae9 Merge "Remove outdated google services links." into mnc-mr-docs 2016-05-19 23:01:54 +00:00
Dirk Dougherty
8b35261e90 Remove outdated google services links.
Change-Id: Ie30c18940c2fd7fbbbfa737145cda36b8a2fc26e
2016-05-19 16:00:56 -07:00
Hemal Patel
a1ed45d7c8 Docs: Fixed a wrong file name
Bug: 26897599
Change-Id: I4a0bb6149e6a88bb9eda90b8bcc44909633f8399
2016-05-19 14:13:29 -07:00
smain@google.com
d24ad86909 Update app context in code snippet bug: 28842396 am: 056df25179 am: 0fc19538cf
am: cca8eba82d

* commit 'cca8eba82d48888656d36aed8020fd3ecd738fdd':
  Update app context in code snippet bug: 28842396

Change-Id: I04ef5aeac32a526028e71ed71bcdf39920cc0c4f
2016-05-18 22:00:21 +00:00
smain@google.com
0fc19538cf Update app context in code snippet bug: 28842396
am: 056df25179

* commit '056df25179e2a6621f9abeb5cdf749387a489751':
  Update app context in code snippet bug: 28842396

Change-Id: I302124bb72a8162dbc0c7b1fa96c14657a86c97c
2016-05-18 21:51:50 +00:00
smain@google.com
056df25179 Update app context in code snippet
bug: 28842396

Change-Id: I306ba2d3f7ccb1f547caa46e038c1d3faaccab26
2016-05-18 14:35:51 -07:00
Kevin Hufnagle
482bf05a8f Merge "cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel)." into mnc-io-docs am: 296d84fbd9
am: 59ce20df8c

* commit '59ce20df8c6573a149461943963e98cee3b11d72':
  cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel).

Change-Id: Iad0a2bc7ed5554b65e833f8ecb2936ffe4fb4b80
2016-05-17 18:39:02 +00:00
Kevin Hufnagle
296d84fbd9 Merge "cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel)." into mnc-io-docs 2016-05-17 18:21:31 +00:00
Kevin Hufnagle
5deb0d6dfe cherrypick from mnc-io-docs docs: Updated Billing API documentation
(for Project Nickel).

This CL is a continuation of CL 1026559.

Added references to Project Nickel (rounded and "relevant" pricing
for each country where an Android app is published) within overview
and reference pages. Also added discussion of pricing templates and
the associated operations in the "administration" page.

Finally, completed minor touch-ups to billing administration section
(removed unhelpful links, updated screen captures).

Bug: 28204935
Change-Id: Id194c17b5dd23fc89b9b69cf90e601993a66d014
Original-Change-Id: I917d06876d1525f24cb26a55a39cd64ae479b8f8
2016-05-16 18:48:53 -07:00
smain@google.com
e9746f7a6a Update links for all files under sdk/ that moved to studio/ am: 89d11705a1 am: d10e0132a1
am: 6c568e6322

* commit '6c568e632242e99eb255f721edcbec0223f9934d':
  Update links for all files under sdk/ that moved to studio/

Change-Id: I2acd1acd6fef98c527ef4dfc0d016bb5cfa296cc
2016-05-15 03:11:46 +00:00
smain@google.com
d10e0132a1 Update links for all files under sdk/ that moved to studio/
am: 89d11705a1

* commit '89d11705a19f73d32a7e604477dd4358dc04d051':
  Update links for all files under sdk/ that moved to studio/

Change-Id: Id47c082a96ffffdfb439aaab80ccb0a645557dec
2016-05-15 03:06:29 +00:00
smain@google.com
89d11705a1 Update links for all files under sdk/ that moved to studio/
Change-Id: I624621dfd7df0f441d0b559e5a12029e5e299964
2016-05-15 02:55:23 +00:00
Kevin Hufnagle
29bcedc4b1 Merge "docs: Updated Billing API documentation (for Project Nickel)." into mnc-io-docs am: 5ea88aad9d
am: 1ee7930329

* commit '1ee7930329356b0748ae7b49cc4d89b2874cc98c':
  docs: Updated Billing API documentation (for Project Nickel).

Change-Id: I695fb2c4a7f0c80148657df6bd3158ef327a6212
2016-05-12 01:56:40 +00:00
Kevin Hufnagle
4434744f13 docs: Updated Billing API documentation (for Project Nickel).
Added references to Project Nickel (rounded and "relevant" pricing
for each country where an Android app is published) within overview
and reference pages. Also added discussion of pricing templates and
the associated operations in the "administration" page.

Finally, completed minor touch-ups to billing administration section
(removed unhelpful links, updated screen captures).

Bug: 28204935
Change-Id: I917d06876d1525f24cb26a55a39cd64ae479b8f8
2016-05-10 22:41:41 -07:00
Elliot Waite
72403f1daa Merge "Change custom_link_attributes to path_attributes format." into mnc-mr-docs am: 14fd7d5 am: 5b4f351
am: 26d957c

* commit '26d957c9c1903fc4f520de8b56cc57539ac33b3a':
  Change custom_link_attributes to path_attributes format.

Change-Id: I5dfd8ee64fbf6502e29d639d454d6b637ecf2e12
2016-04-28 18:50:37 +00:00
Elliot Waite
988248daab Change custom_link_attributes to path_attributes format.
Change-Id: I24439d6f9226ace37eab875e8b1bb634a9e52074
2016-04-27 20:07:57 -07:00
Trevor Johns
682c24e228 Resolve merge conflicts of a5060ee to nyc-dev
This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.

Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
2016-04-19 02:03:59 -07:00
Elliot Waite
fe1d89f339 Change colons to equals for custom_link_attributes.
Change-Id: I9f4ca9d0df9e7b358af28ded8cf6d992e38a0650
2016-03-24 14:57:24 -07:00
Elliot Waite
0bee3d2997 Merge "docs: Add _book.yaml files for DevSite navigation" into mnc-mr-docs 2016-03-23 01:05:11 +00:00
Elliot Waite
20d6d77242 docs: Add _book.yaml files for DevSite navigation
Change-Id: I02a5fe5bb5fe3e968870cec8898deee9e7d8a82d
2016-03-17 17:23:21 -07:00
Andrew Solovay
43ae0397c2 docs: Quick fix to Google Play TOC
Fixing a TOC error I made with CL http://ag/887962
See first comment for doc stage location.

bug: 27582763
Change-Id: Id3a261e11075fc2544ae2840ea67f20b658e6799
2016-03-16 21:37:50 -07:00
Andrew Solovay
5df17af2a9 docs: Restoring deleted play-services/id.jd file
Apparently this content shouldn't have been removed in the big
refactoring. Restoring the page here for now, though presumably it
ought to move to devsite?

See first comment for doc stage location.

bug: 27582763
Change-Id: I58c35842a36e4c18cfc9a14306495411403b11cc
2016-03-16 16:59:22 -07:00
Andrew Solovay
db6446eff7 docs: Billing: In-app purchase titles don't have to be unique
See first comment for doc stage location.

bug: 27151023
Change-Id: I45bb0dc90fdb5b13b57cef56f976b67f1783890a
2016-03-11 13:48:57 -08:00
Joe Fernandez
44fc1e454d docs: InfoPros Project 02 - New API 15 baseline
- batch 01 file set

Change-Id: Ied76061cb968af55efcd638341394ae710c2e7fb
2016-03-07 21:26:13 -08:00
Andrew Solovay
74916a5682 docs: Recommend not using email address in payload string
See first comment for doc stage location.

bug: 26492391
Change-Id: I72c159f1a7b71ff67c0d2c5b634dcc72d9150e6a
2016-02-01 11:06:01 -08:00
Dirk Dougherty
31ae1c518f Doc change: adjustments for design updates.
Change-Id: Ic798228a75ba2ab692fd3e36034606c04651c20c
2016-01-28 17:10:09 -08:00
Joe Fernandez
08320015f8 docs: Eclipse ADT removing and replacing mentions
Batch 05, Project 01 with InfoPros

b/25192800

Change-Id: I6cce84d8498ba9f0aa488b8d43b7b832e58fe899
2016-01-14 09:48:30 -08:00
Andrew Solovay
22c77a8711 docs: New documentation for In-app Billing Promotions
Doc for new feature. See first comment for doc stage location.

bug: 25185711
Change-Id: I3680c1e7670c6c87985b136158047c9bb1b58156
2016-01-11 17:43:28 -08:00
Andrew Solovay
b5c133d3cc docs: Noted that test purchases have empty order ID.
Per bug, noted that orderID is blank for test purchases made with
the sandbox. Added this note both in the "testing" page and in the
reference for INAPP_PURCHASE_DATA.orderId.

See first comment for doc stage location.

bug: 19609418
Change-Id: I74ab54fdf69eeb32d331ea5900dc7582d8150dfa
2015-12-21 16:00:41 -08:00
Joe Fernandez
a7a294cfcb docs: Android Eclipse ADT update and removals - Batch 03
b/25192800

Change-Id: I2ec275ba81449db5d695483e0adee70e4eb579f3
2015-12-17 14:48:55 -08:00
Andrew Solovay
dd3263c990 docs: New IAB "prorates" feature
Added description of new prorated seasonal subscription prices. Also
noted that free trials are now supported for seasonal subscriptions.

Per Z's request, also folded in a bugfix that had been waiting a
while.

See first comment for doc stage location.

bug: 25756808
bug: 14070005
Change-Id: Id43ed7bd6f84ec0ba9a05c4202fc2585c7fd6a22
2015-12-09 16:00:15 -08:00
Neil Fuller
71fbb81b14 Fix @code escapes
The body of {@code} must not be HTML escaped. This is one of
several changes that fix the source in conjunction with a
doclava fix.

Bug: 25757239
Change-Id: Ib38a0fa2dd2a3d68e467f78a812071e763d7e881
2015-12-02 14:24:11 +00:00
Paul Rashidi
0d7c87481b Updating IAB training/overview to use Github and YouTube video.
We've moved the IAB sample to GitHub so just directing the docs to use that
  location as well.
Also included a reference to the YouTube video on this subject.

Bug: 24603614,25080797
Change-Id: Ia7d2a3505255fc1ad1449e1798482b1e3be17991
2015-11-09 14:06:41 -08:00
Andrew Solovay
8e34a8051b docs: In-App Billing HTML formatting cleanup
Fixed line lengths and other white-space-related fixes (e.g.
removing trailing lines and spaces). Also fixed a couple of typos.

I'll build and stage it (see first comment for stage location) but
if it all checks out I'll go ahead and +2 it and submit it myself.

Change-Id: Ia47dfa3b69c87aed01445551ba3259e9f4ba3c44
2015-11-05 15:00:04 -08:00
Quddus Chong
e69ef87c5c docs: Fixed missing closing <strong> tag in IAB landing page.
Change-Id: I9794348c6b141398e96d3c9b4419fd9c2b4b2c86
2015-10-08 10:33:07 -07:00
Andrew Solovay
ac2be1998e Merge "docs: Removing IAB v2 API docs" into mnc-docs 2015-10-07 17:52:48 +00:00
Dirk Dougherty
b9a472cd62 Doc change: update max apk size supported by Play.
Change-Id: Idd1b9fd851a91be543ab970b7eda91ed68d29375
2015-10-05 13:53:07 -07:00
Andrew Solovay
28f84f8793 docs: Removing IAB v2 API docs
In-App Billing Version 2 has been deprecated for years, and was
finally removed in January 2015. Removing its API docs and references
to those docs; there's a second CL (http://ag/782481 for redirects from
those pages to the v3 docs.

See first comment for doc stage location.

bug: 19169884
Change-Id: Ie38e7075779754ef8a2310b0b2bd8b276a781eca
2015-10-02 00:06:40 +00:00
Andrew Solovay
7e86ae85cc docs: IAB formatting fixes (no content changes)
Saw a problem with the files' TOCs that was causing formatting
problems. While I had the files open, I fixed other formatting
issues--mostly just whitespace (paragraphs that were on one line
instead of broken at 100 chars) and a couple of other typos or HTML
errors. No substantive changes to the documentation.

Change-Id: I5f89ae616489d19dd683fd24e11e3482cce99477
2015-10-01 14:33:51 -07:00
Andrew Solovay
eafff2c9ad docs: Restore "docs: Added 3-month and 6-month subscription periods"
See first comment for doc stage location.

This restores commit 29b498bb15 , which
had been submitted prematurely, and was reverted by
commit 5c83c76106

bug: 24168299

Change-Id: Ib941b459c99581217df7b5438fb1b06686e5be7d
2015-09-30 00:11:27 +00:00
Andrew Solovay
5c83c76106 Revert "docs: Added 3-month and 6-month subscription periods"
Per communication from Zeina, this doc is *not* supposed to go live until she gives the word that the feature is live--hopefully Sept. 30 but she's not sure.

This reverts commit 29b498bb15.

Change-Id: I60ce8f60396aeee7b52dda5ded843897b722bce0
2015-09-29 23:59:44 +00:00
Andrew Solovay
29b498bb15 docs: Added 3-month and 6-month subscription periods
See first comment for doc stage location.

bug: 24168299
Change-Id: Ic6040b641f2e563f8b6732a2ac3b2e022dea75c7
2015-09-29 11:01:51 -07:00
Dirk Dougherty
6e0c8b3d92 Doc change: Add note that IAB testing requires alpha/beta opt in.
Change-Id: I5e417c0011082fa957b3edbc05d512779c92b855
2015-09-10 17:39:05 +00:00
Dirk Dougherty
3c05930227 Doc change: update iab order number format.
Change-Id: I798ca82ed373df897f0e8d0a0af1c5bd6c3b8ea0
2015-09-04 00:45:15 +00:00