27600 Commits

Author SHA1 Message Date
Romain Guy
06f96e2652 Refactor Skia shaders handling.
With this change, Skia shaders can easily be applied to any mesh. This change also
supports ComposeShader. For instance, this can be used to blend a gradient and a
bitmap togehter and paint a string of text with the result.

Change-Id: I701c2f9cf7f89b2ff58005e8a1d0d80ccf4a4aea
2010-07-30 19:18:16 -07:00
Romain Guy
42272759e4 Merge "Fix improper clipping after a save()" 2010-07-30 11:41:14 -07:00
Romain Guy
b82da65cb1 Fix improper clipping after a save()
Change-Id: I13426a67f20d77e2710bd500d82884098f4be97c
2010-07-30 11:40:21 -07:00
Andy McFadden
1951356a71 Merge "Add support for dalvik.vm.extra-opts property." 2010-07-30 11:26:29 -07:00
Steve Howard
48c05739dd am 6a114b21: am 7c600369: Merge "Update Context.getSystemService() docs for download manager." into gingerbread
Merge commit '6a114b211a77bdd4f4c687f99f9e5f9273ec1a76'

* commit '6a114b211a77bdd4f4c687f99f9e5f9273ec1a76':
  Update Context.getSystemService() docs for download manager.
2010-07-30 11:15:44 -07:00
Steve Howard
6a114b211a am 7c600369: Merge "Update Context.getSystemService() docs for download manager." into gingerbread
Merge commit '7c600369c9695de73ca37db552eb81b8b89d5e76' into gingerbread-plus-aosp

* commit '7c600369c9695de73ca37db552eb81b8b89d5e76':
  Update Context.getSystemService() docs for download manager.
2010-07-30 11:12:28 -07:00
Steve Howard
7c600369c9 Merge "Update Context.getSystemService() docs for download manager." into gingerbread 2010-07-30 11:09:48 -07:00
Alex Yakavenka
01f51d3645 am 42b23da9: am a27353c1: Cat: Generalize stk into cat
Merge commit '42b23da99ba0679b40bcd402dcc04266a71e7d30'

* commit '42b23da99ba0679b40bcd402dcc04266a71e7d30':
  Cat: Generalize stk into cat
2010-07-30 11:07:45 -07:00
Alex Yakavenka
42b23da99b am a27353c1: Cat: Generalize stk into cat
Merge commit 'a27353c1965911f69be8d02a01b15389189eab9d' into gingerbread-plus-aosp

* commit 'a27353c1965911f69be8d02a01b15389189eab9d':
  Cat: Generalize stk into cat
2010-07-30 11:05:26 -07:00
Jean-Baptiste Queru
5ea2a2e055 am b3311567: am 3d9e1696: Merge "Cat: Move Stk imlpementation into Cat folder"
Merge commit 'b3311567017d2653fd5530a91c1de5436706c5e9'

* commit 'b3311567017d2653fd5530a91c1de5436706c5e9':
  Cat: Move Stk imlpementation into Cat folder
2010-07-30 10:58:12 -07:00
Jean-Baptiste Queru
87623088c8 am 257c696f: am d8d03c89: Merge "Ccat: Initial CCAT implementation"
Merge commit '257c696ff7155ebb71659e0a49761b76049d9ed8'

* commit '257c696ff7155ebb71659e0a49761b76049d9ed8':
  Ccat: Initial CCAT implementation
2010-07-30 10:58:00 -07:00
Andy McFadden
e4d81f25bd Add support for dalvik.vm.extra-opts property.
The goal here is to avoid the dalvik.vm.* property explosion by
having a single property that takes an arbitrary collection of Dalvik
command-line options.  This is intended for testing of various
configurations by the Dalvik team, not industrial use.

Options should be separated by spaces, e.g.

  adb shell setprop dalvik.vm.extra-opts "-showversion -Xmx4m"

will print the version banner and set the heap max to 4MB, which won't
get you very far.

The extra-opts options will appear last, which allows them to override
values set earlier (like the heap max).

Bug 2838629.

(cherry-pick from dalvik-dev branch)

Change-Id: Ibcbb1b62367cf2152798583e8722ef7e461ad19a
2010-07-30 10:57:47 -07:00
Jean-Baptiste Queru
b331156701 am 3d9e1696: Merge "Cat: Move Stk imlpementation into Cat folder"
Merge commit '3d9e1696ed5e68d5a834e3c3217e3226cfac5b6c' into gingerbread-plus-aosp

* commit '3d9e1696ed5e68d5a834e3c3217e3226cfac5b6c':
  Cat: Move Stk imlpementation into Cat folder
2010-07-30 10:55:02 -07:00
Jean-Baptiste Queru
257c696ff7 am d8d03c89: Merge "Ccat: Initial CCAT implementation"
Merge commit 'd8d03c890b03f063bdb669e25742b4f4c69d2bcf' into gingerbread-plus-aosp

* commit 'd8d03c890b03f063bdb669e25742b4f4c69d2bcf':
  Ccat: Initial CCAT implementation
2010-07-30 10:54:59 -07:00
Alex Yakavenka
a27353c196 Cat: Generalize stk into cat
Rename all stk classes, comments and variables into cat classes.
Cat (Card Application Toolkit) is the common class that has
functionality of both Stk and Ccat.

Change-Id: Id0b99d0d9f4b0ce49adcb436060f13d5341ab8ab
2010-07-30 10:46:49 -07:00
Jean-Baptiste Queru
3d9e1696ed Merge "Cat: Move Stk imlpementation into Cat folder" 2010-07-30 10:44:00 -07:00
Jean-Baptiste Queru
d8d03c890b Merge "Ccat: Initial CCAT implementation" 2010-07-30 10:42:15 -07:00
Eric Laurent
b422107d1d am e67332f8: am 92e847ed: Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.
Merge commit 'e67332f879b3f97baaac2252b53ac64686aebdbb'

* commit 'e67332f879b3f97baaac2252b53ac64686aebdbb':
  Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.
2010-07-30 09:58:09 -07:00
Eric Laurent
e67332f879 am 92e847ed: Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.
Merge commit '92e847ed8e455dca3b2d33d92999e3960404d9af' into gingerbread-plus-aosp

* commit '92e847ed8e455dca3b2d33d92999e3960404d9af':
  Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.
2010-07-30 09:52:40 -07:00
Jean-Baptiste Queru
5ea89f77ea Fix build: HistoryRecord is now ActivityRecord
Change-Id: Ide07d72abd02aeb7e56695f2e98ae7af1568ad1c
2010-07-30 09:30:31 -07:00
Eric Laurent
92e847ed8e Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.
Modified types of some arguments and returned values of the Equalizer class from int to short
to match those defined by OpenSL ES SLEqualizerItf interface.

Also fixed a problem with set properties in equalizer engine implementation.

Change-Id: I75894bad0cb67b01c18ca5e22f9687e75ee491b8
2010-07-30 09:12:51 -07:00
Mattias Larsson
5f5548e82d am 85673d91: am a4fd0078: Clear preferred activities when home process crashes
Merge commit '85673d91681e6b5dede0c72f36ed3b81f5c4bb0d'

* commit '85673d91681e6b5dede0c72f36ed3b81f5c4bb0d':
  Clear preferred activities when home process crashes
2010-07-30 08:51:09 -07:00
Mattias Larsson
85673d9168 am a4fd0078: Clear preferred activities when home process crashes
Merge commit 'a4fd0078d138b433d2250a74833ee3cc6424143a' into gingerbread-plus-aosp

* commit 'a4fd0078d138b433d2250a74833ee3cc6424143a':
  Clear preferred activities when home process crashes
2010-07-30 08:45:05 -07:00
Mattias Larsson
a4fd0078d1 Clear preferred activities when home process crashes
If the "default" Home application has been replaced with
a third-party app that is repeatedly crashing at start-up,
there is no way for the user to clear the preferred activities
or uninstall the bad application. If we clear the package
preferred activities when the application crashes, the user
will be prompted with the ResolverActivity at the next boot
and can try using the app again or choose to use another
Home application.

Change-Id: I8ba8e95e6752916d50515d96c117d3084fa980fd
2010-07-30 08:36:42 -07:00
Mathias Agopian
01301d31a4 update current.xml with sensor stuff that got lost during a merge
Change-Id: Ibb61beaa05d8b7fcd99aefa82aa88f1689354f82
2010-07-30 00:56:47 -07:00
Jason Sams
3534531bb7 Merge "Cleanup of signed/unsigned Make all functions overloadable." 2010-07-29 22:53:43 -07:00
Mathias Agopian
78a785b409 am eb248a58: am 55a76dd8: Merge "fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface()." into gingerbread
Merge commit 'eb248a58fabac31873982e4f389ba81981f4041f'

* commit 'eb248a58fabac31873982e4f389ba81981f4041f':
  fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface().
2010-07-29 22:25:15 -07:00
Mathias Agopian
fdece4bbbf resolved conflicts for merge of dfce290b to master
Change-Id: I9caace962cb0a697dd99ed92c5f35e57690fdf91
2010-07-29 22:22:36 -07:00
Mathias Agopian
ce49d03aa4 resolved conflicts for merge of 02513855 to master
Change-Id: Ie33d57798d3d5b800edde753dac86de062bc270c
2010-07-29 22:06:44 -07:00
Mathias Agopian
eb248a58fa am 55a76dd8: Merge "fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface()." into gingerbread
Merge commit '55a76dd8d9996c1e93762d7611789aea696d536c' into gingerbread-plus-aosp

* commit '55a76dd8d9996c1e93762d7611789aea696d536c':
  fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface().
2010-07-29 20:54:12 -07:00
Mathias Agopian
55a76dd8d9 Merge "fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface()." into gingerbread 2010-07-29 20:52:26 -07:00
Dianne Hackborn
d4e60a1f8e Merge "Maybe fix issue #2881233: reboot loop at boot on stingray" 2010-07-29 19:16:18 -07:00
Dianne Hackborn
154db5f635 Maybe fix issue #2881233: reboot loop at boot on stingray
Change-Id: I4bd88fdd506d061146c441143d39b796a8df2f49
2010-07-29 19:15:19 -07:00
Dianne Hackborn
b88d4dfeb5 Merge "Fix crash." 2010-07-29 19:11:01 -07:00
Jason Sams
f0690c4f29 Cleanup of signed/unsigned
Make all functions overloadable.

Change-Id: I443c83afcf9a7acfae394585201f081681f309db

Update examples.

Change-Id: I100d6fa8dd1af376bcee0b2c42c5aabe9c03bb6e

force rebuild of all .rs files to pick up core header changes.

Change-Id: I6231a8a024388481ca231507e83b108ebdbc3500
2010-07-29 19:10:25 -07:00
Dianne Hackborn
8952f695a3 Fix crash.
Change-Id: Ie8871376213930f1c57ea5f8e67142daf7fbe089
2010-07-29 19:07:23 -07:00
Romain Guy
b827f458e1 Merge "Fix gradients rendering and destructor crashes." 2010-07-29 18:49:57 -07:00
Romain Guy
ae5575b342 Fix gradients rendering and destructor crashes.
This changes binds all textures to GL_TEXTURE0, this will have
to be changed when combining shader capabilities.

Change-Id: I02df4f5ba41e9b01ffa52fd7c26b41477c7ed18f
2010-07-29 18:48:04 -07:00
Mathias Agopian
dfce290b80 am 04d7e83e: Added SensorManager.getAltitude()
Merge commit '04d7e83e65e246e154b5b346e3eb0081b741ae88' into gingerbread-plus-aosp

* commit '04d7e83e65e246e154b5b346e3eb0081b741ae88':
  Added SensorManager.getAltitude()
2010-07-29 18:21:03 -07:00
Mathias Agopian
0251385553 am 050b5624: Added SensorManager.getMinDelay()
Merge commit '050b56244ff46d43e4886018d7cd20f0b1dc02b9' into gingerbread-plus-aosp

* commit '050b56244ff46d43e4886018d7cd20f0b1dc02b9':
  Added SensorManager.getMinDelay()
2010-07-29 18:20:51 -07:00
Mathias Agopian
04d7e83e65 Added SensorManager.getAltitude()
this is a helper function to calculate the altitude from the
pressure and pressure at sea level.

Change-Id: I3f6f14fee6190388f95afa36a66287e3d59eef9b
2010-07-29 18:18:01 -07:00
Mathias Agopian
050b56244f Added SensorManager.getMinDelay()
Exposed the new "min delay" sensor property through native and
java sensor apis. This allows the caller to know what is the
maximum rate at which a sensor can return events, or, if a sensor
works in "update" mode (events returned only when the value changes).

Also augmented SensorManager.regusterSensorEvent() so that it can
accept a value in microsecond in addition to the 4 constants already
defined.

Change-Id: If425e9979892666df8c989d7de3c362230fa19e0
2010-07-29 18:18:00 -07:00
Jean-Baptiste Queru
8f5d160c92 am 0c51c98f: am 4506c62a: fix inaccurate copyrights
Merge commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf'

* commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf':
  fix inaccurate copyrights
2010-07-29 17:54:42 -07:00
Jean-Baptiste Queru
0c51c98fd9 am 4506c62a: fix inaccurate copyrights
Merge commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625' into gingerbread-plus-aosp

* commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625':
  fix inaccurate copyrights
2010-07-29 17:52:09 -07:00
Jim Miller
edb2fc6aa8 Merge "Fix 2877497: export rsgProgramVertexLoadProjectionMatrix()" 2010-07-29 17:50:01 -07:00
Jean-Baptiste Queru
4506c62abd fix inaccurate copyrights
Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
2010-07-29 17:35:37 -07:00
Jean-Baptiste Queru
5aa1c034d9 resolved conflicts for merge of 8a76a908 to master
Change-Id: I8983d5c93dfa12d87449ac9f9a17a5aafdadef0a
2010-07-29 16:15:19 -07:00
Jean-Baptiste Queru
8a76a9085d am 9150cff6: Merge "Replaced /sdcard with Environment.getExternalStorageDirectory()"
Merge commit '9150cff64abc79927ade28061ac99a1ebf812905' into gingerbread-plus-aosp

* commit '9150cff64abc79927ade28061ac99a1ebf812905':
  Replaced /sdcard with Environment.getExternalStorageDirectory()
2010-07-29 15:59:10 -07:00
The Android Open Source Project
51ad36e8f2 am f9b8e901: am 3fb62752: am 392edec1: Merge from open-source froyo
Merge commit 'f9b8e9018bf8ab012ec734262620d3274b2cd2ec'

* commit 'f9b8e9018bf8ab012ec734262620d3274b2cd2ec':
  Fix a bug where we cleaned an apps external data when upgrading it. :(
2010-07-29 15:52:09 -07:00
The Android Open Source Project
f9b8e9018b am 3fb62752: am 392edec1: Merge from open-source froyo
Merge commit '3fb627525e077fa5452a99ac1e2a7e9c41995044' into gingerbread-plus-aosp

* commit '3fb627525e077fa5452a99ac1e2a7e9c41995044':
  Fix a bug where we cleaned an apps external data when upgrading it. :(
2010-07-29 15:49:11 -07:00