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
Bruno Oliveira
da61eab862
Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2
2011-06-21 11:07:47 -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
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
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
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
cd944baf51
Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"
...
This reverts commit 1431fd98b1
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 f25be17f64
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
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
Bruno Oliveira
9e67587d02
Integrating RandomMusicPlayer sample into tree.
...
This is a cherrypick of CL 112174 (originally written for
honeycomb-mr1) into the honeycomb-mr2 branch. Original CL:
https://android-git.corp.google.com/g/#change,112174
Patch Set 2: ammending to fix spaces in title (as suggsted by smain@)
Change-Id: I1c6e2f4f3585bb65f9f87342445e21f27bed242d
2011-06-07 01:28:05 -04: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
