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

1538 Commits

Author SHA1 Message Date
Bruno Oliveira
54340961bd Rewriting "Audio and Video" section of Dev Guide. 
Rewriting the "Audio and Video" section of the Dev Guide, renaming it
Media Framework and adding a more details about MediaPlayer,
interaction between MediaPlayer and services, Audio Focus, etc.

Staging:
http://www.corp.google.com/~btco/tmp/offline-sdk/guide/topics/media/index.html

This is a cherrypick of CL 106666 which was originally on honeycomb-mr1.
Link to old CL:
https://android-git.corp.google.com/g/#change,106666

Change-Id: I0efa4c9ed73af7f9dcb02232a6af4a7527645367
 2011-06-21 18:55:46 -04:00
Robert Ly
1f8d37d7a3 am b2dba991: am d1a19b10: am c7c1ba50: Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2 
* commit 'b2dba9910b6bcd26d4d5318b9ee63668ecf39e66':
  cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
 2011-06-21 15:29:07 -07:00
Scott Main
68e5ea8973 cherrypick from mr2 Change-Id: I59a34a84075c63715a6b4aaf6d90acead321ea90 
docs: fix typos

Change-Id: I1e821f9455ee9fcb01d345226f3b606621fdcd8e
 2011-06-20 17:55:59 -07:00
Scott Main
bb64fa1e3d docs: fix a couple typos 
Change-Id: I65e9b59eb48985f21eeea5d0d944b0d8e8b92023
 2011-06-20 17:22:50 -07:00
Scott Main
beeb776209 docs: fix broken link 
Change-Id: I5ac2eed824cef817d309b4e4794c430882db5de8
 2011-06-20 17:17:39 -07:00
Bill Napier
5f9b178e5a Merge "Fixed MonkeyRunner documentation" 2011-06-20 16:35:30 -07:00
Scott Main
ea41e8d067 docs: add Lenevo driver info 
Change-Id: I5ffe82d26375c76cccd3aaa493448de454cdab1c
 2011-06-20 15:50:12 -07:00
Robert Ly
5c0213c967 cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7 
Change-Id: Ica88f38229a66bfad60cbaf5db4bf94cd99c1d19
 2011-06-16 11:00:47 -07:00
Robert Ly
5f1626372d am 8a8f82bb: am 4963cd0b: am 1a3e7cf2: Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2 
* commit '8a8f82bbd606657df8a804b4cd499556e2292404':
  cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc
 2011-06-14 20:57:07 -07:00
Robert Ly
ba8b72a3d1 am f3c9a251: am 17cddaf2: am 409b9a4c: Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2 
* commit 'f3c9a2517ad9db2af4e11435068c24410eaf9c57':
  Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"
 2011-06-14 20:56:57 -07:00
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
409b9a4cad Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2 2011-06-14 16:35:22 -07:00
Robert Ly
051d16ebec resolved conflicts for merge of 398d021b to master 
Change-Id: I4f8a2cfec95bf31c38365da0257e8d13897bb197
 2011-06-14 15:50:38 -07:00
Robert Ly
36107a37a2 am 0b7d7f53: am b658dfb8: am cbd31aec: Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2 
* commit '0b7d7f53a958132eb539fc81130423878c2db650':
  cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e
 2011-06-14 15:25:00 -07:00
Robert Ly
f5d0eb92fb am ff46480e: am 4cd4c820: am 9fa54704: Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2 
* commit 'ff46480e748555a923242af4238ec8d4822fd2ae':
  cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
 2011-06-14 15:22:47 -07:00
Dianne Hackborn
386f67a152 am 8a73d211: am 74c48f2b: am 700a1f25: Merge "Update resources documentation with new qualifiers." into honeycomb-mr2 
* commit '8a73d211845671880b0d50fbb0c5caa065066c80':
  Update resources documentation with new qualifiers.
 2011-06-14 15:21:18 -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
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
Dianne Hackborn
ce67da79e7 Update resources documentation with new qualifiers. 
Change-Id: I4a3e0d3ece64d8a177157e469c39dbb282094373
 2011-06-13 22:01:13 -07:00
Michael Wright
6914d17c7c Fixed MonkeyRunner documentation 
MonkeyRunner's documentation previously had an out of date enum value in
the sample code. This has been updated.

Change-Id: If725815ee578aab8cd59ef17706ea8de7973d4c1
 2011-06-09 15:48:33 -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
Frank Sposaro
34687664be Merge "Fixed typo. "a a" -> "a"" 2011-06-07 15:57:11 -07:00
Frank Sposaro
15dc451906 Fixed typo. "a a" -> "a" 
Change-Id: I600d6f7f5d87766cd841a5e8177581d33dcdd282
 2011-06-06 13:41:37 -07:00
Roman Nurik
1d3a5c1133 am 16475a3a: am 07613835: am e7d60078: Add old blog posts as articles, batch 1 
* commit '16475a3a40beac982886ce6bc300f4ffe29f581d':
  Add old blog posts as articles, batch 1
 2011-06-03 18:02:01 -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
bb718776a1 am b9040e77: am 5b8342cf: am a8629089: Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add \'animator\' resource info" into honeycomb-mr2 
* commit 'b9040e774920c4641c154df2a358100cf78a2bd3':
  cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add 'animator' resource info
 2011-06-03 15:29:17 -07:00
Scott Main
e981ee73a3 am 7c8b81c5: am b04ac7ac: am 0d5ed597: Merge "Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links" into honeycomb-mr2 
* commit '7c8b81c53674ffbd3fc0cdf29f5fff4548fda085':
  Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links
 2011-06-03 15:28:44 -07:00
Scott Main
e91a45a6cf am 5c6e95a7: am ce214df9: am f58e6c98: Merge "doc typo" into honeycomb-mr2 
* commit '5c6e95a77359bd6f758164b7f5a5a92093c2498f':
  doc typo
 2011-06-03 14:43:31 -07:00
Joe Malin
8c56154d9a am 409db558: am a3d68aed: am d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f 
* commit '409db558b3f47ac28f1291d82bef15a07b2920c3':
  Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
 2011-06-03 13:16:29 -07:00
Scott Main
4bd705b196 am 2bb7432d: am f18348b1: am a2272130: cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2 docs: fix typo and slight revision 
* commit '2bb7432d8ff98650a0d3d84b9ac13649474595f9':
  cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2 docs: fix typo and slight revision
 2011-06-02 14:05:04 -07:00
Scott Main
69ff8ab05b am b9cb731b: am b7cfc618: am 28fb09e0: cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262 docs: add document for the compatibility library 
* commit 'b9cb731bb89bd310a17093262ce6483c557d3d4c':
  cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262 docs: add document for the compatibility library
 2011-06-02 14:04:08 -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
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
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
28fb09e0b2 cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262 
docs: add document for the compatibility library

Change-Id: I1825ae1fba0be664a7c6a8b0ba32166f216a893f
 2011-05-26 15:16:01 -07:00
Joe Fernandez
36cca79ca7 am 0a36cec6: am 605be31c: am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1 
* commit '0a36cec642fb58e295d0608026890d95d0ae3cc0':
  docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
 2011-05-19 11:13:41 -07: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
37250130b6 am 2c898da6: am 32638ccb: am 4ef5f4dc: am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d 
* commit '2c898da6d3306e041da0165607555303203ec86d':
  Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
 2011-05-18 10:25:02 -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