Commit Graph

8531 Commits

Author SHA1 Message Date
Raphael Moll
836d66e0ee am 2edb02ab: SDK: generate repo in xsd v6. DO NOT MERGE.
* commit '2edb02ab24e0ba19065cb4d2919892c6ac268921':
  SDK: generate repo in xsd v6. DO NOT MERGE.
2012-04-03 11:19:34 -07:00
Raphael Moll
2edb02ab24 SDK: generate repo in xsd v6. DO NOT MERGE.
Requires change Ib6f5b03c and change I6ba33a96.

Change-Id: Ib42676359289e731d045c4a1e26c85fe5868d633
2012-04-02 15:21:41 -07:00
Trevor Johns
aa49eb26a9 am 4947ffb9: Merge "Docs: Fixing broken link in TtsEngine/_index.html" into ics-mr1
* commit '4947ffb99b5fd271549c33ff9aa3d3f88a27b0d7':
  Docs: Fixing broken link in TtsEngine/_index.html
2012-04-02 14:52:23 -07:00
Trevor Johns
4947ffb99b Merge "Docs: Fixing broken link in TtsEngine/_index.html" into ics-mr1 2012-04-02 14:49:32 -07:00
Tony Chan
2366bc22e7 am 1a2ddb42: sdk doc change: Added KeyChain API Demo
* commit '1a2ddb4216d81f9feadfea3a94bc9923255fe49a':
  sdk doc change: Added KeyChain API Demo
2012-03-31 02:15:58 -07:00
Tony Chan
1a2ddb4216 sdk doc change: Added KeyChain API Demo
Change-Id: Ib2b751a9de485359705b243d2c70e5f8f2c8ab3c
2012-03-30 11:10:01 +08:00
Jesse Hall
2d8fd6b94d am 64cd8f35: EmuGL: use custom egl.cfg in Google APIs add-on
* commit '64cd8f35fb9cefdeaaded4025af011d1d4c9b90a':
  EmuGL: use custom egl.cfg in Google APIs add-on
2012-03-29 12:09:48 -07:00
Trevor Johns
697914d670 Docs: Fixing broken link in TtsEngine/_index.html
This change fixes a broken link in the index page for
development/samples/TtsEngine. RobotSpeakEngine needs to be renamed
to RobotSpeakTtsService.

Issue: 6032266
Change-Id: I2271ab43e866ff7d2f3b78cbe7d7035e1b4a794f
2012-03-28 19:43:33 -07:00
Jesse Hall
64cd8f35fb EmuGL: use custom egl.cfg in Google APIs add-on
Change-Id: I30468d668ce72cf3a4de1cace1f8e4f1610b9756
2012-03-26 15:07:00 -07:00
Raphael Moll
262a0f106f am 9c7b559f: SDK source pkg: exclude all /tools/ and /tests/ directories.
* commit '9c7b559fb730c57a522abb2956c0036edcd15e63':
  SDK source pkg: exclude all /tools/ and /tests/ directories.
2012-03-23 10:37:57 -07:00
Raphael Moll
9c7b559fb7 SDK source pkg: exclude all /tools/ and /tests/ directories.
Change-Id: Ia85105385280e21f073cef22e1130ad369bea121
2012-03-23 10:27:04 -07:00
Xavier Ducrohet
2e6a8d027c am 37bae214: Add flag indicating gpu support in emulator system image.
* commit '37bae214eed57ab4b9908fb07a6be3c0f8bf141b':
  Add flag indicating gpu support in emulator system image.
2012-03-21 16:48:28 -07:00
Xavier Ducrohet
37bae214ee Add flag indicating gpu support in emulator system image.
Change-Id: I21040f50f8e95b389c1e6db2de93654be6da6f7e
2012-03-21 16:44:12 -07:00
Xavier Ducrohet
a774a84d8c am a205c3ad: Merge "Add eclipse+readme files to prebuilt of v7-grid. do not merge." into ics-mr1
* commit 'a205c3ad2a8102d8ba681ad358cd3470bc237be6':
  Add eclipse+readme files to prebuilt of v7-grid. do not merge.
2012-03-16 09:42:48 -07:00
Xavier Ducrohet
a205c3ad2a Merge "Add eclipse+readme files to prebuilt of v7-grid. do not merge." into ics-mr1 2012-03-16 09:40:37 -07:00
Xavier Ducrohet
65b242b151 Add eclipse+readme files to prebuilt of v7-grid. do not merge.
Change-Id: Ife58a0f2abf8ee13c2973ff57b2aaedfd9d78d59
2012-03-16 09:39:57 -07:00
Robert Ly
f9398a3a77 am 6630bfd9: Merge "update searchable dictionary for Android U class" into ics-mr1
* commit '6630bfd9ac3df7ee11c3b8e9abd4c1ee2b58fc17':
  update searchable dictionary for Android U class
2012-03-14 15:43:10 -07:00
Robert Ly
6630bfd9ac Merge "update searchable dictionary for Android U class" into ics-mr1 2012-03-14 15:40:41 -07:00
Robert Ly
7d5b68ca79 update searchable dictionary for Android U class
Change-Id: Ib214400bae29ab2c4a34500dcf84b415ab13b77c
2012-03-13 15:23:35 -07:00
Raphael Moll
6f721123f0 am af574136: Support lib: use /samples directory. do not merge.
* commit 'af57413607d91e6fbd1f19ddc2292f7943e7db27':
  Support lib: use /samples directory. do not merge.
2012-03-12 12:29:47 -07:00
Raphael Moll
af57413607 Support lib: use /samples directory. do not merge.
This NPW now looks for a "samples" directory at the root of
extras SDK packages. This renames the samples so they fit that
new pattern.

Content of the extra is thus:
/v4/*.jar
/v4/src/..
/v13/*.jar
/v13/src/..
/samples/Support4Demos/
/samples/Support13Demos/

(Cherry-pick from 913d903aa2)

Change-Id: I4bb01d35ede7c7af45e80204c131361ffc4300ee
2012-03-12 12:27:02 -07:00
Megha Joshi
5989a5de5b am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1
* commit '27a6a0f0a5dc74886a7f0c42d6300a2cb92f6da2':
  Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well.
2012-03-08 12:22:34 -08:00
Megha Joshi
27a6a0f0a5 Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1 2012-03-08 12:20:00 -08:00
Xavier Ducrohet
9138af34a5 am 88d97250: Prepare for doc package update in rev 2. do not merge.
* commit '88d972501ae16197ebabb2f053a69856bca410d9':
  Prepare for doc package update in rev 2. do not merge.
2012-03-07 20:07:21 -08:00
Xavier Ducrohet
a2482e0933 am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge
* commit '92b3b05096e23b7ce2b4b841044d518a379ada5d':
  Add a prebuilt of the gridlayout support library. do not merge
2012-03-07 20:07:20 -08:00
Xavier Ducrohet
88d972501a Prepare for doc package update in rev 2. do not merge.
Change-Id: Ibd1e7b8cd25aed33f4f6abe86ed36ccf30d4c714
2012-03-07 17:52:21 -08:00
Xavier Ducrohet
92b3b05096 Add a prebuilt of the gridlayout support library. do not merge
Change-Id: Icd43238672a02f84e37d4301bec34dbe48375200
2012-03-07 17:47:12 -08:00
Megha Joshi
52b557155b Adding values-large-land and values-large-port folders.
This is so that I can replace xlarge with large in
training/multiscreen/screensizes.html for it to be compatible with TVs as well.

Change-Id: I7685f4c51dc01ac76c98318d3ee48c73402bf848
2012-03-07 16:04:24 -08:00
Jesse Hall
042bfa5ae0 am 9322c5cb: Work around a y-invert bug on Macs w/ Intel GPU
* commit '9322c5cb2524c4f35408768ee3d1b8030f0360f9':
  Work around a y-invert bug on Macs w/ Intel GPU
2012-03-07 11:17:23 -08:00
Jesse Hall
91dcc11323 am 767d0894: Delete dead code.
* commit '767d08948790527e9df951a752703938ff517d30':
  Delete dead code.
2012-03-07 11:17:21 -08:00
Jesse Hall
9322c5cb25 Work around a y-invert bug on Macs w/ Intel GPU
On Macs running OS X 10.6 and 10.7 with Intel HD Graphics 3000, some
screens or parts of the screen are displayed upside down. The exact
conditions/sequence that triggers this aren't known yet; I haven't
been able to reproduce it in a standalone test. This also means I
don't know whether it is a driver bug, or a bug in the OpenglRender or
Translator code that just happens to work elsewhere.

Thanks to zhiyuan.li@intel.com for a patch this change is based on.

Change-Id: I04823773818d3b587a6951be48e70b03804b33d0
2012-03-07 10:06:57 -08:00
Jesse Hall
767d089487 Delete dead code.
Change-Id: I5b87fac4e2140a903221a1f68b16fa6a96e5effc
2012-03-07 10:06:37 -08:00
Dirk Dougherty
e8a48080a7 am 9ba4ba70: Doc change: string changes for Google Play
* commit '9ba4ba709459ce07161fc683459ae4b4005ed791':
  Doc change: string changes for Google Play
2012-03-05 21:37:38 -08:00
Dirk Dougherty
9ba4ba7094 Doc change: string changes for Google Play
Change-Id: I39acdc4faae23a43d39c2e2976543a946bd656af
2012-03-04 20:54:23 -08:00
Jesse Hall
e7ecf44e75 am 7ef79e49: EmuGL: don\'t [de]queue buffers in eglMakeCurrent
* commit '7ef79e49c7e8f1ecf19a92114f41de39d102a3e8':
  EmuGL: don't [de]queue buffers in eglMakeCurrent
2012-02-27 13:56:11 -08:00
Jesse Hall
828b697bc5 am cbc7300c: EmuGL: enable SurfaceTexture async mode
* commit 'cbc7300cb209a4fd3b250546c72c35b7bb0aa8a1':
  EmuGL: enable SurfaceTexture async mode
2012-02-27 13:56:10 -08:00
Jesse Hall
7ef79e49c7 EmuGL: don't [de]queue buffers in eglMakeCurrent
Whenever a surface was attached to a context, it was dequeing a new
buffer, and enqueing it when detached. This has the effect of doing a
SwapBuffers on detach/attach cycle, which is just wrong and
occasionally caused visible glitches (e.g. animations going backwards
for one frame). It also broke some SurfaceTexture tests which
(validly) depend on specific buffer production/consumption counts.

Change-Id: Ibd4761e8842871b79fd9edf52272900193cb672d
2012-02-24 15:54:59 -08:00
Jesse Hall
cbc7300cb2 EmuGL: enable SurfaceTexture async mode
Pass the swap interval from eglSwapInterval to the native window so it
can enable/disable SurfaceTexture's async mode. Fixes the deadlock in
SurfaceTextureGLToGLTest.EglDestroySurfaceUnrefsBuffers.

Change-Id: I19bf69247341f5617223722df63d6c7f8cf389c6
2012-02-24 15:54:58 -08:00
Jesse Hall
747473797b am 8bd39ae1: Merge "EmuGL: GLESv2 support for OES_EGL_image_external" into ics-mr1
* commit '8bd39ae17caac6d275d785ce9420d7e643f15eb9':
  EmuGL: GLESv2 support for OES_EGL_image_external
2012-02-24 12:08:43 -08:00
Jesse Hall
8bd39ae17c Merge "EmuGL: GLESv2 support for OES_EGL_image_external" into ics-mr1 2012-02-24 12:06:20 -08:00
Tor Norbye
3093ef07a2 am 01076305: Fix version metadata for java.lang.reflect.Field. do not merge.
* commit '010763059f205a0060455acc158c95c7183f5c91':
  Fix version metadata for java.lang.reflect.Field. do not merge.
2012-02-23 18:10:29 -08:00
Tor Norbye
010763059f Fix version metadata for java.lang.reflect.Field. do not merge.
(cherry picked from commit 9ada0ac8f4)

Change-Id: Ic51aaa81e5a569a6384ac4e9f26b715801e13f1d
2012-02-23 18:07:42 -08:00
Jesse Hall
d6bd1843ce EmuGL: GLESv2 support for OES_EGL_image_external
Change-Id: I8911328d5dcccdf4731bd2d8fd953c12fdec5f1b
2012-02-22 15:03:30 -08:00
Jesse Hall
31c861e240 am 00e61338: EmuGL: refinements to GLESv1 image_external
* commit '00e61338b8374de090e81537047846ca06f88280':
  EmuGL: refinements to GLESv1 image_external
2012-02-22 13:45:50 -08:00
Jesse Hall
7211b5ebe0 am ac018fe3: EmuGL: refcount ColorBuffers on the host
* commit 'ac018fe3f65e18083a2dd317f73e4139bfa5fee6':
  EmuGL: refcount ColorBuffers on the host
2012-02-22 13:45:49 -08:00
Jesse Hall
0c50150766 am 91d4e8e1: GLESv2 translator: don\'t delete EGLImage textures
* commit '91d4e8e195592dbc812441597118452f887ea07d':
  GLESv2 translator: don't delete EGLImage textures
2012-02-22 10:10:43 -08:00
Jesse Hall
00e61338b8 EmuGL: refinements to GLESv1 image_external
* EGLImageTargetRenderbufferStorageOES was incorrectly accepting
  TEXTURE_EXTERNAL_OES as a target. Revert that; the host GL will
  correctly reject it with INVALID_ENUM.

* Handle the REQUIRED_TEXTURE_IMAGE_UNITS_OES texparameter query.

* Validate texture parameters set on TEXTURE_EXTERNAL textures;
  otherwise invalid parameters would work on the emulator but not on a
  real device.

Change-Id: I49a088608d58a9822f33e5916bd354eee3709127
2012-02-21 11:13:20 -08:00
Jesse Hall
ac018fe3f6 EmuGL: refcount ColorBuffers on the host
The gralloc API assumes system-wide reference counting of gralloc
buffers. The host-GL accelerated gralloc maps buffers to host-side
ColorBuffer objects, but was destroying them unconditionally in
gralloc_free(), ignoring any additional references from
gralloc_register_buffer().

This affected the SurfaceTexture gralloc buffers used by the
Browser/WebView. For some reason these buffers are actually allocated
by SurfaceFlinger and passed back to the WebView through Binder. But
since SurfaceFlinger doesn't actually need the buffer for anything,
sometime after the WebView has called gralloc_register_buffer()
SurfaceFlinger calls gralloc_free() on it. This caused the host
ColorBuffer to be destroyed long before the WebView is done using it.

Change-Id: I33dbee887a48a6907041cf19e9f38a1f6c983eff
2012-02-21 11:13:20 -08:00
Jesse Hall
91d4e8e195 GLESv2 translator: don't delete EGLImage textures
Copy changes faaf1553cf and
f37a7ed6c5 from the GLESv1 translator to
the GLESv2 translator. After this, both translators use the same logic
for glEGLImageTargetTexture2DOES().

Change-Id: I0a95bf2301df7b7428abc593f38170edf4cbda30
2012-02-21 11:13:19 -08:00
Xavier Ducrohet
baae7fc75d am fd9cdb46: Increase platform sdk package revision. do not merge.
* commit 'fd9cdb46a064d3ecc46aa05fa9c023ae648f07f1':
  Increase platform sdk package revision. do not merge.
2012-02-16 15:33:36 -08:00