Jason Sams
8cb39de03a
Remove RS_KIND from vertex arrays types.
...
Legacy vertex programs now bind by name just like the user programs.
This removes the need for two different ways of declairing the same
information.
Change-Id: I0178c0962842a1bbffb6726984ae1b8f5bb7529c
2010-06-01 15:47:01 -07:00
Jason Sams
c9d0a87d50
types update.
...
Change-Id: I3bd43e163c919be4c3a38e0dd228cee220c62b76
2010-05-28 19:13:20 -07:00
Jason Sams
3678f1989e
Merge "Rough implemetation of ForEach. Remove launchID from root graphics script."
2010-05-28 18:24:49 -07:00
Jason Sams
f17bccc905
Rough implemetation of ForEach.
...
Remove launchID from root graphics script.
Change-Id: I9f80c0d4df1264f2ee1624a6d7216b9dfdf8502e
2010-05-28 18:23:22 -07:00
Jason Sams
12fc0af972
Merge "Fountain update. Update field names to match legacy expectations. Cleanup java code."
2010-05-28 18:16:16 -07:00
Jason Sams
96d3749e4e
Fountain update. Update field names to match legacy expectations.
...
Cleanup java code.
Change-Id: I1ad9ae462e46166a7b6ff2b399417dbfe50a5542
2010-05-28 18:14:41 -07:00
Brian Carlstrom
40ac2e6d57
Merge "Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master"
2010-05-28 14:32:43 -07:00
James Dong
5f95da7a17
am 46e70361: am 46441198: Merge "Avoid copying for input recording frames in CameraSource" into kraken
2010-05-28 11:05:59 -07:00
James Dong
46e703610f
am 46441198: Merge "Avoid copying for input recording frames in CameraSource" into kraken
2010-05-28 11:01:48 -07:00
James Dong
464411983a
Merge "Avoid copying for input recording frames in CameraSource" into kraken
2010-05-28 10:53:09 -07:00
James Dong
dfb1dd6a8c
Avoid copying for input recording frames in CameraSource
...
This is the part one.
- Let CameraSource be a MediaBufferObserver. It releases the recording frame when the ref count of a MediaBuffer containing
the recording frame drops to 0.
This reduces the CPU load from 90+% down to 50-60%.
Part two is related to the avoidance of copying the input video frames to the video encoder.
However, we are not able to use OMX_UseBuffer directly. Still work on the second part.
Change-Id: I906f1d054ae8bdcf82e1617f1fc120152f2eb2eb
2010-05-28 10:44:20 -07:00
Mike Lockwood
8eb25c28c0
Merge "Move CursorWindow class from core/jni to libbinder"
2010-05-28 10:24:29 -07:00
Wu-cheng Li
9222832882
am 3ed1da35: am 198975bb: Merge "Add video frame parameter." into kraken
2010-05-28 09:35:20 -07:00
Mathias Agopian
cf78921436
am 6a9d88ff: am 64ff6ab4: Merge "more clean-up of Surfaceflinger\'s client management" into kraken
2010-05-28 09:35:08 -07:00
Mike Lockwood
2807df89af
Move CursorWindow class from core/jni to libbinder
...
To allow use of the native CursorWindow class outside of the core framework jni
Change-Id: I72e8dcb91a2c691130c33cdfd9a25d343da1c592
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-28 10:08:21 -04:00
Wu-cheng Li
3ed1da3580
am 198975bb: Merge "Add video frame parameter." into kraken
2010-05-28 04:36:29 -07:00
Wu-cheng Li
198975bb01
Merge "Add video frame parameter." into kraken
2010-05-28 04:34:13 -07:00
Wu-cheng Li
d2c2929c94
Add video frame parameter.
...
The image format of preview frames and video frames may be different.
We need another parameter for video frame format.
bug:2720893
Change-Id: I966a31b0ce8cab25cdde65db65a18c8cbe9c7bd6
2010-05-28 17:32:41 +08:00
Brian Carlstrom
f77cf7f0f0
Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master
...
Note that the api/9.xml change is removing APIs that were removed going from RI 5 to RI 6
Change-Id: I665a30c4fdc2ca73c3ade0ad7487aa85cebf272f
2010-05-27 23:11:20 -07:00
Kenny Root
8e98e35e8f
am 50239de1: am ddbab4e1: am 6cc13745: am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
2010-05-27 23:05:47 -07:00
Dirk Dougherty
c0e58245bc
am 527c8b18: am 75ef3197: am 9eae9572: am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
2010-05-27 23:05:42 -07:00
Andreas Huber
56a72f80b8
am 2b4bc19e: am 1a35e612: Merge "Better sniffing of MPEG4 content by checking for a compatible sub-brand." into kraken
2010-05-27 23:05:21 -07:00
Mathias Agopian
6a9d88ff64
am 64ff6ab4: Merge "more clean-up of Surfaceflinger\'s client management" into kraken
2010-05-27 20:05:20 -07:00
Mathias Agopian
64ff6ab4df
Merge "more clean-up of Surfaceflinger's client management" into kraken
2010-05-27 20:04:05 -07:00
Mathias Agopian
c7b388c2b3
more clean-up of Surfaceflinger's client management
...
SurfaceComposerClient now only exist on the WindowManager side,
the client side uses the new SurfaceClient class, which only
exposes what a client needs.
also instead of keeping mappings from IBinder to SurfaceComposerClients
we have a SurfaceClient per Surface (referring to the same IBinder), this
is made possible by the fact that SurfaceClient is very light.
Change-Id: I6a1f7015424f07871632a25ed6a502c55abfcfa6
2010-05-27 19:55:43 -07:00
Adam Powell
39d4dbc4fe
Merge "Recycle MotionEvents for ACTION_OUTSIDE in WindowManagerService"
2010-05-27 18:56:18 -07:00
Adam Powell
47482969bb
Recycle MotionEvents for ACTION_OUTSIDE in WindowManagerService
...
Change-Id: I648e5ad780cad285f190e06cfff1780c6dad0117
2010-05-27 18:52:59 -07:00
Konstantin Lopyrev
a15dcfaf2b
Fix 2677197: Adding minimum complex character support.
...
Change-Id: I520bc5f9aa924bf9b5585b2235a91cc96cb99c25
2010-05-27 15:27:06 -07:00
Joe Malin
afd52a0b40
Merge "DOC CHANGE: Clean up the concepts topic testing_android.jd"
2010-05-27 13:10:54 -07:00
Kenny Root
50239de1a7
am ddbab4e1: am 6cc13745: am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
2010-05-27 12:39:20 -07:00
Dirk Dougherty
527c8b184c
am 75ef3197: am 9eae9572: am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
2010-05-27 12:39:16 -07:00
Kenny Root
ddbab4e165
am 6cc13745: am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
...
Merge commit '6cc137459a21e67765d2490529a920ccfb14e362' into kraken
* commit '6cc137459a21e67765d2490529a920ccfb14e362':
Fix typo in EastAsianWidth javadoc
2010-05-27 12:37:28 -07:00
Dirk Dougherty
75ef31976e
am 9eae9572: am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
...
Merge commit '9eae957207c016db032819eadef261addf994a0d' into kraken
* commit '9eae957207c016db032819eadef261addf994a0d':
Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables.
2010-05-27 12:37:22 -07:00
Kenny Root
6cc137459a
am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
...
Merge commit '94f1751cb0c6ea4004ff86b3af89e06e00a66641' into froyo-plus-aosp
* commit '94f1751cb0c6ea4004ff86b3af89e06e00a66641':
Fix typo in EastAsianWidth javadoc
2010-05-27 12:35:25 -07:00
Dirk Dougherty
9eae957207
am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
...
Merge commit '9f95c64e66df7481b1c624c6cf29569ca384a822' into froyo-plus-aosp
* commit '9f95c64e66df7481b1c624c6cf29569ca384a822':
Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables.
2010-05-27 12:35:18 -07:00
Leon Scroggins
acea08d20f
Prevent a null pointer exception.
...
Bug 2721268
Change-Id: I3a9e838ed3f2f9dccdf7b4bf42a0dbad58e62e02
2010-05-27 15:09:32 -04:00
Kenny Root
94f1751cb0
Merge "Fix typo in EastAsianWidth javadoc" into froyo
2010-05-27 12:04:34 -07:00
Dirk Dougherty
9f95c64e66
Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
2010-05-27 11:46:26 -07:00
Amith Yamasani
9bd8034a1a
Fix a comment typo.
2010-05-27 11:31:26 -07:00
Amith Yamasani
8b932067c1
Merge "Add a battery capacity value to the power profile."
2010-05-27 10:49:08 -07:00
Amith Yamasani
bed865932f
Add a battery capacity value to the power profile.
...
Can be accessed through PowerProfile.getBatteryCapacity()
Individual device profiles need to be updated with their capacities.
2010-05-27 10:37:54 -07:00
Andreas Huber
2b4bc19e20
am 1a35e612: Merge "Better sniffing of MPEG4 content by checking for a compatible sub-brand." into kraken
2010-05-27 10:18:32 -07:00
Andreas Huber
1a35e612e4
Merge "Better sniffing of MPEG4 content by checking for a compatible sub-brand." into kraken
2010-05-27 10:16:54 -07:00
Dirk Dougherty
a1d25f60c3
Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables.
...
Change-Id: I5ff67605829b4fc09263d56a76aefe57f40783fd
2010-05-27 10:01:48 -07:00
Andreas Huber
261eb0cbef
Better sniffing of MPEG4 content by checking for a compatible sub-brand.
...
Change-Id: I076908822ad0e663b9932e61fb33edc12c2e1948
related-to-bug: 2673192
2010-05-27 09:59:54 -07:00
Jeff Hamilton
0e42b29eb0
am 635962e0: am c0046aab: am edf228ce: am dc46f6f6: Merge "Don\'t enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
2010-05-27 09:44:49 -07:00
Jeff Hamilton
635962e0af
am c0046aab: am edf228ce: am dc46f6f6: Merge "Don\'t enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
2010-05-27 09:43:54 -07:00
Jeff Hamilton
c0046aab0c
am edf228ce: am dc46f6f6: Merge "Don\'t enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
...
Merge commit 'edf228ce1fc9aae9fe314229c19e80a434bb4393' into kraken
* commit 'edf228ce1fc9aae9fe314229c19e80a434bb4393':
Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts.
2010-05-27 09:42:44 -07:00
Jeff Hamilton
edf228ce1f
am dc46f6f6: Merge "Don\'t enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
...
Merge commit 'dc46f6f6cc44954c23229019270b54b8912be825' into froyo-plus-aosp
* commit 'dc46f6f6cc44954c23229019270b54b8912be825':
Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts.
2010-05-27 09:40:23 -07:00
Jeff Hamilton
dc46f6f6cc
Merge "Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
2010-05-27 09:39:19 -07:00