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

906 Commits

Author SHA1 Message Date
Scott Main
2d022d01d0 am 9ab0f2b2: Merge "docs: fix link to sample app" into honeycomb 
* commit '9ab0f2b220a6b38cad020bb3f4940737a024a5f6':
  docs: fix link to sample app
 2011-02-14 14:41:14 -08:00
Scott Main
9ab0f2b220 Merge "docs: fix link to sample app" into honeycomb 2011-02-14 14:39:13 -08:00
Scott Main
64c7574810 docs: fix link to sample app 
Change-Id: Ie9127cc15ab527542bd5df564826ea703fba419b
 2011-02-14 14:38:24 -08:00
Scott Main
9a4548f5ba am 81bb4952: Merge "docs: add faketouch to uses-feature doc" into honeycomb 
* commit '81bb4952713da8c6d900508e72650d9388b2bfdc':
  docs: add faketouch to uses-feature doc
 2011-02-14 14:32:40 -08:00
Scott Main
81bb495271 Merge "docs: add faketouch to uses-feature doc" into honeycomb 2011-02-14 14:29:09 -08:00
Scott Main
6209b62241 docs: add faketouch to uses-feature doc 
Change-Id: I335bda6018380c6ed5e891787116b2c1ab6f77f0
 2011-02-14 13:49: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
Katie McCormick
d178211675 Doc change: New docs for Loaders. 
Change-Id: I89e70576462ef9bf576fea2837572546b3a9b355
 2011-02-14 11:49:06 -08:00
Scott Main
06174dde79 am b254165a: Merge "docs: fix links" into honeycomb 
* commit 'b254165af83849c21276bf832759a38d889cd90e':
  docs: fix links
 2011-02-14 11:46:38 -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
b254165af8 Merge "docs: fix links" into honeycomb 2011-02-14 11:44:49 -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
7aceb8d814 am 55ee1d66: Merge "DOC CHANGE: Fix bug 3448489 - Monkeyrunner example" into honeycomb 
* commit '55ee1d66981f1edef966562f11c60886138544ea':
  DOC CHANGE: Fix bug 3448489 - Monkeyrunner example
 2011-02-14 11:28:52 -08:00
Scott Main
077036aa00 docs: fix links 
Change-Id: I7aba4b06996caa55f8d47cab3b13505e37de86ca
 2011-02-14 11:23:48 -08:00
Joe Malin
aec9d75f7c DOC CHANGE: Fix bug 3448489 - Monkeyrunner example 
Change-Id: Ib997e9b0ef27a071c26774d139f19610404cdfbc
 2011-02-14 10:29:12 -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
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
d822438fa7 am 94be4a5e: Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code. 
* commit '94be4a5e1ad833d7e5d0dbed29b806ba8fd5409e':
  Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code.
 2011-02-11 15:42:57 -08:00
Roman Nurik
94be4a5e1a Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code. 
Change-Id: I0b98cf639a0c52343290227291620c88fd260774
 2011-02-11 15:21:49 -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
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
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
810c1c0c35 am 322891c6: Doc change: nfc dev guide 
* commit '322891c689c845b5aa63dbca606967eb9f8f900b':
  Doc change: nfc dev guide
 2011-02-11 13:18:31 -08:00
Robert Ly
2be5828274 Merge "Doc change: updating animation framework topic" into honeycomb 2011-02-11 13:15:55 -08:00
Robert Ly
997a671368 Merge "Doc change: renderscript dev guide" into honeycomb 2011-02-11 13:15:35 -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
James Dong
d24d00ae1c am f9e7442a: Update sample code in documentation 
* commit 'f9e7442a0c0c7efc70d13fa9330baa797316154a':
  Update sample code in documentation
 2011-02-11 11:56:33 -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
James Dong
f9e7442a0c Update sample code in documentation 
bug - 3364497

Change-Id: I4cad247a403917aa7816350454c9ae3930dd3d25
 2011-02-10 18:48:31 -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
ce7c05e842 resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp 
Change-Id: I1308f0a5fda0646a90dcd60a78c15538c7364cbc
 2011-02-10 12:38:07 -08:00
Dirk Dougherty
e110975368 am fefa95a9: Doc change: Add version notes for Android 2.3.3. 
* commit 'fefa95a9c828d2b67227894b7ee3979504c0f52a':
  Doc change: Add version notes for Android 2.3.3.
 2011-02-09 14:20:06 -08:00
Dirk Dougherty
fefa95a9c8 Doc change: Add version notes for Android 2.3.3. 2011-02-09 14:04:10 -08:00
Dirk Dougherty
8d56f6decf am a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread 
* commit 'a3f53afd13bc1722464e169cb82a01d3898852b5':
  Doc change: Add version notes for Android 2.3.3.
 2011-02-08 23:27:53 -08:00
Dirk Dougherty
237a3440d3 Doc change: Add version notes for Android 2.3.3. 
Change-Id: I32dffaee15079a3dffb30dcdff6587be03378fc5
 2011-02-08 20:10:51 -08:00
Scott Main
5988355af4 am 3f41d8f5: docs: fix a couple titles 
* commit '3f41d8f5ee1a8d5366d79ee03d97fac8403c676a':
  docs: fix a couple titles
 2011-02-08 18:48:53 -08:00
Scott Main
3f41d8f5ee docs: fix a couple titles 
Change-Id: I1c2d6c420f814e1ddff5f661214cbbd11f3ca6dd
 2011-02-08 18:46:23 -08:00
Scott Main
2b7aec4663 am f002b675: Merge "docs: shorten and revise some titles in the Developing docs and resolve respective links" into honeycomb 
* commit 'f002b6752562a442c934bdf7c04cb0fedc24d442':
  docs: shorten and revise some titles in the Developing docs and resolve respective links
 2011-02-08 18:39:24 -08:00
Scott Main
f002b67525 Merge "docs: shorten and revise some titles in the Developing docs and resolve respective links" into honeycomb 2011-02-08 18:36:04 -08:00
Scott Main
129c73723f am 3c01a139: rename SIP doc title 
* commit '3c01a139f0d8ece0e300be26ac41280f1e934747':
  rename SIP doc title
 2011-02-08 17:32:14 -08:00
Scott Main
42f1819497 am c442bc60: docs: move the SIP guide into guide/network/ 
* commit 'c442bc605c80a2900a0ed41345f53d218288de7a':
  docs: move the SIP guide into guide/network/
 2011-02-08 17:32:06 -08:00
Katie McCormick
690d31a6a8 am 7134520b: cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API 
* commit '7134520b2635474c5e7f4902c26e12d0ffcc9c64':
  cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
 2011-02-08 17:31:59 -08:00
Joe Malin
9087566bf1 am 7777fb04: Merge "DOC CHANGE: Fix bug 3416872 in MonkeyRunner doc" into honeycomb 
* commit '7777fb04f1bdb11628ef8978c42b14e51ebb9c56':
  DOC CHANGE: Fix bug 3416872 in MonkeyRunner doc
 2011-02-08 16:58:22 -08:00
Joe Malin
7777fb04f1 Merge "DOC CHANGE: Fix bug 3416872 in MonkeyRunner doc" into honeycomb 2011-02-08 16:55:53 -08:00