Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,399 Commits 3 Branches 0 Tags
f7e47a003ada4b225dcafe722ab0de35a846b58a
Commit Graph

27900 Commits

Author SHA1 Message Date
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
456ce6f899 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:05 -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
3768a075c8 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:58 -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
7ba39c4134 am 2ffc9ec3: Ensure we dismiss the <select> option dialog. 
* commit '2ffc9ec3d69d8ee95bce1ccf17163a70b0bd9003':
  Ensure we dismiss the <select> option dialog.
 2011-11-28 10:33:40 -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
b1b50be997 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:17 -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
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
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
a8183fb160 am 8bb56180: Merge "Fix 5654631. It forgot to consider the year in formatDateRange." into ics-mr1 
* commit '8bb56180d208b9264e5a56b49fe06b8471ccaced':
  Fix 5654631. It forgot to consider the year in formatDateRange.
 2011-11-22 17:46:35 -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
193187afbc am 26dd54f8: Merge "Ensure we have an EGL context when building layers Bug #5638421" into ics-mr1 
* commit '26dd54f87c1daaa369576d9abea823c8105bd702':
  Ensure we have an EGL context when building layers Bug #5638421
 2011-11-22 12:34:23 -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
0d00fa958f am 227a64fe: Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1 
* commit '227a64fe23b4e6f05dc31e5f51b0f4c142e52b18':
  Fix an NPE on overflow in BatteryStats history.
 2011-11-22 11:05:01 -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
d437629339 am 7257a32b: Merge "HTML5 Video runs into super full screen mode" into ics-mr1 
* commit '7257a32b9ac7cbbb47659ed7bea4ab47e74ac3ec':
  HTML5 Video runs into super full screen mode
 2011-11-22 08:56:37 -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
Wu-cheng Li
1c04a33c04 Add a method to get empty camera parameters. 
bug:5656411
Change-Id: I96e1f74c95a7b40bfbf68bdc93d14dad6fd63426
 2011-11-22 18:21:18 +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
b61dddc8fa am 8d03007f: Merge "Update zoom (aka display) density from WebView thread." into ics-mr1 
* commit '8d03007f80d74abadfc96926e7cca40d38380bc0':
  Update zoom (aka display) density from WebView thread.
 2011-11-21 23:16:14 -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
f6286e5e9a am 1766b0e2: Fix the build 
* commit '1766b0e25de5a66f9d0f6e73a2c342272fcadc71':
  Fix the build
 2011-11-21 18:31:35 -08:00
Romain Guy
1766b0e25d Fix the build 
Change-Id: I3814c6c39eda2a4b56902e2044fbb121b4885e5d
 2011-11-21 18:28:49 -08:00
Wu-cheng Li
fcc9f9be1f am e7005ec9: Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1 
* commit 'e7005ec9582f11744fa74d9c5c9562f9e4be04dc':
  Move Camera.Sound to a stand-alone class CameraSound.
 2011-11-21 18:13:16 -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
f0401bc1fa am 8cd39e3a: Merge "Notify views when EGL resources are about to be destroyed Bug #5639899" into ics-mr1 
* commit '8cd39e3a104d0739fd2f1ae73e5f4081f1528c6c':
  Notify views when EGL resources are about to be destroyed Bug #5639899
 2011-11-21 17:58:40 -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
5f9447b0fe am fb0784da: Merge "Fix bug 5521467 - Monkeys and ActionBar custom tab views" into ics-mr1 
* commit 'fb0784da5f602bf6410ef914d625c3cedfa11e9f':
  Fix bug 5521467 - Monkeys and ActionBar custom tab views
 2011-11-21 17:37:08 -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
Romain Guy
d0609e41ab Ensure we have an EGL context when building layers 
Bug #5638421

This bug was introduced by the recent changes that force more frequent
flushes of the GL renderer.

Change-Id: I55dd4ace6ba1e70ab41927150d6c60c37d7fb196
 2011-11-21 17:21:15 -08:00
Mangesh Ghiware
31f263db65 Update zoom (aka display) density from WebView thread. 
Fixes bug 5639675.

Change-Id: I982ca0787f5c050c5d1a288cd8751299ee351214
 2011-11-21 17:19:31 -08:00
Adam Powell
05c8277f34 Fix bug 5521467 - Monkeys and ActionBar custom tab views 
Remove custom tab views from old parents if applicable.

Change-Id: I7892f0f271e91a4fc9e26694557e82b81f3fd31a
 2011-11-21 17:14:56 -08:00