drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152,975 Commits 1 Branch 0 Tags
Commit Graph

427 Commits

Author SHA1 Message Date
David Friedman
b357f74e51 Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs 2014-12-05 23:04:58 +00:00
Quddus Chong
4f921244df docs: Added API highlights for Google Play service v6.5 (Nacho) release. 
Change-Id: Ia6c1056f844f66c0cb5896b1d93f44a2aeaaba86
 2014-12-04 15:01:06 -08:00
David Friedman
6c4c8c57fe Updates GMSCore docs to reflect ability to selectively include APIs 
Bug 16679117

Change-Id: Idb5df2869129972a8834118047dfcd23e5140847
 2014-11-24 14:11:50 -08:00
Ricardo Cervera
25bf00bcee docs: Fixes to the Data Layer Wear class. 
Bug: 17917638
Bug: 17917145
Bug: 17931937
Bug: 17933032
Bug: 16899307

Change-Id: Iee9fd0a44cd40b9860cf242cbdaabac409882a15
(cherry picked from commit eff209d2c40221d2f9be2fd6b0c9cde51dd5362b)
 2014-11-20 19:51:25 +00:00
Dirk Dougherty
a79acc0315 Doc change: localized content. 
Change-Id: I5440fe8d6003bdd8e3cb4c44bacea422f322c33b
 2014-11-19 23:44:05 +00:00
kmccormick
de53b041c1 Doc update: new reg error code + snippet 
Change-Id: Ie8df1cc68ebe5a2a6589d34f16e554e36dca546e
 2014-11-11 16:56:54 -08:00
Ricardo Cervera
cc0753b077 docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200 
Change-Id: I4fed30061daabfb05b24e84bb36cd21d38ad0fea
(cherry picked from commit 2871e05b48f0b932885986322ce01212717a6399)
 2014-11-06 16:57:50 +00:00
kmccormick
13d7ea464e DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes. 
Cherry-pick from: Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e

Fix for:
b/17936796

Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e
 2014-10-29 23:06:46 +00:00
Natalie Masse
60144a7a06 am bcf9ced4: am 1e5bb861: Link and typo fixed 
* commit 'bcf9ced47a123220271fcca70f71c2adf69ad100':
  Link and typo fixed
 2014-10-24 22:36:54 +00:00
Andrew Solovay
1c56c15d4d docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result 
See first comment for doc staging directory.

bug: 18000631
Change-Id: I4dba47e0965947774adad86218369678311f4a0c
 2014-10-17 14:05:22 -07:00
Natalie Masse
1e5bb86126 Link and typo fixed 
Change-Id: Ie9ace6e002703d7d1f83173da49672cf60ca1653
 2014-10-17 13:50:24 +01:00
Quddus Chong
8f25f390e5 am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
* commit '9df3d67bdc7c1fa79d0daab1f2ae5f69a476f8dd':
  docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
 2014-10-08 19:08:31 +00:00
Quddus Chong
7f567e4a1c docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
Change-Id: I710c0eab6913988d8bc70ded344a2d60fa594d92
 2014-10-08 10:51:21 -07:00
Quddus Chong
ad658a3d47 am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs 
* commit 'bb5a18487285455131b88caf4a40726f0e4b444c':
  docs: Added API highlights for Google Play services 6.1 (Manchego).
 2014-10-07 23:49:26 +00:00
Quddus Chong
8730092af7 Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs 2014-10-07 23:27:02 +00:00
kmccormick
04e50c474c am d1ba4c13: am ae3bd63b: am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 
* commit 'd1ba4c13d0928d10c467bd7fd5992186925e1a5a':
  Doc update: Update preprod (staging) instructions.
 2014-10-01 17:55:43 +00:00
kmccormick
a1572ffc6b Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 2014-10-01 17:02:26 +00:00
kmccormick
76ab6c6290 Doc update: Update preprod (staging) instructions. 
Fix for:

b/17525318

Change-Id: Id93bd3e6e1fd5f203733121e3148cec8b24ab374
 2014-09-30 12:24:40 -07:00
Scott Rowe
d1462247e0 am 6287a65c: am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown 
* commit '6287a65cca1d7efb8a265be5b51feca0f1e320f7':
  docs: b/16044763 Update IAB docs to give notice of v2 turndown
 2014-09-30 00:53:34 +00:00
Scott Rowe
9d20628b4b docs: b/16044763 Update IAB docs to give notice of v2 turndown 
Change-Id: I696c9b22707d34635ab65b392d90aa7406ab40d0
 2014-09-29 15:11:46 -07:00
Dirk Dougherty
afbe165aec Doc change: Add IAB v2 deprecation notice. 
Change-Id: Ide22c4aa8c56fdd83cb6ce2989eb8c449c55c7c1

Conflicts:
	docs/html/google/play/billing/index.jd
 2014-09-26 11:09:12 -07:00
Quddus Chong
b360122198 docs: Added API highlights for Google Play services 6.1 (Manchego). 
Change-Id: I0d870ef46d3740b44b8c28a1011a6926bfc8133a
 2014-09-22 13:16:15 -07:00
Dirk Dougherty
c55214a95c am 6357cd09: am 496cfbf7: Doc change: Add IAB v2 deprecation notice. 
* commit '6357cd095abf105f2c62a4cba459e50f49cfd5c7':
  Doc change: Add IAB v2 deprecation notice.
 2014-09-18 03:31:23 +00:00
Dirk Dougherty
496cfbf7a8 Doc change: Add IAB v2 deprecation notice. 
Change-Id: Ide22c4aa8c56fdd83cb6ce2989eb8c449c55c7c1

Conflicts:
	docs/html/google/play/billing/index.jd
 2014-09-17 15:56:43 -07:00
Andrew Solovay
b1c066fa5c am 67267dcf: am 6c6664c9: am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs 
* commit '67267dcf909e080ea3adf902c8a9df115bd1b279':
  Docs: Updated to include new Subscriptions functionality.
 2014-09-17 17:09:46 +00:00
Andrew Solovay
88653cb63e Docs: Updated to include new Subscriptions functionality. 
Includes refund/revoke, seasonal subscriptions, etc.

Docs are staged to:

http://asolovay.mtv:9393/google/play/billing/index.html
http://asolovay.mtv:9393/google/play/billing/billing_subscriptions.html

Change-Id: Id8ad33025c2ae165d6fc5e050c4f2aef70acc0d0
 2014-09-10 11:09:24 -07:00
Dirk Dougherty
4a965545ae am d87e0484: am 604ae4c7: am 552e5ce6: Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs 
* commit 'd87e04843ee6dfdba45f133cde423ba30be60e7a':
  Doc change: Add note to use explicit intent when binding to billing service.
 2014-09-09 00:12:32 +00:00
Dirk Dougherty
555439ca97 Doc change: Add note to use explicit intent when binding to billing service. 
Change-Id: I820d7aa88b5951736224d358a3a9d3f0caac6956
 2014-09-04 09:30:59 -07:00
Ricardo Cervera
fc2497fe00 am 665fc318: am df139acf: am 1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs 
* commit '665fc3185d2bda1780ddc9074f46e11777e05405':
  docs: Fixed Google Play Services version number. Bug: 17195954
 2014-08-27 16:17:03 +00:00
Ricardo Cervera
aa0009ec6e docs: Fixed Google Play Services version number. Bug: 17195954 
Change-Id: I7a71aa5f600ae11cce388183fc20e4537864122d
 2014-08-27 08:19:26 -07:00
Quddus Chong
b9fc2b4fc7 am 9893c642: am f42fdfd9: am 152cc584: Merge "docs: Added additional documentation for specifying OAuth scopes. bug: 12650251" into klp-modular-docs 
* commit '9893c6420d0a127b3a3769a1deb2a8d397267e9b':
  docs: Added additional documentation for specifying OAuth scopes. bug: 12650251
 2014-08-25 22:06:39 +00:00
Quddus Chong
70c2b06155 docs: Added additional documentation for specifying OAuth scopes. 
bug: 12650251

Change-Id: I8905ed63208aff82d0c0caf1b3503831f121b09e
 2014-08-21 09:59:30 -07:00
Andrew Solovay
fc6b01f463 am eb60d0f1: am 94174ff7: am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs 
* commit 'eb60d0f1937392351ef81f10b651749bd47f7898':
  docs: Documented new fields returned by getSkuDetails().
 2014-08-19 05:52:57 +00:00
Andrew Solovay
7f09366b6a docs: Documented new fields returned by getSkuDetails(). 
Per bug b/9221265, documented new price_amount_micros and
price_currency_code fields.

Doc is staged to:

http://asolovay.mtv:9265/google/play/billing/billing_reference.html#getSkuDetails

bug: 9221265
Change-Id: I06798692b3329e5e0d1fe3aaf215d9c97f2363c0
 2014-08-13 17:38:47 -07:00
kmccormick
cb62407d7a Doc Change: remove obsolete links. 
Fixes for:

b/16494813

Change-Id: I2aaae520cdafadf8707f2fbf38c10588f0de2987
 2014-08-12 17:52:27 -07:00
kmccormick
ca17708880 am 91917623: am 37bdcbbb: am bcdbe1a0: Merge "Doc Change: remove obsolete links." into klp-modular-docs 
* commit '919176239fd68a801cf4af8c9ba959f1fb574bd8':
  Doc Change: remove obsolete links.
 2014-08-13 17:15:36 +00:00
Andrew Solovay
8136421589 Merge "docs: Revised page to include info about new Publisher API." into klp-modular-docs 2014-07-29 21:36:00 +00:00
Andrew Solovay
d28470e87a docs: Revised page to include info about new Publisher API. 
Also moved the blurb to the "Google Play Distribution" cover page, and
adjusted the TOC accordingly. Per DDoughterty@ 's request, moved the
"Purchase Verification Strategies" section to billing_subscriptions.jd

Page is staged to:

http://asolovay.mtv:9543/google/play/billing/gp-purchase-status-api.html
http://asolovay.mtv:9543/google/play/billing/billing_subscriptions.html#strategies

Change-Id: I884e2f3f25c76fcb055e663058d1a4f4642fb558
 2014-07-29 14:00:03 -07:00
Dirk Dougherty
fa3d1b2a27 Doc change: add notice for admob sdk upgrade. 
Change-Id: I9281b17e4ff277ef99ae57ce0360e05f4231e7ff
 2014-07-29 20:32:17 +00:00
Robert Ly
0f9ea26dcc resolved conflicts for merge of 60e7f541 to lmp-dev 
Conflicts:
	docs/html/google/play/billing/gp-purchase-status-api.jd

Change-Id: I23f4c1a366b894a3cf5f70e26b32cd88bc66784c
 2014-07-30 14:09:25 -07:00
Dirk Dougherty
12b9f6ae37 am 78ad92b4: am 4ff57a9a: am fa3d1b2a: Doc change: add notice for admob sdk upgrade. 
* commit '78ad92b48f8e41a413b6a61970e278024098dbaa':
  Doc change: add notice for admob sdk upgrade.
 2014-07-30 00:55:51 +00:00
Dirk Dougherty
b2902ee380 Doc change: add reminder for developers on using ad id. 
Change-Id: I6de92d091c469a4e81ec29c95ce65204f708fd97
 2014-07-22 20:41:57 +00:00
Dirk Dougherty
4ebdd2f075 am b8109996: am d1929c50: am f3659284: Doc change: add reminder for developers on using ad id. 
* commit 'b81099963772f886e68129c33f32fefb85ac673e':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 01:04:30 +00:00
Dirk Dougherty
d1929c505a am f3659284: Doc change: add reminder for developers on using ad id. 
* commit 'f365928406ef0a80d3aecc2d025642f9efb80a05':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 00:54:01 +00:00
Dirk Dougherty
f365928406 Doc change: add reminder for developers on using ad id. 
Change-Id: I2a6109bd1b97e4432e36c6a5055aee6e2b1c3edd
 2014-07-21 22:15:04 +00:00
kmccormick
fc8a3b5f06 Merge "Doc Update: new Smack sample." into klp-modular-docs 2014-07-16 16:25:13 +00:00
Robert Ly
82088d62f8 Merge "docs: add EU legal notice" into klp-modular-docs 2014-07-16 16:25:13 +00:00
Robert Ly
d9736032e3 docs: add EU legal notice 
bug 16345613
Change-Id: I96215d7a55bc52bc69a312ba0bb0e1e83dd82d9e
 2014-07-16 12:15:11 -07:00
Quddus Chong
133125446d docs: Fixed small typo. 
bug: 14617866

Change-Id: I967be618d805b126a750bb60f8bc26f2dc5a95e9
 2014-07-16 10:28:55 -07:00
kmccormick
d40fa4276e am 1f4e5686: am 289d3c25: am fc8a3b5f: Merge "Doc Update: new Smack sample." into klp-modular-docs 
* commit '1f4e56869c47a8ef68ef83b7693a0f93ad21c984':
  Doc Update: new Smack sample.
 2014-07-16 21:44:50 +00:00