Jaikumar Ganesh
9ab5ef2741
am 910ae39f: am ff33b94e: Merge "Cleanup static references when quitting." into ics-mr1
...
* commit '910ae39f8a12bcb917b7eb1da3f701925da79509':
Cleanup static references when quitting.
2011-11-29 10:09:38 -08:00
Gilles Debunne
c273cd318d
Merge "Restoring mLayout has private in TextView"
2011-11-29 10:09:25 -08:00
Jaikumar Ganesh
ff33b94e23
Merge "Cleanup static references when quitting." into ics-mr1
2011-11-29 10:05:13 -08:00
Gilles Debunne
e29e4d2ade
am 9d8d5297: am 10232fe6: Merge "Extracted text problems" into ics-mr1
...
* commit '9d8d529739b1b9790599364f57cffbe022d15ee2':
Extracted text problems
2011-11-29 10:04:01 -08:00
Gilles Debunne
6c9d4f3cd3
am 0dca407e: am 7be31bd9: Merge "IOOB in text selection." into ics-mr1
...
* commit '0dca407eede3d85a0185718f4993c2b09d1cc658':
IOOB in text selection.
2011-11-29 10:01:43 -08:00
Gilles Debunne
10232fe639
Merge "Extracted text problems" into ics-mr1
2011-11-29 09:59:00 -08:00
Gilles Debunne
7be31bd96a
Merge "IOOB in text selection." into ics-mr1
2011-11-29 09:56:58 -08:00
Gilles Debunne
cdfab19bf7
Restoring mLayout has private in TextView
...
Change-Id: If8c4385ec0b64fb2055f4561aeeb1c145294d679
2011-11-28 18:05:03 -08:00
Dianne Hackborn
c0b7f65ae0
am 496f6e2a: am b54980d1: Merge "Fix issue #5588689 : Black camera preview after coming back from gmail" into ics-mr1
...
* commit '496f6e2ad656c5bb8a277e191554d16abd290b58':
Fix issue #5588689 : Black camera preview after coming back from gmail
2011-11-28 16:57:17 -08:00
Dianne Hackborn
b54980d1d4
Merge "Fix issue #5588689 : Black camera preview after coming back from gmail" into ics-mr1
2011-11-28 16:53:00 -08:00
Jaikumar Ganesh
6f9a61651e
Cleanup static references when quitting.
...
The State machine was leaking references when it was
getting created and destroyed.
Change-Id: I7904baf0482eef1617071d159d7b283566b4095c
2011-11-28 16:19:30 -08:00
Romain Guy
cb52d67600
am 02e88f23: am 46685db9: Merge "Fix crash in existing applications Bug #5659476 " into ics-mr1
...
* commit '02e88f23a65c602e83d7a46c0925e653b948e418':
Fix crash in existing applications Bug #5659476
2011-11-28 16:11:27 -08:00
Romain Guy
46685db957
Merge "Fix crash in existing applications Bug #5659476 " into ics-mr1
2011-11-28 16:06:52 -08:00
Chet Haase
d3ea6b40bb
am 38928899: am 8990cb57: Merge "Fix flashing wifi dialog after rotating back from landscape." into ics-mr1
...
* commit '3892889952b0ad3fa0b095c96d8ae2ae110585e2':
Fix flashing wifi dialog after rotating back from landscape.
2011-11-28 15:47:16 -08:00
Chet Haase
8990cb5768
Merge "Fix flashing wifi dialog after rotating back from landscape." into ics-mr1
2011-11-28 15:43:23 -08:00
Chet Haase
08837c246c
Fix flashing wifi dialog after rotating back from landscape.
...
There was an error in some of the OpenGL layer logic such that we would
occasionally set up a layer for rendering and then not clean up when it was
done. This caused future OpenGL rendering to go into that layer instead of
to the buffers being displayed on the screen, resulting in artifacts including
flashes and displaying of stale content. This happened specifically when
using the wifi settings dialog with the InputMethod keyboard displayed,
but it was probably visible in other situations as well.
Issue #5628248 : Flickering/flashing after entering password for WiFi
Change-Id: I38139f620b310f4309570fa7224552d2ee633999
2011-11-28 15:19:22 -08:00
Romain Guy
ff98fa5a84
Fix crash in existing applications
...
Bug #5659476
The FontRenderer was not cleaning up its temporary state, leading
to crashes when invoking renderDropShadow.
Change-Id: I43b24820dd5625af8c080bbe11b64de2f74164b2
2011-11-28 14:55:56 -08:00
Dianne Hackborn
6d05fd3c79
Fix issue #5588689 : Black camera preview after coming back from gmail
...
Make surface management between SurfaceView and the window manager
much more controlled, to ensure that SurfaceView always gets to report
the current surface is destroyed before the window manager actually
destroys it.
Also a small tweak to allow windows that have a wallpaper background
to still have a preview window. This makes launching home after it
has been killed feel much more responsive.
Change-Id: I0d22cf178a499601a770cb1dbadef7487e392d85
2011-11-28 14:45:50 -08:00
Narayan Kamath
31825c1199
am be1b5ce4: am a6f8ebc6: Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1
...
* commit 'be1b5ce498a68e28d47a167495f47787d6461e88':
Fix TTS instantiation from webview accessibility handlers.
2011-11-28 10:42:00 -08:00
Derek Sollenberger
376690c00f
am aceb7f8b: am 425c595a: Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1
...
* commit 'aceb7f8b29bdcf8bf7fdc14ec9b99f54f2a2a3d2':
Update Webkit with the zoom level after double tap gesture
2011-11-28 10:38:41 -08:00
Narayan Kamath
a6f8ebc616
Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1
2011-11-28 10:36:32 -08:00
Ben Murdoch
e189f0c6db
am b11387a6: am 2ffc9ec3: Ensure we dismiss the <select> option dialog.
...
* commit 'b11387a6e51c424e421b0951de20db46a5f5c992':
Ensure we dismiss the <select> option dialog.
2011-11-28 10:36:22 -08:00
Derek Sollenberger
425c595acb
Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1
2011-11-28 10:34:04 -08:00
Narayan Kamath
68e2af55d6
Fix TTS instantiation from webview accessibility handlers.
...
The TTS instantiated from here shouldn't clobber any
existing TTS objects opened within the same package context.
Ideally, the TTS API should work fine with multiple TTS object
instances within the same package context but making that happen
correctly is a larger change.
bug:5659758
Change-Id: Ia1f63c61b9f12ac92ff42a427a004d414e42a759
2011-11-28 17:49:01 +00:00
Derek Sollenberger
8fae09d575
Update Webkit with the zoom level after double tap gesture
...
In the hardware accelerated case we were not updating webkit
with the new zoom information. This was causing plugins to
render at the old zoom level.
bug: 5663981
Change-Id: I3cb18ad9ca4f185f384ea9fb68780f29160391ad
2011-11-28 11:51:26 -05:00
Ben Murdoch
2ffc9ec3d6
Ensure we dismiss the <select> option dialog.
...
When the WebView is paused, or another action (such as navigating to
a new URL) occurs, cancel any ongoing <select> tag dialog that is open.
Bug: 5666545
Change-Id: Ifc35a239b729ed93cbf82b2096334f7d63f8993d
2011-11-28 16:47:55 +00:00
Narayan Kamath
6ddbe5b587
am b567c41b: am e35581ad: Merge "Fix regressions in TTS completion callbacks." into ics-mr1
...
* commit 'b567c41b00fd196a2994f3cf8090b8a503c04939':
Fix regressions in TTS completion callbacks.
2011-11-24 09:41:48 -08:00
Narayan Kamath
40f71f0be3
Fix regressions in TTS completion callbacks.
...
(a) onUtteranceCompleted should be called on errors too. Also,
fix up the error handling so that onUtteranceCompleted is
always called.
(b) Don't treat empty utterances as errors, and let the engine
synthesize them, as before.
bug:5662598
Change-Id: I9223592bc6fe5f47d71103f4f02f046b54a655a8
2011-11-24 17:32:12 +00:00
Owen Lin
4cf8a3914a
am 85c38af1: am 8bb56180: Merge "Fix 5654631. It forgot to consider the year in formatDateRange." into ics-mr1
...
* commit '85c38af1d47e288775052cd188e3f014fa40e8a2':
Fix 5654631. It forgot to consider the year in formatDateRange.
2011-11-22 17:48:49 -08:00
Owen Lin
8bb56180d2
Merge "Fix 5654631. It forgot to consider the year in formatDateRange." into ics-mr1
2011-11-22 17:44:52 -08:00
Romain Guy
0ce4978308
am e25ed181: am 26dd54f8: Merge "Ensure we have an EGL context when building layers Bug #5638421 " into ics-mr1
...
* commit 'e25ed181070579fca2522112b1659af2fbf8ddfc':
Ensure we have an EGL context when building layers Bug #5638421
2011-11-22 12:42:04 -08:00
Amith Yamasani
468996c504
am d61b61d6: am 227a64fe: Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1
...
* commit 'd61b61d6f97f9f73b86e4a24a747c4451f2bc939':
Fix an NPE on overflow in BatteryStats history.
2011-11-22 12:41:57 -08:00
Romain Guy
26dd54f87c
Merge "Ensure we have an EGL context when building layers Bug #5638421 " into ics-mr1
2011-11-22 12:33:04 -08:00
Amith Yamasani
227a64fe23
Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1
2011-11-22 11:02:49 -08:00
Teng-Hui Zhu
90998b4962
am b8ee50ee: am 7257a32b: Merge "HTML5 Video runs into super full screen mode" into ics-mr1
...
* commit 'b8ee50eece1481110721cb4e93a54c03fbf77d27':
HTML5 Video runs into super full screen mode
2011-11-22 08:59:36 -08:00
Teng-Hui Zhu
7257a32b9a
Merge "HTML5 Video runs into super full screen mode" into ics-mr1
2011-11-22 08:54:59 -08:00
Owen Lin
b193e35ed1
Fix 5654631. It forgot to consider the year in formatDateRange.
...
Change-Id: I494e3ecc7a2e7c418ed61930ffd7311338c11783
fix: 5654631
2011-11-22 15:36:50 +08:00
Mangesh Ghiware
07679d191e
am d7b06977: am 8d03007f: Merge "Update zoom (aka display) density from WebView thread." into ics-mr1
...
* commit 'd7b06977e927557923a6101493c0af1aa857271b':
Update zoom (aka display) density from WebView thread.
2011-11-21 23:18:04 -08:00
Mangesh Ghiware
8d03007f80
Merge "Update zoom (aka display) density from WebView thread." into ics-mr1
2011-11-21 23:14:05 -08:00
Romain Guy
24692d6c9e
am ae64dfb5: am 1766b0e2: Fix the build
...
* commit 'ae64dfb5c34eed73bdc7ada30645ffec003c25fc':
Fix the build
2011-11-21 21:08:52 -08:00
Wu-cheng Li
920ce04449
am a21d5d2c: am e7005ec9: Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1
...
* commit 'a21d5d2c53a37e4f20716cbb5e5d1944b8a3f7df':
Move Camera.Sound to a stand-alone class CameraSound.
2011-11-21 21:08:50 -08:00
Romain Guy
3526b00a53
am c26e4d18: am 8cd39e3a: Merge "Notify views when EGL resources are about to be destroyed Bug #5639899 " into ics-mr1
...
* commit 'c26e4d18a20ab0b3e769fb3e547994f1c27d6713':
Notify views when EGL resources are about to be destroyed Bug #5639899
2011-11-21 21:08:42 -08:00
Adam Powell
79de26ea20
am 516035f0: am fb0784da: Merge "Fix bug 5521467 - Monkeys and ActionBar custom tab views" into ics-mr1
...
* commit '516035f0923aad612932327546e780c7c241ceda':
Fix bug 5521467 - Monkeys and ActionBar custom tab views
2011-11-21 21:08:40 -08:00
Nick Pelly
082ccca5ff
am 4fb747f3: am 043a8b14: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
...
* commit '4fb747f329523d6b3a7efc59a4360a249cdaa5ad':
Replace vendor specific NfcGoogle.apk with generic Nfc.apk
2011-11-21 21:08:29 -08:00
John Reck
7b0fdc100e
am 786513ab: am 0507ac4d: Use isHighEndGfx to determine texture pool
...
* commit '786513aba608d958e69deee3fbdf003bdf5d9632':
Use isHighEndGfx to determine texture pool
2011-11-21 21:07:33 -08:00
Romain Guy
1766b0e25d
Fix the build
...
Change-Id: I3814c6c39eda2a4b56902e2044fbb121b4885e5d
2011-11-21 18:28:49 -08:00
Wu-cheng Li
e7005ec958
Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1
2011-11-21 18:10:52 -08:00
Romain Guy
8cd39e3a10
Merge "Notify views when EGL resources are about to be destroyed Bug #5639899 " into ics-mr1
2011-11-21 17:57:05 -08:00
Adam Powell
fb0784da5f
Merge "Fix bug 5521467 - Monkeys and ActionBar custom tab views" into ics-mr1
2011-11-21 17:34:57 -08:00
Nick Pelly
cee040eb27
Merge "Throw a nicer error message when using an invalid context to create Nfc"
2011-11-21 17:31:45 -08:00