27013 Commits

Author SHA1 Message Date
Romain Guy
5671b28092 Merge "Replaced deprecated setButton Methodcalls" 2010-07-19 10:29:59 -07:00
Xavier Ducrohet
e8466b3f89 am 0a0bb953: (-s ours) am 80e62ac6: Fix the layoutlib Paint.set(Paint) method. Do not merge.
Merge commit '0a0bb953f0198e738e3e15a869af21a66a442466'

* commit '0a0bb953f0198e738e3e15a869af21a66a442466':
  Fix the layoutlib Paint.set(Paint) method. Do not merge.
2010-07-19 10:25:22 -07:00
Eric Laurent
1dfc722c46 am 3c6ea955: am 7203272f: Merge "Fixed problems in audio effect volume control." into gingerbread
Merge commit '3c6ea95553d3a0e416874c583a41efff3f6fbc57'

* commit '3c6ea95553d3a0e416874c583a41efff3f6fbc57':
  Fixed problems in audio effect volume control.
2010-07-19 10:23:00 -07:00
Xavier Ducrohet
0a0bb953f0 am 80e62ac6: Fix the layoutlib Paint.set(Paint) method. Do not merge.
Merge commit '80e62ac61c297452c003919f71c4dcd7063d1b43' into gingerbread-plus-aosp

* commit '80e62ac61c297452c003919f71c4dcd7063d1b43':
  Fix the layoutlib Paint.set(Paint) method. Do not merge.
2010-07-19 10:22:59 -07:00
Xavier Ducrohet
80e62ac61c Fix the layoutlib Paint.set(Paint) method. Do not merge.
It would change the text rendering info but not recompute
the Java Font objects. The effect is a broken font rendering
in the EditText (which use this method to copy some Paint
object before using the copy for the actual drawing)

Change-Id: I9e7fbf9bd57b421fd793876a6de4ade1ecac372d
2010-07-19 10:19:49 -07:00
Eric Laurent
3c6ea95553 am 7203272f: Merge "Fixed problems in audio effect volume control." into gingerbread
Merge commit '7203272f35e40bf9d4b76f1b2f9b0077738df118' into gingerbread-plus-aosp

* commit '7203272f35e40bf9d4b76f1b2f9b0077738df118':
  Fixed problems in audio effect volume control.
2010-07-19 10:19:49 -07:00
Eric Laurent
7203272f35 Merge "Fixed problems in audio effect volume control." into gingerbread 2010-07-19 10:13:27 -07:00
Danica Chang
7a9de8b425 fixed parsing issue in BluetoothService so that it parses the UUID property correctly
Change-Id: If46fd3ae1a0e6393cd47a8f0dc913cef45e05441
2010-07-19 10:03:13 -07:00
The Android Open Source Project
b5b37f3bcc am 3d02b48b: merge from open-source master
Merge commit '3d02b48bd95293c767563729264f007dbcff82b3'

* commit '3d02b48bd95293c767563729264f007dbcff82b3':
  Fix the layoutlib Paint.set(Paint) method.
2010-07-19 09:11:17 -07:00
Adam Bliss
6181f39257 am 27ef0f73: am 9714d2c4: Merge "Don\'t throw an exception from isProviderEnabled and getLastKnownLocation" into gingerbread
Merge commit '27ef0f732c5a97ba88a699b7490045e5370cf51f'

* commit '27ef0f732c5a97ba88a699b7490045e5370cf51f':
  Don't throw an exception from isProviderEnabled and getLastKnownLocation
2010-07-19 09:07:53 -07:00
The Android Open Source Project
3d02b48bd9 merge from open-source master
Change-Id: I84a8efc2d58476c72e84170c19dc692dc180b97d
2010-07-19 09:04:02 -07:00
Adam Bliss
27ef0f732c am 9714d2c4: Merge "Don\'t throw an exception from isProviderEnabled and getLastKnownLocation" into gingerbread
Merge commit '9714d2c4d2a7563ce5ffdc1726461b24e9f1e599' into gingerbread-plus-aosp

* commit '9714d2c4d2a7563ce5ffdc1726461b24e9f1e599':
  Don't throw an exception from isProviderEnabled and getLastKnownLocation
2010-07-19 08:36:26 -07:00
Adam Bliss
9714d2c4d2 Merge "Don't throw an exception from isProviderEnabled and getLastKnownLocation" into gingerbread 2010-07-19 08:09:19 -07:00
Mike Lockwood
cbaea35759 Add MTP_OBJECT_ID column name to MediaStore.MediaColumns
This column will be added to the images, audio_meta, video and audio_playlist
tables to cross reference to the MTP objects table.

Renamed MTP_OBJECT_HANDLE (which is used only by the media scanner) to
MEDIA_SCANNER_NEW_OBJECT_ID to avoid confusion.

Change-Id: I8093485dc0438f408a505e82ffddd0710c7a512c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-19 09:51:56 -04:00
Leon Clarke
387b6580b8 Cancel test selections when they start if the client hasn't overridden the
selection behavior.
http://b/issue?id=2847546

Change-Id: I0d8529add54b3dfbf0af239fda1b15edd7bd32e0
2010-07-19 14:36:28 +01:00
Eric Laurent
0d7e048cf2 Fixed problems in audio effect volume control.
Fixed the following problems in audio effect volume control in AudioFlinger:
- Make sure that the volumes returned by EffectChain::setVolume_l() are correct even is
no change is detected since last call
- Do not use isEnabled() to validate volume control but mState >= ACTIVE instead as the volume control
must be also active in STOPPING and STOPPED states.

Change-Id: Id62da3164fad500ee8a5efd6cd78c77e8fdcb541
2010-07-19 06:31:30 -07:00
Maksymilian Osowski
ee6aaddbbf Merge "Added the LayoutTestsRunner class that is responsible for running the tests. Also, added some methods to FileFilter." 2010-07-19 04:09:24 -07:00
James Dong
4ae577b3f0 am 5e782937: am faf775e7: Fix simulator build (1st attempt)
Merge commit '5e782937ead3042255d83f9c1192f2cc7b688d74'

* commit '5e782937ead3042255d83f9c1192f2cc7b688d74':
  Fix simulator build (1st attempt)
2010-07-18 15:08:52 -07:00
James Dong
5e782937ea am faf775e7: Fix simulator build (1st attempt)
Merge commit 'faf775e772e329e821d81ba735474df097b1e1e9' into gingerbread-plus-aosp

* commit 'faf775e772e329e821d81ba735474df097b1e1e9':
  Fix simulator build (1st attempt)
2010-07-18 15:03:15 -07:00
James Dong
faf775e772 Fix simulator build (1st attempt)
Change-Id: I65a824c17929170b7b2bc75a13e756e92d8fe50a
2010-07-18 14:47:27 -07:00
Vasu Nori
fc6ed67f0a am d773bbd7: am 94dab9b1: fix broken api/current.xml
Merge commit 'd773bbd785aee50c84fe780031c5c796d4ddec9f'

* commit 'd773bbd785aee50c84fe780031c5c796d4ddec9f':
  fix broken api/current.xml
2010-07-17 19:25:56 -07:00
Vasu Nori
d773bbd785 am 94dab9b1: fix broken api/current.xml
Merge commit '94dab9b13590b714a7400d513f1e4655c62ddfaf' into gingerbread-plus-aosp

* commit '94dab9b13590b714a7400d513f1e4655c62ddfaf':
  fix broken api/current.xml
2010-07-17 18:35:21 -07:00
Vasu Nori
df46069627 am bbc2b4e6: am 5b31498b: add video/audio chat-compatibility modes to ContactsContract
Merge commit 'bbc2b4e69a1788987a8fe959cc0105290b431283'

* commit 'bbc2b4e69a1788987a8fe959cc0105290b431283':
  add video/audio chat-compatibility modes to ContactsContract
2010-07-17 18:31:28 -07:00
Vasu Nori
94dab9b135 fix broken api/current.xml
Change-Id: I6cc03dddf20228625f18f7a59aed22628f9661fa
2010-07-17 18:29:22 -07:00
Vasu Nori
bbc2b4e69a am 5b31498b: add video/audio chat-compatibility modes to ContactsContract
Merge commit '5b31498ba1f9874f395d80152304512fa4c0144d' into gingerbread-plus-aosp

* commit '5b31498ba1f9874f395d80152304512fa4c0144d':
  add video/audio chat-compatibility modes to ContactsContract
2010-07-17 18:25:20 -07:00
Vasu Nori
5b31498ba1 add video/audio chat-compatibility modes to ContactsContract
Change-Id: Ic0b04017ad4216f1a1c5f07fa9d27e6970ded931
2010-07-17 18:16:31 -07:00
Romain Guy
33e72aef05 Make View transforms work again.
Change-Id: I42aa8b5a55d7584ed242e1cb1f7123a6354edbc8
2010-07-17 14:26:44 -07:00
Eric Laurent
cdf8743e21 am 2b381aff: am 2c87e9c9: First submission of audio effect library from NXP software.
Merge commit '2b381affda94c5b17e023768f9f2271c69152838'

* commit '2b381affda94c5b17e023768f9f2271c69152838':
  First submission of audio effect library from NXP software.
2010-07-17 06:52:16 -07:00
Eric Laurent
2b381affda am 2c87e9c9: First submission of audio effect library from NXP software.
Merge commit '2c87e9c923b0362fabf8c97ff63997542394c428' into gingerbread-plus-aosp

* commit '2c87e9c923b0362fabf8c97ff63997542394c428':
  First submission of audio effect library from NXP software.
2010-07-17 06:46:03 -07:00
Eric Laurent
2c87e9c923 First submission of audio effect library from NXP software.
This CL contains the first open sourceable version of the audio effect library from NXP software.
The effects implemented are:
- Bass boost
- Virtualizer (stereo widening)
- Equalizer
- Spectrum analyzer

Source file for the effect engines are located under libeffects/lvm/lib
The wrapper implementing the interface with the audio effect framework in under libeffects/lvm/wrapper

The code of other effect libraries has also been reorganized fo clarity:
- the effect factory is now under libeffects/factory
- the test equalizer and reverb effects are under libeffect/testlibs
- the visualizer is under libeffects/virtualizer

Change-Id: I8d91e2181f81b89f8fc0c1e1e6bf552c5809b2eb
2010-07-17 06:33:00 -07:00
Mike Lockwood
f4d207b1c2 Don't throw an exception from isProviderEnabled and getLastKnownLocation
if the location provider does not exist.  Instead use the same behavior
as if the provider were disabled in settings
(return false for isProviderEnabled and null from getLastKnownLocation).
This eliminates for a lot of exception handling around some simple
queries to the location manager.

BUG: 2841014

Change-Id: I4fbe0c088e915c90969e13083201dd3e7f4029cb
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-17 08:21:33 -04:00
Adam Powell
b5de9f3baf Fix bug 2845609 - Touch event dispatching problem.
Maintain the state of the CANCEL_NEXT_UP_EVENT flag properly.

Change-Id: I5ca22409bf8557c486d02806811b10550c5576eb
2010-07-17 01:51:25 -07:00
Romain Guy
b6a45e3993 Merge "Add program for linear gradient." 2010-07-16 23:19:19 -07:00
Romain Guy
f9764a4f53 Add program for linear gradient.
This change adds a new DrawLinearGradientProgram class to enable the drawing
of linear gradients. Two new vertex and fragment shaders are introduced,
based on DrawTextureProgram's shaders.

Change-Id: I885afc076bb6cef8cd3962ae21a086fa6a03bf96
2010-07-16 23:18:27 -07:00
Fabrice Di Meglio
0980de8976 Fix bug #2846543 Delete HIDDEN column from the "Calendars" table
- suppress the "hidden" column from the Calendar API
- add generic "sync5" column which will contain the "hidden" calendar state from the server

Change-Id: Ib2048e9f0fc59f4f544bc6f1787af82fde3984d5
2010-07-16 20:22:28 -07:00
Robert Greenwalt
f268ed9cd9 Merge "Fix emulator dns." 2010-07-16 18:38:57 -07:00
Robert Greenwalt
6fefb33a67 Fix emulator dns.
Really fix it this time.  The previous fix had a flaw which tested ok but was removed
after a code review.  This flaw masked problems in DataConnection, which this fix
fixes.

bug:2849192
Change-Id: I50d2dd827d4427f8030c0f590c85672869b509ff
2010-07-16 18:14:25 -07:00
Jeff Brown
5ab0488223 am 3994396b: am d3616592: Fix trackball down and movement bugs.
Merge commit '3994396b089c36f432a7af5d542ef594142dd09b'

* commit '3994396b089c36f432a7af5d542ef594142dd09b':
  Fix trackball down and movement bugs.
2010-07-16 17:56:15 -07:00
Jeff Brown
3994396b08 am d3616592: Fix trackball down and movement bugs.
Merge commit 'd3616592fe1b315b589766c4b74ce728fc4968f5' into gingerbread-plus-aosp

* commit 'd3616592fe1b315b589766c4b74ce728fc4968f5':
  Fix trackball down and movement bugs.
2010-07-16 17:53:48 -07:00
Jeff Brown
d3616592fe Fix trackball down and movement bugs.
Bug: 2823788
Change-Id: Icb0c392b58f7e735614460b5eb87439cb73ac4f2
2010-07-16 17:46:03 -07:00
Chet Haase
5700c95f40 Merge "Fixing view property invalidation issues" 2010-07-16 17:39:44 -07:00
Romain Guy
ea2604d966 Merge "Add plumbing to support gradients in OpenGL renderer." 2010-07-16 17:13:26 -07:00
Romain Guy
7fac2e1833 Add plumbing to support gradients in OpenGL renderer.
The LinearGradient class keeps a copy of the various parameters that
define the gradient. The copies are native arrays to avoid copying
Java arrays on every draw call. The gradient code path is implemented
until OpenGLRenderer::drawRect() (see TODO.) The actual gradient
implementation will be added in a latter change.

Change-Id: I9300d250ef5e2e9c2e097c3116ee71dfc9d752d8
2010-07-16 17:10:13 -07:00
Xavier Ducrohet
b8bb8ac5bb Fix the layoutlib Paint.set(Paint) method.
It would change the text rendering info but not recompute
the Java Font objects. The effect is a broken font rendering
in the EditText (which use this method to copy some Paint
object before using the copy for the actual drawing)

Change-Id: I6d8d1bf86f0d77d088f60ad81c71dd3ebab727b0
2010-07-16 16:46:39 -07:00
Jeff Brown
24bf20cf1e am e2fb11b9: am ace999b0: Ignore attempts to finish events on unregistered channels.
Merge commit 'e2fb11b9b02518126ace1a998ae7f824fc76068a'

* commit 'e2fb11b9b02518126ace1a998ae7f824fc76068a':
  Ignore attempts to finish events on unregistered channels.
2010-07-16 16:25:45 -07:00
Hung Dang
cbfa242609 am d652751d: am b6761e73: am 28fe43be: Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo
Merge commit 'd652751de782bac7e37916ed5786fcfa637a2be3'

* commit 'd652751de782bac7e37916ed5786fcfa637a2be3':
  Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
2010-07-16 16:25:27 -07:00
Jamie Gennis
691a9fcb2b am 04b95313: am c8c79a65: Merge "Re-use existing Surface objects when reading them from parcels." into gingerbread
Merge commit '04b953132edb5482f0aa6d992f89e7016961528c'

* commit '04b953132edb5482f0aa6d992f89e7016961528c':
  Re-use existing Surface objects when reading them from parcels.
2010-07-16 16:25:23 -07:00
Jeff Brown
5b45b1c274 am 7b8df313: am 00ba8844: Fix individual pointer id up/down reporting.
Merge commit '7b8df313f714d6e8d536e0f8bbe5496fe9a6c26d'

* commit '7b8df313f714d6e8d536e0f8bbe5496fe9a6c26d':
  Fix individual pointer id up/down reporting.
2010-07-16 16:25:13 -07:00
Scott Main
955f1551b6 am aba4bf19: am e068b464: am 2a8dd4e4: Merge "docs: editorial revisions to Search guide" into froyo
Merge commit 'aba4bf19fbdedb2f4f438895e8165a3b34a15633'

* commit 'aba4bf19fbdedb2f4f438895e8165a3b34a15633':
  docs: editorial revisions to Search guide
2010-07-16 16:25:03 -07:00
Jeff Brown
e2fb11b9b0 am ace999b0: Ignore attempts to finish events on unregistered channels.
Merge commit 'ace999b096739d376d4845c0ba94599197ff8477' into gingerbread-plus-aosp

* commit 'ace999b096739d376d4845c0ba94599197ff8477':
  Ignore attempts to finish events on unregistered channels.
2010-07-16 16:03:07 -07:00