Commit Graph

12247 Commits

Author SHA1 Message Date
Grace Kloba
d77667f3b3 am c811cd91: am caf0ce3c: Delay resetting mPreventDrag flags so that the Plugin will have more time to respond whether it wants to handle the touch events. (not have to return the value from WebViewCore before the first tap is up)
Merge commit 'c811cd916f7264f11ba4c96fcd8b88e5d58e04db'

* commit 'c811cd916f7264f11ba4c96fcd8b88e5d58e04db':
  Delay resetting mPreventDrag flags so that the Plugin
2010-01-26 10:27:06 -08:00
Grace Kloba
f3b670aef0 am cf0957ce: am 77dc179b: As embedded and full screen shares the same view, we have to replace the AbsoluteLayout with ViewGroup.Layout before setting it to the dialog as dialog\'s FrameLayout doesn\'t accept AbsoluteLayout.
Merge commit 'cf0957ce4b0ba45b6c66c726710a5126c6a57542'

* commit 'cf0957ce4b0ba45b6c66c726710a5126c6a57542':
  As embedded and full screen shares the same view,
2010-01-26 10:26:57 -08:00
Patrick Scott
696f0adeef am e7b2845d: Merge "DO NOT MERGE return an error when Surface::lock() is called while the surface is already locked." into eclair-mr2
Merge commit 'e7b2845d685a583e8e84de369b6acfa1bebeabf4' into eclair-mr2-plus-aosp

* commit 'e7b2845d685a583e8e84de369b6acfa1bebeabf4':
  DO NOT MERGE
2010-01-26 10:11:30 -08:00
Robert Greenwalt
fafd2adbaa resolved conflicts for merge of 1f2f23bd to master 2010-01-26 10:09:52 -08:00
Grace Kloba
e42072d30c am caf0ce3c: Delay resetting mPreventDrag flags so that the Plugin will have more time to respond whether it wants to handle the touch events. (not have to return the value from WebViewCore before the first tap is up)
Merge commit 'caf0ce3ca2b3deba4bcff6c920740bafd87f2b62' into eclair-mr2-plus-aosp

* commit 'caf0ce3ca2b3deba4bcff6c920740bafd87f2b62':
  Delay resetting mPreventDrag flags so that the Plugin
2010-01-26 10:09:52 -08:00
Grace Kloba
866f0ba964 am 77dc179b: As embedded and full screen shares the same view, we have to replace the AbsoluteLayout with ViewGroup.Layout before setting it to the dialog as dialog\'s FrameLayout doesn\'t accept AbsoluteLayout.
Merge commit '77dc179baa7b8fb405633fd46324e336285d10e2' into eclair-mr2-plus-aosp

* commit '77dc179baa7b8fb405633fd46324e336285d10e2':
  As embedded and full screen shares the same view,
2010-01-26 10:09:39 -08:00
Patrick Scott
30b2c96928 Merge "DO NOT MERGE return an error when Surface::lock() is called while the surface is already locked." into eclair-mr2 2010-01-26 10:07:23 -08:00
San Mehat
fa289ea7af Merge "NetworkManagementService: Start service when SystemServer starts up" 2010-01-26 07:59:08 -08:00
Patrick Scott
c51619f2ff Merge "Set a flag that indicates a response is pending." 2010-01-26 07:08:17 -08:00
San Mehat
f67d028db6 Merge "MountService: Add support for renaming secure containers" 2010-01-26 06:19:21 -08:00
Irfan Sheriff
5c52057ae1 resolved conflicts for merge of d0514347 to master 2010-01-25 19:10:31 -08:00
Robert Greenwalt
8c940c94fd am cc4b4016: Fix the reporting of NO_CONNECTIVITY.
Merge commit 'cc4b4016e4b86db012f94bb889e5ca61ff362171' into eclair-plus-aosp

* commit 'cc4b4016e4b86db012f94bb889e5ca61ff362171':
  Fix the reporting of NO_CONNECTIVITY.
2010-01-25 18:56:32 -08:00
Grace Kloba
4da3d55c4b am e5b9beae: (-s ours) am f6aed0e0: Merge "DO NOT MERGE" into eclair
Merge commit 'e5b9beae260b451cb3d60583c800b0d223ae256f'

* commit 'e5b9beae260b451cb3d60583c800b0d223ae256f':
  DO NOT MERGE
2010-01-25 18:13:29 -08:00
Grace Kloba
1824f75c03 am 5b745762: am d5ada83c: ScaleGestureDetector needs to query the displaymetrics for the width/height on each touch down as orientation can change.
Merge commit '5b74576218055f1c9d31d9559255e8cf504cd662'

* commit '5b74576218055f1c9d31d9559255e8cf504cd662':
  ScaleGestureDetector needs to query the displaymetrics
2010-01-25 18:13:12 -08:00
Nick Pelly
2b2c2e3a35 am 425324e9: am e834722f: Merge "Fix failure to open AVRCP input device due to EPERM." into eclair
Merge commit '425324e97bba75cd69bb6c81de6248529540e6fe'

* commit '425324e97bba75cd69bb6c81de6248529540e6fe':
  Fix failure to open AVRCP input device due to EPERM.
2010-01-25 18:12:47 -08:00
Grace Kloba
80370aa83b am aeeb1a84: (-s ours) am 8681df90: DO NOT MERGE
Merge commit 'aeeb1a84aae2c7400b2edd90cea8306565225275'

* commit 'aeeb1a84aae2c7400b2edd90cea8306565225275':
  DO NOT MERGE
2010-01-25 18:12:31 -08:00
Mike Reed
6b2a58b1b8 am 6dc9232c: (-s ours) am a66baccc: Merge "Do not merge" into eclair
Merge commit '6dc9232c1c9a7ddffba24d4bd218e46894f8414d'

* commit '6dc9232c1c9a7ddffba24d4bd218e46894f8414d':
  Do not merge
2010-01-25 18:12:08 -08:00
Xavier Ducrohet
0c4fc79ed0 am 48edf7c0: am d1da5fa2: Revert "SDK doc change: Add doc update for NDKr3."
Merge commit '48edf7c00201f2bc6186e07dbc614976642682e4'

* commit '48edf7c00201f2bc6186e07dbc614976642682e4':
  Revert "SDK doc change: Add doc update for NDKr3."
2010-01-25 18:11:20 -08:00
Grace Kloba
ee96d5fd87 am f8c7d06f: am 89e3c1ab: Merge "Fix the sloppy detection in the ScaleGestureDetector." into eclair
Merge commit 'f8c7d06ffa67015516b822a992513ab86aad1ad5'

* commit 'f8c7d06ffa67015516b822a992513ab86aad1ad5':
  Fix the sloppy detection in the ScaleGestureDetector.
2010-01-25 18:11:02 -08:00
Xavier Ducrohet
629a8695aa am a0ecd4fb: am 38f7a02a: Merge "SDK doc change: Add doc update for NDKr3." into eclair
Merge commit 'a0ecd4fbe65ffb00afb3043584a3d08ee41b0870'

* commit 'a0ecd4fbe65ffb00afb3043584a3d08ee41b0870':
  SDK doc change: Add doc update for NDKr3.
2010-01-25 18:10:42 -08:00
Scott Main
5fded4023f am bfb86068: am 2a79defa: Merge "docs: add guide to copying and installing the Dev Tools app from the emulator to a device." into eclair
Merge commit 'bfb8606831d5a5776301733cde3650d237870453'

* commit 'bfb8606831d5a5776301733cde3650d237870453':
  docs: add guide to copying and installing the Dev Tools app
2010-01-25 18:10:13 -08:00
Eric Laurent
7277e17b16 Merge "Fix issue 2378022: AudioService should direct volume control to STREAM_VOICE_CALL stream when STREAM_VOICE_CALL stream is active." 2010-01-25 17:16:05 -08:00
Robert Greenwalt
83eda0c788 am 5381e4ef: Merge "Refine fix I53e91db7 to apply only to wifi network" into eclair
Merge commit '5381e4ef4ef1a05b25fa39ff942f4a95e0ae4750' into eclair-plus-aosp

* commit '5381e4ef4ef1a05b25fa39ff942f4a95e0ae4750':
  Refine fix I53e91db7 to apply only to wifi network
2010-01-25 16:54:28 -08:00
Scott Main
781012c991 am d243bc71: Merge "docs: reference the history JS file with docRoot in order to make offline doc searches work. (I think this was a regression due to a missed merge.) Bug: 1909300" into eclair
Merge commit 'd243bc710c92e56974f52449d24e2c6b8dd0ef9e' into eclair-plus-aosp

* commit 'd243bc710c92e56974f52449d24e2c6b8dd0ef9e':
  docs: reference the history JS file with docRoot in order to
2010-01-25 16:54:20 -08:00
Robert Greenwalt
06fb48ea18 Merge "Refine fix I53e91db7 to apply only to wifi network" into eclair 2010-01-25 16:50:10 -08:00
Romain Guy
3711384241 Merge "Made GestureUtilities's several methods public; Changed GestureStroke's smoothening threshold." 2010-01-25 16:30:37 -08:00
Andreas Huber
a0df298dde Merge "Initial checkin of AudioSource and AMRWriter, a pair of classes supporting pure-audio recording in stagefright." 2010-01-25 16:18:58 -08:00
Scott Main
e3ec5eb95b Merge "docs: reference the history JS file with docRoot in order to make offline doc searches work. (I think this was a regression due to a missed merge.) Bug: 1909300" into eclair 2010-01-25 15:39:46 -08:00
Eric Laurent
43c0b0a1f6 Fix issue 2378022: AudioService should direct volume control to STREAM_VOICE_CALL stream when STREAM_VOICE_CALL stream is active.
Modified AudioService.getActiveStreamType() so that STREAM_VOICE_CALL is selected when a track using this stream
type is playing.

Chanded isMusicActive() for a more generic isStreamActive(stream) method in AudioSystem, IAudioFlinger and AudioFlinger.
2010-01-25 14:00:10 -08:00
Eric Laurent
5e4b031248 Merge "Fix issue 2349345: Media sound output stuck on earpiece rather than speaker." 2010-01-25 13:56:42 -08:00
Mathias Agopian
fb8d47c294 Merge "fix [2341222] AGL version of glDrawTexxOES doesn't handle "Z" value correctly" 2010-01-25 13:50:17 -08:00
Mike LeBeau
4c7e631f92 Merge "Add RecognizerIntent.ACTION_VOICE_SEARCH_SETTINGS, which we'll trigger from system settings. For now it'll just be triggered from within the voice search app if you choose the settings menu item." 2010-01-25 12:06:48 -08:00
Mathias Agopian
45351bcae5 fix [2341222] AGL version of glDrawTexxOES doesn't handle "Z" value correctly 2010-01-25 11:49:52 -08:00
Eric Laurent
d6dffeeebd Merge "Fix issue 2363154: Speech synthesis fails to start over A2DP after media server process crash." 2010-01-25 11:46:43 -08:00
Mathias Agopian
a775a728f8 Merge "fix [2303866] eglMakeCurrent doesn't return all error messages described in the spec" 2010-01-25 11:37:54 -08:00
Chris Tate
90492eb82c Merge "Make sure to downgrade to app permissions when invoking callbacks" 2010-01-25 11:35:08 -08:00
Mathias Agopian
8063c3ab04 fix [2303866] eglMakeCurrent doesn't return all error messages described in the spec 2010-01-25 11:30:11 -08:00
Andreas Huber
8aed2b0379 Merge "The qcom OMX video decoders do not allocate output buffer memory at the time OMX_AllocateBuffer is called, wait until we received the first FILL_BUFFER_DONE notification until we rely on the buffer data ptr." 2010-01-25 11:25:17 -08:00
Ken Shirriff
55d7cd8940 Merge "Add SyncState class for calendar provider." 2010-01-25 10:50:47 -08:00
Grace Kloba
450801613f Merge "Manual merge pinch zoom from Eclair to Master." 2010-01-25 09:31:20 -08:00
Mike Reed
6c2d9c241b am f904be16: Merge "disable high-quality filtering during scrolling, until I can cached the scaled images." into eclair
Merge commit 'f904be1659fcc88dd80be2c900ffc89e77b1c737' into eclair-plus-aosp

* commit 'f904be1659fcc88dd80be2c900ffc89e77b1c737':
  disable high-quality filtering during scrolling, until I can cached the scaled images.
2010-01-25 06:24:35 -08:00
Mike Reed
e14a1ad9cc Merge "disable high-quality filtering during scrolling, until I can cached the scaled images." into eclair 2010-01-25 06:19:17 -08:00
Irfan Sheriff
7f195ab187 am 6b32c0a2: (-s ours) am 48ef378d: Merge "DO NOT MERGE Avoid wifi disable in a UNKNOWN state" into eclair
Merge commit '6b32c0a2ffd3fe8bf5c290eeecc78fb2e3521520'

* commit '6b32c0a2ffd3fe8bf5c290eeecc78fb2e3521520':
  DO NOT MERGE Avoid wifi disable in a UNKNOWN state
2010-01-25 06:04:07 -08:00
Robert Greenwalt
1b4533ad36 am 8c48b4a5: (-s ours) am 1a337547: Merge "Add bugreport info about network feature use. DO NOT MERGE" into eclair
Merge commit '8c48b4a532b1011a2f76f3565335c77fc5b141b3'

* commit '8c48b4a532b1011a2f76f3565335c77fc5b141b3':
  Add bugreport info about network feature use. DO NOT MERGE
2010-01-25 06:03:49 -08:00
Mike Reed
ad1f963987 am 70660425: (-s ours) am 9f954cf2: Merge "Do not merge" into eclair
Merge commit '70660425c03ac9688d749b13b48bba24d22efabf'

* commit '70660425c03ac9688d749b13b48bba24d22efabf':
  Do not merge
2010-01-25 06:03:30 -08:00
Mathias Agopian
588dcc7040 DO NOT MERGE
return an error when Surface::lock() is called while the surface is already locked.
2010-01-25 07:51:29 -05:00
Wu-cheng Li
fb55488e4e Merge "Change key to KEY_SUPPORTED_JPEG_THUMBNAIL_SIZES for consistency." 2010-01-24 23:24:10 -08:00
Wu-cheng Li
88eeff5270 Change key to KEY_SUPPORTED_JPEG_THUMBNAIL_SIZES for consistency.
bug:2375986
2010-01-25 15:20:23 +08:00
Jim Miller
65c1cbfaa1 am 2e4e25f3: Merge "Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long." into eclair
Merge commit '2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc' into eclair-plus-aosp

* commit '2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc':
  Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.
2010-01-22 20:23:37 -08:00
Jim Miller
4691ef5e0f Merge "Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long." into eclair 2010-01-22 20:19:12 -08:00