David Turner
235f3008a7
am 3206de39: am a42a3deb: am ece2077b: Merge "emulator opengl: add GLESv2 support to driver + renderer"
...
* commit '3206de396dde02a6fe44b808e699123532516227':
emulator opengl: add GLESv2 support to driver + renderer
2011-07-01 11:48:13 -07:00
David Turner
08bc92ed62
am 78250d2b: am b97e9575: Merge "emulotor gralloc: fixed HAL_PIXEL_FORMAT_RGB_565"
...
* commit '78250d2bfc95ce8db6071547efe88471e75eb8d6':
emulotor gralloc: fixed HAL_PIXEL_FORMAT_RGB_565
2011-07-01 03:21:55 -07:00
David Turner
c35b6f7225
am 5a757de2: am 23839223: Merge "emulator gralloc: Make the cb_handle_t::validate static"
...
* commit '5a757de276415f6c61fb47265375b36bf3da8ee7':
emulator gralloc: Make the cb_handle_t::validate static
2011-07-01 03:21:53 -07:00
David Turner
737db05fe4
am b62e461e: am 580a5748: Merge " opengl translator: Fix windows runtime problems"
...
* commit 'b62e461ec46d8252b3fbca61bb63eb25aba2e5a8':
opengl translator: Fix windows runtime problems
2011-07-01 03:21:41 -07:00
David Turner
78250d2bfc
am b97e9575: Merge "emulotor gralloc: fixed HAL_PIXEL_FORMAT_RGB_565"
...
* commit 'b97e9575770187643379979a016d93772cc181f8':
emulotor gralloc: fixed HAL_PIXEL_FORMAT_RGB_565
2011-07-01 03:17:43 -07:00
David Turner
5a757de276
am 23839223: Merge "emulator gralloc: Make the cb_handle_t::validate static"
...
* commit '23839223b97e2bba2091627a90bbc2a9454545c1':
emulator gralloc: Make the cb_handle_t::validate static
2011-07-01 03:17:42 -07:00
David Turner
b62e461ec4
am 580a5748: Merge " opengl translator: Fix windows runtime problems"
...
* commit '580a57485345cda018df4c63f65d3a9a8a61ce5b':
opengl translator: Fix windows runtime problems
2011-07-01 03:17:40 -07:00
David Turner
99acb819bf
am fbfb73b4: am 0c074ddb: Merge "Setting Renderer default libs to use translator libs"
...
* commit 'fbfb73b40593389ea91c147da5ee374c841009dd':
Setting Renderer default libs to use translator libs
2011-07-01 03:10:53 -07:00
David Turner
94d4f55f1c
am 0c06eaf3: am ebc56952: Merge "emulator opengl: fix windows build"
...
* commit '0c06eaf38c9982bc3ede0c351f4f0165f59283b0':
emulator opengl: fix windows build
2011-07-01 03:10:51 -07:00
David Turner
c6f4edf37e
am 391237dd: am 89a74292: Merge "emulator GLESv2: fixed ( #16 ) NenaMark crashes on exit"
...
* commit '391237dda869e27a0d5e82888dfed0dfa87c3241':
emulator GLESv2: fixed (#16 ) NenaMark crashes on exit
2011-07-01 03:10:49 -07:00
David Turner
3206de396d
am a42a3deb: am ece2077b: Merge "emulator opengl: add GLESv2 support to driver + renderer"
...
* commit 'a42a3deb874a1be0fb27656367efc749a875884e':
emulator opengl: add GLESv2 support to driver + renderer
2011-07-01 03:10:46 -07:00
David Turner
b97e957577
Merge "emulotor gralloc: fixed HAL_PIXEL_FORMAT_RGB_565"
2011-07-01 03:07:00 -07:00
Stas Gurtovoy
33e95e85fd
emulotor gralloc: fixed HAL_PIXEL_FORMAT_RGB_565
...
set its glFormat to GL_RGB since GL_RGB565_OES is not supported on the host.
This also fixes the wallpaper issue, making it visible.
Change-Id: Icf616e70d8f41ca0d01e7cdeb9585107dc8ebc31
2011-07-01 12:06:07 +02:00
David Turner
fbfb73b405
am 0c074ddb: Merge "Setting Renderer default libs to use translator libs"
...
* commit '0c074ddb09f23682bde109aaa1bb201967ad892e':
Setting Renderer default libs to use translator libs
2011-07-01 03:05:03 -07:00
David Turner
0c06eaf38c
am ebc56952: Merge "emulator opengl: fix windows build"
...
* commit 'ebc56952c7d34754c334fdeb1ecef5622ef258b9':
emulator opengl: fix windows build
2011-07-01 03:05:01 -07:00
David Turner
391237dda8
am 89a74292: Merge "emulator GLESv2: fixed ( #16 ) NenaMark crashes on exit"
...
* commit '89a74292b331514a7e54e9971258b8ad99d31965':
emulator GLESv2: fixed (#16 ) NenaMark crashes on exit
2011-07-01 03:04:59 -07:00
David Turner
a42a3deb87
am ece2077b: Merge "emulator opengl: add GLESv2 support to driver + renderer"
...
* commit 'ece2077bdd97f42247c022ed9ee87742ef0d1756':
emulator opengl: add GLESv2 support to driver + renderer
2011-07-01 03:04:57 -07:00
David Turner
23839223b9
Merge "emulator gralloc: Make the cb_handle_t::validate static"
2011-07-01 03:03:47 -07:00
David Turner
580a574853
Merge " opengl translator: Fix windows runtime problems"
2011-07-01 03:02:31 -07:00
David Turner
0c074ddb09
Merge "Setting Renderer default libs to use translator libs"
2011-07-01 03:00:26 -07:00
David Turner
ebc56952c7
Merge "emulator opengl: fix windows build"
2011-07-01 02:59:35 -07:00
David Turner
89a74292b3
Merge "emulator GLESv2: fixed ( #16 ) NenaMark crashes on exit"
2011-07-01 02:57:17 -07:00
David Turner
ece2077bdd
Merge "emulator opengl: add GLESv2 support to driver + renderer"
2011-07-01 02:56:33 -07:00
Dianne Hackborn
46781c155d
Merge "Follow internal impl change."
2011-06-30 13:57:33 -07:00
Jeff Brown
a5be101172
Merge "ApiDemos: Fix array indexing bug in game controller demo."
2011-06-30 12:43:13 -07:00
Jeff Brown
f53e7c9863
ApiDemos: Fix array indexing bug in game controller demo.
...
Change-Id: Ic7f1ce8bed39b2c10dd0e583c3ad118095f14752
2011-06-30 12:01:10 -07:00
Dianne Hackborn
5480519835
Follow internal impl change.
...
Change-Id: I61e545306182e106723e74f28650c165dcdab19a
2011-06-30 11:23:55 -07:00
Stas Gurtovoy
8793e54e60
emulator gralloc: Make the cb_handle_t::validate static
...
This is nicer, since it checks the handle itself, not counting on the caller to check it
Change-Id: I7eba6292dee8e0832a8c0074f508c07c3bc43ff2
2011-06-30 09:14:16 +03:00
Amit Feller
87363ca283
opengl translator: Fix windows runtime problems
...
fixed functions calling conventions in dispatch tables,
added link flag to translator libraries to produce an alias
function for all exported functions with stdcall name mangling.
Change-Id: I4360f26da1f897764ba6d4dd02c365ed00420b51
2011-06-30 09:14:16 +03:00
Amit Feller
a20ba0e4de
Setting Renderer default libs to use translator libs
...
Change-Id: I853a30ce1aa7325d01a30b30c18f4e0bd5a5702f
2011-06-30 09:14:16 +03:00
Amit Feller
efcbbc3f28
emulator opengl: fix windows build
...
Change-Id: I145c7bf3a664fdb2c9e113cd977b4b2431d0668d
2011-06-30 09:14:16 +03:00
Stas Gurtovoy
118af85051
emulator GLESv2: fixed ( #16 ) NenaMark crashes on exit
...
The GL2Encoder::m_compressedTextureFormats member wasn't initialized, so the d'tor
would sometimes crash trying to delete it. Also init m_num_compressedTextureFormats.
Change-Id: Iae423c16a84a4e454e0e1167f7478f9e2f6183c0
2011-06-30 09:14:16 +03:00
Stas Gurtovoy
62d074d9f8
emulator opengl: add GLESv2 support to driver + renderer
...
Added GLESv2 library to system.
Made fixes to the host libOpenGLRender to
compile and support GLESv2 (defined WITH_GLES2).
Other fixes required to make GLESv2 to work.
Change-Id: I9eb198e6092e7fa3550342c50929dd1714282cb3
2011-06-30 09:14:12 +03:00
David Hu
64fee8fe80
Merge "Emulator Connectivity Test"
2011-06-29 17:03:34 -07:00
David Hu
a69cb1fd38
Emulator Connectivity Test
...
The test checks if there is an activity connectivity and if so can a connect be made. The test was verified again the following scenarios:
- airplane mode on (FAIL)
- wifi on only (PASS)
- data on only (PASS)
- radio on but data and wifi off (FAIL)
- data and wifi on (PASS)
Change-Id: I3c400280390f00f52bdc73c8a685f33322d821eb
2011-06-29 16:55:55 -07:00
David 'Digit' Turner
05c6bed0ab
am f249fb4f: am eff8b9de: am 39386d45: Merge "sdk: Copy ABI-specific kernel image to platform image directory."
...
* commit 'f249fb4fe0f5424389fe52e09baf3af1db9a4a55':
sdk: Copy ABI-specific kernel image to platform image directory.
2011-06-29 04:20:10 -07:00
Anirudh Dewani
d9662df316
am 12c15c51: (-s ours) am bc4ea2d9: am fea911d5: Network detection sample using TelephonyManager
...
* commit '12c15c512b8f21ad05777cadd1942d80a494b9bf':
Network detection sample using TelephonyManager
2011-06-29 04:20:08 -07:00
David 'Digit' Turner
f249fb4fe0
am eff8b9de: am 39386d45: Merge "sdk: Copy ABI-specific kernel image to platform image directory."
...
* commit 'eff8b9de35890bf50093d38ef5e9e81557ad4a9c':
sdk: Copy ABI-specific kernel image to platform image directory.
2011-06-29 02:51:26 -07:00
David 'Digit' Turner
eff8b9de35
am 39386d45: Merge "sdk: Copy ABI-specific kernel image to platform image directory."
...
* commit '39386d450fdc2f170f5f7c94d76c38061fd5a9e0':
sdk: Copy ABI-specific kernel image to platform image directory.
2011-06-29 02:46:04 -07:00
David 'Digit' Turner
39386d450f
Merge "sdk: Copy ABI-specific kernel image to platform image directory."
2011-06-29 02:42:09 -07:00
David 'Digit' Turner
f7f6842b32
sdk: Copy ABI-specific kernel image to platform image directory.
...
This patch depends on https://review.source.android.com/24052
It is used to ensure that the proper kernel image is copied to the
platform image's kernel-qemu.
This is needed because for ARMv7 platform builds, the image is
in prebuilt/android-arm/kernel/kernel-qemu-armv7, instead of
prebuilt/android-arm/kernel/kernel-qemu
Change-Id: I0f175a1ba3d97f5c7420597bdeebc7a353551194
2011-06-29 11:32:17 +02:00
Anirudh Dewani
12c15c512b
am bc4ea2d9: am fea911d5: Network detection sample using TelephonyManager
...
* commit 'bc4ea2d9326f24097b0fdd8ca7090688c0f6743b':
Network detection sample using TelephonyManager
2011-06-29 02:18:53 -07:00
Anirudh Dewani
bc4ea2d932
am fea911d5: Network detection sample using TelephonyManager
...
* commit 'fea911d5359f1eb42ff8b9c70cd6f51500f539d4':
Network detection sample using TelephonyManager
2011-06-29 02:16:23 -07:00
Dianne Hackborn
d9344bb5fd
Merge "Add API demo for LocalBroadcastManager."
2011-06-28 14:42:35 -07:00
Jeff Brown
0459e026ac
Merge "Add a sample for handling hover events."
2011-06-28 14:36:15 -07:00
Jeff Brown
402adc44c2
Add a sample for handling hover events.
...
Change-Id: I9e19e09d3f5b8d0fd03f52cc8d88e6a12399d12f
2011-06-28 14:28:57 -07:00
Debashish Chatterjee
6b47b8888c
Merge "Copied recent VoicemailContract changes from framework/base/core to VoicemailProviderDemo."
2011-06-28 10:48:51 -07:00
Debashish Chatterjee
8e385c5809
Copied recent VoicemailContract changes from framework/base/core to VoicemailProviderDemo.
...
Change-Id: I506d5ef224494bdfe074aa0065327c2fba205373
2011-06-28 17:40:55 +01:00
Narayan Kamath
0de2b685b2
Merge "Add sample TTS engine"
2011-06-28 08:58:06 -07:00
David Turner
044c984966
am 868d4286: am 4e9130a6: am bcb0c197: Merge "emulator opengl: fixed wrong delete"
...
* commit '868d42866648d023c5331e4d74aa6c7e130ea7ee':
emulator opengl: fixed wrong delete
2011-06-28 05:12:12 -07:00