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

482 Commits

Author SHA1 Message Date
Dirk Dougherty
30eefe6381 am 7036d76a: Merge "Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr." into honeycomb 
* commit '7036d76a6e172de300c63cb9c33b65a63fe7ce0f':
  Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr.
 2011-02-22 21:14:58 -08:00
Dirk Dougherty
7036d76a6e Merge "Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr." into honeycomb 2011-02-22 12:47:25 -08:00
Dirk Dougherty
36d2d1b4bf Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated 
manifest attr.

Change-Id: Ia6edc7d48341e7eb58172049219cf6d076126a8b
 2011-02-22 12:08:52 -08:00
Nick Pelly
beb01c93f9 Merge "DO NOT MERGE." into honeycomb 2011-02-22 09:10:32 -08:00
Scott Main
483f7130b5 am e4da3934: Merge "docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools" into honeycomb 
* commit 'e4da39345209c47b2736f266adfc22a0fdb4c716':
  docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools
 2011-02-18 15:11:14 -08:00
Scott Main
e4da393452 Merge "docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools" into honeycomb 2011-02-18 15:08:26 -08:00
Nick Pelly
8bbd11cc09 DO NOT MERGE. 
Minor doc update.

Change-Id: I915b39fd858dcc0f20853203cc555c72115cb52b
 2011-02-18 02:18:19 -08:00
Robert Ly
d2acfd6d04 am a58f58da: Merge "Doc change: fixing renderscript samples" into honeycomb 
* commit 'a58f58daf94caa7e50c04707a67ba1a9dacb0a9c':
  Doc change: fixing renderscript samples
 2011-02-17 20:21:35 -08:00
Robert Ly
6518f486a5 Doc change: fixing renderscript samples 
Change-Id: Ie5d17df121ec4bc5fd46448c1670d306322b92d8
 2011-02-17 18:44:31 -08:00
Joe Malin
831a089272 am e766fcd5: DOC CHANGE: Bug 3396898 add attribute uses-library 
* commit 'e766fcd5e967c2400a1fe90a4a01e4f0a12dbd1d':
  DOC CHANGE: Bug 3396898 add attribute uses-library
 2011-02-17 13:18:30 -08:00
Joe Malin
e766fcd5e9 DOC CHANGE: Bug 3396898 add attribute uses-library 
Change-Id: I21810676050abed04c0c69b61c05d8d7228f434d
 2011-02-17 13:08:11 -08:00
Scott Main
7fbeaf9286 docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools 
Change-Id: I6021cd0eb9d37a004036249305819a352efa4f92
 2011-02-16 11:55:10 -08:00
Nick Pelly
d8d51fed86 am 8c8e9d9a: am 1df862a4: Minor doc update. 
* commit '8c8e9d9a7f1bddbc995a5c088f19a0a3be1f6a5b':
  Minor doc update.
 2011-02-16 09:25:09 -08:00
Nick Pelly
8c8e9d9a7f am 1df862a4: Minor doc update. 
* commit '1df862a4656bb0d7a3329311b1e243fc6db32448':
  Minor doc update.
 2011-02-16 09:23:08 -08:00
Nick Pelly
1df862a465 Minor doc update. 
Change-Id: I1d29adfccbdc196a145a2c2a044d63b00e5f788b
 2011-02-16 09:18:34 -08:00
Scott Main
c35d0ee105 am a766a8be: docs: add breadcrumbs to testing docs 
* commit 'a766a8bee24b46fdeea2cc891e6ce202d906245f':
  docs: add breadcrumbs to testing docs
 2011-02-15 20:08:26 -08:00
Scott Main
f0b4f10079 am f2d52938: Merge "docs: revise loader doc title" into honeycomb 
* commit 'f2d5293844a3c782ccd415d327007ec5e7681a26':
  docs: revise loader doc title
 2011-02-15 20:08:21 -08:00
Scott Main
a64507eed2 am c918e4a8: docs: add parent links to graphics docs 
* commit 'c918e4a86d42d89cb893b0150358cfd01ef7d532':
  docs: add parent links to graphics docs
 2011-02-15 20:08:12 -08:00
Scott Main
0ab1b326c7 am 13033ea5: docs: fix misc broken links 
* commit '13033ea52714d48d754c6bc8fccb18514c645a47':
  docs: fix misc broken links
 2011-02-15 20:08:07 -08:00
Scott Main
a766a8bee2 docs: add breadcrumbs to testing docs 
Change-Id: Ib2b3ef1871fba52b8f34513e9279acb98d26fb6c
 2011-02-15 18:02:55 -08:00
Scott Main
f2d5293844 Merge "docs: revise loader doc title" into honeycomb 2011-02-15 17:54:28 -08:00
Scott Main
a564745035 docs: revise loader doc title 
Change-Id: I232eb1da8270625afa0f26951dbd20d9a61fe15d
 2011-02-15 17:50:33 -08:00
Scott Main
c918e4a86d docs: add parent links to graphics docs 
Change-Id: I8dafe4c717e9169bf85cdf0594553558827f73ae
 2011-02-15 17:37:14 -08:00
Scott Main
13033ea527 docs: fix misc broken links 
Change-Id: Id7d0ee36398aca452ceb2c3d15982397f58a06c6
 2011-02-15 16:00:37 -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
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
865cd1ca5c Merge "docs: update sidenav; move loaders under activities, add "more" tags, remove duplicate for content providers, rename Copying/ to Copy/" into honeycomb 2011-02-14 14:42:18 -08:00
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
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
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
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
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
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