Jamie Gennis
57ec59b0f5
Merge "Stagefright: Use the ANW min undequeued bufs query."
2011-03-02 16:44:51 -08:00
Gloria Wang
1450656359
Merge "To support DRM files without file extension"
2011-03-02 16:26:18 -08:00
Andreas Huber
60c937781f
Merge "Resize internal PES buffers dynamically instead of relying on a fixed maximum size."
2011-03-02 16:22:20 -08:00
Andreas Huber
b5245cd477
Merge "Allow optional specification of a PTS timestamp when signalling a discontinuity."
2011-03-02 16:11:01 -08:00
Chia-chi Yeh
6f1a8aee2d
Merge "RTP: update javadocs."
2011-03-02 16:02:57 -08:00
Jeff Brown
a9301c1881
Merge "Fade out the mouse pointer after inactivity or other events."
2011-03-02 15:54:42 -08:00
Romain Guy
c9177ded6e
Merge "We need to go deeper. Bug #3431907 "
2011-03-02 15:48:33 -08:00
Shimeng (Simon) Wang
15fd66cbe0
Merge "Adjust actual scale when zoom density changes."
2011-03-02 15:45:27 -08:00
Alex Sakhartchouk
a7b8942ac4
Merge "Fixing element count bug in renderscript."
2011-03-02 15:38:10 -08:00
Jeff Brown
80f3e7cc15
Fade out the mouse pointer after inactivity or other events.
...
Fades out the mouse pointer:
- after 15 seconds of inactivity normally
- after 3 seconds of inactivity in lights out mode
- after a non-modifier key down
- after a touch down
Extended the native Looper to support enqueuing time delayed
messages. This is used by the PointerController to control
pointer fade timing.
Change-Id: I87792fea7dbe2d9376c78cf354fe3189a484d9da
2011-03-02 15:37:57 -08:00
Irfan Sheriff
8edeafd8f4
Merge "fix network disconnection handling"
2011-03-02 15:36:10 -08:00
Jason Chen
6c6381d6b7
am 166055b5: (-s ours) am d616d505: Merge "Bugfixes in StaticLayout. DO NOT MERGE." into honeycomb
...
* commit '166055b529987554644dc47cb5b29ce33a1ab5d1':
Bugfixes in StaticLayout. DO NOT MERGE.
2011-03-02 15:33:00 -08:00
Jason Chen
683fb2ce7c
am a6883539: (-s ours) am ef7aed89: Merge "DO NOT MERGE Cherry-pick of cd59febcea2 from master" into honeycomb
...
* commit 'a688353928042ccf9620477476d813c9aceed9e2':
DO NOT MERGE Cherry-pick of cd59febcea2 from master
2011-03-02 15:32:57 -08:00
Svetoslav Ganov
5ddcb540a3
Merge "Force close in WebView."
2011-03-02 15:24:58 -08:00
Eric Laurent
b67ae094dc
Merge "Fix issue 3388775."
2011-03-02 15:19:38 -08:00
Romain Guy
e5f2a75e3e
Merge "Properly initialize FBO textures for linear filtering."
2011-03-02 15:14:52 -08:00
Adam Powell
76048aeee7
Merge "Fix bug 3502257 - overscroll effect api"
2011-03-02 14:41:35 -08:00
Amith Yamasani
c527acdcf5
am 0e99d3bf: am df33b8c5: Merge "Check for NTP time as soon as WIFI is connected." into honeycomb
...
* commit '0e99d3bfab99254cc187de127a7a4767f165cde8':
Check for NTP time as soon as WIFI is connected.
2011-03-02 14:20:36 -08:00
Mike Lockwood
1cbd200693
Merge "Combine the USB accessory support library with the platform feature"
2011-03-02 14:19:38 -08:00
Romain Guy
58fc021332
Merge "Fix problem with glyph cache and textScaleX property"
2011-03-02 14:04:47 -08:00
James Dong
31e03a6e2b
Merge "PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits"
2011-03-02 14:00:56 -08:00
Mathias Agopian
c7a4efb215
Merge changes I9a202210,If26ef8be
...
* changes:
fix YV12 documentation
reformat file, which contained tabs instead of spaces
2011-03-02 13:53:34 -08:00
Eric Fischer
ae5ff5abac
am f6d1d87d: (-s ours) am 86b7a597: Import revised translations. DO NOT MERGE
...
* commit 'f6d1d87df5a8b85c5129aa952f7652eaedd92645':
Import revised translations. DO NOT MERGE
2011-03-02 12:53:58 -08:00
Costin Manolache
18d8897470
am c039bb5d: (-s ours) am 66d46ac6: (-s ours) am db52ab69: Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread
...
* commit 'c039bb5d1ee13660142595bf21b4ac1d1ae129a5':
DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.
2011-03-02 12:53:37 -08:00
Dianne Hackborn
4f3b8d41fd
am 4b8c9b74: am 7fff2d19: am 1de4a2ca: am 62619392: Merge "Fix leak when keylock is recreated."
...
* commit '4b8c9b740528301d3ca60fe3b4b861fcd85ceb0a':
Fix leak when keylock is recreated.
2011-03-02 12:52:56 -08:00
Jaikumar Ganesh
90af5430c4
am 998a5617: am 516393fa: am 9711b9b7: am 1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT."
...
* commit '998a5617d5c49c998cf6d102e8d03cbf96f09e51':
Phone crash when old callback func is woken up when enabling BT.
2011-03-02 12:52:48 -08:00
Daniel Sandler
833548757b
Merge "resolved conflicts for merge of 49853dc1 to master"
2011-03-02 12:34:00 -08:00
Daniel Sandler
13b3cf7ac1
resolved conflicts for merge of 49853dc1 to master
...
Change-Id: I0d56965740d1273841e33cfc5db57b4df05915d1
2011-03-02 15:26:53 -05:00
Daniel Sandler
4d40162072
Merge "Invert sense (and text) of rotation lock switch."
2011-03-02 12:25:20 -08:00
Robert Greenwalt
85f4654319
Merge "Start using NetworkUtils.numericToInetAddress."
2011-03-02 12:10:51 -08:00
Andreas Huber
b6307a4cc5
Merge "Provide better duration and seek accuracy if playing vorbis audio from a non-streaming source."
2011-03-02 11:54:48 -08:00
Shimeng (Simon) Wang
05916e5fa5
Merge "Revert "Remove the limitation that zoom can't go beyond overview scale.""
2011-03-02 11:53:17 -08:00
Basavapatna Dattaguru
eab9bd419d
Merge "Fix for issue 3371667: fix source code compilation warnings (4)"
2011-03-02 11:50:17 -08:00
Christopher Tate
1015e6a2fc
Merge "Fix binder proxy death notice tracking"
2011-03-02 11:48:37 -08:00
Dianne Hackborn
5c39c50566
Merge "Fix issue #3431230 : "am" debugging commands failing on -userdebug builds"
2011-03-02 10:19:12 -08:00
JP Abgrall
2c4dd671c1
Merge "Audio packages: Allow stripping down via MINIMAL_NEWWAVELABS=true"
2011-03-02 10:06:33 -08:00
Santosh Madhava
a9643f6350
Merge "Fix for issue 3495914: (In Java) Video clip switches between start and end"
2011-03-02 09:48:39 -08:00
Daniel Sandler
63a4122477
Merge "Bring back some status bar animations."
2011-03-02 09:27:56 -08:00
Kenny Root
e2db5bf537
Merge "Switch to returnCode for IPackageDeleteObserver"
2011-03-02 08:50:42 -08:00
Daniel Sandler
d7ff3083a6
Merge "Turn off animations in the status bar."
2011-03-02 08:38:20 -08:00
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
Jason Chen
f4bc6b0649
am d616d505: Merge "Bugfixes in StaticLayout. DO NOT MERGE." into honeycomb
...
* commit 'd616d5054f5e93f6a492896e7d8dd6d5b7eaa84b':
Bugfixes in StaticLayout. DO NOT MERGE.
2011-03-01 17:57:56 -08:00
Jason Chen
5c2aaabb9a
Merge "Bugfixes in StaticLayout. DO NOT MERGE." into honeycomb
2011-03-01 17:56:06 -08:00
Jason Chen
aa11f79c80
am ef7aed89: Merge "DO NOT MERGE Cherry-pick of cd59febcea2 from master" into honeycomb
...
* commit 'ef7aed89b610d0bd63ad7a1422b8db85730cb917':
DO NOT MERGE Cherry-pick of cd59febcea2 from master
2011-03-01 17:54:26 -08:00