Commit Graph

30970 Commits

Author SHA1 Message Date
Leon Scroggins
2bcea0c685 Merge "New assets for checkboxes and radios for WebView." 2011-03-02 08:34:25 -08:00
Kristian Monsen
156425f084 Merge "Fix from post submit review" 2011-03-02 03:27:47 -08:00
Mathias Agopian
17290c5583 Merge "Add support for up to 32 buffers per Surface" 2011-03-01 20:08:07 -08:00
Vasu Nori
7af7376bea Merge "cosmetic fixes: removing unused members/imports" 2011-03-01 18:39:14 -08:00
Dianne Hackborn
f5f2862b1b Merge "Fix issue #3387676 com.android.browser: java.lang.NullPointerException..." 2011-03-01 18:34:01 -08:00
Vasu Nori
f84fd3db8d Merge "bug:3497143 don't print warning if it is a bug in platform - not in app." 2011-03-01 18:26:17 -08:00
Jim Miller
a7b328c6b4 Merge "Fix 3463772: Bring back alarm icon on LockScreen" 2011-03-01 18:17:06 -08:00
Jim Miller
79daa8e888 Merge "Fix 3482763: Minor layout tweaks and new asset for recents" 2011-03-01 17:50:41 -08:00
Daniel Sandler
e0e1a27b50 Merge "Make with the clicky. (Status bar buttons now play FX.)" 2011-03-01 17:49:18 -08:00
Dianne Hackborn
5faf683e2b Merge "Fix issue #3405957 com.android.settings: java.lang.NullPointerException..." 2011-03-01 17:36:25 -08:00
Dianne Hackborn
1acdeb0c97 Merge "Fix issue #3411615: Crash when getting dialog layout inflator." 2011-03-01 17:18:10 -08:00
James Dong
70a67a1621 Merge "Get rid of redundant media profiles" 2011-03-01 17:11:26 -08:00
Eric Laurent
8200789b7a Merge "Fix issue 3499926." 2011-03-01 17:08:02 -08:00
Jim Miller
af9bd17969 Merge "Fix 3500730: Prevent NPE cause by clicking on footer view" 2011-03-01 16:27:40 -08:00
Romain Guy
8bd4bed0ad Merge "Don't account for scrollX/Y when drawing a display list in a layer." 2011-03-01 15:54:57 -08:00
Adam Powell
ce717cd939 Merge "Fix bug 3501411 - ListView should ignore "up" events outside of its view" 2011-03-01 15:41:58 -08:00
Adam Cohen
355dfa76f9 Merge "Adding mouse scroll wheel support to StackView" 2011-03-01 15:27:19 -08:00
Dianne Hackborn
b2a10fcb0f Merge "Fix issue #3495749: Crash on choosing to open the downloaded images" 2011-03-01 15:26:44 -08:00
John Reck
3be5902930 Merge "Send correct cookies for HTML5 video when incognito" 2011-03-01 15:07:39 -08:00
Romain Guy
c0dd743863 Merge "Correctly mark layers dirty when drawing WebView." 2011-03-01 14:53:48 -08:00
Jamie Gennis
ea72db3737 Merge "Add the MIN_UNDEQUEUED_BUFFERS query to ANW." 2011-03-01 14:38:20 -08:00
Dianne Hackborn
4a89a5e13e Merge "Fix Issue 14340: Sticky Service killed with onDestroy not called, not restarted." 2011-03-01 14:36:12 -08:00
Romain Guy
976c89c19f Merge "Avoid UTF-8 conversions and string copies whenever possible." 2011-03-01 14:28:13 -08:00
Mathias Agopian
acd116daea Add support for up to 32 buffers per Surface
Bug: 3488016

Change-Id: Ie5536ad77d42a4d0e8270e0fd87ecb73471bcbbc
2011-03-01 14:09:06 -08:00
Gilles Debunne
173f177ea8 Merge "AbsListView notifies scroll events to the ViewTreeObserver." 2011-03-01 13:55:16 -08:00
Kristian Monsen
d29000cc0b Merge "Part of fix for bug 3489551 Browser doesn't send cookies for HTML5 video in incognito" 2011-03-01 13:12:24 -08:00
Derek Sollenberger
5bee142a7a Merge "Don't update webkit at every stage of a zoom animation." 2011-03-01 12:58:31 -08:00
Fred Quintana
27ecc3bffb Merge "Fix a deadlock in AccountManagerService cause by different paths of code getting the mCacheLock and DB locks in different orders." 2011-03-01 12:30:06 -08:00
Santosh Madhava
b3382cc23e Merge "Fix for issue 3431967: Memory leak from video editor engine" 2011-03-01 12:04:12 -08:00
Mike Lockwood
86d2fee005 Merge "UsbDeviceSettingsManager: don't write settings file when not necessary" 2011-03-01 12:00:09 -08:00
Mike Lockwood
416a44a9bd Merge "Fix UsbDeviceSettingsManager locking." 2011-03-01 11:59:32 -08:00
Mike Lockwood
4e5f5427e2 Merge "Move USB framework support from android.hardware to android.hardware.usb package" 2011-03-01 11:58:22 -08:00
Eric Laurent
09fce23a7e Merge "Fix issue 3479042." 2011-03-01 11:46:15 -08:00
Jamie Gennis
30365befce Merge "Stagefright: Query buffer usage from the component." 2011-03-01 11:41:29 -08:00
Irfan Sheriff
82a1291b20 Merge "Using AsyncChannel for wifi connectivity" 2011-03-01 11:32:24 -08:00
Eric Fischer
56c065d4c5 Merge "Import revised translations." 2011-03-01 11:11:24 -08:00
Mike Lockwood
fab7422d8d am 5d019f0e: (-s ours) am c01e201f: (-s ours) am 61c1bb4f: Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread
* commit '5d019f0e6d57cdd633aa976a8a0f221941afd343':
  UsbService: Remove stack-trace message during boot. DO NOT MERGE
2011-03-01 10:59:00 -08:00
Mike Lockwood
90ed0ea8a0 am 3fa12d45: (-s ours) am fc88f94f: (-s ours) am 6da062a9: Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread
* commit '3fa12d459d16fb1d3d06b6c68b201340c9d3afcd':
  DO NOT MERGE: Clean up USB notifications:
2011-03-01 10:58:56 -08:00
Mike Lockwood
bab78807eb am 91dceb81: (-s ours) am 54e96c69: (-s ours) am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread
* commit '91dceb8143c9dab6b9b0ad38b5a3d7bb0586c677':
  DO NOT MERGE UsbManager: squashed commit of:
2011-03-01 10:58:52 -08:00
Mike Lockwood
73cc000814 am 8697f397: (-s ours) am f41768c5: (-s ours) am f7b99b32: Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread
* commit '8697f397e29cdfb90f84fab584eff9edc2b0dc6f':
  Give system server permission to access USB. DO NOT MERGE
2011-03-01 10:58:49 -08:00
Xavier Ducrohet
e9265b771d am 2d5ed079: (-s ours) am 7b972755: (-s ours) am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread
* commit '2d5ed07940bc1966d4b55999634f05515e7fe197':
  Merge 1911a6f7 into gingerbread. do not merge.
2011-03-01 10:58:45 -08:00
Wink Saville
aabf253e34 am 23fe0059: (-s ours) am 0eb6af89: Merge "Fixing the write of BackgroundData setting, DO NOT MERGE." into honeycomb
* commit '23fe005900aab2955052e0c9dc36ca05ea351a1a':
  Fixing the write of BackgroundData setting, DO NOT MERGE.
2011-03-01 10:58:05 -08:00
Gilles Debunne
187d75a138 Merge "Removed ViewTreeObserver null checks" 2011-03-01 10:50:00 -08:00
Gilles Debunne
33fca21e8a Merge "Scrollable tabs are correctly displayed." 2011-03-01 10:49:23 -08:00
Adam Powell
ef160cb2ad Merge "Fix a bug where the lazy-initialized ActionBar object was being too lazy." 2011-03-01 10:46:42 -08:00
Eric Rowe
a23b7610b0 Merge "Add test cases for AudioManager SCO methods." 2011-03-01 10:31:26 -08:00
Jamie Gennis
4f87e98c01 Merge "Add an OMX IL API for querying buffer usage flags." 2011-03-01 10:25:38 -08:00
Jamie Gennis
0487b2a20a Merge "Fix error recovery in Stagefright init." 2011-03-01 10:24:55 -08:00
Mike Lockwood
8c18b5f38b am c01e201f: (-s ours) am 61c1bb4f: Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread
* commit 'c01e201f12149ca96593af4e18133d3b2fce5546':
  UsbService: Remove stack-trace message during boot. DO NOT MERGE
2011-03-01 09:12:49 -08:00
Mike Lockwood
bcf65037d2 am fc88f94f: (-s ours) am 6da062a9: Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread
* commit 'fc88f94fc32fc010b153af32dea8e1fd4bae1f19':
  DO NOT MERGE: Clean up USB notifications:
2011-03-01 09:12:45 -08:00