Commit Graph

13097 Commits

Author SHA1 Message Date
Ben Murdoch
cadf61183f Merge "Keep track of when the HTML5 database path has been set, so that we don't inadvertantly sync it to the native side before it has been set by the client." 2010-02-26 02:11:18 -08:00
Jim Miller
314706b490 Merge "Fix 2336057: Provide a way for the user to return to a call from LockScreen." 2010-02-25 21:03:17 -08:00
Jaikumar Ganesh
4cee94295a Merge "Move auto pairing data to a file, add values dynamically." 2010-02-25 19:39:58 -08:00
Chris Tate
caa61ca9ba Merge "Default the auto-restore setting to "enabled."" 2010-02-25 18:04:08 -08:00
Chris Tate
16f8b4abac Merge "Be sure to back up / restore some new settings" 2010-02-25 17:20:50 -08:00
Marc Blank
b1dc2870f6 Merge "Define the new lastSyncedAttendeeStatus column" 2010-02-25 16:59:54 -08:00
Chris Tate
7e7c9df1f8 Merge "Start respecting the auto-restore-at-install setting" 2010-02-25 16:52:08 -08:00
Adam Powell
afaabe9e18 Merge "HorizontalScrollView multitouch scroll and only grip on content AbsListView multitouch scroll and only grip on content" 2010-02-25 16:29:42 -08:00
Andreas Huber
dec5f7571b Merge "Support vendor MPEG4 test content with apparently malformed chunks in them." 2010-02-25 16:25:43 -08:00
Kenny Root
ed907c6742 Merge "Remove misleading method comment on TextView#setHint" 2010-02-25 15:54:19 -08:00
James Dong
06fcdf078f Merge "Add some space and total memory amount to the memory dump from the media server process." 2010-02-25 15:14:40 -08:00
James Dong
f19c8e6765 Merge "Image encoding settings java API through xml configuration file" 2010-02-25 15:11:29 -08:00
The Android Open Source Project
b4c6a03a2b am fc7028f1: merge from open-source master
Merge commit 'fc7028f1c68dcc8d59c8e4daf4a8917a3d9a7558'

* commit 'fc7028f1c68dcc8d59c8e4daf4a8917a3d9a7558':
  Move LocationTracker test app from vendor/google to frameworks/base/tests
2010-02-25 15:08:03 -08:00
The Android Open Source Project
eb45079bee merge from open-source master 2010-02-25 14:54:51 -08:00
Romain Guy
dacc3f288b Merge "Prevent ProgressBar from updating itself when hidden. Bug #2470737" 2010-02-25 14:33:32 -08:00
Gilles Debunne
cc5b716065 Merge "New test on ContextMenuInfo packed positions." 2010-02-25 13:49:53 -08:00
Steve Howard
c008117902 Merge "Improve accelerometer-based orientation sensing." 2010-02-25 13:42:43 -08:00
Eric Fischer
6fe82c2126 Merge "Add support for accessing native bidi implementation via jni." 2010-02-25 12:18:55 -08:00
Robert Greenwalt
0cce2542f1 Merge "Fix no-mobile-data after wifi." 2010-02-25 12:18:26 -08:00
Oscar Montemayor
8730152740 Merge "Replacing hard-coded mount point for ASEC with a getenv() call." 2010-02-25 11:43:22 -08:00
Dianne Hackborn
5dda951bcf Re-arrange android-common so framework no longer links with it.
This is the framework part, moving classes around so the framework
no longer needs to link to android-common.  Makes some APIs public,
others that didn't need to be public are private in the framework,
some small things are copied.
2010-02-25 11:39:33 -08:00
Amith Yamasani
d49c1ced10 Merge "Configuration param to indicate if sd card is behind the battery." 2010-02-25 11:13:21 -08:00
Dianne Hackborn
34ea92b448 Merge "Init car mode when phone is booted in a dock." 2010-02-25 11:10:55 -08:00
Romain Guy
50d6cbbce6 Merge "Correctly handle negative margins in horizontal linear layouts." 2010-02-25 11:02:24 -08:00
Elliott Hughes
01f6dc41cb Merge "Remove incorrect/misleading irrelevancies from example code." 2010-02-25 10:32:41 -08:00
Amith Yamasani
db58c8c755 Merge "Fix for voice search crash in maps and youtube. Bug 2453182" 2010-02-25 10:27:33 -08:00
Mike LeBeau
fb71314a49 Merge "Add the API constants to support providing hint strings in the response to RecognizerIntent.ACTION_GET_LANGUAGE_DETAILS." 2010-02-25 10:16:14 -08:00
Jean-Michel Trivi
e55691e379 Merge "Fix bug 2452941 Add a flag to maintain the intended direct playback of TTS data independently from the associated AudioTrack state. Only start the track when it's been stopped but is supposed to be playing." 2010-02-25 08:47:40 -08:00
Mike LeBeau
e49afd8614 Add the API constants to support providing hint strings in the response to
RecognizerIntent.ACTION_GET_LANGUAGE_DETAILS.

This will use the new support for ArrayList<CharSequence> bundles added in
http://b/2468093. This and the corresponding VoiceSearch CL should not be
submitted until that is.
2010-02-25 07:19:55 -08:00
Steve Block
b5f513b9e7 Merge "Add HTML5 layout tests that currently fail to the DumpRenderTree skipped list" 2010-02-25 03:17:36 -08:00
Eric Laurent
83db7782aa Merge "Fix issue 2327064: Music played via line out is interrupted due to the phone call audio on BT hs." 2010-02-25 00:14:47 -08:00
Suchi Amalapurapu
4c0c10cb7a Merge "Add new handler mechanism in MountService to make unmount api asynchronous. MountService updates state on PackageManager and then tries to kill processes holding file references to media about to be unmounted by invoking api on ACtivityManager. This is retried upto 4 times to make sure all processes holding file references are killed before unmounting the media at specified path." 2010-02-24 20:43:24 -08:00
Robert Greenwalt
83b9d9c8f5 Merge "Add mobile data on/off switch." 2010-02-24 19:45:32 -08:00
Carl Shapiro
2c0ba019e5 Merge "Remove empty finalize methods." 2010-02-24 19:15:06 -08:00
San Mehat
488259ec96 Merge "MountService: Send UMS_CONNECTED broadcast on boot if UMS connected." 2010-02-24 19:04:48 -08:00
Grace Kloba
59d23756a9 am cbe4f887: (-s ours) am a406fb90: DO NOT MERGE
Merge commit 'cbe4f88747b56a753e4a9bf061946f4c6f051243'

* commit 'cbe4f88747b56a753e4a9bf061946f4c6f051243':
  DO NOT MERGE
2010-02-24 18:56:27 -08:00
Romain Guy
daba8ec2eb Merge "Fix tabs." 2010-02-24 18:55:59 -08:00
Grace Kloba
926c85d6bb am a406fb90: DO NOT MERGE
Merge commit 'a406fb90805adf36fe0fabd3a79018e33706453c' into eclair-mr2-plus-aosp

* commit 'a406fb90805adf36fe0fabd3a79018e33706453c':
  DO NOT MERGE
2010-02-24 18:39:55 -08:00
Adam Powell
cd1f2949ca Merge "ScrollView multiple pointer support. Fixed a bug where ScrollView wouldn't scroll if the initially tapped child ignores the down event." 2010-02-24 18:30:14 -08:00
Dmitri Plotnikov
fe9649ffd7 Merge "Introducing tentative (and hidden) API for contact search snippets" 2010-02-24 18:26:40 -08:00
Robert Greenwalt
ed05d0371b Merge "Tethering improvements." 2010-02-24 18:07:18 -08:00
San Mehat
685ce0e49f Merge "AsecTests: Add teardown to tests" 2010-02-24 18:06:01 -08:00
Romain Guy
501eed376e Merge "Fix the build." 2010-02-24 18:00:01 -08:00
Jesse Wilson
36180e6461 Merge "New update of preloaded classes for Froyo." 2010-02-24 17:38:13 -08:00
Chris Tate
0418eeb3b0 Merge "Add 'restoreAnyVersion' attr for apps that want to restore "future" data" 2010-02-24 17:24:54 -08:00
Joe Onorato
775c5b3935 Merge "Make ScrollView only do overscroll if you're grabbing the child view." 2010-02-24 16:30:00 -08:00
Fred Quintana
ef6f2a9409 Merge "allow permission USE_CREDENTIALS for AccountManager.invalidateAuthToken as well as the previous MANAGE_ACCOUNTS" 2010-02-24 15:25:44 -08:00
Eric Fischer
9963d1531a Merge "Filenames of sound effects are not translatable." 2010-02-24 14:53:10 -08:00
Vasu Nori
297ac17573 Merge "yet another race condition fix to address bug:2456970" 2010-02-24 14:36:36 -08:00
Grace Kloba
66f322746a Merge "If mPreventDrag is cancelled due to time out, remove the pending TOUCH_EVENTS and then send an ACTION_CANCEL and skip the rest of touch events." 2010-02-24 14:32:50 -08:00