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
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
Chet Haase
a44370e22b
Merge "Fix flashing wifi dialog after rotating back from landscape." into ics-mr1
2011-11-28 15:43:23 -08:00
Eric Rowe
1d6410bcaf
Merge "Fix SCO start stop tests." into ics-mr1
2011-11-28 12:32:34 -08:00
Narayan Kamath
50db512db6
Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1
2011-11-28 10:36:32 -08:00
Derek Sollenberger
7dea1f9e3e
Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1
2011-11-28 10:34:04 -08:00
Narayan Kamath
8c65dea758
Merge "Fix regressions in TTS completion callbacks." into ics-mr1
2011-11-24 09:38:15 -08:00
Irfan Sheriff
1f13f84cea
Merge "Fix tethering interaction from wifi" into ics-mr1
2011-11-23 19:18:22 -08:00
John Wang
0f20328ac0
Merge "Fix a build break." into ics-mr1
2011-11-23 16:48:32 -08:00
Mathias Agopian
b8bb31dc10
temporarily hardcode Nexus S refresh rate
...
Change-Id: Id8465f679b96636041b4b891d0b358c387d456c3
2011-11-23 14:51:09 -08:00
Eric Laurent
ae170f664c
Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
2011-11-23 12:31:04 -08:00
Michael Chan
029d707b4b
Merge "Update description of account_type" into ics-mr1
2011-11-23 12:12:51 -08:00
Robert Greenwalt
252b763217
Merge "Fix some policy-base routing issues." into ics-mr1
2011-11-23 11:25:39 -08:00
Owen Lin
0f644e5257
Merge "Fix 5654631. It forgot to consider the year in formatDateRange." into ics-mr1
2011-11-22 17:44:52 -08:00
The Android Open Source Project
0922394b74
Reconcile with ics-mr0-release
...
Change-Id: Ib84a053208dd4deae9bfe04e185ab2cec4728864
2011-11-22 15:24:04 -08:00
The Android Open Source Project
46dbb9b634
Reconcile with ics-mr0-release
...
Change-Id: I0b5b295a6fc0e4e7978ce11905c3cffd0e07f7e1
2011-11-22 15:14:10 -08:00
The Android Automerger
5ac81863de
merge in ics-mr0-release history after reset to ics-mr0
2011-11-22 14:28:06 -08:00
dujin.cha
94b093c607
am fe464a76: [Prime K] Fix gabage character issue
...
* commit 'fe464a76d8fc858be971dbb5e67b1d22fd925347':
[Prime K] Fix gabage character issue
2011-11-22 13:18:27 -08:00
Jean-Baptiste Queru
502a9c95c8
Ignore e36657e5
...
Change-Id: I93632b881f8c5231a521863cb4a8f05d81ea8ada
2011-11-22 13:15:31 -08:00
Romain Guy
a67d4d23e5
Merge "Draw in the correct FBO after invoking a GL functor Bug #5650514 " into ics-mr1
2011-11-22 12:33:17 -08:00
Romain Guy
b1c3730a26
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
6ff0e8a106
Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1
2011-11-22 11:02:49 -08:00
Teng-Hui Zhu
05e688ad9d
Merge "HTML5 Video runs into super full screen mode" into ics-mr1
2011-11-22 08:54:59 -08:00
Andreas Huber
2389af0dc6
Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
2011-11-22 08:39:11 -08:00
Daniel Sandler
9f96a44b20
Merge "Dismiss system windows when screen savers start." into ics-mr1
2011-11-22 07:15:29 -08:00
Mangesh Ghiware
2b7f7eb1fa
Merge "Update zoom (aka display) density from WebView thread." into ics-mr1
2011-11-21 23:14:05 -08:00
