63064 Commits

Author SHA1 Message Date
Chet Haase
8990cb5768 Merge "Fix flashing wifi dialog after rotating back from landscape." into ics-mr1 2011-11-28 15:43:23 -08:00
Mathias Agopian
3f15700a01 split ComposerService out of SurfaceComposerClient.h
Change-Id: I1eb691f7ca263d5895d871ab675bb5826e0323c6
2011-11-28 15:21:57 -08:00
Mathias Agopian
16aca51972 rewrite SF's message loop on top of Looper
Change-Id: Ib56139f87a5c0b124e34da5c8151207219b2577b
2011-11-28 15:21:57 -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
Glenn Kasten
589364c717 Merge "Make AudioTrack a RefBase so wrappers not needed" 2011-11-28 14:54:28 -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
70a1ee38b2 am 500afb87: Merge "Fix SCO start stop tests." into ics-mr1
* commit '500afb87a7a8b5928ef1a5196bdfd0bcc2b87e4a':
  Fix SCO start stop tests.
2011-11-28 14:26:39 -08:00
Eric Rowe
500afb87a7 Merge "Fix SCO start stop tests." into ics-mr1 2011-11-28 12:32:34 -08:00
The Android Automerger
5e560e6c4b merge in ics-mr1-release history after reset to ics-mr1 2011-11-28 12:22:27 -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
Andreas Huber
d03e7d62d5 If an error occurs that prevents us from reallocating buffers during a format change
we need to transition to executing state anyway to be able to properly flush/shutdown
in the future.

Change-Id: Ie48bc09ea31942009ae3a5a45aabc9ffad9fb91f
related-to-bug: 5655016
2011-11-28 10:54:12 -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
Narayan Kamath
be1b5ce498 am a6f8ebc6: Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1
* commit 'a6f8ebc616cfe3185ae2513ef2f846e8d32b551e':
  Fix TTS instantiation from webview accessibility handlers.
2011-11-28 10:39:07 -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
aceb7f8b29 am 425c595a: Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1
* commit '425c595acb798ed9652b5a1f0e5412cbd8e3873d':
  Update Webkit with the zoom level after double tap gesture
2011-11-28 10:35:57 -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
Ben Murdoch
b11387a6e5 am 2ffc9ec3: Ensure we dismiss the <select> option dialog.
* commit '2ffc9ec3d69d8ee95bce1ccf17163a70b0bd9003':
  Ensure we dismiss the <select> option dialog.
2011-11-28 10:33:48 -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
Logan Chien
12be3fff12 Remove dead code.
Change-Id: I2838a40026291e7345b07911af3ba17278b63ffe
2011-11-27 08:42:11 +08:00
Jeff Brown
b145ae9eca Merge "Use sized integer typedefs in hash_type specializations." 2011-11-24 12:21:46 -08:00
Jeff Brown
bbd63f0246 Use sized integer typedefs in hash_type specializations.
Change-Id: I3f9e004db2f3be1cb43a885c3ae142f251fd6845
2011-11-24 11:54:21 -08: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
b567c41b00 am e35581ad: Merge "Fix regressions in TTS completion callbacks." into ics-mr1
* commit 'e35581ad5ad635f9dcfe4ab6a432c48b46b782cd':
  Fix regressions in TTS completion callbacks.
2011-11-24 09:40:04 -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
Irfan Sheriff
4b173c0d8c am 694b266e: am 7b6d238b: Merge "Fix tethering interaction from wifi" into ics-mr1
* commit '694b266e0366e5400d577659d1bb8152f0a106e7':
  Fix tethering interaction from wifi
2011-11-23 19:22:50 -08:00
Irfan Sheriff
694b266e03 am 7b6d238b: Merge "Fix tethering interaction from wifi" into ics-mr1
* commit '7b6d238b7515fdd070c361a03e99e6022f2cd2ba':
  Fix tethering interaction from wifi
2011-11-23 19:19:56 -08:00
Irfan Sheriff
7b6d238b75 Merge "Fix tethering interaction from wifi" into ics-mr1 2011-11-23 19:18:22 -08:00
John Wang
40da453ec5 am 08b52112: am e95f4986: Merge "Fix a build break." into ics-mr1
* commit '08b52112335dcbcd51fa387c2a9a92dc43efa689':
  Fix a build break.
2011-11-23 16:51:47 -08:00
John Wang
08b5211233 am e95f4986: Merge "Fix a build break." into ics-mr1
* commit 'e95f49869b02dd9792718fb1075241acdf6ca775':
  Fix a build break.
2011-11-23 16:50:04 -08:00
John Wang
e95f49869b Merge "Fix a build break." into ics-mr1 2011-11-23 16:48:32 -08: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
42afab3799 am 8ce22f26: Fixing a typo in framework widget padding
* commit '8ce22f2644acb51bfe0b9d600f1d2ad64e80513c':
  Fixing a typo in framework widget padding
2011-11-23 16:41:01 -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
John Wang
b74ecb1d45 Fix a build break.
Change-Id: I2a9ceaace02f442c5e36fa8425b051116c81e76f
2011-11-23 16:26:13 -08:00
John Wang
e5c9937903 am 39c293f4: am 9b108009: Check watingApns before access it.
* commit '39c293f4392f6c4bb4da6182123a0511cabb0df1':
  Check watingApns before access it.
2011-11-23 15:39:34 -08:00
John Wang
39c293f439 am 9b108009: Check watingApns before access it.
* commit '9b1080091c4ac97378db366cdd6961aba28756c5':
  Check watingApns before access it.
2011-11-23 15:37:20 -08:00
Jeff Brown
8a743d90a9 Merge "Add a basic hashtable data structure, with tests!" 2011-11-23 15:32:09 -08:00
Mathias Agopian
b16dc690a5 temporarily hardcode Nexus S refresh rate
Change-Id: Id8465f679b96636041b4b891d0b358c387d456c3
2011-11-23 14:51:09 -08:00
John Wang
9b1080091c Check watingApns before access it.
bug:5663125
Change-Id: I66275fafd316f318f9035ac11c16a30fcb32f7c8
2011-11-23 14:26:38 -08:00
Stephen Hines
e7d17220be Merge "Add support for handling a bitcode wrapper to librs." 2011-11-23 13:58:13 -08:00
Eric Laurent
08e74ba8b0 am f6422f5f: am 20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
* commit 'f6422f5f5d04aab47f8f36a0ea92e2140bed0105':
  audioflinger: reduce sleep time to avoid underrun
2011-11-23 12:35:01 -08:00
Eric Laurent
f6422f5f5d am 20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
* commit '20398fac99ff78cb3ec3dd122930e45d409e0524':
  audioflinger: reduce sleep time to avoid underrun
2011-11-23 12:32:53 -08:00
Eric Laurent
20398fac99 Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1 2011-11-23 12:31:04 -08:00