David Turner
b995f447cf
am 9872711d: am 338504e1: am a569aede: am aa77b777: Merge "emulator opengl: some system egl fixes after a review."
...
* commit '9872711d3ee7ccf44b1dcfa2e0087cd5be2f91bd':
emulator opengl: some system egl fixes after a review.
2011-06-17 04:48:47 -07:00
David Turner
4fe3bee359
am b5afb43c: am 7c5ec4fa: am 3d411f51: am c39872ac: Merge "emulator opengl: moved gralloc buffer handle struct to be shared."
...
* commit 'b5afb43ccae21ba64595947d32ef23c091f7b1d5':
emulator opengl: moved gralloc buffer handle struct to be shared.
2011-06-17 04:48:40 -07:00
David Turner
9872711d3e
am 338504e1: am a569aede: am aa77b777: Merge "emulator opengl: some system egl fixes after a review."
...
* commit '338504e1e7965ed8bd2986c21b1aa3d2c641a535':
emulator opengl: some system egl fixes after a review.
2011-06-17 04:46:19 -07:00
David Turner
b5afb43cca
am 7c5ec4fa: am 3d411f51: am c39872ac: Merge "emulator opengl: moved gralloc buffer handle struct to be shared."
...
* commit '7c5ec4fa11ddd4a735baa379fd5ad3051e928d79':
emulator opengl: moved gralloc buffer handle struct to be shared.
2011-06-17 04:46:10 -07:00
David Turner
338504e1e7
am a569aede: am aa77b777: Merge "emulator opengl: some system egl fixes after a review."
...
* commit 'a569aedecf988b121055bc96957136e5517560dd':
emulator opengl: some system egl fixes after a review.
2011-06-17 04:43:22 -07:00
David Turner
7c5ec4fa11
am 3d411f51: am c39872ac: Merge "emulator opengl: moved gralloc buffer handle struct to be shared."
...
* commit '3d411f51d5993aadeba22cedebe88317a387dc3b':
emulator opengl: moved gralloc buffer handle struct to be shared.
2011-06-17 04:43:19 -07:00
David Turner
a569aedecf
am aa77b777: Merge "emulator opengl: some system egl fixes after a review."
...
* commit 'aa77b7776e6e86140f8112764d758dd426b71803':
emulator opengl: some system egl fixes after a review.
2011-06-17 04:40:20 -07:00
David Turner
3d411f51d5
am c39872ac: Merge "emulator opengl: moved gralloc buffer handle struct to be shared."
...
* commit 'c39872ac6bc57ed702ab2b111987f671844779b0':
emulator opengl: moved gralloc buffer handle struct to be shared.
2011-06-17 04:40:15 -07:00
David Turner
aa77b7776e
Merge "emulator opengl: some system egl fixes after a review."
2011-06-17 04:24:53 -07:00
David Turner
c39872ac6b
Merge "emulator opengl: moved gralloc buffer handle struct to be shared."
2011-06-17 04:24:42 -07:00
Dianne Hackborn
2a5f96547c
am 712e6c2d: am e5062a33: am 102041a8: SDK only: add documentation tags.
...
* commit '712e6c2d2ea1f83ea3e339e8e875d4b25edeca6c':
SDK only: add documentation tags.
2011-06-16 15:00:19 -07:00
Dianne Hackborn
712e6c2d2e
am e5062a33: am 102041a8: SDK only: add documentation tags.
...
* commit 'e5062a33a9714a1cd81efaef3924cac2687ee4f8':
SDK only: add documentation tags.
2011-06-16 14:57:28 -07:00
Dianne Hackborn
e5062a33a9
am 102041a8: SDK only: add documentation tags.
...
* commit '102041a8bc4ebca69c20f5d281a96a904c52d4c8':
SDK only: add documentation tags.
2011-06-16 14:52:21 -07:00
Dianne Hackborn
102041a8bc
SDK only: add documentation tags.
...
Also fix up the new support API demo documentation.
Change-Id: I7a6945ffafa6a93cd394d5ce5729d6f9dfc0a183
2011-06-16 14:38:03 -07:00
Adam Powell
d52f0e629d
am 1abb2db1: (-s ours) am 1de571fd: am b0b4bcfc: DO NOT MERGE. Only impacts SDK. Integrate from master.
...
* commit '1abb2db10c93266a415d76b859bff133ac95d52d':
DO NOT MERGE. Only impacts SDK. Integrate from master.
2011-06-16 12:42:46 -07:00
Xavier Ducrohet
7f57c82587
am 344560c9: am 35c419ca: am 47d88948: Update sdk files for the mr2 sdk.
...
* commit '344560c9d99c403027592f80d86d879fcedcc9e2':
Update sdk files for the mr2 sdk.
2011-06-16 09:30:32 -07:00
Debashish Chatterjee
98c465c7d8
Merge "Changed VoicemailProvider demo app to use new VoicemailContract api."
2011-06-16 02:21:10 -07:00
Adam Powell
1abb2db10c
am 1de571fd: am b0b4bcfc: DO NOT MERGE. Only impacts SDK. Integrate from master.
...
* commit '1de571fdd3e56aa1912458f610882ee0f9cf138b':
DO NOT MERGE. Only impacts SDK. Integrate from master.
2011-06-16 00:54:35 -07:00
Adam Powell
1de571fdd3
am b0b4bcfc: DO NOT MERGE. Only impacts SDK. Integrate from master.
...
* commit 'b0b4bcfc3148693f26736ca191171380577d04ce':
DO NOT MERGE. Only impacts SDK. Integrate from master.
2011-06-16 00:49:22 -07:00
Adam Powell
b0b4bcfc31
DO NOT MERGE. Only impacts SDK. Integrate from master.
...
Update for ViewPager changes
Change-Id: Ib7024ae0ba2759a8477f267438b7b3a35ae51d23
2011-06-16 00:42:18 -07:00
Ben Komalo
3e3eab70f2
Merge "API sample for using new disallow camera policy."
2011-06-15 23:11:06 -07:00
Adam Powell
73742f8b58
ViewPager API update
...
Change-Id: I3033caefc206c969f172b2dd0e76809a21c15652
2011-06-15 19:36:13 -07:00
Yu Shan Emily Lau
bcecdee723
Merge "Add the framerate catpure tool. The change introduce two new keywords - StartCaptureFramerate and EndCaptureFramerate. This will call the adb shell call service call SurfaceFlinger 1013 to get the actual fps. The system property - viewancestor.profile_rendering must be set to true before running this test."
2011-06-15 18:40:18 -07:00
Yu Shan Emily Lau
d099c144ed
Add the framerate catpure tool. The change
...
introduce two new keywords - StartCaptureFramerate and
EndCaptureFramerate. This will call the adb shell call
service call SurfaceFlinger 1013 to get the actual fps.
The system property - viewancestor.profile_rendering
must be set to true before running this test.
Change-Id: I0fd1940ac94c77fc2bbf3c8048d7d5d68571590e
2011-06-15 18:39:39 -07:00
Ben Komalo
63506eeafe
API sample for using new disallow camera policy.
...
Change-Id: Ic83b2079312860a3c4b9348ca28dc7d3c0a2b9e6
2011-06-15 18:01:22 -07:00
Adam Powell
847ace68c7
Merge "Update for ViewPager changes"
2011-06-15 17:51:38 -07:00
Adam Powell
691c832162
Update for ViewPager changes
...
Change-Id: I186fe998b05b37d178ed07633597692900c6d238
2011-06-15 17:31:27 -07:00
Xavier Ducrohet
344560c9d9
am 35c419ca: am 47d88948: Update sdk files for the mr2 sdk.
...
* commit '35c419caafc504a944aaef34c30ef901186cfcda':
Update sdk files for the mr2 sdk.
2011-06-15 15:51:28 -07:00
Xavier Ducrohet
35c419caaf
am 47d88948: Update sdk files for the mr2 sdk.
...
* commit '47d88948c97657d443fbef5dc1b67f4a1cd5bc12':
Update sdk files for the mr2 sdk.
2011-06-15 15:47:58 -07:00
Xavier Ducrohet
47d88948c9
Update sdk files for the mr2 sdk.
...
Change-Id: Ia40fc45be7be93fbe12103f057f50b99fe6e2797
2011-06-15 15:30:27 -07:00
Anirudh Dewani
2a92e94315
am 76f74ab9: am 03c343e1: am b79c8d05: Merge "Adding resizeMode to widget samples." into honeycomb-mr2
...
* commit '76f74ab940fd1d4eb7da9a41286bde5972715626':
Adding resizeMode to widget samples.
2011-06-15 14:00:08 -07:00
Anirudh Dewani
76f74ab940
am 03c343e1: am b79c8d05: Merge "Adding resizeMode to widget samples." into honeycomb-mr2
...
* commit '03c343e16cd23bfd90124302458d35e47ee62050':
Adding resizeMode to widget samples.
2011-06-15 13:44:06 -07:00
Anirudh Dewani
03c343e16c
am b79c8d05: Merge "Adding resizeMode to widget samples." into honeycomb-mr2
...
* commit 'b79c8d0583f84b185d0bd2a47d41a25aaee469b8':
Adding resizeMode to widget samples.
2011-06-15 12:29:47 -07:00
Anirudh Dewani
b79c8d0583
Merge "Adding resizeMode to widget samples." into honeycomb-mr2
2011-06-15 10:57:44 -07:00
Debashish Chatterjee
c635aaacff
Changed VoicemailProvider demo app to use new VoicemailContract api.
...
- Use new VoicemailContract instead of VoicemailProvider for API.
VoicemailContract will soon be submitted to framework/base. The local
copy will then be deleted.
- Got rid of some unused util/core classes.
Change-Id: Ic7ac76777023a8b94a5ddf2f90caf0bf48d1f60c
2011-06-15 17:09:49 +01:00
David Turner
3c31257c82
am 7b1f606b: am 1aa6b813: am 7284c53c: am e68305d9: Merge "Handle egl context"
...
* commit '7b1f606b8ca60f3b081a7ad7b9f7fe14716447c9':
Handle egl context
2011-06-14 15:22:07 -07:00
David Turner
55da7e7592
am 279fd012: am 65803c1f: am 3389c10a: am 96deb3b2: Merge "emulator opengl: Create and destroy Surfaces"
...
* commit '279fd012f2be94fefb2a90e01c845394e38154be':
emulator opengl: Create and destroy Surfaces
2011-06-14 15:22:00 -07:00
David Turner
7b1f606b8c
am 1aa6b813: am 7284c53c: am e68305d9: Merge "Handle egl context"
...
* commit '1aa6b813c267953c19d029c4864f31db58992f98':
Handle egl context
2011-06-14 13:23:52 -07:00
David Turner
279fd012f2
am 65803c1f: am 3389c10a: am 96deb3b2: Merge "emulator opengl: Create and destroy Surfaces"
...
* commit '65803c1fc73dfd52c93dd717b2cea17ac5c84dc9':
emulator opengl: Create and destroy Surfaces
2011-06-14 13:23:45 -07:00
David Turner
1aa6b813c2
am 7284c53c: am e68305d9: Merge "Handle egl context"
...
* commit '7284c53cfe1a4f21e487c4d312c4a5b685d82ffb':
Handle egl context
2011-06-14 12:59:34 -07:00
David Turner
65803c1fc7
am 3389c10a: am 96deb3b2: Merge "emulator opengl: Create and destroy Surfaces"
...
* commit '3389c10a1057038b213c85d5180f8199f956c0b8':
emulator opengl: Create and destroy Surfaces
2011-06-14 12:59:31 -07:00
David Turner
7284c53cfe
am e68305d9: Merge "Handle egl context"
...
* commit 'e68305d9c0ffdb5f99a1b9c62618825bb526e4c4':
Handle egl context
2011-06-14 12:40:01 -07:00
David Turner
3389c10a10
am 96deb3b2: Merge "emulator opengl: Create and destroy Surfaces"
...
* commit '96deb3b2c85508cc166097fea92b20326a3f94f9':
emulator opengl: Create and destroy Surfaces
2011-06-14 12:39:56 -07:00
David Turner
e68305d9c0
Merge "Handle egl context"
2011-06-14 12:12:09 -07:00
David Turner
96deb3b2c8
Merge "emulator opengl: Create and destroy Surfaces"
2011-06-14 12:10:42 -07:00
Dianne Hackborn
b6d84fde9f
resolved conflicts for merge of ce28e097 to master
...
Change-Id: Iced68c2dbae177b59aa6f3862868e68836be2afd
2011-06-13 17:21:25 -07:00
Dianne Hackborn
ce28e09784
am 67117872: am b181a0d1: Merge "New API demos showing use of tabs with fragments." into honeycomb-mr2
...
* commit '67117872570ae826923c496055d153df473f7740':
New API demos showing use of tabs with fragments.
2011-06-13 16:38:27 -07:00
Dianne Hackborn
6711787257
am b181a0d1: Merge "New API demos showing use of tabs with fragments." into honeycomb-mr2
...
* commit 'b181a0d1a8c880449ba58dc8d5798bc39cba2153':
New API demos showing use of tabs with fragments.
2011-06-13 16:36:31 -07:00
Dianne Hackborn
b181a0d1a8
Merge "New API demos showing use of tabs with fragments." into honeycomb-mr2
2011-06-13 16:33:26 -07:00
Dianne Hackborn
be6b6b494f
New API demos showing use of tabs with fragments.
...
Also various cleanup in other demos.
Change-Id: I4f5669117e28312bcd4b28795c5eca5f4ab6dcfb
2011-06-13 16:27:17 -07:00