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

2317 Commits

Author SHA1 Message Date
Scott Main
138836adc7 Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2 2011-06-22 17:45:13 -07:00
Scott Main
9fc3579cab docs: add info about manifest attributes that should not change 
Change-Id: Ia58d855ccaa3348bc0a2f7a4b7847ec115c442e8
 2011-06-22 15:57:37 -07:00
Scott Main
929cba1391 docs: remove exclamation from media title 
Change-Id: If89584a6b52c6a0e70e6636e1da260b47c0ca072
 2011-06-22 14:43:14 -07:00
Katie McCormick
d4fac2c026 Doc change: updated TOC for Bluetooth CL. 
Change-Id: Ifd60e332d3088402e939fc851374800f526f8cdf
 2011-06-22 14:28:29 -07:00
Scott Main
24ef1aa672 Merge "docs: use new CSE to show results for all sites" into honeycomb-mr2 2011-06-22 14:23:22 -07:00
Scott Main
702a6caa20 docs: use new CSE to show results for all sites 
Change-Id: Idd85d78fcdd90381b6f03406a76b13e02d540e37
 2011-06-22 13:58:32 -07:00
Robert Ly
d60e1b5b91 cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5 
Change-Id: Ib47cf367f5c9ca66da2921fa86078693198a7968
 2011-06-22 12:44:02 -07:00
Bruno Oliveira
f5c6236289 Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2 2011-06-21 16:44:56 -07:00
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
Robert Ly
981d824acf am 5520ec6f: am 152e5f56: am 329e0b90: Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2 
* commit '5520ec6f8958d9030a4c9b606b25be6190c75a08':
  cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
 2011-06-21 15:28:26 -07:00
Bruno Oliveira
da61eab862 Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2 2011-06-21 11:07:47 -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
c7c1ba5071 Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2 2011-06-20 09:37:51 -07:00
Robert Ly
329e0b9020 Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2 2011-06-20 09:37:36 -07:00
Dianne Hackborn
a7f88508d3 resolved conflicts for merge of 872a1e79 to master 
Change-Id: I50253b22f181729d4e748970acf1a3ad868ccd74
 2011-06-16 16:01:27 -07:00
Dianne Hackborn
2f04883ff8 SDK only: integrate new sample code, deprecating along the way. 
The new support library features and sample code for switching
between fragments using a TabHost now eliminates the utility of
the TabActivity class, so deprecate it.  This also means there is
no longer any use in ActivityGroup or LocalActivityManager.  Yay.

Also fix up things so the new support API demos are included in
the documentation.

Change-Id: I4f073b82787f32560ba1fa5b6a23746ecc8aecdc
 2011-06-16 14:52:00 -07:00
Robert Ly
235ac0160f cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb 
Change-Id: Ic18859f171d03f8562ad91761da40a55b59f47ea
 2011-06-16 11:05:46 -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
c4753a7ff2 am 2ecb884f: am b481a600: am c7731e07: Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2 
* commit '2ecb884f7586218a1608cd5b0d82a45de6f9a069':
  cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d
 2011-06-14 20:57:11 -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
b83683a526 am 5e69c0f5: am 1dbb7075: am 8467cd7f: Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2 
* commit '5e69c0f5569940b5f6a0f9c5a2677639c5ed3062':
  cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac
 2011-06-14 20:57:01 -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
7c8c449b8b am 2aeafe0b: am b5c31b8a: am 194f4745: Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2 
* commit '2aeafe0baaab1f833110994deb7cd6714cab1d5f':
  Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"
 2011-06-14 20:56:51 -07:00
Robert Ly
c7731e070e Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2 2011-06-14 17:45:04 -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
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
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
86f1ea099a am ae6dc0c5: am cbfab050: am a91d6552: Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2 
* commit 'ae6dc0c5e213ce5ca3c504020bc73993e1aceb9a':
  cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
 2011-06-14 15:22:51 -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
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
Robert Ly
de50cace6e cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d 
Change-Id: I88d74001d58176ac9ca24265512d92646c345488
 2011-06-14 11:20:33 -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