LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,334 Commits 2 Branches 0 Tags
478ebe0bfbf78b62338fdd789f366b85d7966baf
Commit Graph

8334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
478ebe0bfb am 2d003a27: am 2310657c: Move support lib to rev 5. 
* commit '2d003a274d9138d78947a1f5bf315492afb64002':
  Move support lib to rev 5.
 2011-11-23 14:06:36 -08:00
James Dong
c07b0c7599 am d2c0b7d4: am a8fe85ea: Update the media_profiles.xml file to include maximum memory usage support for video editor. do not merge. 
* commit 'd2c0b7d4ac768a6cc706d17a59671c02b2177da0':
  Update the media_profiles.xml file to include maximum memory usage support for video editor. do not merge.
 2011-11-23 14:06:36 -08:00
Vladimir Chtchetkine
0b3ae146a4 am 9a1a290e: am fd1bdd61: Update supported frame sizes for fake camera. do not merge. 
* commit '9a1a290e58df454c07ed447693585a819642e3e0':
  Update supported frame sizes for fake camera. do not merge.
 2011-11-23 14:06:29 -08:00
Xavier Ducrohet
2d003a274d am 2310657c: Move support lib to rev 5. 
* commit '2310657c422924ef91a845d16e562acf10bc2797':
  Move support lib to rev 5.
 2011-11-23 14:04:31 -08:00
James Dong
d2c0b7d4ac am a8fe85ea: Update the media_profiles.xml file to include maximum memory usage support for video editor. do not merge. 
* commit 'a8fe85ea64b82cdee7ba0ec4d3d2a211da8c24f4':
  Update the media_profiles.xml file to include maximum memory usage support for video editor. do not merge.
 2011-11-23 14:04:30 -08:00
Vladimir Chtchetkine
9a1a290e58 am fd1bdd61: Update supported frame sizes for fake camera. do not merge. 
* commit 'fd1bdd611a2954bfb171548b8fa288b0319a0aa9':
  Update supported frame sizes for fake camera. do not merge.
 2011-11-23 14:04:29 -08:00
Xavier Ducrohet
2310657c42 Move support lib to rev 5. 
Change-Id: I8163752e9913cdadd0d17a1ec2bbf6b8e7efa9ae
 2011-11-23 14:01:59 -08:00
James Dong
a8fe85ea64 Update the media_profiles.xml file to include maximum memory usage support for video editor. do not merge. 
related-to-bug: 5625690

(cherry picked from commit f8781452d9)

Change-Id: Id27eb9052f00328ba04bac8486c9ed23f3c6a09b
 2011-11-23 13:14:50 -08:00
Vladimir Chtchetkine
fd1bdd611a Update supported frame sizes for fake camera. do not merge. 
Camera framework requires 352x288, and 320x240 frames for video preview and video
recording. If these dimensions are missing in camera properties the camera app
may abort when entering video mode, or start video recording.

Also truned off switching fake frames, leaving only the checker board.

(cherry picked from commit 6f00e7fc48)

Change-Id: Ic50225e1700ea3b04ae5445549548f2ffe4ae2df
 2011-11-23 13:14:16 -08:00
Jesse Hall
95520daf99 am 3a655154: am af4f66be: EmuGL: implement OES_EGL_image_external for GLESv1 
* commit '3a655154d00e5ea67218bc3b5afb09b654a17156':
  EmuGL: implement OES_EGL_image_external for GLESv1
 2011-11-22 15:46:27 -08:00
Jesse Hall
3a655154d0 am af4f66be: EmuGL: implement OES_EGL_image_external for GLESv1 
* commit 'af4f66be50b17c8b8fce1dda53389bb0a10968ba':
  EmuGL: implement OES_EGL_image_external for GLESv1
 2011-11-22 15:43:26 -08:00
Jesse Hall
5d548e0c03 am 25902c05: am f37a7ed6: GLES translator: don\'t delete EGLImage textures 
* commit '25902c05406daaaa1605e13a30b1323e14a3acf2':
  GLES translator: don't delete EGLImage textures
 2011-11-22 15:39:43 -08:00
Jesse Hall
ff5c311d79 am f25dc0f6: am faaf1553: EmuGL: set texture info from EGLImage 
* commit 'f25dc0f673a931640a7fcbba2613710ab8667235':
  EmuGL: set texture info from EGLImage
 2011-11-22 15:39:42 -08:00
Jesse Hall
25902c0540 am f37a7ed6: GLES translator: don\'t delete EGLImage textures 
* commit 'f37a7ed6c5c609a3afc33f81bf50893362917ae6':
  GLES translator: don't delete EGLImage textures
 2011-11-22 15:37:32 -08:00
Jesse Hall
f25dc0f673 am faaf1553: EmuGL: set texture info from EGLImage 
* commit 'faaf1553cfa39c23ceb198ba7edbd46ff3a11f7a':
  EmuGL: set texture info from EGLImage
 2011-11-22 15:37:31 -08:00
Jesse Hall
af4f66be50 EmuGL: implement OES_EGL_image_external for GLESv1 
GLESv2 support will come in a followup change but will take advantage
of the GLClientState changes.

Change-Id: Ib6cbb4dafbd071e3b59b1e5d808b3e23656ada92
 2011-11-21 13:47:49 -08:00
Jesse Hall
f37a7ed6c5 GLES translator: don't delete EGLImage textures 
When remapping a GLES texture to a different GL texture in
glEGLImageTargetTexture2DOES(), the GLES texture's previous GL texture was
deleted unconditionally. This is bad when it came from an EGLImage and is
therefore owned by (and will continue to be used by) some other object.

The code now skips deleting the old GL texture if it came from an EGLImage.
This mirrors the logic in glDeleteTextures().

Change-Id: I5b650334a7019d824517c2915b1f23961fbbd809
 2011-11-21 13:14:19 -08:00
Jesse Hall
faaf1553cf EmuGL: set texture info from EGLImage 
The EGL->GL translator implementation of glEGLImageTargetTexture2DOES was
properly replacing uses of the target texture object with the texture object
associated with the EGLImage in the host GL library, but wasn't updating its
own info about the texture (dimensions, etc.). This broke places where the
translator relied on knowing this, e.g. when implementing the GLES glDrawTexi
call on top of GL glDrawArrays.

Change-Id: Ia4aefd89852a2609221c56da76bfac927464c0b2
 2011-11-18 14:11:49 -08:00
Svetoslav Ganov
26fc9fd942 am cd2db139: Add the support libraries to the platform documentation (demos). 
* commit 'cd2db139ae4bbfbe7f8fa74a8b899328f2ff3c77':
  Add the support libraries to the platform documentation (demos).
 2011-11-18 10:13:55 -08:00
Fred Chung
52615b8591 am b47c44c2: am 512ea9b6: DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b 
* commit 'b47c44c2101199049c37d9c06c8906d24a9d2f10':
  DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b
 2011-11-17 16:03:38 -08:00
Svetoslav Ganov
cd2db139ae Add the support libraries to the platform documentation (demos). 
Updated the support demos due to renamed support classes.

bug:5629339

Change-Id: Ia94cd60ea2b89ad74003baaa8eb8e84d21822374
 2011-11-17 15:15:24 -08:00
Fred Chung
b47c44c210 am 512ea9b6: DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b 
* commit '512ea9b6f8cc75ec74a7ab8d1c38dec201667f1e':
  DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b
 2011-11-17 14:49:25 -08:00
James Dong
4b2198fdfc am f8781452: Update the media_profiles.xml file to include maximum memory usage support for video editor 
* commit 'f8781452d95b9a14a656706981c0005fd1b3a2ef':
  Update the media_profiles.xml file to include maximum memory usage support for video editor
 2011-11-16 17:41:22 -08:00
Fred Chung
512ea9b6f8 DO NOT MERGE: SDK sample code for Bluetooth HDP API. 
Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b

Change-Id: I1d5e37fc24d82f8f9f846c82b93f68dcc58d95cc
 2011-11-16 15:26:28 -08:00
James Dong
f8781452d9 Update the media_profiles.xml file to include maximum memory usage support for video editor 
Change-Id: I26eacaaca76b72fc5a43ee8fabacf62060418edd
related-to-bug: 5625690
 2011-11-16 14:37:49 -08:00
Fred Chung
4457573f90 am 053c4648: Merge "SDK sample code for Bluetooth HDP API." into ics-mr1 
* commit '053c46485bd24cdef4f0bbbe224cbaa1ba3d7f9b':
  SDK sample code for Bluetooth HDP API.
 2011-11-16 09:34:40 -08:00
Fred Chung
053c46485b Merge "SDK sample code for Bluetooth HDP API." into ics-mr1 2011-11-16 09:31:44 -08:00
Mathias Agopian
f674adf24a am fb305664: Merge "should fix sdk build" into ics-mr1 
* commit 'fb30566416499d441718af4bc9956404270f25ec':
  should fix sdk build
 2011-11-15 21:12:54 -08:00
Mathias Agopian
fb30566416 Merge "should fix sdk build" into ics-mr1 2011-11-15 21:11:21 -08:00
Mathias Agopian
9c14396791 should fix sdk build 
Change-Id: I5b403056f5245eae9a6476d9d573a3b1c25ea0c6
 2011-11-15 21:09:15 -08:00
Svetoslav Ganov
514f8f06b3 am 41867b63: Merge "Fix the support-v4 demos to work on a platform with APIs V4 (samples part)" into ics-mr1 
* commit '41867b639fb02d9606d4f30359cafc66498f0cbd':
  Fix the support-v4 demos to work on a platform with APIs V4 (samples part)
 2011-11-15 14:37:24 -08:00
Svetoslav Ganov
41867b639f Merge "Fix the support-v4 demos to work on a platform with APIs V4 (samples part)" into ics-mr1 2011-11-15 14:34:53 -08:00
Svetoslav Ganov
a09e21a223 Fix the support-v4 demos to work on a platform with APIs V4 (samples part) 
Some of the samples are using APIs that are introduced after v4 but not supported
in the v4 library.  Update the samples to use the new stuff added to the support
library.

bug:5616340

Change-Id: I90889f5e9ee48e7e30249464e60d5d28cd3f7a4b
 2011-11-15 11:38:45 -08:00
Fred Chung
14c26228cd SDK sample code for Bluetooth HDP API. 
Change-Id: I0f68ba42309c960f0df1e537b0932c6d68d9657b
 2011-11-14 21:36:25 -08:00
Dianne Hackborn
b7b3d55837 am 2fd75c63: Move switch preference into its own demo. 
* commit '2fd75c63684e4ada9e00e1d31304519e60f5a22a':
  Move switch preference into its own demo.
 2011-11-14 14:36:03 -08:00
Dianne Hackborn
2fd75c6368 Move switch preference into its own demo. 
This avoids everything breaking on pre-ICS platforms.

Also get rid of pref initialization in Application. I hate that.  Hate
hate hate.  Hate.  Totally hate.

Totally.

Change-Id: Idb3526a96eb2dff49f9de8e5ae71149cb4ed6e96
 2011-11-14 14:28:42 -08:00
Yu Shan Emily Lau
c21219a36a am d673b70d: am 6b415b7d: (-s ours) Merge "do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch" into ics-mr0 
* commit 'd673b70dfd2506882c04335e29714e0d2c4ed5cd':
  do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch
 2011-11-09 18:59:59 +00:00
Yu Shan Emily Lau
d673b70dfd am 6b415b7d: (-s ours) Merge "do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch" into ics-mr0 
* commit '6b415b7d0530151ffa3221594102a6752a539692':
  do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch
 2011-11-09 16:41:13 +00:00
Yu Shan Emily Lau
cc72c4c2fd am 1baa142c: do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch 
* commit '1baa142c06f3500f02dfc8d2fc15f5f70b77f3b0':
  do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch
 2011-11-09 14:37:25 +00:00
Yu Shan Emily Lau
6b415b7d05 Merge "do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch" into ics-mr0 2011-11-08 16:03:19 -08:00
Yu Shan Emily Lau
1baa142c06 do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch 
Change-Id: Ia54463c93a7f941d7de3cc003ce773749d1f016e
 2011-11-08 15:35:28 -08:00
Ken Wakasa
e53fd02f84 am c7160d8d: am c3b08379: Fix wrong paths to class references 
* commit 'c7160d8dcb9861af67eea4b822889b3ce93be0b9':
  Fix wrong paths to class references
 2011-11-07 17:37:20 +00:00
Ken Wakasa
c7160d8dcb am c3b08379: Fix wrong paths to class references 
* commit 'c3b0837982378fc1277295fb2322e33f6414a0b9':
  Fix wrong paths to class references
 2011-11-07 16:44:19 +00:00
Ken Wakasa
c3b0837982 Fix wrong paths to class references 
Change-Id: I778be2217165185fbb8eef08b8a232ea7ba986f0
 2011-11-07 20:00:25 +09:00
Yu Shan Emily Lau
887527429d do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch 
Change-Id: I21f83b96afc5c3a00a6570e8284adc23191b6dd2
 2011-11-05 17:09:57 -07:00
Raphael
a2c602839d am d960df40: cherrypick 76bd108d from master. do not merge. 
* commit 'd960df40f2c762c02cc2b47c53444b9b0f8374f1':
  cherrypick 76bd108d from master. do not merge.
 2011-11-03 22:45:52 +00:00
Raphael
d960df40f2 cherrypick 76bd108d from master. do not merge. 
Change-Id: Ibb677f286b54a9dd593301a0f8b194d3b2dc58d1
SDK: update SDK to API 15
 2011-11-03 15:42:39 -07:00
Robert Ly
4b148ed4f9 am cc1eef49: am 8e3c1951: Merge "adding fountain framebuffer object sdk sample" into ics-mr0 
* commit 'cc1eef493524af0ce727927996b346312637c78a':
  adding fountain framebuffer object sdk sample
 2011-11-03 19:57:14 +00:00
Robert Ly
cc1eef4935 am 8e3c1951: Merge "adding fountain framebuffer object sdk sample" into ics-mr0 
* commit '8e3c1951915010985db2abee212e8c4c37cacc53':
  adding fountain framebuffer object sdk sample
 2011-11-03 19:56:00 +00:00
Robert Ly
8e3c195191 Merge "adding fountain framebuffer object sdk sample" into ics-mr0 2011-11-03 12:54:02 -07:00