Kenny Root
bb9d394b21
Clean up use of HAVE_ANDROID_OS
...
HAVE_ANDROID_OS was defined as "1" for targets, but never defined as "0"
for non-targets. Changing them to #ifdef should be safe and matches
all the other uses of HAVE_ANDROID_OS throughout the system.
Change-Id: I82257325a8ae5e4e4371ddfc4dbf51cea8ea0abb
2011-02-16 10:56:32 -08:00
Mathias Agopian
492277d2e2
allow root to call into surfaceflinger
...
this is useful for running standalone tests
with standalone SurfaceFlinger.
Change-Id: I08d054f6214affa3a777a82765f4e0bd256ba26d
2011-02-15 19:27:47 -08:00
Stephen Hines
1243354542
am e49f75eb: am bbcf2079: Merge "Fix struct initializer for balls." into honeycomb
...
* commit 'e49f75eb4634f8ee70ad0b5fbd8c6ea19773024f':
Fix struct initializer for balls.
2011-02-11 16:49:48 -08:00
Stephen Hines
e49f75eb46
am bbcf2079: Merge "Fix struct initializer for balls." into honeycomb
...
* commit 'bbcf2079e9978ad6f75732070ce1dcc0dea3ea3f':
Fix struct initializer for balls.
2011-02-11 16:47:04 -08:00
Stephen Hines
7655a7dd1d
Fix struct initializer for balls.
...
Bug: 3092382
Change-Id: Ie4e85177727b32f0a260fae53885c97bee111343
2011-02-11 16:38:46 -08:00
Romain Guy
eefdd709dd
Merge "Dirty layers in the area covered by a drawBitmapMesh() call Bug #3410827 "
2011-02-10 15:50:16 -08:00
Romain Guy
b18d2d0079
Dirty layers in the area covered by a drawBitmapMesh() call
...
Bug #3410827
Change-Id: Ic8b4f6201af94497bba86c75819588c78debddc2
2011-02-10 15:52:54 -08:00
Jason Sams
a03837b6ee
am e8d074d7: am cbcd9335: Merge "Basic 101 level compute example for RS." into honeycomb
...
* commit 'e8d074d763f1c9551c41654589597e45476d27e0':
Basic 101 level compute example for RS.
2011-02-10 15:46:21 -08:00
Alex Sakhartchouk
cc3b7cd293
am bf3aae10: am efc48eea: Merge "HelloWorld graphics sample for Renderscript." into honeycomb
...
* commit 'bf3aae10b5fa73cced245276f3b2f433c9cd635e':
HelloWorld graphics sample for Renderscript.
2011-02-10 15:46:01 -08:00
Alex Sakhartchouk
f2270583fd
am 7541a9a2: am f1ff8b2f: Merge "Cleanup of the code in view to do creation/destruction in the right places." into honeycomb
...
* commit '7541a9a25036410f17718d86fe57ea33c0f789d3':
Cleanup of the code in view to do creation/destruction in the right places.
2011-02-10 15:45:57 -08:00
Jason Sams
e8d074d763
am cbcd9335: Merge "Basic 101 level compute example for RS." into honeycomb
...
* commit 'cbcd93352b9fff3ada4a01c3094b24e5fafde97f':
Basic 101 level compute example for RS.
2011-02-10 15:08:41 -08:00
Alex Sakhartchouk
bf3aae10b5
am efc48eea: Merge "HelloWorld graphics sample for Renderscript." into honeycomb
...
* commit 'efc48eea1541990046248b86e899c72b58c8506f':
HelloWorld graphics sample for Renderscript.
2011-02-10 15:08:14 -08:00
Alex Sakhartchouk
7541a9a250
am f1ff8b2f: Merge "Cleanup of the code in view to do creation/destruction in the right places." into honeycomb
...
* commit 'f1ff8b2fd6441d122e84c5040834bf6e0d845b05':
Cleanup of the code in view to do creation/destruction in the right places.
2011-02-10 15:07:59 -08:00
Jason Sams
cbcd93352b
Merge "Basic 101 level compute example for RS." into honeycomb
2011-02-10 13:06:16 -08:00
Alex Sakhartchouk
efc48eea15
Merge "HelloWorld graphics sample for Renderscript." into honeycomb
2011-02-10 09:53:30 -08:00
Alex Sakhartchouk
f1ff8b2fd6
Merge "Cleanup of the code in view to do creation/destruction in the right places." into honeycomb
2011-02-10 09:51:34 -08:00
Jason Sams
716b27b69d
Basic 101 level compute example for RS.
...
Change-Id: Ic196ebdf558c1b9661182e191e31d7f62448e73a
2011-02-09 17:11:34 -08:00
Alex Sakhartchouk
4123cc5efb
HelloWorld graphics sample for Renderscript.
...
Change-Id: I7f5c4813a207a37f67c563407369a1dbc1be250d
2011-02-09 15:39:29 -08:00
Alex Sakhartchouk
85bccf6e0b
am 699a0969: Merge "DO NOT MERGE Removing an activity that shouldn\'t go into samples" into honeycomb
...
* commit '699a0969434b6ee434dd9f5f212fe1bb914fdf0d':
DO NOT MERGE Removing an activity that shouldn't go into samples
2011-02-09 15:23:54 -08:00
Alex Sakhartchouk
f82428a932
Cleanup of the code in view to do creation/destruction in the right places.
...
Change-Id: I1c87682cc2c35ad5ee15c06cd78f48b612668181
2011-02-09 08:59:32 -08:00
Alex Sakhartchouk
d9349abdaa
DO NOT MERGE
...
Removing an activity that shouldn't go into samples
Change-Id: I00025770d926af2dbf399d28f8e855568e260b8b
2011-02-09 08:53:32 -08:00
Jason Sams
fbf8e02d99
am e2b2a02a: am 4fd70373: Merge "Fix bug 3421901 remove 2 functions from public headers in the SDK." into honeycomb
...
* commit 'e2b2a02a91dc4101a9481b5bb6ba4c56c7a35dd7':
Fix bug 3421901 remove 2 functions from public headers in the SDK.
2011-02-08 15:06:50 -08:00
Jason Sams
e2b2a02a91
am 4fd70373: Merge "Fix bug 3421901 remove 2 functions from public headers in the SDK." into honeycomb
...
* commit '4fd70373ecafbf5a87a1c35852aec2818612e928':
Fix bug 3421901 remove 2 functions from public headers in the SDK.
2011-02-08 14:57:35 -08:00
Jason Sams
4fd70373ec
Merge "Fix bug 3421901 remove 2 functions from public headers in the SDK." into honeycomb
2011-02-08 12:07:49 -08:00
Jason Sams
4110c9931a
am 5510d172: am f8cbf729: Merge "cleanup headers for SDK. bug 3421901" into honeycomb
...
* commit '5510d1722b8da4fd630a236f0fd3aad0cc4dac0c':
cleanup headers for SDK. bug 3421901
2011-02-07 14:20:07 -08:00
Jason Sams
5510d1722b
am f8cbf729: Merge "cleanup headers for SDK. bug 3421901" into honeycomb
...
* commit 'f8cbf7297bd7e29867154610cbc24fe0dbc168d1':
cleanup headers for SDK. bug 3421901
2011-02-07 14:17:45 -08:00
Jason Sams
f8cbf7297b
Merge "cleanup headers for SDK. bug 3421901" into honeycomb
2011-02-07 13:59:45 -08:00
Robert Ly
c07eb39417
am 18f5c7e6: am cfc048a3: set targetsdk=11 on renderscript misc samples project
...
* commit '18f5c7e6919a8d66b1b7c818d55b92504961b379':
set targetsdk=11 on renderscript misc samples project
2011-02-07 13:51:11 -08:00
Robert Ly
a5c8eb76f5
am 7eca7f74: am 5cf98da8: Merge "Fixing renderscript samples to properly declare targetSDK" into honeycomb
...
* commit '7eca7f742a31654a3240f70611ac8c82705d2b42':
Fixing renderscript samples to properly declare targetSDK
2011-02-07 13:51:03 -08:00
Mike Cleron
b3fe3f59d1
am e4d08c02: am 851beae7: Merge "Properly handle dirty rectangles generated from 9-patches Bug #3409580 " into honeycomb
...
* commit 'e4d08c02229bea67c6f19db22d4ffa45196d4258':
Properly handle dirty rectangles generated from 9-patches Bug #3409580
2011-02-07 13:47:58 -08:00
Mike Cleron
b31688eb05
am a626eb18: am 2d47fd3c: Merge "Fix crash when Paths are GCd in hw accelerated apps" into honeycomb
...
* commit 'a626eb18ae2c4a48c8770ece3a64eeee5974f455':
Fix crash when Paths are GCd in hw accelerated apps
2011-02-07 13:47:48 -08:00
Stephen Hines
74d0778229
am 95dc232c: am a5b8768f: Merge "Add support for memcpy/memset to RS." into honeycomb
...
* commit '95dc232c0a16c64e422ef7e57e14e5f955b112a2':
Add support for memcpy/memset to RS.
2011-02-07 13:47:21 -08:00
Jamie Gennis
f7398e2808
am c7839751: am c2efcd2c: Merge "Initialize the SurfaceTexture transform fields." into honeycomb
...
* commit 'c7839751aa1de52e0c3aab7dd1518b0fc8f2ee0a':
Initialize the SurfaceTexture transform fields.
2011-02-07 13:47:02 -08:00
Romain Guy
3e4ac8967d
am 80038fbc: am ba27cf75: Merge "Empty the clip rect when intersection is empty. Bug #3410035 " into honeycomb
...
* commit '80038fbcf629936852afba0054b26939a3a9835a':
Empty the clip rect when intersection is empty. Bug #3410035
2011-02-07 13:42:47 -08:00
Chet Haase
69d792f34a
am 38e8c353: am 59301777: Merge "Fix leak in reused display lists" into honeycomb
...
* commit '38e8c35322e41708e5b1f2260d7d67ff525d8560':
Fix leak in reused display lists
2011-02-07 11:38:47 -08:00
Romain Guy
0e6fe4f31a
am a9c369d0: am 87465f02: Merge "Fixes cache misses and extra allocations. Bug #3421454 " into honeycomb
...
* commit 'a9c369d0fbe2b995f456877b2368aac95f810558':
Fixes cache misses and extra allocations. Bug #3421454
2011-02-07 11:37:12 -08:00
Robert Ly
18f5c7e691
am cfc048a3: set targetsdk=11 on renderscript misc samples project
...
* commit 'cfc048a3f912695f7a251a2266aef59ac4d2d124':
set targetsdk=11 on renderscript misc samples project
2011-02-06 14:24:56 -08:00
Robert Ly
cfc048a3f9
set targetsdk=11 on renderscript misc samples project
...
Change-Id: Ib352d6e53bd5b2a56c84169e188b835d87c894f1
2011-02-06 13:59:21 -08:00
Robert Ly
7eca7f742a
am 5cf98da8: Merge "Fixing renderscript samples to properly declare targetSDK" into honeycomb
...
* commit '5cf98da85c1698cacbeed8d4883373d0e0774fd8':
Fixing renderscript samples to properly declare targetSDK
2011-02-06 00:55:01 -08:00
Robert Ly
5cf98da85c
Merge "Fixing renderscript samples to properly declare targetSDK" into honeycomb
2011-02-06 00:51:40 -08:00
Robert Ly
d307645ece
Fixing renderscript samples to properly declare targetSDK
...
Change-Id: I0374fdcd06470e26dc7e849323a1764c08756af1
2011-02-04 18:02:25 -08:00
Mike Cleron
e4d08c0222
am 851beae7: Merge "Properly handle dirty rectangles generated from 9-patches Bug #3409580 " into honeycomb
...
* commit '851beae717dc8e9b66c214d9d6aab2e76d52b086':
Properly handle dirty rectangles generated from 9-patches Bug #3409580
2011-02-04 15:32:08 -08:00
Mike Cleron
a626eb18ae
am 2d47fd3c: Merge "Fix crash when Paths are GCd in hw accelerated apps" into honeycomb
...
* commit '2d47fd3c3566e5fbe16bcee2ec4be87c6cdc2440':
Fix crash when Paths are GCd in hw accelerated apps
2011-02-04 15:32:04 -08:00
Mike Cleron
851beae717
Merge "Properly handle dirty rectangles generated from 9-patches Bug #3409580 " into honeycomb
2011-02-04 15:29:42 -08:00
Mike Cleron
2d47fd3c35
Merge "Fix crash when Paths are GCd in hw accelerated apps" into honeycomb
2011-02-04 15:29:28 -08:00
Stephen Hines
95dc232c0a
am a5b8768f: Merge "Add support for memcpy/memset to RS." into honeycomb
...
* commit 'a5b8768f01462374aed42e5c602afe65b7e050ef':
Add support for memcpy/memset to RS.
2011-02-04 15:17:09 -08:00
Stephen Hines
a5b8768f01
Merge "Add support for memcpy/memset to RS." into honeycomb
2011-02-04 15:15:34 -08:00
Jamie Gennis
c7839751aa
am c2efcd2c: Merge "Initialize the SurfaceTexture transform fields." into honeycomb
...
* commit 'c2efcd2ceadab33b42d938e3771c994816e9a4b0':
Initialize the SurfaceTexture transform fields.
2011-02-04 15:05:28 -08:00
Stephen Hines
3f73da5c96
Add support for memcpy/memset to RS.
...
Bug: 3426446
Change-Id: I78170a50bdd891d928b3db96685b4c3c801b6f00
2011-02-04 14:56:49 -08:00
Romain Guy
c78b5d50f9
Properly handle dirty rectangles generated from 9-patches
...
Bug #3409580
This bug affects anything that draws a 9patch inside a layer, this includes
launcher's workspace, all of the fade animations, etc.
Change-Id: Icbe8ecd158e3d5f44d07516462de68c5d1fb0a8f
2011-02-04 14:00:42 -08:00