Commit Graph

6224 Commits

Author SHA1 Message Date
Dianne Hackborn
73b4fea09c am 8486cba6: (-s ours) am d9012d1b: DO NOT MERGE. Integrate API demo work from master.
* commit '8486cba691e103ee73ce32861342bc8e0c00f646':
  DO NOT MERGE.  Integrate API demo work from master.
2011-05-13 15:47:53 -07:00
Dianne Hackborn
8486cba691 am d9012d1b: DO NOT MERGE. Integrate API demo work from master.
* commit 'd9012d1bfa132969fb8fed737e2f9f19eefbc0b5':
  DO NOT MERGE.  Integrate API demo work from master.
2011-05-13 15:45:34 -07:00
Dianne Hackborn
d9012d1bfa DO NOT MERGE. Integrate API demo work from master.
New API demo for the support library FragmentPager class.

Add API demo for new -wNNNdp and -hNNNdp configs.

Add new API demo for implementing a custom loader.

Also turn the fragment cursor list demo into a loader cursor demo.
2011-05-13 13:31:52 -07:00
Dianne Hackborn
b6054b4888 More improvements to pager.
Also another size step for the resource screen size sample.

Change-Id: I9e8b63d2fc9a0ceab7b003f7bd75218b78311ed6
2011-05-13 12:15:54 -07:00
Steve Block
d02fa8b7b9 Merge "Fix WebCore include paths due to merge to WebKit r75315" 2011-05-13 06:45:07 -07:00
Steve Block
6557199f1f Fix WebCore include paths due to merge to WebKit r75315
The WebCore directory has moved inside a new Source directory.

Change-Id: Idce70451e1526a5c92d4b3abcc5bd2dbf3fca903
2011-05-13 11:47:39 +01:00
Jean-Baptiste Queru
4a8ac3deda am 39e63e52: Merge 6a79f798
* commit '39e63e526a196f4d22e37a1ec11079fa4672a071':
  test_defs: new CTS security test.
2011-05-12 17:31:48 -07:00
Jean-Baptiste Queru
39e63e526a Merge 6a79f798
Change-Id: I1bb91242b2fb7651ba0505c416d7559d50259472
2011-05-12 16:28:47 -07:00
Jean-Baptiste Queru
6a79f79832 am 3ef19fa9: Merge "test_defs: new CTS security test." into gingerbread
* commit '3ef19fa91771be93f398af577a4432bb0fd571aa':
  test_defs: new CTS security test.
2011-05-12 16:20:21 -07:00
Jean-Baptiste Queru
3ef19fa917 Merge "test_defs: new CTS security test." into gingerbread 2011-05-12 15:56:22 -07:00
David 'Digit' Turner
f3d15e4ff7 am 265327f0: am d1ac6bdc: Merge "emulator: opengl: ut_renderer usability improvements"
* commit '265327f06c60aeed17e600db12ad40367c50ae72':
  emulator: opengl: ut_renderer usability improvements
2011-05-11 13:11:51 -07:00
David 'Digit' Turner
265327f06c am d1ac6bdc: Merge "emulator: opengl: ut_renderer usability improvements"
* commit 'd1ac6bdc3b3b4c2fe788d8b8f7886ac625cb1559':
  emulator: opengl: ut_renderer usability improvements
2011-05-10 17:19:04 -07:00
Alex Sakhartchouk
7efa2db5a1 Merge "Some refactoring of the code." 2011-05-10 10:03:06 -07:00
David 'Digit' Turner
d1ac6bdc3b Merge "emulator: opengl: ut_renderer usability improvements" 2011-05-09 02:45:28 -07:00
David 'Digit' Turner
91f40d930e emulator: opengl: ut_renderer usability improvements
This patch provides two useful changes to the ut_renderer
unit-test program:

1/ the ability to control the GL window dimensions with
   two env. variables: ANDROID_WINDOW_WIDTH and ANDROID_WINDOW_HEIGHT

2/ the ability to save/restore the GL window position between
   GL connections.

Both are useful to use ut_renderer in a demo setting, nothing more.

Change-Id: I19a8f911ee821ddc4eb6307de12d63600ff696b0
2011-05-05 22:42:31 +02:00
Brian Carlstrom
ac8836da56 Move jdwpspy into C++ now that jdwp itself is in C++.
git cherry-pick --no-commit  73cfba122a4ae1c6162fe1c5112e77d8c8430dd9

Change-Id: Id0c6188ece19f6eade18ba8725384d94465aa197
2011-05-05 00:19:46 -07:00
Alex Sakhartchouk
13ec73c22c Some refactoring of the code.
Change-Id: I7b2aa13621c9a2e7a952efafbb1aaf4d86461fed
2011-05-04 18:40:09 -07:00
Iliyan Malchev
d78fc7acbc android_native_buffer_t -> ANativeWindowBuffer
Change-Id: I246690d0ecd83b6da8dc0abeff68887abd92fc92
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-05-03 15:49:31 -07:00
John Evans
5bfda7e1c0 Merge "New version of SampleSyncAdapter sample code that allows local editing" 2011-05-03 15:40:03 -07:00
Mike Lockwood
5ec063c0c6 am 04b53db9: am cd392822: Add USB MissleLauncher sample program
* commit '04b53db9b44cbef91473bec7d7bab41931729b09':
  Add USB MissleLauncher sample program
2011-05-03 15:24:57 -07:00
Mike Lockwood
7e2b5698a0 am 95dfe367: am 3385faf4: Add AdbTest sample program
* commit '95dfe367255161e5927c8a6c077111eb013d7ec6':
  Add AdbTest sample program
2011-05-03 15:24:55 -07:00
Mike Lockwood
04b53db9b4 am cd392822: Add USB MissleLauncher sample program
* commit 'cd39282253ec8a27eae1d580fbaa91a8f3c7c5ff':
  Add USB MissleLauncher sample program
2011-05-03 15:22:17 -07:00
Mike Lockwood
95dfe36725 am 3385faf4: Add AdbTest sample program
* commit '3385faf4e60e1ac4f4cf387702ef3be211374ef2':
  Add AdbTest sample program
2011-05-03 15:22:14 -07:00
Stephen Hines
10fa05711b Merge "Fix RS graphics samples." 2011-05-03 15:11:33 -07:00
Mike Lockwood
cd39282253 Add USB MissleLauncher sample program
This is sample code that controls a USB missle launcher using USB host APIs

Change-Id: Ic4201faccc4562bf114c70d50b0cab6a00d28a98
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 17:56:51 -04:00
Mike Lockwood
3385faf4e6 Add AdbTest sample program
This sample implements the "adb logcat" command using USB host APIs.

Change-Id: Ifbf122e99358bd3a1cd2a7967c364ffd59f003b3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 17:55:19 -04:00
Nick Kralevich
26070d5afe test_defs: new CTS security test.
Change-Id: Ic400b823796d6f9ef140e8b24001434129e92da1
2011-05-03 14:31:02 -07:00
David Turner
372da9e106 am 11540e0a: am 835aef2c: Merge "emulator: opengl: Fix Mac and Windows builds."
* commit '11540e0aaf9bd88693902cd7aa3fa75e4c8bd614':
  emulator: opengl: Fix Mac and Windows builds.
2011-05-03 13:46:37 -07:00
David 'Digit' Turner
f1a0d538ed am 2076f0fd: am caa6ddbe: Merge "emulator: opengl: Add clean step."
* commit '2076f0fd16c486b18536491050060ff46261908a':
  emulator: opengl: Add clean step.
2011-05-03 13:46:21 -07:00
David 'Digit' Turner
92f7b61b6a am 937322d2: am 4ad320d8: Merge "adding error handling for Xerrors on EGl linux implementation (EglLinuxApi.cpp)"
* commit '937322d250474ee79a8e298656887004c5ed7813':
  adding error handling for Xerrors on EGl linux implementation (EglLinuxApi.cpp)
2011-05-03 13:46:06 -07:00
David 'Digit' Turner
d4d9176eed am 9ffa5d90: am d73fbc24: Merge "emulator: opengl: Use QEMU pipe."
* commit '9ffa5d9043ff64badaf3ad4d024c0dd020630202':
  emulator: opengl: Use QEMU pipe.
2011-05-03 13:45:43 -07:00
David Turner
6c919f7346 am ade2d9c4: am 02d918b0: Merge "common debug flag for the wrapper libraries"
* commit 'ade2d9c49e23fe1d161bc95e9c74d2701f5b6e91':
  common debug flag for the wrapper libraries
2011-05-03 13:45:12 -07:00
David Turner
208c321ed5 am cb06d634: am d82e3bed: Merge "emulator opengl: handle NULL pointers"
* commit 'cb06d63476ec87be63349db1f7e4453295b2ca3f':
  emulator opengl: handle NULL pointers
2011-05-03 13:45:05 -07:00
David Turner
50c5590e27 am 15223314: am d6ff1cc8: Merge "emugen: porperly handle nullAllowed API calls"
* commit '15223314375a8a0c945f916a4024abf59e80682b':
  emugen: porperly handle nullAllowed API calls
2011-05-03 13:44:55 -07:00
David Turner
132473e137 am 3c87fcdc: am cb8efdf0: Merge "emulator opengl: missing constant in glUtilsParamSize"
* commit '3c87fcdc42d76391591cfe428499a30da3a517c1':
  emulator opengl: missing constant in glUtilsParamSize
2011-05-03 13:44:52 -07:00
David Turner
ea083bd4bf am 7cc315de: am ecd4dd7b: Merge "emulator opengl - ensure server connection for rendering thread"
* commit '7cc315debd14e321d1e2c6b2e5294dc019d2cc3f':
  emulator opengl - ensure server connection for rendering thread
2011-05-03 13:44:46 -07:00
David Turner
f77b8f2350 am 24d217ce: am f549d0b3: Merge "emulator opengl : add Dungeon Defenders to the test apps list"
* commit '24d217ce70374fb698e05bb66897761bfb2fd320':
  emulator opengl : add Dungeon Defenders to the test apps list
2011-05-03 13:44:13 -07:00
David Turner
21f8dc1e5c am e43081d3: am 413e35ed: Merge changes I9226275f,If78e8431,I3e36796d,I90c157df
* commit 'e43081d3e7321c8d0892a809ea625ecf2cf36b0c':
  opengl emulator : GLESv2 handling in the test egl implementation
  emulator opengl : unit-test renderer  GLESv2
  emulator opengl: context version param
  emulator opengl - encode glShaderSource
2011-05-03 13:44:07 -07:00
David Turner
5dec7c0cc7 am d4427e57: am d10c9651: Merge "opengl emulator - handle shader string decoding"
* commit 'd4427e5758766b2f3f721b90a6d74a6167872959':
  opengl emulator - handle shader string decoding
2011-05-03 13:43:50 -07:00
David Turner
290e934051 am 2608ce9c: am 5b840fb3: Merge "emulator opengl - GLESv2 implementation"
* commit '2608ce9cc12fa4c7fc6380b85af7b45b680a1f16':
  emulator opengl - GLESv2 implementation
2011-05-03 13:43:44 -07:00
David Turner
f6d08a9371 am 975a39ba: am 26aad35e: Merge "emulator opengl: typo caused the decoder to crash"
* commit '975a39baa3d779a1972100c11fe7d9447b2feae8':
  emulator opengl: typo caused the decoder to crash
2011-05-03 13:43:39 -07:00
David Turner
d80b7d556c am 699650b5: am 4fc26310: Merge "Emulator Opengl unit test - use sperate implementation libraries"
* commit '699650b50b38b2c716731e0943ebee2e79b3d4ee':
  Emulator Opengl unit test - use sperate implementation libraries
2011-05-03 13:43:35 -07:00
David Turner
e62c67f6e9 am 43a4beea: am 1dac46ff: Merge "Emulator Opengl - adding preliminary version of GLESv2 encoder"
* commit '43a4beea240f848546b2bb7f59a789a1a07dfcb9':
  Emulator Opengl - adding preliminary version of GLESv2 encoder
2011-05-03 13:43:26 -07:00
David Turner
a6eebf5eaf am d043a681: am 3dadd581: Merge "emugen: make \'setContextAccessor\' method static"
* commit 'd043a68144572b7fa71dc59e15adeb1199613d32':
  emugen: make 'setContextAccessor' method static
2011-05-03 13:43:16 -07:00
David Turner
de9024201b am cf0dd28b: am a80adff3: Merge "emugen - fix wrapper context naming"
* commit 'cf0dd28b871cfc45d66f6814c561777c6a3ad7be':
  emugen - fix wrapper context naming
2011-05-03 13:43:11 -07:00
David Turner
70a14fd343 am 2bd2dcb3: am 13006a26: Merge "emugen: generate wrapper library files"
* commit '2bd2dcb3957a409de2c6d788e8c239dc80e8fd31':
  emugen: generate wrapper library files
2011-05-03 13:43:05 -07:00
David Turner
859aac3ad0 am 071f3aaa: am 351c4d55: Merge "emulator Opengl - slight type change for GLESv2"
* commit '071f3aaa15772ad41f0adaabd35ce6c102d2e7aa':
  emulator Opengl - slight type change for GLESv2
2011-05-03 13:42:58 -07:00
David Turner
4065fbfc56 am 153c35f3: am d8bbe0ce: Merge "emulator Opengl - number of supported vertex attributes"
* commit '153c35f3354e7283c2e2f4071b7788eb33132af2':
  emulator Opengl - number of supported vertex attributes
2011-05-03 13:42:52 -07:00
David Turner
9c79c3c17b am 003f8d12: am e72ec4bf: Merge "adding support for getting gles proc address from eglGetProcAdress"
* commit '003f8d1275e9c95d3f5646b8a2f9c13c3a6a3038':
  adding support for getting gles proc address from eglGetProcAdress
2011-05-03 13:42:45 -07:00
David Turner
80412bab31 am d1286137: am 8e2dc32b: Merge "Add GLESv2 functionality to GLESv1/GLESv2 shared code"
* commit 'd1286137f73a6547f6728f9d76752b59ad60c720':
  Add GLESv2 functionality to GLESv1/GLESv2 shared code
2011-05-03 13:42:38 -07:00