Commit Graph

145 Commits

Author SHA1 Message Date
Scott Main
e502c7c0ca am f0b4f100: am f2d52938: Merge "docs: revise loader doc title" into honeycomb
* commit 'f0b4f1007935a724cd0cfa64520ac98ee68a2266':
  docs: revise loader doc title
2011-02-15 20:15:31 -08:00
Scott Main
a564745035 docs: revise loader doc title
Change-Id: I232eb1da8270625afa0f26951dbd20d9a61fe15d
2011-02-15 17:50:33 -08:00
Scott Main
ebcf0ae513 am 40534523: am a460a9ac: docs: add \'new\' tags and resolve some doc title regressions
* commit '40534523304784fdc46f0de28fcaad9d3df2821b':
  docs: add 'new' tags and resolve some doc title regressions
2011-02-15 15:52:25 -08:00
Scott Main
a460a9ac79 docs: add 'new' tags and resolve some doc title regressions
Change-Id: I4894d29dded74e4e47cdff6e816417de776cfe04
2011-02-15 15:45:55 -08:00
Robert Ly
c00cc5f226 cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
Doc change: nfc dev guide

Change-Id: I918d0eddc51a96adf901170a6b2f6cbd38579d1d
2011-02-15 15:20:57 -08:00
Scott Main
148164095e am 753c22cf: am 865cd1ca: Merge "docs: update sidenav; move loaders under activities, add "more" tags, remove duplicate for content providers, rename Copying/ to Copy/" into honeycomb
* commit '753c22cfecb04cfdccea3b92197f73e7328d0b15':
  docs: update sidenav; move loaders under activities, add "more" tags, remove duplicate for content providers, rename Copying/ to Copy/
2011-02-14 14:47:11 -08:00
Scott Main
753c22cfec am 865cd1ca: Merge "docs: update sidenav; move loaders under activities, add "more" tags, remove duplicate for content providers, rename Copying/ to Copy/" into honeycomb
* commit '865cd1ca5c31243764545dc888ee117a9215e837':
  docs: update sidenav; move loaders under activities, add "more" tags, remove duplicate for content providers, rename Copying/ to Copy/
2011-02-14 14:44:30 -08:00
Scott Main
c059fa4de4 docs: update sidenav; move loaders under activities, add "more" tags,
remove duplicate for content providers, rename Copying/ to Copy/

Change-Id: I4ad8839da1862185caf15b50e0376bb0e380bb21
2011-02-14 14:23:53 -08:00
Katie McCormick
89e0878a20 am 1d0fad21: am 28c3f5ca: Merge "Doc change: New docs for Loaders." into honeycomb
* commit '1d0fad219d78652f8d93344054466b664c2a6699':
  Doc change: New docs for Loaders.
2011-02-14 12:06:02 -08:00
Katie McCormick
1d0fad219d am 28c3f5ca: Merge "Doc change: New docs for Loaders." into honeycomb
* commit '28c3f5ca436f466638012934b8f3f1f923158118':
  Doc change: New docs for Loaders.
2011-02-14 12:03:16 -08:00
Katie McCormick
28c3f5ca43 Merge "Doc change: New docs for Loaders." into honeycomb 2011-02-14 12:01:04 -08:00
Scott Main
7046bbd47b am 1d7fb0a6: am 2e805682: Merge "add compatible-screens manifest element and update supports-screens element with resizeable attribute" into honeycomb
* commit '1d7fb0a6aa0283484676a26e123aee6871828025':
  add compatible-screens manifest element and update supports-screens element with resizeable attribute
2011-02-14 11:49:17 -08:00
Katie McCormick
d178211675 Doc change: New docs for Loaders.
Change-Id: I89e70576462ef9bf576fea2837572546b3a9b355
2011-02-14 11:49:06 -08:00
Scott Main
1d7fb0a6aa am 2e805682: Merge "add compatible-screens manifest element and update supports-screens element with resizeable attribute" into honeycomb
* commit '2e80568263924b13c59a24d4d28fecb903bbc2a9':
  add compatible-screens manifest element and update supports-screens element with resizeable attribute
2011-02-14 11:46:35 -08:00
Scott Main
2e80568263 Merge "add compatible-screens manifest element and update supports-screens element with resizeable attribute" into honeycomb 2011-02-14 11:44:10 -08:00
Joe Malin
b495eb90cf am b2206668: am 83c8b8a3: Merge "Doc Change: Topics for copy/paste/drag/drop" into honeycomb
* commit 'b2206668d1559df2f0885723e89e7f59d372c7e0':
  Doc Change: Topics for copy/paste/drag/drop
2011-02-14 10:08:26 -08:00
Joe Malin
b2206668d1 am 83c8b8a3: Merge "Doc Change: Topics for copy/paste/drag/drop" into honeycomb
* commit '83c8b8a3284063c201beccc79f14db6bd715dd82':
  Doc Change: Topics for copy/paste/drag/drop
2011-02-14 10:05:46 -08:00
Joe Malin
dd05f1812e Doc Change: Topics for copy/paste/drag/drop
Change-Id: I755216fe9d2afca87a9adaeb99840142ff34a685
2011-02-14 09:47:22 -08:00
Roman Nurik
5559d6a4c6 am 471f89cc: am b9659336: Merge "Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations." into honeycomb
* commit '471f89cc8666f484c5a609503f16d806b8c716f0':
  Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations.
2011-02-11 16:47:34 -08:00
Roman Nurik
471f89cc86 am b9659336: Merge "Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations." into honeycomb
* commit 'b9659336c24ee9be8041132f0d9a1bca3ff6ed36':
  Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations.
2011-02-11 16:44:52 -08:00
Roman Nurik
b9659336c2 Merge "Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations." into honeycomb 2011-02-11 16:43:32 -08:00
Roman Nurik
7641db4b3e Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations.
Change-Id: I905213a47c9da0476e8495ffa20344a8811d56bc
2011-02-11 14:42:17 -08:00
Robert Ly
b3103093a4 am 65bdc59e: resolved conflicts for merge of 810c1c0c to honeycomb-plus-aosp
* commit '65bdc59ea0e5c1cbc97ea2b288b71d48de173a79':
  Doc change: nfc dev guide
2011-02-11 14:02:00 -08:00
Robert Ly
65bdc59ea0 resolved conflicts for merge of 810c1c0c to honeycomb-plus-aosp
Conflicts:
	docs/html/guide/guide_toc.cs

Change-Id: I42d55f7ae899a914dc3f1c8a55492411c28057a2
2011-02-11 13:49:09 -08:00
Robert Ly
c53349f6f2 am 6059bb3e: am 2be58282: Merge "Doc change: updating animation framework topic" into honeycomb
* commit '6059bb3e24bf47c3bfd805c887775db817d537e7':
  Doc change: updating animation framework topic
2011-02-11 13:21:47 -08:00
Robert Ly
3e7a131c6b am 41d34195: am 997a6713: Merge "Doc change: renderscript dev guide" into honeycomb
* commit '41d34195f9d0c6a1548bb9c0de27a8cfd147210f':
  Doc change: renderscript dev guide
2011-02-11 13:21:44 -08:00
Robert Ly
6059bb3e24 am 2be58282: Merge "Doc change: updating animation framework topic" into honeycomb
* commit '2be58282746de92773f6423d4ae55a2ef4e5f226':
  Doc change: updating animation framework topic
2011-02-11 13:18:41 -08:00
Robert Ly
41d34195f9 am 997a6713: Merge "Doc change: renderscript dev guide" into honeycomb
* commit '997a671368c3b9f66f3a415876aaa94b391ab602':
  Doc change: renderscript dev guide
2011-02-11 13:18:33 -08:00
Robert Ly
2be5828274 Merge "Doc change: updating animation framework topic" into honeycomb 2011-02-11 13:15:55 -08:00
Scott Main
1b6dd05927 add compatible-screens manifest element
and update supports-screens element with resizeable attribute

Change-Id: I0f9247464572d126b725270b40074a390b0887bf
2011-02-11 13:00:52 -08:00
Robert Ly
bc68067d25 Doc change: renderscript dev guide
Change-Id: I4a70e4659fa629fa16369c81ebc601c8b4b570e5
2011-02-10 21:37:03 -08:00
Robert Ly
676faeba90 Doc change: updating animation framework topic
Change-Id: Ideb386113a0fb027f62c1ed4215dd0bab79fdb72
2011-02-10 21:22:33 -08:00
Scott Main
4eccd96f4a am c06e7abe: resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp
* commit 'c06e7abe6f37d1d8bc4f1c228964229d9f101d70':
  docs: move the SIP guide into guide/network/
2011-02-10 13:51:30 -08:00
Scott Main
c06e7abe6f resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp
Change-Id: I42c36e828f5b28d84f2062bfd4963711251696b7
2011-02-10 13:47:32 -08:00
Robert Ly
322891c689 Doc change: nfc dev guide
Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
2011-02-10 13:42:13 -08:00
Katie McCormick
360e40ef21 am ce7c05e8: resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp
* commit 'ce7c05e842d4e35ce180d398ecb969aad18f3460':
  cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
2011-02-10 13:03:27 -08:00
Katie McCormick
ce7c05e842 resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp
Change-Id: I1308f0a5fda0646a90dcd60a78c15538c7364cbc
2011-02-10 12:38:07 -08:00
Scott Main
6edbd32835 am 2b7aec46: am f002b675: Merge "docs: shorten and revise some titles in the Developing docs and resolve respective links" into honeycomb
* commit '2b7aec46639ffb3242eb1ac6d557c87e68442438':
  docs: shorten and revise some titles in the Developing docs and resolve respective links
2011-02-08 18:42:01 -08:00
Scott Main
300cd26a4f docs: shorten and revise some titles in the Developing docs
and resolve respective links

Change-Id: Ic78e859eaad99fc391857676a6aff63a655e72ca
2011-02-08 15:04:42 -08:00
Scott Main
9e593ef997 am 2d258298: am 96764812: cherrypick Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f docs: move the SIP guide into guide/network/
* commit '2d258298e2fec670908c69e38c5a3a05b1f3d0f0':
  cherrypick Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f docs: move the SIP guide into guide/network/
2011-02-08 10:35:33 -08:00
Katie McCormick
d51a5d7d69 am e056d2ad: am 6b311196: cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
* commit 'e056d2ad427f36a78dec1461295a90c20d534863':
  cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
2011-02-08 10:35:27 -08:00
Scott Main
967648121d cherrypick Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f
docs: move the SIP guide into guide/network/

Change-Id: I3aaf9e9ae6c63bfd5d65518dd45c86bda31965ca
2011-02-08 09:35:02 -08:00
Katie McCormick
6b31119612 cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2
Doc change: Adding new docs for SIP API

Change-Id: If1b8af96927809847834d449d1e22c51d8cc5fc5
2011-02-08 09:26:13 -08:00
Bill Gruber
b7bad4f22a cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83
Initial posting of in-app billing docs

Change-Id: I80813b8f38840a572179e5d65309bccb7279bd15
2011-02-08 09:18:42 -08:00
Scott Main
8b166b4794 am b1ddc7ec: resolved conflicts for merge of 9bf45a00 to honeycomb-plus-aosp
* commit 'b1ddc7ec5cd28595948644140b77bda282b7df6d':
  Finish the app fundamentals rewrite by updating the side nav and resolving links in the dev guide Also move the app fundamentals document back to fundamentals.jd TODO: resolve links in the javadocs
2011-02-07 21:20:23 -08:00
Scott Main
b1ddc7ec5c resolved conflicts for merge of 9bf45a00 to honeycomb-plus-aosp
Change-Id: I2b2957346a99d5601005831a41033a355df5b163
2011-02-07 21:17:09 -08:00
Scott Main
9bf45a0075 Finish the app fundamentals rewrite by updating the side nav and resolving links in the dev guide
Also move the app fundamentals document back to fundamentals.jd
TODO: resolve links in the javadocs

Change-Id: Ia3c81a83bf7fe75f7942fd41bfb1d626ee72d5d9
2011-02-07 21:03:04 -08:00
Scott Main
c442bc605c docs: move the SIP guide into guide/network/
Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f
2011-02-07 18:35:49 -08:00
Katie McCormick
7134520b26 cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2
Doc change: Adding new docs for SIP API

Change-Id: I62bedbcaab3900edcc49d67b59279c5025977a95
2011-02-07 18:32:04 -08:00
Bill Gruber
510e0af108 am a9b9e3f7: am 930189f0: am df71cabb: cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
* commit 'a9b9e3f7a955888c44ecfba6cf29c420862976d2':
  cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
2011-02-02 16:25:26 -08:00