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

2060 Commits

Author SHA1 Message Date
Robert Ly
1a3e7cf259 Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2 2011-06-14 17:43:38 -07:00
Robert Ly
8467cd7f90 Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2 2011-06-14 16:36:17 -07:00
Robert Ly
409b9a4cad Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2 2011-06-14 16:35:22 -07:00
Robert Ly
194f47451c Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2 2011-06-14 16:35:12 -07:00
Robert Ly
cd944baf51 Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" 
This reverts commit 1431fd98b1a9b69a8b9a03d07bc408aefe30c28e
 2011-06-14 15:09:41 -07:00
Robert Ly
86ef7977a9 Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2 2011-06-14 15:06:42 -07:00
Robert Ly
8077b8b3bb Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" 
This reverts commit f25be17f6413417aa6a1e3a5a791302099d15008
 2011-06-14 15:02:42 -07:00
Robert Ly
cbd31aec9f Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2 2011-06-14 14:58:32 -07:00
Robert Ly
a91d655291 Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2 2011-06-14 14:56:00 -07:00
Robert Ly
f25be17f64 cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7 
Conflicts:

	docs/html/guide/topics/usb/adk.jd

Change-Id: I09b7fafd5d946a9e0d42c025089bdab717c8ca3e
 2011-06-14 11:50:19 -07:00
Robert Ly
f197b639ec cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a 
Change-Id: I8b7848139e93df385d0727f9536be73124687cc7
 2011-06-14 11:27:41 -07:00
Robert Ly
1431fd98b1 cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb 
Conflicts:

	docs/html/sdk/sdk_toc.cs

Change-Id: I03be3486734960c4c691d4d2abe6b17c5114b1a9
 2011-06-14 11:26:39 -07:00
Robert Ly
ef18aea78d cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac 
Change-Id: I7a1ca07b5aac9979b710e78b4d0e33f78ac18cee
 2011-06-14 11:21:30 -07:00
Dianne Hackborn
ce67da79e7 Update resources documentation with new qualifiers. 
Change-Id: I4a3e0d3ece64d8a177157e469c39dbb282094373
 2011-06-13 22:01:13 -07:00
Robert Ly
bffb5235ac cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc 
Change-Id: I77ae1a4f999ae0f4fff925bf8a7f9caf0b868329
 2011-06-09 12:00:06 -07:00
Robert Ly
4d1824206b cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e 
Change-Id: I3a91d80c1d298ed0aa9e01c1e1be313e1e72b444
 2011-06-09 11:58:57 -07:00
Roman Nurik
e7d6007872 Add old blog posts as articles, batch 1 
Change-Id: Ibe1bcf1ceef2eb1a1b4bc0c1b2451ed69838ee3a
 2011-06-03 16:45:00 -07:00
Scott Main
a86290891a Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add 'animator' resource info" into honeycomb-mr2 2011-06-02 09:52:09 -07:00
Scott Main
99960b73e9 cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e 
docs: add 'animator' resource info

Change-Id: Ifbd130e5bf762d89300c20db0d86d7f695b4ff4b
 2011-06-02 09:51:23 -07:00
Scott Main
b823675121 Merge "cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11" into honeycomb-mr2 2011-06-02 09:49:43 -07:00
Scott Main
25d0b9f3a0 cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 
docs: release notes for adt 11

Change-Id: I9041a5e34fcf34e8a08b3e9becc8c149f773a250
 2011-06-02 09:48:24 -07:00
Scott Main
0d5ed597b7 Merge "Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links" into honeycomb-mr2 2011-06-02 09:47:31 -07:00
Scott Main
8f0d336c4d Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b 
docs: fix broken links

Change-Id: Ibc71e21b6024a8bed0fc07dba5e0a9c6c5d7f8c0
 2011-06-02 09:45:53 -07:00
Scott Main
f9e43b8cba doc typo 
Change-Id: Iab3246e12059582096594eb795f2eb42da46f667
 2011-06-01 16:28:19 -07:00
Scott Main
f5992953e4 docs: fix typos 
Change-Id: I59a34a84075c63715a6b4aaf6d90acead321ea90
 2011-06-01 09:46:04 -07:00
Joe Malin
d40a5d5cb7 Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f 
Change-Id: I48ddc26d4fc8e2e44627cfb0e98d9f0b596042b6
 2011-05-31 16:36:04 -07:00
Scott Main
f128d5d49b Merge "docs: adjust what's visible for online and offline docs" into honeycomb-mr2 2011-05-27 10:17:41 -07:00
Scott Main
c0324b89f5 docs: adjust what's visible for online and offline docs 
Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08
 2011-05-27 10:15:31 -07:00
Scott Main
a227213011 cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2 
docs: fix typo and slight revision

Change-Id: I33ec5fef9f04dad6deae5681571c36bf70205569
 2011-05-26 15:21:38 -07:00
Scott Main
f5d8ceae68 cherry pick Change-Id: I58ae8210a17f76ff92ee9d064cf42fd4a81ad9b5 
docs: fix markup and typos

Change-Id: Ib0c5a0b41bfa2e9faef9b9b8e2cad8a69e6e1c8b
 2011-05-26 15:19:07 -07:00
Scott Main
28fb09e0b2 cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262 
docs: add document for the compatibility library

Change-Id: I1825ae1fba0be664a7c6a8b0ba32166f216a893f
 2011-05-26 15:16:01 -07:00
Jeff Hamilton
734e9b0c73 Swap Mifare for MIFARE. 
Change-Id: I45580d32f5ccebf906372c3c1664bc66718a672e
 2011-05-25 17:37:51 -05:00
Joe Fernandez
146a0b4522 am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1 
* commit 'fde9ac72668ced2e473ad247cacc8a4bdd05996f':
  docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
 2011-05-19 10:53:04 -07:00
Joe Fernandez
fde9ac7266 Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1 2011-05-19 10:49:45 -07:00
Katie McCormick
4ef5f4dce6 am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d 
* commit '566489dbf6047ce90f3765b4058723dbcd731b30':
  Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
 2011-05-17 17:38:04 -07:00
Katie McCormick
566489dbf6 Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d 
Change-Id: I7dd7ec732aa3089b4e20d5a859f35e1bbd846c3b
 2011-05-17 17:21:00 -07:00
Joe Fernandez
f6d8de6ff7 docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74 
Change-Id: I85e6b923857d538df8e1e040030aa988279de9eb
 2011-05-17 15:13:46 -07:00
Scott Main
a0ecd648ab am dcf2f354: docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265 
* commit 'dcf2f354963c8cdf5d70263782979cf1bd18b0bf':
  docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
 2011-05-17 11:19:01 -07:00
Scott Main
dcf2f35496 docs: simple update to OpenGl doc to update version support 
Note, this doc still needs a lot more work; this is a small step
bug: 4395265

Change-Id: Ibe3fd816e88aa2b20ca99859b929164715f67027
 2011-05-17 10:40:40 -07:00
Roman Nurik
8f3dbe1c37 am ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1 
* commit 'ce6253d8fda92a508fa1000b5d1110e6e7a5b539':
  Add link to Speech Input article to resource browser, tweak outdated information in the article.
 2011-05-16 16:01:27 -07:00
Roman Nurik
ce6253d8fd Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1 2011-05-16 15:58:08 -07:00
Scott Main
8a29ffa3b0 am 7a701024: docs: add redirects to key legacy docs bug: 4439292 
* commit '7a701024be7e58f840ebf9636cdad62ee4606b72':
  docs: add redirects to key legacy docs bug: 4439292
 2011-05-16 14:01:30 -07:00
Roman Nurik
ecaf3f4f28 Add link to Speech Input article to resource browser, tweak outdated information in the article. 
Change-Id: I5715f8bf7f2f11e5005cc3e9541846ac06797ac6
 2011-05-16 14:00:13 -07:00
Scott Main
7a701024be docs: add redirects to key legacy docs 
bug: 4439292

Change-Id: Ifd8f590504507fe417aae102a757cb7eae5507a3
 2011-05-16 13:54:02 -07:00
Robert Ly
79d3f6305f am 904f4810: doc change: added link to diydrones and a few small changes 
* commit '904f48107e2843a1e255872afac8ddf8e9513ca4':
  doc change: added link to diydrones and a few small changes
 2011-05-16 12:29:17 -07:00
Robert Ly
904f48107e doc change: added link to diydrones and a few small changes 
Change-Id: I4ca757f3dfb60f442c34cfbb4e7145eacb42b395
 2011-05-16 12:19:24 -07:00
Dirk Dougherty
8b8bfc5d28 am babf844f: Merge "Doc change: typo fix" into honeycomb-mr1 
* commit 'babf844f4606f07de0e3349b5847faa2f8f208cc':
  Doc change: typo fix
 2011-05-16 11:01:44 -07:00
Scott Main
582c1361e8 am 5eba0e98: docs: update featured videos and increase the max results for each playlist 
* commit '5eba0e98d1f7ed8f9d04a44adb8d8a37ef7f4659':
  docs: update featured videos and increase the max results for each playlist
 2011-05-16 11:01:42 -07:00
Dirk Dougherty
babf844f46 Merge "Doc change: typo fix" into honeycomb-mr1 2011-05-16 10:59:00 -07:00
Scott Main
5eba0e98d1 docs: update featured videos and increase the max results for each playlist 
Change-Id: I8d7a547960ed5bae4ea2eec9e8bac14c421d3746
 2011-05-16 10:56:26 -07:00