27683 Commits

Author SHA1 Message Date
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
Xia Wang
8f076ec3c3 DO NOT MERGE
move change to gingerbread.

Wait for broadcast even if the network state has been changed.
bug: 2863356

Change-Id: Ia78d1d6c2906371b56dfd4765845431047e9e9c0
2010-07-29 19:15:33 -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
Dmitri Plotnikov
b2ce481c81 Adding a lookup URI to simplify loading of a contact
This will be initially used by the editor to load
the entire contacts in a consistent manner either
locally or from a Directory.

Change-Id: I0e02b1b35cbbb3c4443063684641c928e5ac5318
2010-07-29 18:28:50 -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
Jamie Gennis
d0062478ef Fix a bug that prevented the creation of EGL shared contexts.
Change-Id: I6b0ec5ef86abdd4e9083067ba297107cfb094df3
2010-07-29 17:54:14 -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
The Android Open Source Project
27eecb704a Merge branch 'froyo' of git://android.git.kernel.org/platform/frameworks/base into HEAD 2010-07-29 17:45:56 -07:00
Jean-Baptiste Queru
83407b993f fix inaccurate copyrights
Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
2010-07-29 17:41:35 -07:00
Gilles Debunne
3d8d9440d8 Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo 2010-07-29 17:39:32 -07:00
Gilles Debunne
83884db9dc Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo 2010-07-29 17:39:18 -07:00
Jean-Baptiste Queru
4506c62abd fix inaccurate copyrights
Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
2010-07-29 17:35:37 -07:00
Gilles Debunne
5d658d048e Fixed doc typos in HeterogeneousExpandableList.java.
Bad links.

Cherry-pick from master for a documentation update.
https://android-git.corp.google.com/g/#change,59176

Change-Id: Ib69b05c09fc80434cb9cd79d61fae4035adc1970
2010-07-29 16:56:25 -07:00
Gilles Debunne
c09a6977ae Fixes regarding densities in "Providing Resources" documentation page.
The ratio between densities is not constant.

The Exception for dpi qualifier in point 4 of the algorithm should be detailed.

I understand that if my config is ldpi-trackball-v5
and I have the choice between mdpi and hdpi-trackball-v5, mdpi will be chosen.

Cherry-picked from master CL 59188.

Change-Id: Ibe412a82845527ebdb104605c99c205ca52ab97c
2010-07-29 16:54:03 -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
The Android Open Source Project
3fb627525e am 392edec1: Merge from open-source froyo
Merge commit '392edec1162e9d00bcb66b271f43908f75d42ace' into gingerbread

* commit '392edec1162e9d00bcb66b271f43908f75d42ace':
  Fix a bug where we cleaned an apps external data when upgrading it. :(
2010-07-29 15:46:48 -07:00
The Android Open Source Project
392edec116 Merge from open-source froyo
Change-Id: Ifa75fce9bd362b06ecb622219ef501e61e89fd76
2010-07-29 15:38:49 -07:00
Dianne Hackborn
3855980b43 Fix a bug where we cleaned an apps external data when upgrading it. :(
Change-Id: I0eee1e7062d334c66d6daa3c43e11a292263aada
2010-07-29 15:24:15 -07:00
Jean-Baptiste Queru
9150cff64a Merge "Replaced /sdcard with Environment.getExternalStorageDirectory()" 2010-07-29 15:01:24 -07:00
Vasu Nori
92c9e0db8e Merge "expose more sqlite errors as exceptions" 2010-07-29 14:58:01 -07:00
Vasu Nori
dea9713387 expose more sqlite errors as exceptions
this should help developers figure out what various sqlite errors mean
and possibly programmatically handle them.

Change-Id: I5c313be1b17b6c5171929bf04e19a16ea92bb357
2010-07-29 14:57:08 -07:00
Jean-Baptiste Queru
44a1e3a574 am 969907f3: am f0fa8416: Merge "Make hasIccCard return true if RUIM card is present."
Merge commit '969907f3f59cf9420c3bd9d672b509196cf82cbe'

* commit '969907f3f59cf9420c3bd9d672b509196cf82cbe':
  Make hasIccCard return true if RUIM card is present.
2010-07-29 14:56:49 -07:00
Jean-Baptiste Queru
969907f3f5 am f0fa8416: Merge "Make hasIccCard return true if RUIM card is present."
Merge commit 'f0fa8416e13b2885b858b6974b101c70833e4729' into gingerbread-plus-aosp

* commit 'f0fa8416e13b2885b858b6974b101c70833e4729':
  Make hasIccCard return true if RUIM card is present.
2010-07-29 14:53:42 -07:00
Romain Guy
f82447e43e Merge "Moved all the rendering code to the new shader generator." 2010-07-29 14:41:27 -07:00
Jean-Baptiste Queru
f0fa8416e1 Merge "Make hasIccCard return true if RUIM card is present." 2010-07-29 14:37:48 -07:00
Romain Guy
889f8d1403 Moved all the rendering code to the new shader generator.
The generator supports features that are not yet implement in the
renderer: color matrix, lighting, porterduff color blending and
composite shaders.

This change also adds support for repeated/mirrored non-power of 2
bitmap shaders.

Change-Id: I903a11a070c0eb9cc8850a60ef305751e5b47234
2010-07-29 14:37:42 -07:00
Romain Guy
15d6184be7 am ff74e22b: am ce3ac5f0: Merge "Corrected buffer overflow when parsing /proc/wakelocks"
Merge commit 'ff74e22b59f8157580953fcd69e3c32aa8f68eb2'

* commit 'ff74e22b59f8157580953fcd69e3c32aa8f68eb2':
  Corrected buffer overflow when parsing /proc/wakelocks
2010-07-29 14:36:29 -07:00
Romain Guy
8fb007e6d9 am 0f0b7160: am e53fe4a4: Merge "Fixed a documentation Bug (Issue 9236)"
Merge commit '0f0b71600b658c2c1a5cac63cb402f9ea443cb30'

* commit '0f0b71600b658c2c1a5cac63cb402f9ea443cb30':
  Fixed a documentation Bug (Issue 9236)
2010-07-29 14:36:22 -07:00
Romain Guy
ff74e22b59 am ce3ac5f0: Merge "Corrected buffer overflow when parsing /proc/wakelocks"
Merge commit 'ce3ac5f02970fcab91e16ecb573931d209b1985c' into gingerbread-plus-aosp

* commit 'ce3ac5f02970fcab91e16ecb573931d209b1985c':
  Corrected buffer overflow when parsing /proc/wakelocks
2010-07-29 14:32:34 -07:00
Romain Guy
0f0b71600b am e53fe4a4: Merge "Fixed a documentation Bug (Issue 9236)"
Merge commit 'e53fe4a465a014788e3b93ca9f30f229481bc4e5' into gingerbread-plus-aosp

* commit 'e53fe4a465a014788e3b93ca9f30f229481bc4e5':
  Fixed a documentation Bug (Issue 9236)
2010-07-29 14:32:29 -07:00
Dianne Hackborn
f058088888 am 52075987: am 31b5d548: Merge "Fix a bug where we cleaned an apps external data when upgrading it. :(" into gingerbread
Merge commit '52075987c5726c95613f98571aac4c54e8319df4'

* commit '52075987c5726c95613f98571aac4c54e8319df4':
  Fix a bug where we cleaned an apps external data when upgrading it. :(
2010-07-29 14:17:30 -07:00
Dianne Hackborn
52075987c5 am 31b5d548: Merge "Fix a bug where we cleaned an apps external data when upgrading it. :(" into gingerbread
Merge commit '31b5d5485f7336639d252da7ba979234dbd2f1e1' into gingerbread-plus-aosp

* commit '31b5d5485f7336639d252da7ba979234dbd2f1e1':
  Fix a bug where we cleaned an apps external data when upgrading it. :(
2010-07-29 14:12:17 -07:00
Dianne Hackborn
31b5d5485f Merge "Fix a bug where we cleaned an apps external data when upgrading it. :(" into gingerbread 2010-07-29 14:07:14 -07:00
Christopher Tate
1fdacef18d am 06abd0a6: am 571180c4: Merge "Attempt to fix the SDK build" into gingerbread
Merge commit '06abd0a6a833beda1c0e68aed44912d145745a42'

* commit '06abd0a6a833beda1c0e68aed44912d145745a42':
  Attempt to fix the SDK build
2010-07-29 14:04:07 -07:00