Daniel Sandler
aa0c0b6556
am 865b9802: Merge "Expanding NotificationManager\'s event logging." into ics-mr1
...
* commit '865b98024fb5fa21854feb578b8816bbb72120ba':
Expanding NotificationManager's event logging.
2011-11-30 11:55:50 -08:00
Daniel Sandler
2e9f9c7edc
Merge "Expanding NotificationManager's event logging." into ics-mr1
2011-11-30 11:54:17 -08:00
Jeff Sharkey
a36b003bdc
am 47e4015b: Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1
...
* commit '47e4015ba23c507196980dcb4a311afc7e2358b1':
Avoid airplane mode labels when Wi-Fi enabled.
2011-11-30 11:46:19 -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
5a1696368c
am 2f504d9e: Merge "NumberPicker incorrectly shown for the old theme." into ics-mr1
...
* commit '2f504d9ea8aa18cd8dbaa2dcc3f3959252b414cc':
NumberPicker incorrectly shown for the old theme.
2011-11-30 10:27:45 -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
79206d2174
am db904b47: Merge "Fix issue #5628789 : Cannot set static/custom wallpaper after clearing Settings data" into ics-mr1
...
* commit 'db904b4782a4dfc9d81d5d0616dea3656893b539':
Fix issue #5628789 : Cannot set static/custom wallpaper after clearing Settings data
2011-11-30 10:22:37 -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
Narayan Kamath
de0d9c3075
am cc084f1d: Fix superfluous onError callbacks.
...
* commit 'cc084f1d734c1e332d6acc1f89204036ee82bd0c':
Fix superfluous onError callbacks.
2011-11-30 04:57:10 -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
53233c52d0
am bb1e7d43: Merge changes I7e973a35,Ib3386fcc into ics-mr1
...
* commit 'bb1e7d4324ff43491c526c77f405bbbf0cece611':
SurfaceTexture: add EGL_KHR_fence_sync option
SurfaceTexture: add a blit-to-FBO test
2011-11-29 17:48:01 -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
b63de44c22
am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
...
* commit '6f1dd757cb158d17c76baeb170f7db2271802ef8':
SurfaceMediaSource: use the vid enc usage bit
2011-11-29 17:26:32 -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
7b7dde99ca
am f296ee69: Merge "Send animation start notification back to webkit from ui thread" into ics-mr1
...
* commit 'f296ee697409b4b55bef17d534edbc24a4619f0f':
Send animation start notification back to webkit from ui thread
2011-11-29 16:57:29 -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
3ac429c942
am 1808f214: Merge "Fix issue #5636525 : ANR observed in setup wizard after changing language" into ics-mr1
...
* commit '1808f214b0cd7a62628b273b93a1ea688f262565':
Fix issue #5636525 : ANR observed in setup wizard after changing language
2011-11-29 15:30:08 -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
ed2e31437b
am d3788b97: Merge "WebView animation support" into ics-mr1
...
* commit 'd3788b97c9a28e8cbfa4432389a5de04073a333b':
WebView animation support
2011-11-29 14:21:10 -08:00
Teng-Hui Zhu
97cf3c67f6
Merge "WebView animation support" into ics-mr1
2011-11-29 14:18:27 -08:00
Romain Guy
8b59b5100e
am a9a91ad3: Merge "Improve screenshot animation performance Bug #5525888 " into ics-mr1
...
* commit 'a9a91ad356271c4c4d663223ff42694fbeb1d2a0':
Improve screenshot animation performance Bug #5525888
2011-11-29 14:16:59 -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
94547b18a9
am 564fee36: Merge "Make sure we can properly shutdown even if" into ics-mr1
...
* commit '564fee36667e2699c59a29102136220dc2f65862':
Make sure we can properly shutdown even if
2011-11-29 14:12:21 -08:00
Andreas Huber
e872046f28
am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
...
* commit 'd12dc28460f622ab29e83fa688ad83a8263e9417':
If an error occurs that prevents us from reallocating buffers during a format change
2011-11-29 14:12:20 -08:00
Andreas Huber
ed6671ae3a
am 351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
...
* commit '351143fb0e2fcfb7dc2ef1045d693c71eb0ea329':
Updated (internal) API for IStreamSource to signal discontinuities
2011-11-29 14:12:18 -08:00
Andreas Huber
2f91d3ebca
am 405a4e34: Merge "Finer granularity discontinuity support." into ics-mr1
...
* commit '405a4e34032f8a07028138266fe9f79f6753b466':
Finer granularity discontinuity support.
2011-11-29 14:10:09 -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
fed0daed87
am be6ab576: Merge "Fix application launch shortcuts." into ics-mr1
...
* commit 'be6ab576ff0e3bf2a8dc3feee6f476061afbda30':
Fix application launch shortcuts.
2011-11-29 13:15:51 -08:00
Jeff Brown
191d77be36
Merge "Fix application launch shortcuts." into ics-mr1
2011-11-29 13:13:33 -08:00
Dianne Hackborn
57dd63caa6
am 50b20425: Merge "Another attempt at getting OOM reports to batch." into ics-mr1
...
* commit '50b2042502bc459b40430fe3b3b83d7d61e5daf9':
Another attempt at getting OOM reports to batch.
2011-11-29 13:09:03 -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
46b547efd8
am 9ab3c624: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '9ab3c62499c054b600699fb107c28fc8926ca5a1':
Import revised translations. DO NOT MERGE
2011-11-29 11:47:08 -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
4c2384c26f
am 3f2730c5: Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1
...
* commit '3f2730c5317700e3ae5412b5c825a747b591ebc2':
temporarily hardcode Nexus S refresh rate
2011-11-29 11:36:54 -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
89369172f7
am 9b518d93: Merge "Fix issue #5642121 : Proximity sensor didn\'t turn the screen on in call" into ics-mr1
...
* commit '9b518d9304eb4ad17591944926231b661a3dfce0':
Fix issue #5642121 : Proximity sensor didn't turn the screen on in call
2011-11-29 10:17:42 -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
395567a9d4
am eb701df8: Merge "Cleanup references when turning BT off." into ics-mr1
...
* commit 'eb701df88cb3027d6323f9e2607cbe4d5ca93ac2':
Cleanup references when turning BT off.
2011-11-29 10:07:09 -08:00
Jaikumar Ganesh
a2a0b7a053
am ff33b94e: Merge "Cleanup static references when quitting." into ics-mr1
...
* commit 'ff33b94e236fcde3833fba698d32d0e6b98fa303':
Cleanup static references when quitting.
2011-11-29 10:07:07 -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
f0ec6fbcbc
am 10232fe6: Merge "Extracted text problems" into ics-mr1
...
* commit '10232fe63916d03d147d0a07f8bf4d70cb60941c':
Extracted text problems
2011-11-29 10:01:35 -08:00
Gilles Debunne
736fa13542
am 7be31bd9: Merge "IOOB in text selection." into ics-mr1
...
* commit '7be31bd96a4cc71ebc2539573f062fa53cc7cb05':
IOOB in text selection.
2011-11-29 09:59:25 -08:00
Gilles Debunne
87b0b8c84c
Merge "Extracted text problems" into ics-mr1
2011-11-29 09:59:00 -08:00