Gilles Debunne
e3d12016b4
Merge "TextViews keep focus after Done" into ics-mr1
2011-12-01 10:22:15 -08:00
Gilles Debunne
fb3064556e
Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1
2011-12-01 10:21:59 -08:00
Andreas Huber
8adebc7d05
Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1
2011-12-01 10:18:19 -08:00
Robert Greenwalt
70e320c37d
Merge "Fix state synchronization problem." into ics-mr1
2011-12-01 09:42:13 -08:00
Ben Murdoch
670acec923
Merge "Fix crash with HTML5 video." into ics-mr1
2011-12-01 09:03:22 -08:00
Daniel Sandler
859cdf2328
Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1
2011-12-01 06:29:53 -08:00
Bart Sears
5b74fe7ca1
Merge "fix position of WebTextView on scrolling layers" into ics-mr1
2011-11-30 22:29:16 -08:00
Adam Cohen
c3003b601d
Merge "Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug 5640357)" into ics-mr1
2011-11-30 21:10:27 -08:00
Dianne Hackborn
dfcc7b62f5
Merge "Fix issue #5433192 and maybe #5433192 " into ics-mr1
2011-11-30 20:49:21 -08:00
satok
cc4f36dfc8
Merge "Fix ConcurrentModificationException in TextServicesManagerService" into ics-mr1
2011-11-30 17:37:52 -08:00
Svetoslav Ganov
efe11185b5
Merge "Fixing memory leaks in the accessiiblity layer." into ics-mr1
2011-11-30 16:56:41 -08:00
Dianne Hackborn
ea402a7e8c
Merge "Fix issue #5679504 : Device stuck and sudden reboot - Watchdog reset?" into ics-mr1
2011-11-30 14:12:44 -08:00
Dianne Hackborn
5703b2516a
Merge "Turn off debug log." into ics-mr1
2011-11-30 14:11:17 -08:00
Romain Guy
0ff2c27b3e
Merge "Cache drawable constant states instead of drawables Bug #5678369 " into ics-mr1
2011-11-30 14:07:34 -08:00
Mathias Agopian
363c4a9fa0
Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1
2011-11-30 13:52:21 -08:00
Daniel Sandler
2e9f9c7edc
Merge "Expanding NotificationManager's event logging." into ics-mr1
2011-11-30 11:54:17 -08:00
Jeff Sharkey
4f1fbce904
Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1
2011-11-30 11:44:54 -08:00
Svetoslav Ganov
8cc888b840
Merge "NumberPicker incorrectly shown for the old theme." into ics-mr1
2011-11-30 10:25:42 -08:00
Dianne Hackborn
4ef3a35243
Merge "Fix issue #5628789 : Cannot set static/custom wallpaper after clearing Settings data" into ics-mr1
2011-11-30 10:20:29 -08:00
Mathias Agopian
bc2d79ed7a
add a way to access the version string of the h/w implementation of EGL
...
we use a hidden egl extension. the version string is printed
in SF's dumpsys log.
Change-Id: I123eb4bde6de462bb2404c67b74d6d6219a48d6a
2011-11-29 18:00:35 -08:00
Mathias Agopian
0c740a46d2
Merge changes I7e973a35,Ib3386fcc into ics-mr1
...
* changes:
SurfaceTexture: add EGL_KHR_fence_sync option
SurfaceTexture: add a blit-to-FBO test
2011-11-29 17:46:35 -08:00
Jamie Gennis
e06a1748a4
Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
2011-11-29 17:25:09 -08:00
Jamie Gennis
86edf4f647
SurfaceTexture: add EGL_KHR_fence_sync option
...
This change adds a compile-time option for SurfaceTexture to use the
EGL_KHR_fence_sync extension to synchronize access to Gralloc buffers.
Bug: 5122031
Change-Id: I7e973a358631fff5308acf377581b811911fe790
2011-11-29 17:09:01 -08:00
Chris Craik
3c03f63b65
Merge "Send animation start notification back to webkit from ui thread" into ics-mr1
2011-11-29 16:55:47 -08:00
Dianne Hackborn
e2918f4c5b
Merge "Fix issue #5636525 : ANR observed in setup wizard after changing language" into ics-mr1
2011-11-29 15:28:41 -08:00
Jamie Gennis
fe27e2f468
SurfaceTexture: add a blit-to-FBO test
...
This change adds a test for blitting (via GL rendering) from a
SurfaceTexture to an FBO.
Change-Id: Ib3386fcc3f37153277f3e37a26347441bb80ab58
2011-11-29 14:52:36 -08:00
Teng-Hui Zhu
97cf3c67f6
Merge "WebView animation support" into ics-mr1
2011-11-29 14:18:27 -08:00
Romain Guy
84a287ec89
Merge "Improve screenshot animation performance Bug #5525888 " into ics-mr1
2011-11-29 14:14:44 -08:00
Andreas Huber
8f2b02be3c
Merge "Make sure we can properly shutdown even if" into ics-mr1
2011-11-29 14:09:10 -08:00
Andreas Huber
f40dde90b8
Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
2011-11-29 14:09:03 -08:00
Andreas Huber
63f0959613
Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
2011-11-29 14:08:45 -08:00
Andreas Huber
92075ff809
Merge "Finer granularity discontinuity support." into ics-mr1
2011-11-29 14:08:13 -08:00
Jeff Brown
191d77be36
Merge "Fix application launch shortcuts." into ics-mr1
2011-11-29 13:13:33 -08:00
Dianne Hackborn
cf3c682c88
Merge "Another attempt at getting OOM reports to batch." into ics-mr1
2011-11-29 13:05:26 -08:00
Jeff Brown
9ee44c8f94
Fix application launch shortcuts.
...
Improved quick launch bookmarks to support category-based shortcuts
instead of hardcoding package and class names for all apps.
Added a set of Intent categories for typical applications on the
platform.
Added support for some of the HID application launch usages to
reduce reliance on quick launch for special purpose keys. Some
keyboard vendors have hardcoded launch keys that synthesize
"Search + X" type key combos. The goal is to encourage them
to stop doing this by implementing more of HID.
Bug: 5674723
Change-Id: I79f1147c65a208efc3f67228c9f0fa5cd050c593
2011-11-29 12:17:22 -08:00
Eric Fischer
0c06ad7ee1
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-29 11:44:59 -08:00
Mathias Agopian
623f5d61b9
Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1
2011-11-29 11:35:07 -08:00
Dianne Hackborn
8f0995738b
Merge "Fix issue #5642121 : Proximity sensor didn't turn the screen on in call" into ics-mr1
2011-11-29 10:16:11 -08:00
Jaikumar Ganesh
da1053de0d
Merge "Cleanup references when turning BT off." into ics-mr1
2011-11-29 10:05:27 -08:00
Jaikumar Ganesh
8d9b517bd0
Merge "Cleanup static references when quitting." into ics-mr1
2011-11-29 10:05:13 -08:00
Gilles Debunne
87b0b8c84c
Merge "Extracted text problems" into ics-mr1
2011-11-29 09:59:00 -08:00
Gilles Debunne
919cb05045
Merge "IOOB in text selection." into ics-mr1
2011-11-29 09:56:58 -08:00
Daniel Sandler
a6e18fc3de
Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1
2011-11-29 05:49:11 -08:00
Yu Shan Emily Lau
907e5e7c09
Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1
2011-11-28 19:53:58 -08:00
Christopher Tate
203e95eef8
Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1
2011-11-28 17:56:18 -08:00
Xia Wang
efba5b5674
am 2d9f4620: Fix build
...
* commit '2d9f4620625405b916aa27177a6b5f82f8e5b15d':
Fix build
2011-11-28 16:53:50 -08:00
Dianne Hackborn
7aa0d8fb3d
Merge "Fix issue #5588689 : Black camera preview after coming back from gmail" into ics-mr1
2011-11-28 16:53:00 -08:00
Romain Guy
30d5c55ee7
Merge "Fix crash in existing applications Bug #5659476 " into ics-mr1
2011-11-28 16:06:52 -08:00
Xia Wang
5c71c805c5
am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901 " into ics-mr0
...
* commit '25261f59af0d902f239e541b735f7dc31e714b07':
Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901
2011-11-28 16:02:44 -08:00
Xia Wang
0969e94791
Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901 " into ics-mr0
2011-11-28 16:00:49 -08:00