25319 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Andreas Huber
7f9fe5fdfa Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo 2010-07-30 08:05:56 -07:00
Mathias Agopian
bd2de0e42a remove copybit hack from software opengl (libagl)
h/w acceleration is not supported through software gl + copybit anylonger,
instead, h/w opengl must be used. in the system compositor, a new h/w
composition api will be introduced to allow h/w accelerated composition with
overlays and/or 2D blocks.

Change-Id: I04949cb074ba8c4d637319ace23497c16a58d5bf
2010-07-29 23:28:03 -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
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
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
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
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
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
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
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
Jean-Baptiste Queru
f0fa8416e1 Merge "Make hasIccCard return true if RUIM card is present." 2010-07-29 14:37:48 -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
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
Romain Guy
ce3ac5f029 Merge "Corrected buffer overflow when parsing /proc/wakelocks" 2010-07-29 14:00:48 -07:00
Romain Guy
e53fe4a465 Merge "Fixed a documentation Bug (Issue 9236)" 2010-07-29 14:00:02 -07:00
Dianne Hackborn
fb1f103191 Fix a bug where we cleaned an apps external data when upgrading it. :(
Change-Id: I0eee1e7062d334c66d6daa3c43e11a292263aada
2010-07-29 13:58:32 -07:00
Christopher Tate
06abd0a6a8 am 571180c4: Merge "Attempt to fix the SDK build" into gingerbread
Merge commit '571180c4c72e0bb4f930f8971edf000a652f10f6' into gingerbread-plus-aosp

* commit '571180c4c72e0bb4f930f8971edf000a652f10f6':
  Attempt to fix the SDK build
2010-07-29 13:58:00 -07:00
Christopher Tate
571180c4c7 Merge "Attempt to fix the SDK build" into gingerbread 2010-07-29 13:53:37 -07:00
Christopher Tate
466b22b76e Attempt to fix the SDK build
On the assumption that the local min() function declaration is in
conflict with some 'min' #define floating around, rename the local
function to min_of().

Change-Id: I62aa27f213c6093cc78805de611cf4aa75f0eef2
2010-07-29 13:42:45 -07:00
Jeff Brown
9c7054119a am aab985b9: Fix touch input in landscape mode.
Merge commit 'aab985b951c4cf5ec2753ffbec516164b3c03c3a' into gingerbread-plus-aosp

* commit 'aab985b951c4cf5ec2753ffbec516164b3c03c3a':
  Fix touch input in landscape mode.
2010-07-29 13:13:38 -07:00
Jeff Brown
b0a57502c6 am 6ec402b5: DO NOT MERGE: Fix input event injection ANRs on UI thread.
Merge commit '6ec402b5ae33c8927694d8522b4cc6a5c8ba974e' into gingerbread-plus-aosp

* commit '6ec402b5ae33c8927694d8522b4cc6a5c8ba974e':
  DO NOT MERGE: Fix input event injection ANRs on UI thread.
2010-07-29 13:09:07 -07:00