27121 Commits

Author SHA1 Message Date
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
Wu-cheng Li
9d062cfe94 Add camera focus move callback.
bug:5534973
Change-Id: Iaadcb2738ad040f94849be30ee531326f6199431
2011-11-29 14:28:05 +08:00
Gilles Debunne
cdfab19bf7 Restoring mLayout has private in TextView
Change-Id: If8c4385ec0b64fb2055f4561aeeb1c145294d679
2011-11-28 18:05:03 -08:00
Xia Wang
462a9da4c3 am 4f5434f3: am e5715521: am 2d9f4620: Fix build
* commit '4f5434f3a3ce51d7d6caf463e5571bb686e2bdd1':
  Fix build
2011-11-28 16:59:20 -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
Xia Wang
e571552123 am 2d9f4620: Fix build
* commit '2d9f4620625405b916aa27177a6b5f82f8e5b15d':
  Fix build
2011-11-28 16:53:50 -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
Xia Wang
2d9f462062 Fix build
Change-Id: I465d85e4783763f311ed6ec0a09c1edde9712405
2011-11-28 16:49:06 -08:00
Jaikumar Ganesh
9bb275197d Cleanup references when turning BT off.
Bug: 5572649
Change-Id: I62f9e0620832b69995d5c6e1c24634c9a3895a4b
2011-11-28 16:19:36 -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
Xia Wang
7480255799 am 6c509ef0: am da822367: am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901" into ics-mr0
* commit '6c509ef0bad761feecfd94b66d532ae05b450317':
  Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901
2011-11-28 16:07:13 -08:00
Romain Guy
46685db957 Merge "Fix crash in existing applications Bug #5659476" into ics-mr1 2011-11-28 16:06:52 -08:00
Xia Wang
da82236788 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
25261f59af 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
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
Eric Rowe
866103c00d am 70a1ee38: am 500afb87: Merge "Fix SCO start stop tests." into ics-mr1
* commit '70a1ee38b24a7c8dfc789db024bdf54f277ddba3':
  Fix SCO start stop tests.
2011-11-28 14:28:35 -08:00
Eric Rowe
500afb87a7 Merge "Fix SCO start stop tests." into ics-mr1 2011-11-28 12:32:34 -08:00
Irfan Sheriff
618455f7e7 Redesign p2p around provision discovery
= Provision Discovery:Is an optional discovery technique for figuring out
if a peer supports the specific WPS option. For compatibility reasons,
we will now always use it during connection but at the same time support
devices that request to support connection without it

= State machine and UI redesign around the new interaction

= Specify config methods explicitly for compatibility

Bug: 5599949
Change-Id: Ib79435dda472c43cc0746f56bf79ea896b2e33a4
2011-11-28 11:50:11 -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
e35581ad5a Merge "Fix regressions in TTS completion callbacks." into ics-mr1 2011-11-24 09:38:15 -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
Adam Cohen
8556439ef9 am 42afab37: am 8ce22f26: Fixing a typo in framework widget padding
* commit '42afab3799c5dba8abccabe231b74c96d5ff0c14':
  Fixing a typo in framework widget padding
2011-11-23 16:42:46 -08:00
Adam Cohen
8ce22f2644 Fixing a typo in framework widget padding
Change-Id: I90733500487b3e9fb1ff19a7b946d6faf526a2c1

Conflicts:

	core/res/res/values-sw600dp/dimens.xml
2011-11-23 16:31:53 -08:00
Teng-Hui Zhu
7ae9f3ab55 WebView animation support
Fix the jumping issue when double tapping

bug:4982054
Change-Id: Ifb67030a3132fe3820a1fcc8ffc97a1ab474c223
2011-11-23 10:47:51 -08:00
Eric Rowe
fca8e9d919 Fix SCO start stop tests.
Change-Id: Idf292bc244a494e2ffb11359e83c0d072907ea3b
Bug-id: http://b/5644683
2011-11-22 19:16:50 -08: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
Fabrice Di Meglio
55abad3904 Merge "Improve TextLayoutCache performances" 2011-11-22 11:23:49 -08:00
Fabrice Di Meglio
0af10b54bf Improve TextLayoutCache performances
- introduce TextLayoutEngine
- reduce calls to HB_NewFace as they are opening the font files under the cover
- refactor code for removing FontData structure
- fix logging

Change-Id: Id9658fcd454b74c34ecf4e9dfd1bd2201e04b988
2011-11-22 11:16:20 -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