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

73 Commits

Author SHA1 Message Date
Dirk Dougherty
9a6672beb1 resolved conflices for merge of 93ccd1a2 to master 
Change-Id: Ic77367cb9c90027e036a461697295fd604b50014
 2014-05-14 14:50:13 -07:00
Dirk Dougherty
3506ac87c0 Doc change: Updated content for distribute. 
Change-Id: I612fbb8e5b7aedd73c0e633e5517bb89375760ed
 2014-05-14 14:10:51 -07:00
quddusc
0574dc53b2 am 7d86d6b5: am aa141fb0: am c2cc2999: am 7e8a997f: am 62729b15: Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095" into klp-docs 
* commit '7d86d6b5a7a680b243fb99aadf338a0e55ddbdd8':
  docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095
 2014-01-16 16:17:57 +00:00
quddusc
62729b15a9 Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095" into klp-docs 2014-01-16 16:03:06 +00:00
quddusc
59069f96fc docs: Removed obsolete screenshot of Play Store purchase flow. 
Bug: 9846095

Change-Id: Ia3a7b69007964e73ee3ffe4825795814d3341340
 2014-01-15 10:08:51 -08:00
quddusc
18b7daf89f am 2808073f: am 76a6dfaf: am e53c32a0: am c61e6bc6: am 72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251" into klp-docs 
* commit '2808073f079e381d5c465bce454708972a7e8cd6':
  docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251
 2014-01-14 20:46:02 +00:00
quddusc
72159ab085 Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251" into klp-docs 2014-01-14 20:28:56 +00:00
quddusc
e79c9561bf am 9795592c: am 976b0d13: am fd08cd48: am 0d4068ad: am ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477" into klp-docs 
* commit '9795592c3c02c2f7d1edc38185076779b17e2664':
  docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477
 2014-01-07 00:44:57 +00:00
quddusc
ff65ca29a0 Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477" into klp-docs 2014-01-06 21:55:28 +00:00
quddusc
896e9744b0 docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. 
Bug: 9316251

Change-Id: I06779c3f6318058e475621d57898c2982757df38
 2014-01-06 19:53:49 +00:00
Katie McCormick
83fbad4c3f am 02d5df10: am d59c6151: am 406fb742: am 65f5d74e: am 048895b5: Merge "Doc update: update console instructions per new UI." into klp-docs 
* commit '02d5df1066c07972e1169a338e5fba16c86cc51b':
  Doc update: update console instructions per new UI.
 2014-01-03 21:23:45 +00:00
Katie McCormick
048895b5a0 Merge "Doc update: update console instructions per new UI." into klp-docs 2014-01-03 21:09:38 +00:00
quddusc
9c1f71966e docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. 
Bug: 7044477

Change-Id: I722dc2e47c8dbe0cba48e44434d62fe28f23714f
 2014-01-02 11:47:23 -08:00
quddusc
5b100c15d2 am 9e39c952: am 9dd65b93: am cd73f770: am 5d98ddf2: am fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905 
* commit '9e39c9526d89f875a0884629d020e2253e9179dd':
  docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905
 2013-12-26 23:54:27 +00:00
quddusc
fca563a2d6 docs: Fixed code snippet for unbinding from IAB v3 service. 
Bug: 11858905

Change-Id: Id1af4fc50a020ab520b2c836df8182db6c3a35bd
 2013-12-20 15:21:38 -08:00
Katie McCormick
5719ee1a0c Doc update: update console instructions per new UI. 
Change-Id: I7b29e5c54914f0b2bff12d5025aae0d584821890
 2013-12-11 18:02:54 -08:00
Dirk Dougherty
71cd5fd73f am 0bef299c: am b319cde4: am 312165a8: am f93cc02f: am c6da5232: Merge "Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3." into klp-docs 
* commit '0bef299c766a51d29a5e7e818d42eefc2dc278b1':
  Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3.
 2013-12-12 00:13:27 +00:00
Dirk Dougherty
103c212691 Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3. 
Change-Id: I9592f5364afd3c24ab047bb938bdaf6e8bf3b922
 2013-12-11 15:35:30 -08:00
Katie McCormick
ac21fd91fb am 1e5af1bc: am 0037930b: am 63cd3802: Doc update: update old console references. 
* commit '1e5af1bcfa3d6d3047a1b60b7abfeab6f3e9d81a':
  Doc update: update old console references.
 2013-11-15 14:50:30 -08:00
Katie McCormick
63cd380200 Doc update: update old console references. 
Change-Id: I54d50876022b308a4688293853b3e9227cb5e87c
 2013-11-15 22:33:13 +00:00
Joe Fernandez
33baa5ad7d Removing quotes from page.tags values 
Change-Id: I9e12079568ef7be8574743a34856ed2839e1e76a
 2013-11-14 21:00:10 +00:00
Dirk Dougherty
1ef5374793 Doc change: change initial quota limit for Google Play Developer API v1_1. 
Change-Id: I553bbe9794cfbeee0fc8ebeded5af9ce6256a975
 2013-09-17 09:13:29 -07:00
Scott Main
27c57555db fix misc broken links 
Change-Id: Iecd3462e752eddd0aa2feea3a7e9cf5ff2d92dd3
 2013-08-01 11:31:38 -07:00
Dirk Dougherty
a9dcc33459 Doc change: edits to purchase status api docs. 
Change-Id: I96e8c9d47e90fe2bc9d3dd449524686a094c7041
(cherry picked from commit cd9a1a8fe98bd29e3f52b8a04e8106e89b431d64)
 2013-07-31 00:49:43 +00:00
Scott Main
299c5ea31b Revert "docs: add link to developer survey on main landing pages" 
This reverts commit da31f2ea9274614da18aa2544fc43fb4ee213741.
 2013-07-30 12:28:43 -07:00
Dirk Dougherty
cfb8f9a076 am 3059c708: am d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev 
* commit '3059c70844848c7bd1aad7bffd2d5828cf745540':
  docs: add link to developer survey on main landing pages
 2013-07-09 10:52:40 -07:00
Scott Main
da31f2ea92 docs: add link to developer survey on main landing pages 
Change-Id: Ib842dc074be9541764379d2adfecb0af01751d76
 2013-07-08 16:16:21 -07:00
Dirk Dougherty
2b336ce4d8 am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API. 
* commit '94e207b95799125dcc6ea65eb68697a6568579a3':
  Doc change: Add docs for GP Purchase Status API.
 2013-06-12 17:40:06 -07:00
Dirk Dougherty
57bb89f0b2 Doc change: Add docs for GP Purchase Status API. 
Change-Id: I6f5feb51f1ad06200bb512bcb54eab2f94f40e00
 2013-06-12 16:06:36 -07:00
Dirk Dougherty
09c03c9216 am e0e54203: am dacb0480: am 33b1ed42: am 1519c299: Merge "Doc change: Add docs for test purchases." into jb-mr1.1-docs 
* commit 'e0e5420321f9cb63fff3af8d088e8ee4e47a28a9':
  Doc change: Add docs for test purchases.
 2013-05-14 22:32:48 -07:00
Dirk Dougherty
c80197d065 Doc change: Add docs for test purchases. 
Change-Id: Ic686cd220a6af8676567bd87a9769fc985189cd3
 2013-05-14 22:24:05 -07:00
Dirk Dougherty
ab3b13eb33 am e5d47b39: am cdfeb09d: am 10fc5e05: am cca23552: am 974af93d: Doc change: update payment detail for merch account. 
* commit 'e5d47b39fd748ebfe8c7fe4da6849ba70faff69a':
  Doc change: update payment detail for merch account.
 2013-04-22 14:30:24 -07:00
Dirk Dougherty
cca235525f am 974af93d: Doc change: update payment detail for merch account. 
* commit '974af93de950b68616aed44985720e2978db5393':
  Doc change: update payment detail for merch account.
 2013-04-22 14:22:47 -07:00
Dirk Dougherty
974af93de9 Doc change: update payment detail for merch account. 
Change-Id: I54298c010183a112776065ec894611d5de5f1cc1
 2013-04-22 14:17:36 -07:00
Scott Main
4a88777e53 am 2ad00035: am 6c79bc7e: am bfc4e4eb: am c9762f20: Merge "exclude IAB docs and various SDK docs from search suggestions Also delete several useless files" into jb-mr1.1-docs 
* commit '2ad0003576dccedcfe5bff0af9bfbb6db97a2351':
  exclude IAB docs and various SDK docs from search suggestions Also delete several useless files
 2013-04-12 13:11:30 -07:00
Scott Main
6be7162966 exclude IAB docs and various SDK docs from search suggestions 
Also delete several useless files

Change-Id: I1b17e4eca17e69169002fc617180beb2ac83f67a
 2013-04-12 11:19:39 -07:00
quddusc
d922182604 am a6eaec81: am dd50e98c: am f634d6a2: am c0050433: Merge "docs: Added details about key/signature for IAB/Licensing docs. Bugs: 8338447" into jb-mr1.1-docs 
* commit 'a6eaec812f1d0d2d551d0d98b67bb22cfc26c31a':
  docs: Added details about key/signature for IAB/Licensing docs. Bugs: 8338447
 2013-04-02 10:04:19 -07:00
quddusc
ce4027bd2d docs: Added details about key/signature for IAB/Licensing docs. 
Bugs: 8338447

Change-Id: Ifc5556dc096065e59d34f6cde8fde2b64e5b200e
 2013-04-01 18:43:50 -07:00
Elliott Hughes
3ae3048377 am a19647d3: Merge "Correct executable bit for source files [Take 2]" 
* commit 'a19647d3d81d3bdd15ad3bc8a2ece8e7bd1095fe':
  Correct executable bit for source files [Take 2]
 2013-03-28 14:27:09 -07:00
Chirayu Desai
3e4a3ea2ff Correct executable bit for source files [Take 2] 
Change Ieb51bafb46c895a21d2e83696f5a901ba752b2c5 left out some
files, this fixes them.

Change-Id: Ia949a8581668836ea0251602e048f09c852f5169
 2013-03-27 16:52:35 +05:30
quddusc
2a1ac70579 am e772ce34: am 3a3290e3: am 096c7f7b: am f353c9ed: Merge "docs: Fix IABv3 AIDL installation instructions for Eclipse users. Bug: 8282080" into jb-mr1.1-docs 
* commit 'e772ce348ce99bc3edbfec186ff416cb2735113f':
  docs: Fix IABv3 AIDL installation instructions for Eclipse users. Bug: 8282080
 2013-03-05 13:13:45 -08:00
quddusc
5319f312aa docs: Fix IABv3 AIDL installation instructions for Eclipse users. 
Bug: 8282080

Change-Id: I094a3b4ac7e241009e75bae457f34a0a32accde1
 2013-02-27 15:41:08 -08:00
Dirk Dougherty
0db6a9e9a6 am a18ff6f1: am f809e96f: am 1a15b24b: am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 
* commit 'a18ff6f1ae45c4553e7d2e0c65a5b347bbb370e4':
  Doc change: Remove refs to Copy Protection and note EOL in GP.
 2013-02-26 10:47:54 -08:00
Dirk Dougherty
012ef92e03 Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev 2013-02-26 18:36:11 +00:00
Dirk Dougherty
531a599660 am 82f810f3: am bc1a863f: am 094023a7: am 47dae077: Doc change: Update DC image, fix typo. 
* commit '82f810f3d4e70c264cb81c0cb6caaec2e864ebd0':
  Doc change: Update DC image, fix typo.
 2013-02-22 10:15:52 -08:00
Dirk Dougherty
47dae0771c Doc change: Update DC image, fix typo. 
Change-Id: Ifa68c9dd457cc8deb65e63cac54082ce082fa18d
 2013-02-22 09:54:45 -08:00
Dirk Dougherty
aca4a7760a Doc change: Remove refs to Copy Protection and note EOL in GP. 
Change-Id: Ia03a6173cc635a5de460cd5534c454840510b33d

Bug:6951537
 2013-02-21 15:47:43 -08:00
Dirk Dougherty
959256498a am 9de13839: am d886d128: am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing. 
* commit '9de1383960314eed43c4df1c0bcc82cd883bd76f':
  Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
 2013-02-21 14:29:33 -08:00
Dirk Dougherty
f32cbc3d49 Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing. 
bug: 8033647
bug: 8033688

Change-Id: Id7b5efd48f8e13ba8c8f4ab0e0f8e5dc736b1691
 2013-02-21 13:29:07 -08:00
Dirk Dougherty
f16de3f3f6 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.
 2013-02-14 12:09:16 -08:00