Robert Greenwalt
35e22bb2c0
Merge "Add build options for tethering."
2010-02-26 18:01:28 -08:00
Adam Powell
32820ca5f9
Merge "ListView now tries to keep the position containing focused child views on-screen."
2010-02-26 17:06:50 -08:00
Adam Powell
4524176014
Merge "FastScroller now reports scroll state changes for its associated AbsListView"
2010-02-26 16:46:35 -08:00
Mike LeBeau
9b6381e033
Merge "Add an extra which allows to query *only* for the voice search language preference. This will be used by e.g. LatinIME to avoid extra computation when this is all that's needed (probably a common use case for this API)."
2010-02-26 15:21:29 -08:00
Mike Lockwood
443b18ea4e
Merge "Tethering: Use battery changed broadcast instead of UMS broadcast to determine when USB is connected and disconnected."
2010-02-26 15:19:10 -08:00
Robert Greenwalt
3c8ce50ecc
Merge "Fix hipri status notifications"
2010-02-26 14:58:45 -08:00
Chris Tate
3db1ec312c
Merge "Make sure to apply the auto-restore setting when the system is restored"
2010-02-26 14:16:59 -08:00
Romain Guy
98cc14afb1
Merge "Do not detach headers and footers from the list view."
2010-02-26 14:15:42 -08:00
Fred Quintana
d39c84f544
Merge "remove redundant @hides"
2010-02-26 13:43:09 -08:00
Mike Lockwood
990262693b
Merge "CdmaDataConnectionTracker: Add DUN to list of supported APN types."
2010-02-26 13:37:34 -08:00
Marco Nelissen
7ef78c84d7
Merge "When we're in the 'playback complete' state, don't consider pausing an error. This makes 'playback complete' essentially equivalent to being paused at the end, and treats it the same as being paused at any other position."
2010-02-26 13:30:27 -08:00
Romain Guy
253c5a3582
Merge "Send cancel event to recycled views instead of an up. Bug #2309387 "
2010-02-26 13:16:21 -08:00
Chris Tate
5dccef7b21
Merge "Add single-package restore to Bmgr feature set"
2010-02-26 13:06:42 -08:00
Vasu Nori
228ddffe31
Merge "in finalize() methods, log warnings if db lock is going to be held."
2010-02-26 11:45:54 -08:00
Gilles Debunne
23ecb031e6
Merge "New tests for ExpandableListView to exercice packed position with headers/footers."
2010-02-26 11:37:41 -08:00
Andreas Huber
c94a4f9cf0
Merge "The PV aac software decoder screws up if playing a mono-AACplus stream unless we output stereo data. Now we always output stereo data as the legacy OMX nodes did."
2010-02-26 10:47:11 -08:00
Marco Nelissen
42f42dcee2
Merge "Make AsyncPlayer.startSound catch all exceptions instead of only a few. Two reasons for this: - it's used in the system process - it's run in a separate thread, so the user of AsyncPlayer cannot catch these exceptions"
2010-02-26 10:46:46 -08:00
Fred Quintana
19200e6496
Merge "deprecate SyncConstValue, since it is now only used by the deprecated ContactsProvider interface"
2010-02-26 09:50:18 -08:00
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
