1427 Commits

Author SHA1 Message Date
Dianne Hackborn
efcd77407b am 177c405a: am c6e1d880: Merge "Introduce official public NativeWindow type." into gingerbread
Merge commit '177c405a242e811b1010bd8382b5807ab8df31a8'

* commit '177c405a242e811b1010bd8382b5807ab8df31a8':
  Introduce official public NativeWindow type.
2010-06-30 16:11:21 -07:00
Romain Guy
01959f6552 Merge "Remove unnecessary return and add bitmap generation ID tracking." 2010-06-30 16:07:09 -07:00
Mathias Agopian
1dc623e3b3 am e341a0b5: am 30fe6fa0: Merge "fix live wallpapers on Droid" into gingerbread
Merge commit 'e341a0b5e9a1e30a020970a69c58c34f902ea06f'

* commit 'e341a0b5e9a1e30a020970a69c58c34f902ea06f':
  fix live wallpapers on Droid
2010-06-30 16:05:37 -07:00
Romain Guy
fe8809471a Remove unnecessary return and add bitmap generation ID tracking.
Change-Id: Icf5e0635e789f5ea53268c22fad51cf733b5b1a6
2010-06-30 16:05:32 -07:00
Dianne Hackborn
c6e1d88022 Merge "Introduce official public NativeWindow type." into gingerbread 2010-06-30 16:05:30 -07:00
Mathias Agopian
30fe6fa07a Merge "fix live wallpapers on Droid" into gingerbread 2010-06-30 15:59:02 -07:00
Romain Guy
364703c6fa Fix the build.
Change-Id: I08bd6daf25351daca3ae552e1cfcfce85eefa73b
2010-06-30 15:51:03 -07:00
Romain Guy
68e9a49aeb Merge "Add hooks for drawBitmap()." 2010-06-30 15:50:05 -07:00
Jeff Brown
5840b7c119 am 0c2df984: am d8ae2885: Merge "Fix injection of specially intercepted keys like HOME." into gingerbread
Merge commit '0c2df98425c8fa4ce092eebea80ae197547f6a86'

* commit '0c2df98425c8fa4ce092eebea80ae197547f6a86':
  Fix injection of specially intercepted keys like HOME.
2010-06-30 15:48:50 -07:00
Dianne Hackborn
25a98b8e21 resolved conflicts for merge of 7f6c6e8f to master
Change-Id: Id9dddb78c51f16ff8c4b60339421c94fde506db2
2010-06-30 15:44:58 -07:00
Mathias Agopian
4cfb3a69d2 fix live wallpapers on Droid
On omap3 h/w we force opaque formats to RGB_565 instead of RGBX_8888
because the GL driver doesn't support it. RGBX_8888 is always remapped
to RGBA_8888.

Change-Id: I0bfabeb98c8d3a399079e6797cf2a0ee95915324
2010-06-30 15:43:47 -07:00
Dianne Hackborn
8b49bd1a2f Introduce official public NativeWindow type.
Not yet hooked up to anything in the NDK, but requires renaming
the existing android_native_window_t type everywhere.

Change-Id: Iffee6ea39c93b8b34e20fb69e4d2c7c837e5ea2e
2010-06-30 15:32:04 -07:00
Romain Guy
ce0537b800 Add hooks for drawBitmap().
Change-Id: I58e962c3a8b2bc75c2605fe369ad3002579d86e0

Add texture cache.

Change-Id: I1c0e5581d228869e114438258a1014e33e024ad7
2010-06-30 15:21:01 -07:00
Jeff Brown
d009787182 Fix injection of specially intercepted keys like HOME.
This change mainly unwinds a premature optimization in the
dispatch pipeline.
To test HOME injection, run 'adb shell input keyevent 3'.

Change-Id: I1c4b7377c205da7c898014b8b07fc6dc1d46e4dd
2010-06-30 14:41:59 -07:00
Alex Sakhartchouk
071508d9f3 Removing font initialization on startup
Change-Id: I6f28204c3d431955fbf0f2f74dde09012bba0a4d
2010-06-30 12:59:01 -07:00
Jason Sams
e519b37f5a Fix an uninitialized pointer.
Change-Id: If66a502b6b23d00c4a2dd02fb46912f6dee2866b
2010-06-30 12:07:50 -07:00
Dianne Hackborn
3c80a4a044 Implement default key handling for native code.
The native code now maintains a list of all keys that may use
default handling.  If the app finishes one of these keys
without handling it, the key will be passed back off to Java
for default treatment.

Change-Id: I6a842a0d728eeafa4de7142fae573f8c11099e18
2010-06-30 10:49:40 -07:00
Chris Tate
41254a8ddd am af4a2d1f: am ddcb543a: Merge "Fix native input dispatch in the emulator." into gingerbread
Merge commit 'af4a2d1f52c7d54408db341781399d2886de72c1'

* commit 'af4a2d1f52c7d54408db341781399d2886de72c1':
  Fix native input dispatch in the emulator.
2010-06-29 17:06:31 -07:00
Chris Tate
ddcb543ac8 Merge "Fix native input dispatch in the emulator." into gingerbread 2010-06-29 17:01:04 -07:00
Jeff Brown
0b72e82c5f Fix native input dispatch in the emulator.
Set a default orientation of ROTATION_0.
Added some more careful checks based on whether we have valid
absolute axis information from the driver.
Reset key repeating during configuration changes since the keyboard
device may have been removed.

Change-Id: I685960828acffcb17595fc5683309e8064a76714
2010-06-29 16:52:21 -07:00
Mathias Agopian
e595a547fc am 33df868b: am 1eb442ee: Merge "remove a hack that was used only used on h/w we no longer support." into gingerbread
Merge commit '33df868bb35726d250c8a6d0ebd8c84749ffd51f'

* commit '33df868bb35726d250c8a6d0ebd8c84749ffd51f':
  remove a hack that was used only used on h/w we no longer support.
2010-06-29 15:36:53 -07:00
Mathias Agopian
1eb442eef7 Merge "remove a hack that was used only used on h/w we no longer support." into gingerbread 2010-06-29 15:33:36 -07:00
Mathias Agopian
c19ffcba19 remove a hack that was used only used on h/w we no longer support.
this should fix the opal build.

Change-Id: I43d7633696fea5be6bc834293a832d22f6bdfc61
2010-06-29 15:31:58 -07:00
Dianne Hackborn
639061d9c2 am b5f05d00: am 0934fbb6: Merge "Update native activity & event APIs to follow correct conventions." into gingerbread
Merge commit 'b5f05d0018d72531e40c2afadfee90e9bc0c8893'

* commit 'b5f05d0018d72531e40c2afadfee90e9bc0c8893':
  Update native activity & event APIs to follow correct conventions.
2010-06-29 12:21:16 -07:00
Dianne Hackborn
2e9f93e8db Update native activity & event APIs to follow correct conventions.
Change-Id: Ie64fb3a9c68bc9c117fa5621b75d1f609e304e0e
2010-06-29 10:43:54 -07:00
Mathias Agopian
b23ef2937d am 5d31a452: am f0562b4b: Merge changes I93dfc4c8,I781953d6 into gingerbread
Merge commit '5d31a4523bf5d1d3e3b5aa51043a1551d7aa56d7'

* commit '5d31a4523bf5d1d3e3b5aa51043a1551d7aa56d7':
  fix[2798925] Gingerbread TOT not booting
  Revert "Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger""
2010-06-28 20:06:21 -07:00
Mathias Agopian
f0562b4b07 Merge changes I93dfc4c8,I781953d6 into gingerbread
* changes:
  fix[2798925] Gingerbread TOT not booting
  Revert "Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger""
2010-06-28 20:01:58 -07:00
Mathias Agopian
8fa4c811e6 fix[2798925] Gingerbread TOT not booting
Fixed a typo where checking against the wrong constant caused GL_TEXTURE_EXTERNAL_OES
to be used with a regular texture, which some GL driver will choke on.

Change-Id: I93dfc4c8fa674433bbb678eee31954e9a8d0cb4b
2010-06-28 19:54:17 -07:00
Chris Tate
f40e4928b9 am 96725326: am 31e0ffe8: Merge "Native input event dispatching." into gingerbread
Merge commit '96725326149687168937cf62f75364cf9cc3e96b'

* commit '96725326149687168937cf62f75364cf9cc3e96b':
  Native input event dispatching.
2010-06-28 19:16:42 -07:00
Jeff Brown
349703effc Native input event dispatching.
Target identification is now fully native.
Fixed a couple of minor issues related to input injection.
Native input enabled by default, can be disabled by setting
WindowManagerPolicy.ENABLE_NATIVE_INPUT_DISPATCH to false.

Change-Id: I7edf66ed3e987cc9306ad4743ac57a116af452ff
2010-06-28 19:10:54 -07:00
Romain Guy
d55a86120d Add support for saveLayer().
saveLayer() is affected by the paint's alpha and xfermode.

Change-Id: I28693a9337052643adccdb4889a8f228d4e17903
2010-06-28 18:52:24 -07:00
Romain Guy
026c5e1670 Implement support for PorterDuff's blending modes.
The blending modes are currently hooked up only when drawing filled rects but the
code is reusable for other primitives. This will allow implementation of saveLayer().
This method is required to support the fade effects used throughout the standard
Android UI.

Change-Id: I396023d123436f16cdafc606e358e4eb80c9df2c
2010-06-28 17:12:22 -07:00
Romain Guy
5cbbce5357 Reduced the complexity of layers composition.
This change also refactors the code base a bit by moving classes out of
OpenGLRenderer into separate headers/implementations. This makes the code
more manageable.

This change also adds documentation for implementation methods. The
undocumented methods are simply Skia's Canvas methods.

Change-Id: I54c68b443580a0129251dddc1a7ac95813d5289e
2010-06-27 22:59:20 -07:00
Romain Guy
1d58b498de Merge "Add implementations for saveLayerAlpha() and textured rects." 2010-06-26 00:16:20 -07:00
Romain Guy
bd6b79b402 Add implementations for saveLayerAlpha() and textured rects.
Even though there's an implementation for textured rects, drawBitmap() is not
hooked up yet as it will require a good texture cache.

This method is implemented using FBOs. There's currently an issue either in the
driver or in the Canvas renderer that forces the FBO to be fullscreen, which is
extremely expensive and yields terrible performance.

Change-Id: I148419195e12d45653c60186938aa78c23a68e2c
2010-06-26 00:13:53 -07:00
Mathias Agopian
781953d62d Revert "Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger""
This reverts commit 330dd304a471d260a73e342a240921c03c825f99.
2010-06-25 18:02:21 -07:00
Jason Sams
2afa22003d Merge "Update fountain to use boolean rather than ints for true/false." 2010-06-25 15:12:29 -07:00
Jason Sams
61d10a4e43 Update fountain to use boolean rather than ints for true/false.
Change-Id: I5e8334f53239c869caeaff45e611309cea5ba284
2010-06-25 15:09:45 -07:00
Eric Laurent
cf3a2b79f3 am cdf1357b: am 8e103da1: Merge "Various fixes and improvements in audio effects implementation" into gingerbread
Merge commit 'cdf1357b6e0152280dcd611b5f096db4887d8126'

* commit 'cdf1357b6e0152280dcd611b5f096db4887d8126':
  Various fixes and improvements in audio effects implementation
2010-06-25 14:22:39 -07:00
Romain Guy
7ae7ac48aa Convert tabs to spaces.
Change-Id: I5d3ae48af79b19b6d293deff0521e4bb57d5114b
2010-06-25 13:46:18 -07:00
Romain Guy
1b63338639 Merge "Implement quickReject() and drawRect()." 2010-06-25 13:43:21 -07:00
Romain Guy
c7d53494f1 Implement quickReject() and drawRect().
The OpenGL ES 2.0 renderer can now draw colored rectangles. At least there's
something on screen now.

Change-Id: I80a13ccc1dd56784edf74f2670a364f30700234a
2010-06-25 13:41:57 -07:00
Jason Sams
3d54108d98 Merge "Add support for non-VBO drawing in Meshes." 2010-06-25 12:46:35 -07:00
Jason Sams
eeeaccc899 Add support for non-VBO drawing in Meshes.
Change-Id: Ic4dd88cbe591091ebe740babe30213c15ad60cb3
2010-06-25 12:45:41 -07:00
Eric Laurent
53334cdb81 Various fixes and improvements in audio effects implementation
Effect API:
- Use different definitions for audio device, channels, formats... in AudioSystem and EffectApi:
  Removed media/AudioCommon.h file created for initial version of EffectApi
- Indicate audio session and output ID to effect library when calling EffectCreate(). Session ID can be useful to optimize
the implementation of effect chains in the same audio session. Output ID can be used for effects implemented in audio hardware.
- Renamed EffectQueryNext() function to EffectQueryEffect() and changed operating mode:
  now an index is passed for the queried effect instead of implicitly querying the next one.
- Added CPU load and memory usage indication in effects descriptor
- Added flags and commands to indicate changes in audio mode (ring tone, in call...) to effect engine
- Added flag to indicate hardware accelerated effect implementation.
- Renamed EffectFactoryApi.h to EffectsFactoryApi.h for consistency with EffectsFactory.c/h

Effect libraries:
- Reflected changes in Effect API
- Several fixes in reverb implementation
- Added build option TEST_EFFECT_LIBRARIES in makefile to prepare integration of actual effect library.
- Replaced pointer by integer identifier for library handle returned by effects factory

Audio effect framework:
- Added support for audio session -1 in preparation of output stage effects configuration.
- Reflected changes in Effect API
- Removed volume ramp up/down when effect is inserted/removed: this has to be taken care of by effect engines.
- Added some overflow verification on indexes used for deferred parameter updates via shared memory
- Added hardcoded CPU and memory limit check when creating a new effect instance

Change-Id: I43fee5182ee201384ea3479af6d0acb95092901d
2010-06-25 11:59:35 -07:00
Alex Sakhartchouk
5b7e333cf2 Merge "Adding freetype font rendering to renderscript." 2010-06-25 09:24:19 -07:00
Jeff Hamilton
c086d9403f Revert "am 256fc043: am 081bc5c4: fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger"
This reverts commit e02dec8c4cbab17d09983af1328308b8aa61ef85, reversing
changes made to 6d7a052fb04b251c517d0a9049b8d5d7408ce8c0.

Bug: 2798567
2010-06-25 10:48:08 -05:00
Mathias Agopian
e02dec8c4c am 256fc043: am 081bc5c4: fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
Merge commit '256fc04394431cbd332e56747fdbfda4cb4c2e25'

* commit '256fc04394431cbd332e56747fdbfda4cb4c2e25':
  fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
2010-06-25 08:30:06 -07:00
Mathias Agopian
081bc5c47d fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
Make sure to not use GL_TEXTURE_EXTERNAL when it's not supported
by the GL. The error was harmless, but annoying.

Change-Id: I571a9a9b05d35da51420950a6a6e95629067efd0
2010-06-24 21:28:59 -07:00
Romain Guy
ca9d544e38 Merge "Add colored rectangles implementation in OpenGLRenderer." 2010-06-24 19:32:44 -07:00