David Turner
3b2f4ee1a8
am f90611b8: am 9448b1c2: am 8c141dd2: Merge "EglChooseConfig should handle the case where "configs" is NULL."
...
* commit 'f90611b8400d03c0d2ed5a29ab741cbcab18fad6':
EglChooseConfig should handle the case where "configs" is NULL.
2011-06-08 14:47:32 -07:00
David Turner
dc4a727fb9
am cb802ae3: am 6d70e8c3: am bf483268: Merge "Emulators\'s GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_C
...
* commit 'cb802ae3d9ece422dca25e98e153a65b172e3192':
Emulators's GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into GLcommon folder.
2011-06-08 14:47:22 -07:00
Brett Chabot
0e5c937ff7
Merge "Fix runtest build step."
2011-06-08 13:56:42 -07:00
Brett Chabot
546a3285ce
Fix runtest build step.
...
Update make syntax to new 'mmm' logic.
Bug 4556556
Change-Id: Ie1fd5f6714ee7ef731b063751e0ddd674bc31021
2011-06-07 19:21:11 -07:00
Xavier Ducrohet
f3fdaca576
am 733342c7: am 76fb8500: am 80f84422: Add v13 to the compatibility package.
...
* commit '733342c71260e8ae4d158848eb4629f550761350':
Add v13 to the compatibility package.
2011-06-07 17:53:59 -07:00
David 'Digit' Turner
5ac5b707bb
am b257bb8a: am e9c7386b: am e011bed4: Merge "ndk: x86: Sanitize platform headers and libraries."
...
* commit 'b257bb8ab4a18e6683aec64389305e179f6eb86b':
ndk: x86: Sanitize platform headers and libraries.
2011-06-07 17:16:35 -07:00
Brett Chabot
97748e0099
Merge "Make runtest reboot and root more robust."
2011-06-07 15:13:20 -07:00
David Turner
f90611b840
am 9448b1c2: am 8c141dd2: Merge "EglChooseConfig should handle the case where "configs" is NULL."
...
* commit '9448b1c2822eaf7a55ceaa3feefa88941d8b47d9':
EglChooseConfig should handle the case where "configs" is NULL.
2011-06-07 13:22:13 -07:00
David Turner
cb802ae3d9
am 6d70e8c3: am bf483268: Merge "Emulators\'s GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into
...
* commit '6d70e8c39ec00488ce8acb94d39a77072d9ef465':
Emulators's GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into GLcommon folder.
2011-06-07 13:21:44 -07:00
Dianne Hackborn
518936d32b
am b36c8d68: am 0a9365f8: am 7ffb7d4b: Update pager demos to match new v4 ViewPager API.
...
* commit 'b36c8d68a33d12086bf74ccaa826e8dae67ce673':
Update pager demos to match new v4 ViewPager API.
2011-06-07 11:13:47 -07:00
Xavier Ducrohet
733342c712
am 76fb8500: am 80f84422: Add v13 to the compatibility package.
...
* commit '76fb8500d32e0d9a64b2d00522237d6d8f7a71e9':
Add v13 to the compatibility package.
2011-06-07 10:58:00 -07:00
Xavier Ducrohet
76fb8500d3
am 80f84422: Add v13 to the compatibility package.
...
* commit '80f844229137cb0d78689ea61aea37da4c770c8c':
Add v13 to the compatibility package.
2011-06-07 10:48:13 -07:00
Brett Chabot
cdfaae1a34
Make runtest reboot and root more robust.
...
Add a couple sleep statements to allow time for device to go offline.
Change-Id: I3a5fffc948f6c7b67bcdec4526990a6becd2d02f
2011-06-07 10:16:02 -07:00
Brett Chabot
8207c8935b
Merge "Remove runtest hard dependency on test_defs.xml files."
2011-06-07 10:08:09 -07:00
Brett Chabot
3c9cefc70f
Remove runtest hard dependency on test_defs.xml files.
...
Previously runtest would fail hard if development/test_runner/test_defs.xml
file was not present, even if it wasn't needed (ie running in --path mode).
This commit skips test_defs parsing if --path is specified, and only parses
development/test_runner/test_defs.xml if its present.
Bug 4556556
Change-Id: Ief2dbbdab5c7e82e5db64414392d6e2a564e815d
2011-06-07 08:27:36 -07:00
Xavier Ducrohet
80f8442291
Add v13 to the compatibility package.
...
Also remove ApiDemos from the package and instead
add each library-specific sample app to each v##
folder.
Change-Id: I2932bbb91c7122c122973902d1fcd159ca899381
2011-06-06 19:21:45 -07:00
David 'Digit' Turner
b257bb8ab4
am e9c7386b: am e011bed4: Merge "ndk: x86: Sanitize platform headers and libraries."
...
* commit 'e9c7386b0506f7c2f0bc258e3a899fcbe64adc3e':
ndk: x86: Sanitize platform headers and libraries.
2011-06-06 17:30:49 -07:00
Dianne Hackborn
b36c8d68a3
am 0a9365f8: am 7ffb7d4b: Update pager demos to match new v4 ViewPager API.
...
* commit '0a9365f82530e63334e023b605f71968b48ce91c':
Update pager demos to match new v4 ViewPager API.
2011-06-06 15:18:59 -07:00
Dianne Hackborn
0a9365f825
am 7ffb7d4b: Update pager demos to match new v4 ViewPager API.
...
* commit '7ffb7d4b2face7d2ce5cee82c92ec36fd0ba2932':
Update pager demos to match new v4 ViewPager API.
2011-06-06 15:12:15 -07:00
Dianne Hackborn
7ffb7d4b2f
Update pager demos to match new v4 ViewPager API.
...
Change-Id: I3b0f3382d56b477868b5a5fbf5af22fa83c3e06a
2011-06-06 15:01:45 -07:00
Dianne Hackborn
7a16938f3a
am b6991d5c: am a6cadd62: am 47f569e4: Lost and found.
...
* commit 'b6991d5cf17506af0cea039aad4e0ee1ab379449':
Lost and found.
2011-06-03 17:34:52 -07:00
Andy Stadler
840f368951
am 14eda725: (-s ours) am dfb979cd: am 7e408e8b: Merge "DO NOT MERGE Replacement sample code for DevicePolicyManager api." into honeycomb-mr2
...
* commit '14eda7256c58e435e9bfad2f0d45e1f6bd715d68':
DO NOT MERGE Replacement sample code for DevicePolicyManager api.
2011-06-03 16:35:16 -07:00
Dianne Hackborn
f32273ce7d
am 6faeacbb: am 068fa0c3: am 72d2e5c1: New demos for the v13 support library.
...
* commit '6faeacbbc561161a84a26e951f896880baa91ce5':
New demos for the v13 support library.
2011-06-03 16:21:41 -07:00
Dianne Hackborn
b6991d5cf1
am a6cadd62: am 47f569e4: Lost and found.
...
* commit 'a6cadd6244b4c0045ccb571881af982267b4ee9c':
Lost and found.
2011-06-03 13:33:06 -07:00
Dianne Hackborn
a6cadd6244
am 47f569e4: Lost and found.
...
* commit '47f569e460adaef04b75174706b7c95471567ca8':
Lost and found.
2011-06-03 13:17:32 -07:00
Dianne Hackborn
df92d5c5f6
Fix build.
...
Change-Id: If9c9289f63f98a8108452020fa28aa16b1d4a78e
2011-06-03 13:09:42 -07:00
Dianne Hackborn
47f569e460
Lost and found.
...
Change-Id: I3aa4824e2c2157be715d93b698963c54dd98e099
2011-06-03 12:31:09 -07:00
Dianne Hackborn
d190f3b9d0
resolved conflicts for merge of faf6dcd6 to master
...
Change-Id: I637e2982daefb7c4800ed31bc4cadbfb16cc2c81
2011-06-03 11:05:47 -07:00
Andy Stadler
14eda7256c
am dfb979cd: am 7e408e8b: Merge "DO NOT MERGE Replacement sample code for DevicePolicyManager api." into honeycomb-mr2
...
* commit 'dfb979cd631ef552b627a94a6e88eec6a2db655a':
DO NOT MERGE Replacement sample code for DevicePolicyManager api.
2011-06-03 10:33:09 -07:00
Andy Stadler
dfb979cd63
am 7e408e8b: Merge "DO NOT MERGE Replacement sample code for DevicePolicyManager api." into honeycomb-mr2
...
* commit '7e408e8be4cd546206b45c51fa41cc09939dbe33':
DO NOT MERGE Replacement sample code for DevicePolicyManager api.
2011-06-03 10:28:42 -07:00
Andy Stadler
7e408e8be4
Merge "DO NOT MERGE Replacement sample code for DevicePolicyManager api." into honeycomb-mr2
2011-06-03 10:24:20 -07:00
Dianne Hackborn
6faeacbbc5
am 068fa0c3: am 72d2e5c1: New demos for the v13 support library.
...
* commit '068fa0c33bf92ca63a07a93f09e98324c9443709':
New demos for the v13 support library.
2011-06-02 19:49:40 -07:00
Dianne Hackborn
068fa0c33b
am 72d2e5c1: New demos for the v13 support library.
...
* commit '72d2e5c1b9bbd96a38035781790ca14dd59b15b8':
New demos for the v13 support library.
2011-06-02 19:48:21 -07:00
Dianne Hackborn
72d2e5c1b9
New demos for the v13 support library.
...
Change-Id: I79a727f987d3b21274e1f9ee6359caa2231c258b
2011-06-02 19:44:57 -07:00
David 'Digit' Turner
6a517b0612
am 91641c03: am c1b7604a: am 18fc9b3e: Merge "ndk: Update libc.a to Gingerbread version."
...
* commit '91641c03b03d7c2a4e187fcb22615799314a8439':
ndk: Update libc.a to Gingerbread version.
2011-06-02 18:52:26 -07:00
Andy Stadler
547494ef8a
DO NOT MERGE Replacement sample code for DevicePolicyManager api.
...
* UI is organized into multiple screens to make it easier to understand
* More feedback about local vs global (aggregate) policies
* Uses preference fragments for modern appearance
Backport of: I075161d389942786e6c95483becbff7ebe847078
Change-Id: Ie88c1577b2ebae124615cc4b45968851cf11187e
2011-06-02 16:39:17 -07:00
Andy Stadler
98ff2036ec
Add support lib src for Launcher2
...
Change-Id: Ie1b5036cfacab233d78e65447490b1fed9a8c4fd
2011-06-01 12:01:18 -07:00
Andy Stadler
5c70b4559d
Merge "Replacement sample code for DevicePolicyManager api."
2011-05-31 16:06:56 -07:00
David Turner
9448b1c282
am 8c141dd2: Merge "EglChooseConfig should handle the case where "configs" is NULL."
...
* commit '8c141dd2c012733feb7fedce6e96a2c3f13c5c6c':
EglChooseConfig should handle the case where "configs" is NULL.
2011-05-31 14:32:05 -07:00
David Turner
8c141dd2c0
Merge "EglChooseConfig should handle the case where "configs" is NULL."
2011-05-31 13:58:18 -07:00
Stephen Hines
0ed4da6881
Merge "Simplify HelloCompute example. :)"
2011-05-31 13:00:55 -07:00
Dianne Hackborn
faf6dcd6cd
am 94703eef: am 10c33528: Extract support lib samples out of ApiDemos and in to their own app.
...
* commit '94703eef4ce1a5dcfd8ed1a001a41374ec51f94a':
Extract support lib samples out of ApiDemos and in to their own app.
2011-05-31 10:54:18 -07:00
Dianne Hackborn
94703eef4c
am 10c33528: Extract support lib samples out of ApiDemos and in to their own app.
...
* commit '10c33528e033643099783a5bc4eedb4b8a1e9a0e':
Extract support lib samples out of ApiDemos and in to their own app.
2011-05-31 10:51:48 -07:00
Andy Stadler
0879ed418d
Replacement sample code for DevicePolicyManager api.
...
* UI is organized into multiple screens to make it easier to understand
* More feedback about local vs global (aggregate) policies
* Uses preference fragments for modern appearance
Change-Id: I075161d389942786e6c95483becbff7ebe847078
2011-05-31 10:14:27 -07:00
David Turner
6d70e8c39e
am bf483268: Merge "Emulators\'s GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into GLcommon fold
...
* commit 'bf483268fc2651ea926217851ceea0329e0bb476':
Emulators's GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into GLcommon folder.
2011-05-31 08:03:53 -07:00
Yochai Shefi Simchon
aac7fe282c
EglChooseConfig should handle the case where "configs" is NULL.
...
Change-Id: I236afdfc73eb5dd5a3ab19e2b388772ea297bdb4
2011-05-31 14:13:26 +03:00
David Turner
bf483268fc
Merge "Emulators's GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into GLcommon folder."
2011-05-30 08:18:32 -07:00
Amit Feller
624176d51a
Emulators's GLES 2.0 translator implementation
...
This is the GLESv2 on top of openGL implementation on the host
most of this change is moving code which is necessary by both
GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into
GLcommon folder.
GLESv2Imp - includes GLES 2.0 entry points implementation
Change-Id: I934fb963478a7f596d824612f847a5aa77d2ed9d
2011-05-30 11:06:24 +03:00
David 'Digit' Turner
91641c03b0
am c1b7604a: am 18fc9b3e: Merge "ndk: Update libc.a to Gingerbread version."
...
* commit 'c1b7604a096ca32513b04c322fce1a0c550de099':
ndk: Update libc.a to Gingerbread version.
2011-05-29 08:59:31 -07:00
Dianne Hackborn
10c33528e0
Extract support lib samples out of ApiDemos and in to their own app.
...
Change-Id: I2ca344e5f1b44c4825de938c9a4f9375a523ede5
2011-05-27 18:40:15 -07:00