Scott Main
4971c3c4a1
am 44b48a37: am db76388e: am 9a05cfe5: docs: update docs for new screen support attributes and qualifiers
...
* commit '44b48a377d47bb27b667ab87347f0a88ba3fba0b':
docs: update docs for new screen support attributes and qualifiers
2011-06-27 14:14:26 -07:00
Scott Main
01ecdcc756
am b9d7873c: am a602972c: am 1acd2a7f: Merge "docs: add Lenevo driver info" into honeycomb-mr2
...
* commit 'b9d7873cecdc6052ed4004293ead2071db7fb24c':
docs: add Lenevo driver info
2011-06-24 17:15:53 -07:00
Scott Main
090117774a
am d4f9872c: am dc0ae0cb: am 138836ad: Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2
...
* commit 'd4f9872cb077abc54cfa2def348f831d24e32ca0':
docs: add info about manifest attributes that should not change
2011-06-23 14:30:30 -07:00
Scott Main
16d1f17675
am d65fab3d: am e2f74aec: am 929cba13: docs: remove exclamation from media title
...
* commit 'd65fab3de6381a8b040101c74d5276290de1c7c1':
docs: remove exclamation from media title
2011-06-23 14:29:50 -07:00
Katie McCormick
c182bd5162
am 02362299: am a108223f: am d4fac2c0: Doc change: updated TOC for Bluetooth CL.
...
* commit '023622997d886074f7c0cf831945a466803acf5e':
Doc change: updated TOC for Bluetooth CL.
2011-06-23 14:29:25 -07:00
Scott Main
9a05cfe542
docs: update docs for new screen support attributes and qualifiers
...
Change-Id: I8fdfd90e5d7970bdbb72e0b3271f047f5ed300ee
2011-06-23 11:35:07 -07:00
Scott Main
1acd2a7f2b
Merge "docs: add Lenevo driver info" into honeycomb-mr2
2011-06-23 09:18:22 -07:00
Scott Main
e847fc24c3
am dba7dd71: am 6f2bcc4d: am 24ef1aa6: Merge "docs: use new CSE to show results for all sites" into honeycomb-mr2
...
* commit 'dba7dd71f296a6220cb5a5308221b9ead1b4f106':
docs: use new CSE to show results for all sites
2011-06-23 08:17:28 -07:00
Robert Ly
f64d0ef991
am b6f9e5dd: am 60506b4f: am d60e1b5b: cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
...
* commit 'b6f9e5dd96e34691743000d9f51e4d5d71ead70a':
cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
2011-06-23 08:17:23 -07:00
Bruno Oliveira
f14192bc4f
am ecf16143: am 0310f4da: am f5c62362: Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2
...
* commit 'ecf161437e4a2f2e0493f303119e8b2f090739eb':
Rewriting "Audio and Video" section of Dev Guide.
2011-06-23 08:16:55 -07:00
Bruno Oliveira
3987ea1557
am a62f707d: am f1c71771: am da61eab8: Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2
...
* commit 'a62f707da28226d5c6d160d1f0e21a65dcfba5fc':
Integrating RandomMusicPlayer sample into tree.
2011-06-23 07:47:39 -07:00
Scott Main
80a0fa0b69
am fe8e2fb3: am de937ac0: am bb64fa1e: docs: fix a couple typos
...
* commit 'fe8e2fb32febccc5c88ca4eba089d747755975d4':
docs: fix a couple typos
2011-06-23 07:41:29 -07:00
Scott Main
b0f0245297
am 35837c32: am 20fe290e: am beeb7762: docs: fix broken link
...
* commit '35837c3234a2e888d0a1016f71c5b371a7014f4e':
docs: fix broken link
2011-06-23 07:41:15 -07:00
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
