Commit Graph

8362 Commits

Author SHA1 Message Date
The Android Automerger
a3e8aa9da3 merge in ics-mr1-release history after reset to ics-mr1 2011-11-22 11:55:33 -08:00
Jesse Hall
af4f66be50 EmuGL: implement OES_EGL_image_external for GLESv1
GLESv2 support will come in a followup change but will take advantage
of the GLClientState changes.

Change-Id: Ib6cbb4dafbd071e3b59b1e5d808b3e23656ada92
2011-11-21 13:47:49 -08:00
Jesse Hall
f37a7ed6c5 GLES translator: don't delete EGLImage textures
When remapping a GLES texture to a different GL texture in
glEGLImageTargetTexture2DOES(), the GLES texture's previous GL texture was
deleted unconditionally. This is bad when it came from an EGLImage and is
therefore owned by (and will continue to be used by) some other object.

The code now skips deleting the old GL texture if it came from an EGLImage.
This mirrors the logic in glDeleteTextures().

Change-Id: I5b650334a7019d824517c2915b1f23961fbbd809
2011-11-21 13:14:19 -08:00
Jesse Hall
faaf1553cf EmuGL: set texture info from EGLImage
The EGL->GL translator implementation of glEGLImageTargetTexture2DOES was
properly replacing uses of the target texture object with the texture object
associated with the EGLImage in the host GL library, but wasn't updating its
own info about the texture (dimensions, etc.). This broke places where the
translator relied on knowing this, e.g. when implementing the GLES glDrawTexi
call on top of GL glDrawArrays.

Change-Id: Ia4aefd89852a2609221c56da76bfac927464c0b2
2011-11-18 14:11:49 -08:00
Svetoslav Ganov
cd2db139ae Add the support libraries to the platform documentation (demos).
Updated the support demos due to renamed support classes.

bug:5629339

Change-Id: Ia94cd60ea2b89ad74003baaa8eb8e84d21822374
2011-11-17 15:15:24 -08:00
Fred Chung
b47c44c210 am 512ea9b6: DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b
* commit '512ea9b6f8cc75ec74a7ab8d1c38dec201667f1e':
  DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b
2011-11-17 14:49:25 -08:00
The Android Automerger
b911dde9d4 merge in ics-mr1-release history after reset to ics-mr1 2011-11-17 06:45:52 -08:00
Fred Chung
512ea9b6f8 DO NOT MERGE: SDK sample code for Bluetooth HDP API.
Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b

Change-Id: I1d5e37fc24d82f8f9f846c82b93f68dcc58d95cc
2011-11-16 15:26:28 -08:00
James Dong
f8781452d9 Update the media_profiles.xml file to include maximum memory usage support for video editor
Change-Id: I26eacaaca76b72fc5a43ee8fabacf62060418edd
related-to-bug: 5625690
2011-11-16 14:37:49 -08:00
Fred Chung
053c46485b Merge "SDK sample code for Bluetooth HDP API." into ics-mr1 2011-11-16 09:31:44 -08:00
The Android Automerger
0c5793c94d merge in ics-mr1-release history after reset to ics-mr1 2011-11-16 06:45:39 -08:00
Mathias Agopian
fb30566416 Merge "should fix sdk build" into ics-mr1 2011-11-15 21:11:21 -08:00
Mathias Agopian
9c14396791 should fix sdk build
Change-Id: I5b403056f5245eae9a6476d9d573a3b1c25ea0c6
2011-11-15 21:09:15 -08:00
Svetoslav Ganov
41867b639f Merge "Fix the support-v4 demos to work on a platform with APIs V4 (samples part)" into ics-mr1 2011-11-15 14:34:53 -08:00
Svetoslav Ganov
a09e21a223 Fix the support-v4 demos to work on a platform with APIs V4 (samples part)
Some of the samples are using APIs that are introduced after v4 but not supported
in the v4 library.  Update the samples to use the new stuff added to the support
library.

bug:5616340

Change-Id: I90889f5e9ee48e7e30249464e60d5d28cd3f7a4b
2011-11-15 11:38:45 -08:00
The Android Automerger
cfb2cc2120 merge in ics-mr1-release history after reset to ics-mr1 2011-11-15 06:45:30 -08:00
Fred Chung
14c26228cd SDK sample code for Bluetooth HDP API.
Change-Id: I0f68ba42309c960f0df1e537b0932c6d68d9657b
2011-11-14 21:36:25 -08:00
Dianne Hackborn
2fd75c6368 Move switch preference into its own demo.
This avoids everything breaking on pre-ICS platforms.

Also get rid of pref initialization in Application. I hate that.  Hate
hate hate.  Hate.  Totally hate.

Totally.

Change-Id: Idb3526a96eb2dff49f9de8e5ae71149cb4ed6e96
2011-11-14 14:28:42 -08:00
Yu Shan Emily Lau
d673b70dfd am 6b415b7d: (-s ours) Merge "do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch" into ics-mr0
* commit '6b415b7d0530151ffa3221594102a6752a539692':
  do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch
2011-11-09 16:41:13 +00:00
The Android Automerger
36ad3914cd merge in ics-mr1-release history after reset to ics-mr1 2011-11-09 06:45:58 -08:00
Yu Shan Emily Lau
6b415b7d05 Merge "do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch" into ics-mr0 2011-11-08 16:03:19 -08:00
Yu Shan Emily Lau
1baa142c06 do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch
Change-Id: Ia54463c93a7f941d7de3cc003ce773749d1f016e
2011-11-08 15:35:28 -08:00
David Hu
9bc092f5b1 Change the test to user the listener mechanism
this is to avoid the precision issue with the coordinates

DO NOT MERGE

Change-Id: Icfab3fa6fd0a331aef12ee71c73bac04dc9685be
2011-11-08 14:43:36 -08:00
The Android Automerger
85ae4c5a46 merge in ics-mr1-release history after reset to ics-mr1 2011-11-08 06:45:15 -08:00
Ken Wakasa
c7160d8dcb am c3b08379: Fix wrong paths to class references
* commit 'c3b0837982378fc1277295fb2322e33f6414a0b9':
  Fix wrong paths to class references
2011-11-07 16:44:19 +00:00
Ken Wakasa
c3b0837982 Fix wrong paths to class references
Change-Id: I778be2217165185fbb8eef08b8a232ea7ba986f0
2011-11-07 20:00:25 +09:00
The Android Automerger
6c6e78d4a2 merge in ics-mr1-release history after reset to ics-mr1 2011-11-06 06:45:31 -08:00
Yu Shan Emily Lau
887527429d do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch
Change-Id: I21f83b96afc5c3a00a6570e8284adc23191b6dd2
2011-11-05 17:09:57 -07:00
Raphael
d960df40f2 cherrypick 76bd108d from master. do not merge.
Change-Id: Ibb677f286b54a9dd593301a0f8b194d3b2dc58d1
SDK: update SDK to API 15
2011-11-03 15:42:39 -07:00
Robert Ly
cc1eef4935 am 8e3c1951: Merge "adding fountain framebuffer object sdk sample" into ics-mr0
* commit '8e3c1951915010985db2abee212e8c4c37cacc53':
  adding fountain framebuffer object sdk sample
2011-11-03 19:56:00 +00:00
Robert Ly
8e3c195191 Merge "adding fountain framebuffer object sdk sample" into ics-mr0 2011-11-03 12:54:02 -07:00
Robert Ly
a3a8cfd25b adding fountain framebuffer object sdk sample
Change-Id: I0156281baf450b4aafcd1d43bf5fd9ef8d4cb6cc
2011-11-02 15:30:37 -07:00
The Android Automerger
7da5f25160 merge in ics-mr1-release history after reset to ics-mr1 2011-11-02 06:45:30 -07:00
Eric Fischer
92a00bb671 Import revised translations.
Change-Id: I7220d09a75e5372acdab213888ecd53665004c71
2011-11-01 13:19:12 -07:00
The Android Automerger
0e91ad7563 merge in ics-mr1-release history after reset to ics-mr1 2011-11-01 06:45:26 -07:00
Svetoslav Ganov
c90e0d5936 am bc43ef45: Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0
* commit 'bc43ef4554c457c499af9e5f998f6f79a484f4a3':
  Folding Accessibility Service sample into ApiDemos.
2011-10-31 20:30:29 +00:00
Svetoslav Ganov
bc43ef4554 Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0 2011-10-31 13:28:53 -07:00
The Android Automerger
a3fc6df0db merge in ics-mr1-release history after reset to ics-mr1 2011-10-30 06:45:57 -07:00
Jack Palevich
48a1cf10af am e864636c: Remove Graphics > OpenGL ES > Hidden Activity from Api Demos
* commit 'e864636c554efa18f83ad9fa405058b51d531998':
  Remove Graphics > OpenGL ES > Hidden Activity from Api Demos
2011-10-29 03:15:18 +00:00
Svetoslav Ganov
101f061d35 Folding Accessibility Service sample into ApiDemos.
1. Moving Accerssibility Service sample into ApiDemos since
   we are putting all accessibility samples there.

2. Fixed regressions (mainly due to adding new event types)
   in the Accessibility Service sample.

3. Updated the Query Window Content sample to have some
   instructions and to work with touch exploration.

Change-Id: I226ac4130f7f8cae47bb52cbdeab9f104cfaba40
2011-10-28 19:18:24 -07:00
Jack Palevich
e864636c55 Remove Graphics > OpenGL ES > Hidden Activity from Api Demos
This activity was accidentally added to the Api Demos manifest
in an earlier checkin.

Because the corresponding Java classes were never checked in,
the activity never actually worked.

Change-Id: I7a7c8c90e8e6b9689f87720fc7f4d53556c2f227
2011-10-28 15:45:43 -07:00
Xavier Ducrohet
4001fcd436 am ded0dc05: Updated source.prop file for updated ICS SDK.
* commit 'ded0dc055f64492894445b76fdce060ae9b98b90':
  Updated source.prop file for updated ICS SDK.
2011-10-28 19:03:55 +00:00
Xavier Ducrohet
ded0dc055f Updated source.prop file for updated ICS SDK.
Change-Id: I935e8eb29ae52c56e4f897c69c808010b701e195
2011-10-28 11:27:07 -07:00
Alexander Lucas
1e94a78a1e am 96c0210e: Adding ICS Accessibility Features to ApiDemos app.
* commit '96c0210eb57e60f03c23a8e504782a8ba4b9edfe':
  Adding ICS Accessibility Features to ApiDemos app.
2011-10-28 17:26:20 +00:00
Alexander Lucas
96c0210eb5 Adding ICS Accessibility Features to ApiDemos app.
Change-Id: I37485821a77fed483308434e7b1d407642379d8c
2011-10-27 18:40:54 -07:00
Jack Palevich
060c9691a1 am 1163f69a: Fix activities that want to handle screen size and orientation changes themselves.
* commit '1163f69aac0e72ea3274c2516caa540accd418ca':
  Fix activities that want to handle screen size and orientation changes themselves.
2011-10-27 18:49:41 +00:00
Jack Palevich
1163f69aac Fix activities that want to handle screen size and orientation changes themselves.
In API level 13 the android:configChanges property was changed incompatably.

In API level 12 and below, an activity that wanted to handle screen size and orientation changes
could achieve that by specifying

    android:configChanges="orientation"

Starting with API level 13  the activity must specify

    android:configChanges="orientation|screenLayout|screenSize|smallestScreenSize"

This change updates all the activities in ApiDemos that want to handle screen size and orientation
changes themselves.

Fixes b/5522551 ApiDemos OpenGL ES rotation-without-restarting-Activity broken for API levels 13+

Change-Id: Ibc8b2b77eab9be279b56c026d76787d7185c62c9
2011-10-27 05:45:45 -07:00
The Android Automerger
1a0bc43075 merge in ics-mr1-release history after reset to ics-mr1 2011-10-26 07:05:23 -07:00
Ed Heyl
f35154588b Merge remote branch 'goog/ics-mr0' into ics-mr1 2011-10-26 12:46:30 +00:00
Svetoslav Ganov
e824e69087 Adding a code sample for how to write a custom action provider.
NOTE: This change does *not* affect the system image rather only the SDK.

bug:5499856

Change-Id: I589ed412b72e94b21dbe1f069006c7c527a06c71
2011-10-25 20:35:52 +00:00