summaryrefslogtreecommitdiffstats
path: root/docs
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of 872a1e79 to masterDianne Hackborn2011-06-161-0/+20
|\ | | | | | | Change-Id: I50253b22f181729d4e748970acf1a3ad868ccd74
| * SDK only: integrate new sample code, deprecating along the way.Dianne Hackborn2011-06-161-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | am 2ecb884f: am b481a600: am c7731e07: Merge "cherrypick from hc mr1 ↵Robert Ly2011-06-141-9/+9
|\ \ | |/ | | | | | | | | | | Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2 * commit '2ecb884f7586218a1608cd5b0d82a45de6f9a069': cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d
| * Merge "cherrypick from hc mr1 Change-Id: ↵Robert Ly2011-06-141-9/+9
| |\ | | | | | | | | | I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2
| | * cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7dRobert Ly2011-06-141-9/+9
| | | | | | | | | | | | Change-Id: I88d74001d58176ac9ca24265512d92646c345488
* | | am 8a8f82bb: am 4963cd0b: am 1a3e7cf2: Merge "cherry pick from hc mr1 ↵Robert Ly2011-06-141-35/+35
|\ \ \ | |/ / | | | | | | | | | | | | | | | Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2 * commit '8a8f82bbd606657df8a804b4cd499556e2292404': cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc
| * | Merge "cherry pick from hc mr1 Change-Id: ↵Robert Ly2011-06-141-35/+35
| |\ \ | | | | | | | | | | | | I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2
| | * | cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbcRobert Ly2011-06-091-35/+35
| | |/ | | | | | | | | | Change-Id: I77ae1a4f999ae0f4fff925bf8a7f9caf0b868329
* | | am 5e69c0f5: am 1dbb7075: am 8467cd7f: Merge "cherrypick from hc mr1 ↵Robert Ly2011-06-142-3/+86
|\ \ \ | |/ / | | | | | | | | | | | | | | | Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2 * commit '5e69c0f5569940b5f6a0f9c5a2677639c5ed3062': cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac
| * | Merge "cherrypick from hc mr1 Change-Id: ↵Robert Ly2011-06-142-3/+86
| |\ \ | | | | | | | | | | | | I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2
| | * | cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186acRobert Ly2011-06-142-3/+86
| | |/ | | | | | | | | | Change-Id: I7a1ca07b5aac9979b710e78b4d0e33f78ac18cee
* | | am f3c9a251: am 17cddaf2: am 409b9a4c: Merge "Revert "cherrypick from hc mr1 ↵Robert Ly2011-06-141-20/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2 * commit 'f3c9a2517ad9db2af4e11435068c24410eaf9c57': Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"
| * | Merge "Revert "cherrypick from hc mr1 Change-Id: ↵Robert Ly2011-06-141-20/+3
| |\ \ | | | | | | | | | | | | I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2
| | * | Revert "cherrypick from hc mr1 Change-Id: ↵Robert Ly2011-06-141-20/+3
| | | | | | | | | | | | | | | | | | | | I23143ecaa0eeab68d55d007b8594a51bf90fbab7" This reverts commit f25be17f6413417aa6a1e3a5a791302099d15008
* | | | am 2aeafe0b: am b5c31b8a: am 194f4745: Merge "Revert "cherrypick from hc mr1 ↵Robert Ly2011-06-141-2/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2 * commit '2aeafe0baaab1f833110994deb7cd6714cab1d5f': Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"
| * | | Merge "Revert "cherrypick from hc mr1 Change-Id: ↵Robert Ly2011-06-141-2/+1
| |\ \ \ | | | | | | | | | | | | | | | I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2
| | * | | Revert "cherrypick from hc mr1 Change-Id: ↵Robert Ly2011-06-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" This reverts commit 1431fd98b1a9b69a8b9a03d07bc408aefe30c28e
* | | | | resolved conflicts for merge of 398d021b to masterRobert Ly2011-06-146-719/+1324
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I4f8a2cfec95bf31c38365da0257e8d13897bb197
| * | | | Merge "cherrypick from hc mr1 Change-Id: ↵Robert Ly2011-06-146-719/+1324
| |\ \ \ \ | | | | | | | | | | | | | | | | | | I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2
| | * | | | cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06aRobert Ly2011-06-146-719/+1324
| | | |_|/ | | |/| | | | | | | | | | | | Change-Id: I8b7848139e93df385d0727f9536be73124687cc7
* | | | | am 0b7d7f53: am b658dfb8: am cbd31aec: Merge "cherry pick from hc mr1 ↵Robert Ly2011-06-142-129/+347
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2 * commit '0b7d7f53a958132eb539fc81130423878c2db650': cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e
| * | | | Merge "cherry pick from hc mr1 Change-Id: ↵Robert Ly2011-06-142-129/+347
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2
| | * | | | cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739eRobert Ly2011-06-092-129/+347
| | |/ / / | | | | | | | | | | | | | | | Change-Id: I3a91d80c1d298ed0aa9e01c1e1be313e1e72b444
* | | | | am ae6dc0c5: am cbfab050: am a91d6552: Merge "cherrypick from hc mr1 ↵Robert Ly2011-06-141-1/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2 * commit 'ae6dc0c5e213ce5ca3c504020bc73993e1aceb9a': cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
| * | | | Merge "cherrypick from hc mr1 Change-Id: ↵Robert Ly2011-06-141-1/+2
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| | I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
| | * | cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cbRobert Ly2011-06-141-1/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | Conflicts: docs/html/sdk/sdk_toc.cs Change-Id: I03be3486734960c4c691d4d2abe6b17c5114b1a9
* | | am ff46480e: am 4cd4c820: am 9fa54704: Merge "cherrypick from hc mr1 ↵Robert Ly2011-06-141-3/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2 * commit 'ff46480e748555a923242af4238ec8d4822fd2ae': cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
| * | cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7Robert Ly2011-06-141-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: docs/html/guide/topics/usb/adk.jd Change-Id: I09b7fafd5d946a9e0d42c025089bdab717c8ca3e
* | | am 8a73d211: am 74c48f2b: am 700a1f25: Merge "Update resources documentation ↵Dianne Hackborn2011-06-141-40/+80
|\ \ \ | |/ / | | | | | | | | | | | | | | | with new qualifiers." into honeycomb-mr2 * commit '8a73d211845671880b0d50fbb0c5caa065066c80': Update resources documentation with new qualifiers.
| * | Update resources documentation with new qualifiers.Dianne Hackborn2011-06-131-40/+80
| |/ | | | | | | Change-Id: I4a3e0d3ece64d8a177157e469c39dbb282094373
* | Merge "Fixed typo. "a a" -> "a""Frank Sposaro2011-06-071-1/+1
|\ \
| * | Fixed typo. "a a" -> "a"Frank Sposaro2011-06-061-1/+1
| | | | | | | | | | | | Change-Id: I600d6f7f5d87766cd841a5e8177581d33dcdd282
* | | am 16475a3a: am 07613835: am e7d60078: Add old blog posts as articles, batch 1Roman Nurik2011-06-037-0/+313
|\ \ \ | | |/ | |/| | | | | | | * commit '16475a3a40beac982886ce6bc300f4ffe29f581d': Add old blog posts as articles, batch 1
| * | Add old blog posts as articles, batch 1Roman Nurik2011-06-037-1/+314
| | | | | | | | | | | | Change-Id: Ibe1bcf1ceef2eb1a1b4bc0c1b2451ed69838ee3a
* | | am b9040e77: am 5b8342cf: am a8629089: Merge "cherrypick Change-Id: ↵Scott Main2011-06-032-13/+42
|\ \ \ | |/ / | | | | | | | | | | | | | | | I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add \'animator\' resource info" into honeycomb-mr2 * commit 'b9040e774920c4641c154df2a358100cf78a2bd3': cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add 'animator' resource info
| * | Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: ↵Scott Main2011-06-022-13/+42
| |\ \ | | | | | | | | | | | | add 'animator' resource info" into honeycomb-mr2
| | * | cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35eScott Main2011-06-022-13/+42
| | | | | | | | | | | | | | | | | | | | | | | | docs: add 'animator' resource info Change-Id: Ifbd130e5bf762d89300c20db0d86d7f695b4ff4b
* | | | am 59a3ad16: am d5335253: am b8236751: Merge "cherry pick Change-Id: ↵Scott Main2011-06-032-6/+139
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11" into honeycomb-mr2 * commit '59a3ad16f57d23eb692b29bf7822dd5011dd7cc5': cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11
| * | | Merge "cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 ↵Scott Main2011-06-022-6/+139
| |\ \ \ | | | | | | | | | | | | | | | docs: release notes for adt 11" into honeycomb-mr2
| | * | | cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514Scott Main2011-06-022-6/+139
| | |/ / | | | | | | | | | | | | | | | | | | | | docs: release notes for adt 11 Change-Id: I9041a5e34fcf34e8a08b3e9becc8c149f773a250
* | | | am 7c8b81c5: am b04ac7ac: am 0d5ed597: Merge "Cherry pick Change-Id: ↵Scott Main2011-06-031-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links" into honeycomb-mr2 * commit '7c8b81c53674ffbd3fc0cdf29f5fff4548fda085': Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links
| * | | Merge "Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b ↵Scott Main2011-06-021-2/+2
| |\ \ \ | | | | | | | | | | | | | | | docs: fix broken links" into honeycomb-mr2
| | * | | Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560bScott Main2011-06-021-2/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | docs: fix broken links Change-Id: Ibc71e21b6024a8bed0fc07dba5e0a9c6c5d7f8c0
* | | | am 5c6e95a7: am ce214df9: am f58e6c98: Merge "doc typo" into honeycomb-mr2Scott Main2011-06-031-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '5c6e95a77359bd6f758164b7f5a5a92093c2498f': doc typo
| * | | doc typoScott Main2011-06-011-1/+1
| |/ / | | | | | | | | | Change-Id: Iab3246e12059582096594eb795f2eb42da46f667
| * | docs: fix typosScott Main2011-06-011-4/+4
| | | | | | | | | | | | Change-Id: I59a34a84075c63715a6b4aaf6d90acead321ea90
* | | am 409db558: am a3d68aed: am d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba ↵Joe Malin2011-06-031-1/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | to I48ddc26d4f * commit '409db558b3f47ac28f1291d82bef15a07b2920c3': Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
| * | Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4fJoe Malin2011-05-311-1/+20
| | | | | | | | | | | | Change-Id: I48ddc26d4fc8e2e44627cfb0e98d9f0b596042b6
* | | am 092b0bd9: am de43d71b: am f128d5d4: Merge "docs: adjust what\'s visible ↵Scott Main2011-06-022-9/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | for online and offline docs" into honeycomb-mr2 * commit '092b0bd9b62e3b0fe07dfd4c5a0b3323ff95d2a0': docs: adjust what's visible for online and offline docs
| * | Merge "docs: adjust what's visible for online and offline docs" into ↵Scott Main2011-05-272-9/+18
| |\ \ | | | | | | | | | | | | honeycomb-mr2
generated by cgit v1.1 at 2024-09-13 11:06:54 +0000