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

455 Commits

Author SHA1 Message Date
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
Robert Ly
f49e33c87e am f3c3edfe: am bafdb900: am 82088d62: Merge "docs: add EU legal notice" into klp-modular-docs 
* commit 'f3c3edfee8d9a2148603c1082e128f8bcbe44fc0':
  docs: add EU legal notice
 2014-07-16 19:32:11 +00:00
Quddus Chong
564ddefc57 am 6743f1ea: am 1a2a9730: am f0d8c6fc: Merge "docs: Fixed small typo. bug: 14617866" into klp-modular-docs 
* commit '6743f1ea92e8c1516774d38469511d189a1bf5eb':
  docs: Fixed small typo. bug: 14617866
 2014-07-16 18:23:27 +00:00
kmccormick
9c311fb4c6 Doc Update: new Smack sample. 
Change-Id: I4395d13eab5e7801dae85394350536ae6cb38e9e
 2014-07-15 13:26:37 -07:00
Quddus Chong
9afee0df49 docs: Added missing instructions for copying the Google Play Services library project. 
Change-Id: I04bbfce7e3901a1aa14a3c2a273674014c60ae17
 2014-07-09 15:49:17 -07:00
Quddus Chong
4696936e9b am 8e086faf: am 9afee0df: docs: Added missing instructions for copying the Google Play Services library project. 
* commit '8e086faf89a0c59163731cbe2c7778b7365722ab':
  docs: Added missing instructions for copying the Google Play Services library project.
 2014-07-09 23:14:57 +00:00
kmccormick
74223986ad Doc Update: Add Cloud Save to left nav. 
Change-Id: Id87b0ea16231bc70cbd8147ec5252aad251f2363
 2014-07-07 14:41:56 -07:00
kmccormick
3b83426718 am 0ed5a556: am 74223986: Doc Update: Add Cloud Save to left nav. 
* commit '0ed5a5563da96df08ccdd6a0da8556317c7b47b6':
  Doc Update: Add Cloud Save to left nav.
 2014-07-07 23:33:52 +00:00
Quddus Chong
63958c5185 am 56d09070: am af165529: Merge "docs: Fixed url pointing to Google Play Services 5.0 blog post." into klp-modular-dev 
* commit '56d0907024e6389aaa0b84f8f9d82b48ce0b228f':
  docs: Fixed url pointing to Google Play Services 5.0  blog post.
 2014-07-07 16:15:22 +00:00
Quddus Chong
eebcc90d37 docs: Fixed url pointing to Google Play Services 5.0 blog post. 
Change-Id: I7bf6a450546b03c23171db0047866560983f88d0
 2014-07-02 12:21:27 -07:00
Quddus Chong
85a25e0200 Merge "docs: Added "What's New" for GMS Longhorn (Google Play Services 5.0)" into klp-modular-dev 2014-06-27 16:52:20 +00:00
Quddus Chong
28dc271a04 am 69fc782a: am 85a25e02: Merge "docs: Added "What\'s New" for GMS Longhorn (Google Play Services 5.0)" into klp-modular-dev 
* commit '69fc782a8bdb09da25c5052381d15f3ff3b0cb3a':
  docs: Added "What's New" for GMS Longhorn (Google Play Services 5.0)
 2014-06-30 21:57:19 +00:00
Quddus Chong
641037ed83 docs: Added "What's New" for GMS Longhorn (Google Play Services 5.0) 
Change-Id: If6c1738e8cac574ced4a1d2643c62771f317d678
 2014-06-24 15:26:17 -07:00
Katie McCormick
ad055ee3ae am 4c64e2e5: am e89c6ebe: Doc update: GCM changes for I/O. 
* commit '4c64e2e50fb9fa9c110d559c140e430f0f23718c':
  Doc update: GCM changes for I/O.
 2014-06-24 21:20:28 +00:00
Katie McCormick
e89c6ebece Doc update: GCM changes for I/O. 
Fixes for:

b/15348323
b/15349955
b/15330953

Change-Id: Ie256a76ea83cf16256cded858531dd78b8da0558
 2014-06-23 22:40:16 +00:00
Dirk Dougherty
ceaa57c927 am 39b707c8: am bf66c17e: Merge "remove extraneous tag causing extra spacing between heading/text." into klp-docs 
* commit '39b707c8d543149e449c04e502ee84361fe3fa47':
  remove extraneous tag causing extra spacing between heading/text.
 2014-06-21 02:37:39 +00:00
Dirk Dougherty
247b896903 am da6b3222: am ceaa57c9: am 39b707c8: am bf66c17e: Merge "remove extraneous tag causing extra spacing between heading/text." into klp-docs 
* commit 'da6b32226a40abaeeca3e00780ddffd3cd554241':
  remove extraneous tag causing extra spacing between heading/text.
 2014-06-22 01:16:39 +00:00
Quddus Chong
ef655f26fc docs: Added "games" metadata tag for Play Games landing page in d.a.c. 
Bug: 15709471

Change-Id: Ibac4bd844245e71a8cb975bd86d07f9df0c25be5
 2014-06-18 08:57:24 -07:00
Quddus Chong
c287e2713c am 82ea0eb2: am ef655f26: docs: Added "games" metadata tag for Play Games landing page in d.a.c. Bug: 15709471 
* commit '82ea0eb213d75163398fdd0f1da672e058e64f17':
  docs: Added "games" metadata tag for Play Games landing page in d.a.c. Bug: 15709471
 2014-06-18 16:14:50 +00:00
smain@google.com
d9e9843924 am aa3ebacd: am dc9f74a5: misc cleanup to the SDK install steps 
* commit 'aa3ebacd4f7cd7ecf02291114c109a4cd3d1d27a':
  misc cleanup to the SDK install steps
 2014-06-17 18:16:45 +00:00
smain@google.com
dc9f74a567 misc cleanup to the SDK install steps 
Change-Id: I76cb566d20d134b6ba6d63ab5adb689d6bbfc0e5
 2014-06-17 11:03:51 -07:00
smain@google.com
28b244ef02 am 755c930a: am b17420b8: Merge "add toggle for IDE instructions, revise some titles and other cleanup to Google API setup" into klp-modular-dev 
* commit '755c930a5139987d865facdc9ed2e8c033136dfd':
  add toggle for IDE instructions, revise some titles and other cleanup to Google API setup
 2014-06-17 03:33:25 +00:00
smain@google.com
7332669e39 add toggle for IDE instructions, revise some titles and other cleanup to Google API setup 
Change-Id: Ic2454824adddb80ac844939f165cc68fc52a7005
 2014-06-16 20:12:30 -07:00