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

7433 Commits

Author SHA1 Message Date
Dirk Dougherty
6357cd095a am 496cfbf7: Doc change: Add IAB v2 deprecation notice. 
* commit '496cfbf7a83e4c0f66ece27f36c2dc3d31994ff1':
  Doc change: Add IAB v2 deprecation notice.
 2014-09-18 01:00:09 +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
Robert Ly
4243ec2a84 am 9efd9f60: am fc95c477: docs: edu changes for launch 
* commit '9efd9f607006b3e02cda714901884e1ce22475d3':
  docs: edu changes for launch
 2014-09-17 15:33:16 +00:00
Robert Ly
9efd9f6070 am fc95c477: docs: edu changes for launch 
* commit 'fc95c477835f86d99cf8c7ce5c1dd098fa42e69c':
  docs: edu changes for launch
 2014-09-17 15:19:15 +00:00
Robert Ly
fc95c47783 docs: edu changes for launch 
Change-Id: Ia9047138bd9972e572b5dd93310339b630a2810d
 2014-09-17 15:13:09 +00:00
Andrew Solovay
67267dcf90 am 6c6664c9: am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs 
* commit '6c6664c95d7935398909e798e0aad451a2a83b1b':
  Docs: Updated to include new Subscriptions functionality.
 2014-09-17 06:12:12 +00:00
Andrew Solovay
6c6664c95d am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs 
* commit 'a209406faa1f2b0f1dd7b6e3c5a468729f1c562f':
  Docs: Updated to include new Subscriptions functionality.
 2014-09-17 06:01:09 +00:00
Andrew Solovay
a209406faa Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs 2014-09-17 02:21:10 +00:00
Robert Ly
6641ddf671 am d00b110a: am e152b793: docs: remove fire and forget language from wear docs 
* commit 'd00b110a3b9991553806d196f1115a510a72210c':
  docs: remove fire and forget language from wear docs
 2014-09-15 22:03:04 +00:00
Robert Ly
d00b110a3b am e152b793: docs: remove fire and forget language from wear docs 
* commit 'e152b793e5f56ac9d73d0b3e3e191fea6b0ba1e5':
  docs: remove fire and forget language from wear docs
 2014-09-15 19:27:18 +00:00
Robert Ly
e152b793e5 docs: remove fire and forget language from wear docs 
Change-Id: I0a8d83ba0db24f1232d4c729f298c6af04c048b3
 2014-09-15 10:46:23 -07:00
Joe Fernandez
41b12f2932 am 02480cbf: am 1b12b1dc: Merge "docs: remove bad link in the quick view box for TV Recommendations #2" into klp-modular-docs 
* commit '02480cbffabd1ca80441c9676db01b177468883a':
  docs: remove bad link in the quick view box for TV Recommendations #2
 2014-09-13 00:00:29 +00:00
Joe Fernandez
02480cbffa am 1b12b1dc: Merge "docs: remove bad link in the quick view box for TV Recommendations #2" into klp-modular-docs 
* commit '1b12b1dc6f0203913ceb0a88dcf5ef1639fe6515':
  docs: remove bad link in the quick view box for TV Recommendations #2
 2014-09-12 23:42:04 +00:00
Joe Fernandez
1b12b1dc6f Merge "docs: remove bad link in the quick view box for TV Recommendations #2" into klp-modular-docs 2014-09-12 23:28:54 +00:00
Joe Fernandez
b813f16c47 docs: remove bad link in the quick view box for TV Recommendations #2 
Change-Id: I649d8d735bda2b0c657217bc86c1a29a2d7eddc2
 2014-09-12 16:24:01 -07:00
kmccormick
b94103dd20 am f530df1c: am 7392152b: Doc Update: update Cloud Platform link 
* commit 'f530df1c7ec39fb15e284dc18942276d85c740a2':
  Doc Update: update Cloud Platform link
 2014-09-12 19:07:21 +00:00
kmccormick
f530df1c7e am 7392152b: Doc Update: update Cloud Platform link 
* commit '7392152ba21917aff15db89988e1317819b5dd72':
  Doc Update: update Cloud Platform link
 2014-09-12 18:49:18 +00:00
kmccormick
7392152ba2 Doc Update: update Cloud Platform link 
Fix for:

b/17411644

Change-Id: I3893ed25d7b058e2635a56113af74d20284688af
 2014-09-11 18:26:15 -07:00
Ricardo Cervera
4bb4d66c0e am 02afa734: am a6c12f01: Merge "docs: Fixed minor bug in downloads class. Bug: 16948533" into klp-modular-docs 
* commit '02afa7348b7b6b41d24f4d401d07ed3cea4b5066':
  docs: Fixed minor bug in downloads class. Bug: 16948533
 2014-09-11 00:19:06 +00:00
Ricardo Cervera
02afa7348b am a6c12f01: Merge "docs: Fixed minor bug in downloads class. Bug: 16948533" into klp-modular-docs 
* commit 'a6c12f0189c92b556fd7c3af3d8466d9b6d828c9':
  docs: Fixed minor bug in downloads class. Bug: 16948533
 2014-09-11 00:06:10 +00:00
Ricardo Cervera
d086db30d0 Merge "cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug: 16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365" into klp-modular-docs 2014-09-10 23:57:47 +00:00
Ricardo Cervera
a6c12f0189 Merge "docs: Fixed minor bug in downloads class. Bug: 16948533" into klp-modular-docs 2014-09-10 23:57:16 +00:00
Robert Ly
0adb8bb0a2 am 5debe44b: am 0743bca5: docs: add 64k method limit note 
* commit '5debe44b88e41b61ecbbc48c60a006cd6abd734d':
  docs: add 64k method limit note
 2014-09-10 18:16:12 +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
Robert Ly
5debe44b88 am 0743bca5: docs: add 64k method limit note 
* commit '0743bca58961582078f4e8199fe9a6fa044036eb':
  docs: add 64k method limit note
 2014-09-10 18:04:16 +00:00
Robert Ly
0743bca589 docs: add 64k method limit note 
Change-Id: I6590fc996331c1f2024276d338c4035f2cb0f18d
 2014-09-10 10:50:46 -07:00
Robert Ly
0cb4c738fb am 9f60bc3f: am 52a18161: docs: update api dashboard for september 
* commit '9f60bc3f129037f2f1b05a09902c8e97d66322f3':
  docs: update api dashboard for september
 2014-09-09 23:51:10 +00:00
Robert Ly
9f60bc3f12 am 52a18161: docs: update api dashboard for september 
* commit '52a1816180c7a85b13c543a5cdb6a7506cb8f01d':
  docs: update api dashboard for september
 2014-09-09 23:40:51 +00:00
Robert Ly
52a1816180 docs: update api dashboard for september 
Change-Id: Icae4efd0729b61c0f6c1850da641bc065bc12122
 2014-09-09 16:28:08 -07:00
Dirk Dougherty
d87e04843e am 604ae4c7: am 552e5ce6: Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs 
* commit '604ae4c79e67be6be19724e03f35b9e6cc3fd617':
  Doc change: Add note to use explicit intent when binding to billing service.
 2014-09-08 23:59:34 +00:00
Dirk Dougherty
604ae4c79e am 552e5ce6: Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs 
* commit '552e5ce6bb418b9a8b3b1ba9c102c562d0a4019e':
  Doc change: Add note to use explicit intent when binding to billing service.
 2014-09-08 23:53:32 +00:00
Dirk Dougherty
552e5ce6bb Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs 2014-09-08 23:46:56 +00:00
Robert Ly
718803f52e am aa19f1fc: am b5a21ad3: Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"" 
* commit 'aa19f1fccb12eb141af92837aded0478006ab935':
  Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""
 2014-09-08 22:51:20 +00:00
Robert Ly
aa19f1fccb am b5a21ad3: Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"" 
* commit 'b5a21ad3fba1d8d3b096a0d685d71c148fefa11b':
  Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""
 2014-09-08 22:43:42 +00:00
Robert Ly
b5a21ad3fb Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"" 
This reverts commit 4186379a2a37123d31ce5d1aff1facc8e7dfbfd3.

Change-Id: I34a7b8689362053c0ad8124eaa3f40a5c282bc80
 2014-09-08 22:30:09 +00:00
David Friedman
7eabd92a14 am 32079484: am 4186379a: Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html" 
* commit '3207948444ed39b867c14cfc314b8caaf60fe571':
  Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"
 2014-09-08 22:26:59 +00:00
David Friedman
a4c038a72a am 7e8786d9: am c6142d97: NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html 
* commit '7e8786d9755526a2d29c10c60759eb1c290afa38':
  NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html
 2014-09-08 22:26:53 +00:00
David Friedman
3207948444 am 4186379a: Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html" 
* commit '4186379a2a37123d31ce5d1aff1facc8e7dfbfd3':
  Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"
 2014-09-08 22:13:09 +00:00
David Friedman
7e8786d975 am c6142d97: NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html 
* commit 'c6142d97d79bc6a5ce2bb77fce9ae5d988f49542':
  NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html
 2014-09-08 22:13:05 +00:00
David Friedman
4186379a2a Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html" 
This reverts commit c6142d97d79bc6a5ce2bb77fce9ae5d988f49542.

Change-Id: Idc6fde822bf42300897d96fc934a94e6b9418d76
 2014-09-08 21:58:22 +00:00
David Friedman
c6142d97d7 NDKr10b changes to be published to DAC NDK page. 
Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html

Change-Id: I559068eb1567bc03f69cadade5073f419635ad69
 2014-09-08 11:45:27 -07: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
909cdff437 am c5b5366f: am ddfe9d11: docs: Added SONY logo (hi-res) for Wear site 
* commit 'c5b5366f1ba236a98cb5aa044b89c6302baf4540':
  docs: Added SONY logo (hi-res) for Wear site
 2014-09-04 16:16:24 +00:00
Ricardo Cervera
c5b5366f1b am ddfe9d11: docs: Added SONY logo (hi-res) for Wear site 
* commit 'ddfe9d11fc11a0e4fafb71703a8212b7671cb354':
  docs: Added SONY logo (hi-res) for Wear site
 2014-09-04 16:05:25 +00:00
Ricardo Cervera
ddfe9d11fc docs: Added SONY logo (hi-res) for Wear site 
Change-Id: I64441072a9f6dbf6eb209c954a43056c19f29551
 2014-09-04 08:52:39 -07:00
Scott Rowe
14f413be3c am 048d8baa: am 0ccf80c3: Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs 
* commit '048d8baaffadc28ee8e7bab0ce61a868c09c311a':
  docs: b/15790433 updated for xxhdpi and xxxhdpi
 2014-09-04 00:13:02 +00:00
Scott Rowe
048d8baaff am 0ccf80c3: Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs 
* commit '0ccf80c31dbf236ec8ffafc8c72f036c3137bc5a':
  docs: b/15790433 updated for xxhdpi and xxxhdpi
 2014-09-03 23:58:25 +00:00
Scott Rowe
0ccf80c31d Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs 2014-09-03 23:52:13 +00:00
Ricardo Cervera
17aec62001 am 15abafe2: am c0393e7f: Merge "docs: Docs for Android project view. Bug: 17108468" into klp-modular-docs 
* commit '15abafe2c0bbe034a63162ff409922225f55aed9':
  docs: Docs for Android project view. Bug: 17108468
 2014-09-03 23:37:46 +00:00
Joe Fernandez
a1a3c8a126 am 9de22952: am ab833be6: Merge "docs: Fix bug with Accessibility Services dev guide" into klp-modular-docs 
* commit '9de229527e710a90b03a415a9b752cc6e2a11592':
  docs: Fix bug with Accessibility Services dev guide
 2014-09-03 23:29:46 +00:00