35077 Commits

Author SHA1 Message Date
Jack Palevich
6f688ae7fb Merge "Allow a GLSurfaceView to be reattached to a window." 2010-10-26 18:25:56 -07:00
Jack Palevich
2ff6a82461 Allow a GLSurfaceView to be reattached to a window.
This approach is more backwards-compatible than the previous attempt.

The onDetachedFromWindow case is unchanged from the "classic"
GLSurfaceView behavior, except that we don't throw a NPE if the
renderer has never been set.

Change-Id: Ia8103a73366ddb13be44f16b789c929e75ddc792
2010-10-26 18:19:14 -07:00
Vasu Nori
8aebc966d2 Merge "add method in MediaFile to determine if a file is a mediatype of not" 2010-10-26 17:59:03 -07:00
Xavier Ducrohet
5da5438e41 Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." 2010-10-26 16:56:30 -07:00
Romain Guy
f887594d0e Merge "Remove unnecessary GL calls." 2010-10-26 16:31:31 -07:00
Romain Guy
746b7401ce Remove unnecessary GL calls.
This change batches calls to glScissor() and removes extra GL
queries and glActiveTexture() calls.

Change-Id: I1cd079d314f87cd9c088f95c8d4909c2f860f6aa
2010-10-26 16:27:31 -07:00
Andreas Huber
a8264dfe5a am e1e82745: am 2088e371: Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread 2010-10-26 16:25:51 -07:00
Andreas Huber
e1e8274588 am 2088e371: Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread 2010-10-26 16:23:54 -07:00
Andreas Huber
2088e371ed Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread 2010-10-26 16:21:48 -07:00
Jason Sams
64eb351cff Merge "Begin adding async allocation creation." 2010-10-26 16:16:17 -07:00
Vasu Nori
45b43622e3 add method in MediaFile to determine if a file is a mediatype of not
this helps DownloadService to avoid invoking MediaScanner on
pdf or other non-mediatype files.

Change-Id: I92514e1a11f5119229c0c7292e410e352a9dbcdd
2010-10-26 16:12:27 -07:00
Justin Ho
6bdf5c39d8 am 1f61ad17: (-s ours) am 3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread 2010-10-26 16:10:57 -07:00
Irfan Sheriff
a8413beb39 Merge "WifiLock extensions for high performance mode" 2010-10-26 16:08:29 -07:00
Justin Ho
1f61ad1728 am 3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread 2010-10-26 16:08:13 -07:00
Justin Ho
3810c08bbc Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread 2010-10-26 16:06:28 -07:00
Adam Cohen
e1838c773d Merge "- Made showNext() and showPrevious() on StackView remotable - Made StackView show the transition when showNext() or showPrevious() is called" 2010-10-26 15:51:57 -07:00
Adam Cohen
3352b6807f - Made showNext() and showPrevious() on StackView remotable
- Made StackView show the transition when showNext() or
  showPrevious() is called

Change-Id: Id6e3e6d9ff374c037323f77d247f1a1e4398009e
2010-10-26 15:46:31 -07:00
Justin Ho
95ce5b20c8 DO NOT MERGE - Fixing ringtones that were put in as notifications
Change-Id: I09a8a0f369604a6332b921b9e944a800ec4d6677
2010-10-26 15:34:07 -07:00
Dianne Hackborn
adf840ea0c Merge "ClipDescription no longer inherits from ClipData." 2010-10-26 15:25:18 -07:00
Dianne Hackborn
f834dfabbc ClipDescription no longer inherits from ClipData.
Change-Id: Ie4939f87c7e1628d9c19ecb5c0b3036d1f76ef29
2010-10-26 15:23:15 -07:00
Andreas Huber
0a612889b5 Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise.
Change-Id: Iea88e3f09955d82a9a11fbcc075db8d9c4007490
2010-10-26 15:06:44 -07:00
Xavier Ducrohet
d815e37048 Fix rendering of digitalClock/Gallery in Eclipse editors.
Change-Id: Iedcd3184cd9f34be8d0695a51eda953ac68683ce
2010-10-26 14:29:23 -07:00
Romain Guy
2d38cc80af Merge "Enable display lists." 2010-10-26 14:26:15 -07:00
Romain Guy
0d9275e565 Enable display lists.
Change-Id: Id0d9b987251da5b7ecbb5497a55dbb5937430316
2010-10-26 14:22:30 -07:00
Gloria Wang
4bd78cbe87 Merge "Do not create drm directory here. Fix for bug 3134576." 2010-10-26 14:16:47 -07:00
Raphael
f241c40476 Revert "Fix rendering of digitalClock/Gallery in Eclipse editors."
This reverts commit 25e96ce7b99f9736a6024d25bd65a83774c7640f.
2010-10-26 13:55:10 -07:00
Irfan Sheriff
5876a4273e WifiLock extensions for high performance mode
Add extension to WifiLock to allow apps to operate
in high performance mode (high power & disable suspend
optimizations for battery consumption).

Bug: 2834260
Change-Id: Id394d265b9876bf0230efb3d222056e9b80b44fd
2010-10-26 13:25:03 -07:00
Jason Sams
31a7e42f4b Begin adding async allocation creation.
Change-Id: I5d1381699e2b334c1d824f357bd6b310a5f79be8

Implement async bitmap upload and clean up types.

Change-Id: Icbe9894e04c1319351c1cd75b0e0017855198f20
2010-10-26 13:09:17 -07:00
Chet Haase
9440083be2 Merge "Optimizing ColorFilter in display lists" 2010-10-26 12:53:57 -07:00
Chet Haase
ad93c2bb63 Optimizing ColorFilter in display lists
Change-Id: Ie4d5e5b0bc45e0ce47bba144049303c270762e54
2010-10-26 12:52:03 -07:00
Daniel Sandler
fdfe1a6bef Merge "Remove logspew." 2010-10-26 12:48:35 -07:00
Daniel Sandler
91fb28caf6 Remove logspew.
Change-Id: Ic713febfb1d92d19321ed512dbf6f38e5e2dfbf4
2010-10-26 15:37:36 -04:00
Mathias Agopian
32b1dd2632 am 85c5ca07: am 2f19f56a: Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread 2010-10-26 12:26:23 -07:00
Mathias Agopian
49d1735482 am 1b98a9e6: am 5219dd8e: Merge "add format parameter to setBufferGeometry" into gingerbread 2010-10-26 12:23:53 -07:00
Mathias Agopian
324be17021 am d9588e9c: am a7b745ca: Merge "fix eglChooseConfig() for special attributes." into gingerbread 2010-10-26 12:23:46 -07:00
Mathias Agopian
85c5ca07b9 am 2f19f56a: Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread 2010-10-26 12:22:12 -07:00
Mathias Agopian
1b98a9e6a9 am 5219dd8e: Merge "add format parameter to setBufferGeometry" into gingerbread 2010-10-26 12:19:48 -07:00
Mathias Agopian
d9588e9c3c am a7b745ca: Merge "fix eglChooseConfig() for special attributes." into gingerbread 2010-10-26 12:19:43 -07:00
Mathias Agopian
2f19f56ac5 Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread 2010-10-26 12:18:32 -07:00
Mathias Agopian
5219dd8e29 Merge "add format parameter to setBufferGeometry" into gingerbread 2010-10-26 12:18:19 -07:00
Jeff Hamilton
eb1f2de631 am f56aac4b: am d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread 2010-10-26 12:18:08 -07:00
Mathias Agopian
a7b745ca75 Merge "fix eglChooseConfig() for special attributes." into gingerbread 2010-10-26 12:18:07 -07:00
Jeff Hamilton
f56aac4b6e am d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread 2010-10-26 12:16:10 -07:00
Jeff Hamilton
d8cf2125c1 Merge "Add a way to get a string for an error code." into gingerbread 2010-10-26 12:14:17 -07:00
Xavier Ducrohet
68404a0125 am a44a5e02: am 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread 2010-10-26 12:13:32 -07:00
Gloria Wang
a784d4ed25 Do not create drm directory here. Fix for bug 3134576.
Change-Id: I1e26ff32b1c2d97464d544c2455eab0a726e3294
2010-10-26 12:11:55 -07:00
Xavier Ducrohet
a44a5e02d2 am 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread 2010-10-26 12:10:28 -07:00
Jeff Hamilton
68a5c9f3cf Add a way to get a string for an error code.
Change-Id: I133e974c656eb558349cbc3f9a2caf5b18c8fc3d
2010-10-26 14:09:48 -05:00
Xavier Ducrohet
1b6180ec31 Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread 2010-10-26 12:09:18 -07:00
James Dong
ee1dc6221f Merge "Remove unused and hidden setVideoEncoderLevel() from MediaRecorder.java" 2010-10-26 12:01:39 -07:00