ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
12,980 Commits 2 Branches 0 Tags 54 MiB
664e53dd23
Commit Graph

12980 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
664e53dd23 resolved conflicts for merge of 4dcd2ee8 to master 2010-03-01 11:30:02 -08:00
Paul Westbrook
e26f4a308f Merge "Bug 2306842" 2010-03-01 09:41:49 -08:00
The Android Open Source Project
05d7350329 merge from open-source master 2010-03-01 09:30:21 -08:00
Marc Blank
121181af47 Merge "Put _SYNC_LOCAL_ID into event entities" 2010-03-01 08:37:20 -08:00
Dave Sparks
01058d3646 Merge "Stop previous ringtone when silent is selected. Bug 2256593." 2010-03-01 07:55:11 -08:00
Derek Sollenberger
8ccb632005 Merge "force plugins to render on top of browser content." 2010-03-01 05:35:21 -08:00
Andrei Popescu
a8133ffe12 Merge "VideoPlayer::onPrepared() can be called after the user pressed back in the VideoView. This can cass a NPE since our Timer would have been destroyed by then." 2010-03-01 05:30:05 -08:00
Gilles Debunne
227c650d76 Merge "Fixes for ExpandableListView with headers/footers" 2010-02-27 13:13:11 -08:00
Mike Lockwood
1b960bb8ff Merge "Fix synchronization problem in PowerManagerService.dump()" 2010-02-27 06:16:54 -08:00
Jacek Surazski
78528bb55f Merge "Add BatteryInfo to ApplicationErrorReport." 2010-02-27 04:00:44 -08:00
Mathias Agopian
07f8949946 Merge "to help debugging [2461567] Home screen redraw messed up" 2010-02-26 19:01:06 -08:00
Mathias Agopian
c8ff222963 Merge "fix [2475541] Deprecate Sensor.TYPE_ORIENTATION" 2010-02-26 19:00:56 -08:00
Mathias Agopian
45853c9759 to help debugging [2461567] Home screen redraw messed up 
log SF's idea of the front buffer in dumpsys.
 2010-02-26 18:59:23 -08:00
James Dong
be4da7f9f1 Merge "Don't allow MediaRecorder.setParameter() to be invoked in the following states: error, prepared or recording" 2010-02-26 18:56:22 -08:00
Eric Fischer
2b94c46e2a Merge "Import new translations." 2010-02-26 18:12:37 -08:00
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