summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Properly initialize FBO textures for linear filtering.Romain Guy2011-03-021-0/+5
| | | | Change-Id: I67fc4fd760483ef85809be8d6e608cf4f469650f
* Merge "Don't account for scrollX/Y when drawing a display list in a layer."Romain Guy2011-03-011-3/+8
|\
| * Don't account for scrollX/Y when drawing a display list in a layer.Romain Guy2011-03-011-3/+8
| | | | | | | | Change-Id: I73bdcdab3e547d00ba2853aed550e65d5f8c6fcd
* | Merge "Fix bug 3501411 - ListView should ignore "up" events outside of its view"Adam Powell2011-03-011-1/+5
|\ \
| * | Fix bug 3501411 - ListView should ignore "up" events outside of its viewAdam Powell2011-03-011-1/+5
| | | | | | | | | | | | | | | | | | | | | Do not dispatch item clicks if the up event occurs completely outside of list bounds. Change-Id: I2bc38040bcc98944e1449affcdbd75e0194637cf
* | | Merge "Adding mouse scroll wheel support to StackView"Adam Cohen2011-03-011-0/+36
|\ \ \
| * | | Adding mouse scroll wheel support to StackViewAdam Cohen2011-03-011-0/+36
| | | | | | | | | | | | | | | | Change-Id: I8ae5039606b3080059cea579547f6c61586641e3
* | | | Merge "Fix issue #3495749: Crash on choosing to open the downloaded images"Dianne Hackborn2011-03-013-44/+81
|\ \ \ \
| * | | | Fix issue #3495749: Crash on choosing to open the downloaded imagesDianne Hackborn2011-03-013-44/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is due to the window doing a relayout after its activity is stopped, at which point it may need to interact with the adapter to load data. The fix here is to tell ViewRoot about an activity being stopped and, if in this state, hold off on doing any new measurements and layouts of the hierarchy until it is no longer stopped. In this case the relayout was happening due to the cursor being deactivated, with causes the adapter to invalidate its data. Because this is now in a dialog window, this allows the window to actually be resized smaller (unlike when in a full screen activity), and boom. Change-Id: I26442b4679819b4a4e6bc56289afd3445526750b
* | | | | Merge "Send correct cookies for HTML5 video when incognito"John Reck2011-03-011-2/+3
|\ \ \ \ \
| * | | | | Send correct cookies for HTML5 video when incognitoJohn Reck2011-03-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3489551 Change-Id: Ic35ec725e72e97830afff2fb0392b2300d8c45f6
* | | | | | Merge "Correctly mark layers dirty when drawing WebView."Romain Guy2011-03-012-10/+26
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Correctly mark layers dirty when drawing WebView.Romain Guy2011-03-012-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7ae0c3cfa0916d8fbeaf01e8da127c621a06a0f4
* | | | | | Merge "Add the MIN_UNDEQUEUED_BUFFERS query to ANW."Jamie Gennis2011-03-017-15/+62
|\ \ \ \ \ \
| * | | | | | Add the MIN_UNDEQUEUED_BUFFERS query to ANW.Jamie Gennis2011-02-287-15/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a new query to ANativeWindow for getting the minimum number of buffers that must be left un-dequeued during the steady-state operation of the ANativeWindow. Change-Id: Ie8c461fc26b02ecde02ddb4f95bf763662cf1551 Related-Bug: 3356050
* | | | | | | Merge "Fix Issue 14340: Sticky Service killed with onDestroy not called, not ↵Dianne Hackborn2011-03-011-4/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | restarted."
| * | | | | | | Fix Issue 14340: Sticky Service killed with onDestroy not called, not restarted.Dianne Hackborn2011-03-011-4/+6
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2804c49ad5669ca89744c6d92ead0c7d21ee31d5 http://code.google.com/p/android/issues/detail?id=14340
* | | | | | | Merge "Avoid UTF-8 conversions and string copies whenever possible."Romain Guy2011-03-012-12/+15
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Avoid UTF-8 conversions and string copies whenever possible.Romain Guy2011-03-012-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie4584417bbb7247e6c567fbfdb819529e548bb8f
* | | | | | Merge "AbsListView notifies scroll events to the ViewTreeObserver."Gilles Debunne2011-03-011-25/+25
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | AbsListView notifies scroll events to the ViewTreeObserver.Gilles Debunne2011-03-011-25/+25
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ViewTreeObserver OnScrollChangedListener will then get notified. The scroll values are not specified, since they are passed to the base View.onScrollChanged method that simply sets the flags. No need to throw these from a Runnable (in case this happens during a relayout) since the listeners will be notified later from ViewRoot.draw(). Calling View.onScrollChanged in invokeOnItemScrollListener for normal scroll and in onOverScrolled to handle mScroller animation. Change-Id: Ib41434e5cd82e5a45ca6653db576746e89ef072d
* | | | | Merge "Part of fix for bug 3489551 Browser doesn't send cookies for HTML5 ↵Kristian Monsen2011-03-011-12/+76
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | video in incognito"
| * | | | | Part of fix for bug 3489551 Browser doesn't send cookies for HTML5 video in ↵Kristian Monsen2011-03-011-12/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incognito Adding private mode parameter for some cookie operations. Depends on this change in webkit: https://android-git.corp.google.com/g/#change,99051 Change-Id: I304de625632c3d659bf0d7a6b6a6e2bec985ecb6
* | | | | | Merge "Don't update webkit at every stage of a zoom animation."Derek Sollenberger2011-03-011-3/+4
|\ \ \ \ \ \
| * | | | | | Don't update webkit at every stage of a zoom animation.Derek Sollenberger2011-03-011-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL defers updating webkit until a zoom animation has completed. bug: 3451126 Change-Id: I75a90f307a3493363811ba67ec4e55bfec9c0702
* | | | | | | Merge "Fix a deadlock in AccountManagerService cause by different paths of ↵Fred Quintana2011-03-012-319/+351
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | code getting the mCacheLock and DB locks in different orders."
| * | | | | | | Fix a deadlock in AccountManagerService cause by differentFred Quintana2011-03-012-319/+351
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | paths of code getting the mCacheLock and DB locks in different orders. The philosophy I followed for this was to ensure that the DatabaseHelper is only ever accessed from within a synchronized(mCacheLock) block. I also renamed a bunch of methods to make it easier to know if a given method should be called from within this synchronized block. Bug: 3404506 Change-Id: Ia48f95e77b77647d0717f70f1d8364da3719cc13
* | | | | | | | Merge "Fix for issue 3431967: Memory leak from video editor engine"Santosh Madhava2011-03-011-21/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix for issue 3431967: Memory leak from video editor engineSantosh Madhava2011-03-011-21/+26
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibaa66d7c95f2a60b59dc3102d3b5130ff1fbc62e
* | | | | | | | Merge "UsbDeviceSettingsManager: don't write settings file when not necessary"Mike Lockwood2011-03-011-8/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | UsbDeviceSettingsManager: don't write settings file when not necessaryMike Lockwood2011-03-011-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I48772f71822e3489f9e6c640985055569a656124 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | Merge "Fix UsbDeviceSettingsManager locking."Mike Lockwood2011-03-012-156/+181
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix UsbDeviceSettingsManager locking.Mike Lockwood2011-03-012-156/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I93117ce791de95b0ab95017601f5d90ed5dd7a6a Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | Merge "Move USB framework support from android.hardware to ↵Mike Lockwood2011-03-0134-276/+154
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | android.hardware.usb package"
| * | | | | | | | Move USB framework support from android.hardware to android.hardware.usb packageMike Lockwood2011-03-0134-276/+154
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I00fd4f0caaa4aebe48f71c576bb211b5f38bf88d Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | Merge "Fix issue 3479042."Eric Laurent2011-03-015-1/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix issue 3479042.Eric Laurent2011-02-285-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that when an AudioRecord using the resampler is restarted, the resampler state is not reset (as there is no reset function in the resampler). The consequence is that the first time the record thread loop runs, it calls the resampler which consumes the remaining data in the input buffer and when this buffer is released the input index is incremented over the limit. The fix consists in implementing a reset function in the resampler. A similar problem was also present for playback but unoticed because the track buffer is always drained by the mixer when a track stops. The only problem for playback was that the initial phase fraction was wrong when restarting a track after stop (it was correct after a pause). Change-Id: Ifc2585d685f4402d29f4afc63f6efd1d69265de3
* | | | | | | | | Merge "Stagefright: Query buffer usage from the component."Jamie Gennis2011-03-012-4/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Stagefright: Query buffer usage from the component.Jamie Gennis2011-02-282-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes Stagefright query the gralloc buffer usage flags from the OMX IL component and passing those flags on to the ANativeWindow. Change-Id: Ic9af8a9e6df9ff4aadc7355890324d68841bc488 Related-Bug: 3479027
* | | | | | | | | | Merge "Using AsyncChannel for wifi connectivity"Irfan Sheriff2011-03-017-95/+146
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Using AsyncChannel for wifi connectivityIrfan Sheriff2011-02-287-95/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieee5a3a1a739238d8a6659493684f1be0cbea691
* | | | | | | | | | | Fix password field drawing.Leon Scroggins2011-03-011-0/+2
| |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:3499916 Change-Id: Idb10e9780e6a0cfecd6228de0fbfd4a1035ab61e
* | | | | | | | | | Merge "Import revised translations."Eric Fischer2011-03-014-51/+51
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import revised translations.Eric Fischer2011-03-014-51/+51
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibd5a50501b157fccde300eb6822a7627c91e6640
* | | | | | | | | | am 5d019f0e: (-s ours) am c01e201f: (-s ours) am 61c1bb4f: Merge ↵Mike Lockwood2011-03-010-0/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread * commit '5d019f0e6d57cdd633aa976a8a0f221941afd343': UsbService: Remove stack-trace message during boot. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ am c01e201f: (-s ours) am 61c1bb4f: Merge "UsbService: Remove stack-trace ↵Mike Lockwood2011-03-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | message during boot. DO NOT MERGE" into gingerbread * commit 'c01e201f12149ca96593af4e18133d3b2fce5546': UsbService: Remove stack-trace message during boot. DO NOT MERGE
| | * \ \ \ \ \ \ \ \ \ am 61c1bb4f: Merge "UsbService: Remove stack-trace message during boot. DO ↵Mike Lockwood2011-02-281-4/+9
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into gingerbread * commit '61c1bb4fef439650a3b88131c6e1360ffc03a7ed': UsbService: Remove stack-trace message during boot. DO NOT MERGE
| | | * \ \ \ \ \ \ \ \ \ Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" ↵Mike Lockwood2011-02-281-4/+9
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread
| | | | * | | | | | | | | | UsbService: Remove stack-trace message during boot. DO NOT MERGEDavid 'Digit' Turner2011-02-271-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes a stack trace message during the boot under emulation. The observers tried to access a null reference when no USB configuration is supported by the emulated device. So do not start them in this case. + Change a Slog.w into a Slog.i since this is an acceptable condition. Change-Id: I801f352574716d7868f182bb6e5ee49e5b12e4f1
* | | | | | | | | | | | | | am 3fa12d45: (-s ours) am fc88f94f: (-s ours) am 6da062a9: Merge "DO NOT ↵Mike Lockwood2011-03-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE: Clean up USB notifications:" into gingerbread * commit '3fa12d459d16fb1d3d06b6c68b201340c9d3afcd': DO NOT MERGE: Clean up USB notifications: