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

64734 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Sakhartchouk
8d57f404fa Merge "Element getters." into graphics-dev 2011-12-16 09:51:53 -08:00
Alex Sakhartchouk
f5d8ac7cc3 Element getters. 
Change-Id: Ibe570464557eeecad108b4d3cb8f02fad13943de
 2011-12-16 09:44:26 -08:00
The Android Open Source Project
00bb647145 am 92363543: am 57ea96a4: Reconcile with ics-mr1-release 
* commit '923635436b0cd3392f3aa9328a4a855e5000dfb5':
  SurfaceMediaSource: use the HW_TEXTURE usage bit
  SurfaceMediaSource: use the HW_TEXTURE usage bit
 2011-12-16 08:12:23 -08:00
The Android Open Source Project
923635436b am 57ea96a4: Reconcile with ics-mr1-release 
* commit '57ea96a4b3273aa8592873355a2f79c74b1abec1':
  SurfaceMediaSource: use the HW_TEXTURE usage bit
  SurfaceMediaSource: use the HW_TEXTURE usage bit
 2011-12-16 08:09:57 -08:00
The Android Open Source Project
57ea96a4b3 Reconcile with ics-mr1-release 
Change-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da
 2011-12-16 08:08:07 -08:00
Jesse Wilson
a2be5d0a48 am 4868dfa3: Merge "Give a reflection example for installing the HTTP response cache." 
* commit '4868dfa33b5d710b6f09aad05aa5e256da9cd45d':
  Give a reflection example for installing the HTTP response cache.
 2011-12-16 07:38:31 -08:00
Jesse Wilson
0adf3e45d8 am 0f05f1eb: Merge "Track libcore tests moving from frameworks/base to libcore." 
* commit '0f05f1ebefbebdb7b5aec74da553d6a2f3d6e858':
  Track libcore tests moving from frameworks/base to libcore.
 2011-12-16 07:38:29 -08:00
Jesse Wilson
4868dfa33b Merge "Give a reflection example for installing the HTTP response cache." 2011-12-16 07:37:22 -08:00
Jesse Wilson
0f05f1ebef Merge "Track libcore tests moving from frameworks/base to libcore." 2011-12-16 07:36:32 -08:00
Glenn Kasten
4b64d21c09 am f96272c3: Merge "setActiveTrack and setBufferProvider can\'t fail" 
* commit 'f96272c3cdb3c3f6177d3fcd29e597e10dc2040f':
  setActiveTrack and setBufferProvider can't fail
 2011-12-16 07:31:36 -08:00
Glenn Kasten
cd5f159420 am 844756be: Merge "Simplify enable/disable mixing" 
* commit '844756be54681dd96b822558b136367e459e5e6a':
  Simplify enable/disable mixing
 2011-12-16 07:31:34 -08:00
Glenn Kasten
f96272c3cd Merge "setActiveTrack and setBufferProvider can't fail" 2011-12-16 07:30:14 -08:00
Glenn Kasten
844756be54 Merge "Simplify enable/disable mixing" 2011-12-16 07:29:57 -08:00
Chet Haase
ada81693a1 am 0904c203: Merge "Fix issues from recent glyph caching change" 
* commit '0904c203c4c56e43f723522351b7a3bc304196ef':
  Fix issues from recent glyph caching change
 2011-12-16 06:51:34 -08:00
Chet Haase
0904c203c4 Merge "Fix issues from recent glyph caching change" 2011-12-16 06:49:59 -08:00
Dirk Dougherty
364a4bb80c am 77aba791: am 4365a486: am 8b6ed2d1: Doc change: edits to ICS MR1 API Overview. 
* commit '77aba791ac2a9b72632d52d5f6af3bb93334088d':
  Doc change: edits to ICS MR1 API Overview.
 2011-12-16 00:29:32 -08:00
Dirk Dougherty
77aba791ac am 4365a486: am 8b6ed2d1: Doc change: edits to ICS MR1 API Overview. 
* commit '4365a486126ecb20061f01d1e5c8e5f357045f18':
  Doc change: edits to ICS MR1 API Overview.
 2011-12-16 00:27:42 -08:00
Dirk Dougherty
4365a48612 am 8b6ed2d1: Doc change: edits to ICS MR1 API Overview. 
* commit '8b6ed2d17d5e7e47944026679c9cba66611ab27f':
  Doc change: edits to ICS MR1 API Overview.
 2011-12-16 00:25:06 -08:00
Dirk Dougherty
8b6ed2d17d Doc change: edits to ICS MR1 API Overview. 
Change-Id: Idb18e3085b3dd54c9a39e74c37428c3d5b28aa83
 2011-12-16 00:11:43 -08:00
Joe Fernandez
f866981250 am aa04058c: am 9b06f091: am 5b18c714: Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 
* commit 'aa04058ce05f9ae6f4fa5f7caf1ebf4073f09340':
  docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
 2011-12-15 23:17:28 -08:00
Joe Fernandez
aa04058ce0 am 9b06f091: am 5b18c714: Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 
* commit '9b06f091c4d74415b18eb32f84ae931624b93f18':
  docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
 2011-12-15 23:15:32 -08:00
Joe Fernandez
9b06f091c4 am 5b18c714: Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 
* commit '5b18c714bbff269d7db880b42de34fd1385da9f9':
  docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
 2011-12-15 23:12:57 -08:00
Joe Fernandez
5b18c714bb Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 2011-12-15 23:11:26 -08:00
Joe Fernandez
71d5c1db17 docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6 
Change-Id: I628cd076cd37f6252837de276c4b7a9040c37bc1
 2011-12-15 23:09:43 -08:00
Fred Chung
12316bb355 am 26c4a3e9: am d30167f0: am 14633f1b: am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo. 
* commit '26c4a3e9792755e2ab66331822d6faabc824782e':
  Fixed Android U Enterprise lesson pre-requisites and a minor typo.
 2011-12-15 22:39:56 -08:00
Fred Chung
26c4a3e979 am d30167f0: am 14633f1b: am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo. 
* commit 'd30167f0cda249c9a0d1d118d837d58f3c2b2c89':
  Fixed Android U Enterprise lesson pre-requisites and a minor typo.
 2011-12-15 22:37:40 -08:00
Fred Chung
d30167f0cd am 14633f1b: am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo. 
* commit '14633f1b1eea585cdc094ebae75708db2293fe56':
  Fixed Android U Enterprise lesson pre-requisites and a minor typo.
 2011-12-15 22:35:10 -08:00
Fred Chung
14633f1b1e am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo. 
* commit '48e0617b9e7d06da803c572d6584d68898733d37':
  Fixed Android U Enterprise lesson pre-requisites and a minor typo.
 2011-12-15 22:33:31 -08:00
Fred Chung
48e0617b9e Fixed Android U Enterprise lesson pre-requisites and a minor typo. 
Change-Id: Ide393a0957f3e797f14d7c349c35337849b15f02
 2011-12-15 22:25:19 -08:00
Scott Main
e3bfb3a0cc am 734a9954: am ed8851a6: am 8e980c1e: Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 
* commit '734a9954eca793d480e05fd012f82111ed54d2f1':
  docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
 2011-12-15 22:18:51 -08:00
Scott Main
734a9954ec am ed8851a6: am 8e980c1e: Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 
* commit 'ed8851a6f2e4d9477aaa20c333d7220901d8faeb':
  docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
 2011-12-15 22:17:15 -08:00
Scott Main
ed8851a6f2 am 8e980c1e: Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 
* commit '8e980c1e4e86cb4c7ea679eba3cc01d64e323b26':
  docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
 2011-12-15 22:14:48 -08:00
Scott Main
00338dc07b am 6475bd21: am 4faca92f: am 36c67785: docs: update homepage for 4.0.3 announcment 
* commit '6475bd21122b26fd3dfeeca9be8c973d5b928910':
  docs: update homepage for 4.0.3 announcment
 2011-12-15 22:13:32 -08:00
Scott Main
8e980c1e4e Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 2011-12-15 22:12:53 -08:00
Scott Main
6475bd2112 am 4faca92f: am 36c67785: docs: update homepage for 4.0.3 announcment 
* commit '4faca92faa13bcf5d6c2e76b226466066e5562a2':
  docs: update homepage for 4.0.3 announcment
 2011-12-15 22:12:08 -08:00
Scott Main
4faca92faa am 36c67785: docs: update homepage for 4.0.3 announcment 
* commit '36c677855c0a54ede9e92aa856cb2250960e922e':
  docs: update homepage for 4.0.3 announcment
 2011-12-15 22:09:46 -08:00
Scott Main
36c677855c docs: update homepage for 4.0.3 announcment 
Change-Id: I54d1d447ac224982f4483afede2087ce18937ed0
 2011-12-15 22:04:46 -08:00
Jamie Gennis
94180377e7 SurfaceMediaSource: use the HW_TEXTURE usage bit 
This change makes SurfaceMediaSource request Gralloc buffers with the
HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit.  It is a
temporary workaround for what is likely a Gralloc bug.

Bug: 5771063
Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
 2011-12-15 20:52:26 -08:00
The Android Automerger
ce2ac73d1d merge in ics-mr1-release history after reset to ics-mr1 2011-12-15 20:50:02 -08:00
Scott Main
25514ce3ab am b2f1cda7: am b193d241: am 4cb7d095: am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles) 
* commit 'b2f1cda755c26951b175ca069e156b512d66b42a':
  docs: fix encoding issue or whatever with docs (not showing titles)
 2011-12-15 20:26:58 -08:00
Scott Main
b2f1cda755 am b193d241: am 4cb7d095: am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles) 
* commit 'b193d24145d84a1748cfdcffae56ebfe549ef940':
  docs: fix encoding issue or whatever with docs (not showing titles)
 2011-12-15 20:24:47 -08:00
Scott Main
b193d24145 am 4cb7d095: am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles) 
* commit '4cb7d0953534587ba2051c6536fdde4b2c9539d5':
  docs: fix encoding issue or whatever with docs (not showing titles)
 2011-12-15 20:22:39 -08:00
Scott Main
4cb7d09535 am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles) 
* commit '98af5edc70b0b418366f5197b9aeef30f135d40e':
  docs: fix encoding issue or whatever with docs (not showing titles)
 2011-12-15 20:19:55 -08:00
Jamie Gennis
3e0f448fbe SurfaceMediaSource: use the HW_TEXTURE usage bit 
This change makes SurfaceMediaSource request Gralloc buffers with the
HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit.  It is a
temporary workaround for what is likely a Gralloc bug.

Bug: 5771063
Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
 2011-12-15 20:18:19 -08:00
Scott Main
98af5edc70 docs: fix encoding issue or whatever with docs (not showing titles) 
Change-Id: Iac9afc3aa36e86d2f8defc8a7252864c23ecc23b
 2011-12-15 20:13:20 -08:00
Scott Main
2302ce32be am 680ccb51: am 34e46115: am 8f266b9e: am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0 
* commit '680ccb511b9375caac12bd3e292acb96af286aeb':
  docs: add remembering users class to nav
 2011-12-15 20:03:38 -08:00
Scott Main
680ccb511b am 34e46115: am 8f266b9e: am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0 
* commit '34e46115a5cee1b0e186b450ef2598df999c5cbe':
  docs: add remembering users class to nav
 2011-12-15 20:01:28 -08:00
Scott Main
3f775a0ed8 am 2538d4a5: am 98e4adf9: am 26e461b3: am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0 
* commit '2538d4a55c1bce3302774191eb8986bbdf3dc543':
  Doc merge from master:Training class on Identifying and Authenticating Users.
 2011-12-15 19:59:29 -08:00
Scott Main
34e46115a5 am 8f266b9e: am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0 
* commit '8f266b9e348ba69d953568624b8d0e2cea07f99d':
  docs: add remembering users class to nav
 2011-12-15 19:59:25 -08:00
Scott Main
2538d4a55c am 98e4adf9: am 26e461b3: am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0 
* commit '98e4adf942fe3ade14225875fdb018efe941e99f':
  Doc merge from master:Training class on Identifying and Authenticating Users.
 2011-12-15 19:57:21 -08:00