Cary Clark
f79a819f24
Merge "account for find dialog height when positioning layers"
2010-03-02 08:37:18 -08:00
Leon Clarke
e861b8f95d
Merge " Fix issue with authentication with flash" into eclair-mr2
2010-03-02 08:33:10 -08:00
Grace Kloba
c2ca936700
Merge "Start the synchronous load in the WebCore thread."
2010-03-02 08:21:22 -08:00
Cary Clark
72ab9980cb
account for find dialog height when positioning layers
...
The Find dialog draws on top of the WebView, including any
layers attached to the bottom of the screen. Adjust the view
dimenions returned to the layer code by the height of the Find
dialog if visible.
http://b/2453769
2010-03-02 10:59:44 -05:00
Derek Sollenberger
717c6ae0cf
am 2705c8f0: Merge "DO NOT MERGE. force plugins to render on top of browser content." into eclair-mr2
...
Merge commit '2705c8f09975f1bf10c84af323a67c104a177129' into eclair-mr2-plus-aosp
* commit '2705c8f09975f1bf10c84af323a67c104a177129':
DO NOT MERGE. force plugins to render on top of browser content.
2010-03-02 06:44:47 -08:00
Leon Clarke
cb01dba348
Fix issue with authentication with flash
2010-03-02 14:43:03 +00:00
Derek Sollenberger
2705c8f099
Merge "DO NOT MERGE. force plugins to render on top of browser content." into eclair-mr2
2010-03-02 06:33:32 -08:00
Patrick Scott
0245e09fa7
Merge "Store the LoadListener in the SslErrorHandler passed to the client."
2010-03-02 05:40:09 -08:00
Grace Kloba
5f38e1aaa1
Start the synchronous load in the WebCore thread.
...
Fix http://b/issue?id=2480606
2010-03-01 23:10:10 -08:00
Ken Shirriff
0ef3eeec40
Merge "Remove DateException and obsolete DateUtils functions."
2010-03-01 22:46:07 -08:00
Dianne Hackborn
829778843c
Move the pointer location thing out of common.
2010-03-01 21:42:15 -08:00
Dianne Hackborn
ef05e076ce
Fix issue #2448075 : aapt doesn't fix up activity-alias android:targetActivity links
...
And related:
- The aapt tool now sets a resource configurations sdk level to match any configs
that have been set (for example if you specify density your sdk level will be
at least 4).
- New option to modify the targetPackage attribute of instrumentation.
- Clean up of aapt options help.
- Fix of UI type values to leave 0 for "unspecified".
- Make the UI mode config APIs public.
2010-03-01 20:42:14 -08:00
Charles Chen
883dbacb12
Merge "Fixing a bug with TTS that caused TTS to ignore the default settings unless the user had set the defaults to always override app settings."
2010-03-01 19:05:20 -08:00
Charles Chen
6a8b73be57
Fixing a bug with TTS that caused TTS to ignore the default settings
...
unless the user had set the defaults to always override app settings.
2010-03-01 18:52:41 -08:00
Mathias Agopian
5d26c1e38d
Added a name to Surface created by SurfaceFlinger
...
Updated the window manager to use this new facility.
Surfaces name are now printed by "dumpsys".
2010-03-01 18:34:50 -08:00
Romain Guy
42c79880b0
Apply alpha animations on ImageView instances.
...
Bug #2479570
2010-03-01 17:21:59 -08:00
Daniel Sandler
7491d8757f
Merge "New vibrate/silent mode behavior."
2010-03-01 17:16:55 -08:00
Ken Shirriff
cfa8fd0799
Remove unused Calendar.insertVEvent method
2010-03-01 16:42:42 -08:00
Romain Guy
58c63990a2
Merge "Prevent crash in Dialog. Bug #2249637 "
2010-03-01 16:41:27 -08:00
Romain Guy
7883c975dd
Prevent crash in Dialog.
...
Bug #2249637
2010-03-01 16:39:17 -08:00
Marc Blank
918a95b9c9
Merge "Rename _SYNC_LOCAL_ID to _SYNC_DATA"
2010-03-01 16:18:27 -08:00
Marc Blank
5b8c69d95a
Rename _SYNC_LOCAL_ID to _SYNC_DATA
...
* This is being used as a discretionary column by Exchange calendar
sync, so rename to avoid association with old usage
Change-Id: I544e285fa04d252c945c1953b57ef67da0e588ae
2010-03-01 16:17:50 -08:00
Grace Kloba
c0524d26a6
am 3ff7cecd: Merge "DO NOT MERGE" into eclair-mr2
...
Merge commit '3ff7cecd3d9a1bb9485e32b0e6920f24022a5565' into eclair-mr2-plus-aosp
* commit '3ff7cecd3d9a1bb9485e32b0e6920f24022a5565':
DO NOT MERGE
2010-03-01 16:13:21 -08:00
Grace Kloba
3ff7cecd3d
Merge "DO NOT MERGE" into eclair-mr2
2010-03-01 16:02:12 -08:00
Wu-cheng Li
8cbb8f5e1f
Unhide zoom API.
...
bug:2458926
2010-03-01 15:32:33 -08:00
Kenny Root
ec8f9b6481
Fix misspelling in JavaDoc tag
...
Minor misspelling in "@inheritDoc" tag
Change-Id: I1e6252b549c20e1871e4be0170d2d06256beec9f
2010-03-01 15:01:51 -08:00
Fred Quintana
aceb6fe23e
Merge "fix a system crash that occurs when ChooseAccountActivity is restarted from the icicle"
2010-03-01 14:47:22 -08:00
Fred Quintana
262226137d
fix a system crash that occurs when ChooseAccountActivity is
...
restarted from the icicle
http://b/issue?id=2352368
2010-03-01 14:39:00 -08:00
Romain Guy
61c9d4b450
Let apps change the bottom strip in TabWidget.
...
Bug #2478088
Also expose a few useful APIs.
2010-03-01 14:23:23 -08:00
Ken Shirriff
a53bbe4033
Remove DateException and obsolete DateUtils functions.
...
These functions are deprecated and no longer used.
2010-03-01 14:21:13 -08:00
Paul Westbrook
37acc3122c
Merge "Bug 2464063"
2010-03-01 14:21:03 -08:00
Grace Kloba
12f807091d
am 3ca122df: am cfb50c66: Merge "If we get TOUCH_UP before getting the WebCore\'s response for TOUCH_DOWN, remove the pending TOUCH_EVENT before proceeding to fling." into eclair-mr2
...
Merge commit '3ca122df9e9a25f7ed1c39ef18c5c4ba2e316fe8'
* commit '3ca122df9e9a25f7ed1c39ef18c5c4ba2e316fe8':
If we get TOUCH_UP before getting the WebCore's
2010-03-01 13:16:46 -08:00
Grace Kloba
3ca122df9e
am cfb50c66: Merge "If we get TOUCH_UP before getting the WebCore\'s response for TOUCH_DOWN, remove the pending TOUCH_EVENT before proceeding to fling." into eclair-mr2
...
Merge commit 'cfb50c66faf4ff8a6f76884fdaf2dcb48d4d63a3' into eclair-mr2-plus-aosp
* commit 'cfb50c66faf4ff8a6f76884fdaf2dcb48d4d63a3':
If we get TOUCH_UP before getting the WebCore's
2010-03-01 13:11:55 -08:00
Joe Onorato
227df2433b
Merge "Switch the services library to using the new Slog"
2010-03-01 13:08:31 -08:00
Grace Kloba
cfb50c66fa
Merge "If we get TOUCH_UP before getting the WebCore's response for TOUCH_DOWN, remove the pending TOUCH_EVENT before proceeding to fling." into eclair-mr2
2010-03-01 13:07:06 -08:00
Grace Kloba
eb494c002c
Merge "If zoom scale is set to minimum, treat it as in overview mode."
2010-03-01 13:06:58 -08:00
Joe Onorato
8a9b22056b
Switch the services library to using the new Slog
2010-03-01 13:06:50 -08:00
Paul Westbrook
1d93d4cedc
Bug 2464063
...
Remove Browser.EXTRA_SHARE_TITLE, since Intent.EXTRA_SUBJECT is the
standard way to set a title for a SEND intent
2010-03-01 13:06:48 -08:00
Joe Onorato
0ec40173b6
Merge "Add new Slog class."
2010-03-01 13:03:52 -08:00
Fred Quintana
881cc1dffb
Merge "fix a bug where if a syncmanager gets back a SyncAlreadyInProgress error it immediately reschedules another sync, thus burning up the battery if the sync is in progress for a while."
2010-03-01 13:00:26 -08:00
Fred Quintana
82c5c4248a
fix a bug where if a syncmanager gets back a SyncAlreadyInProgress error
...
it immediately reschedules another sync, thus burning up the battery if
the sync is in progress for a while.
http://b/issue?id=2477901
2010-03-01 12:36:21 -08:00
Grace Kloba
a752a949af
If we get TOUCH_UP before getting the WebCore's
...
response for TOUCH_DOWN, remove the pending TOUCH_EVENT
before proceeding to fling.
This is partial fix for
http://b/issue?id=2450534
2010-03-01 12:29:11 -08:00
Derek Sollenberger
6078399d29
DO NOT MERGE. force plugins to render on top of browser content.
2010-03-01 15:26:43 -05:00
Grace Kloba
b3d0cc5ca9
If zoom scale is set to minimum, treat it as in overview
...
mode.
When view size changed, we will adjust scale factor,
which should update the zoom button states afterwards.
http://b/issue?id=2477282
2010-03-01 12:25:29 -08:00
Derek Sollenberger
74bfea76ea
am a630dcdb: am ecde72fe: Ensure the IME is rendered above the surface when we z-order the surface to be on top.
...
Merge commit 'a630dcdb956f9acb028dd03bc63b28874f100f8a'
* commit 'a630dcdb956f9acb028dd03bc63b28874f100f8a':
Ensure the IME is rendered above the surface when we z-order the surface to be on top.
2010-03-01 12:23:27 -08:00
Grace Kloba
ef962fc34c
DO NOT MERGE
...
Manual merge part of https://android-git.corp.google.com/g/#change,42462
from master to mr2 for Adobe.
Fix http://b/issue?id=2475242
2010-03-01 12:13:01 -08:00
Derek Sollenberger
a630dcdb95
am ecde72fe: Ensure the IME is rendered above the surface when we z-order the surface to be on top.
...
Merge commit 'ecde72fe411811ca02a2565bf73b86e6e8ddc76b' into eclair-mr2-plus-aosp
* commit 'ecde72fe411811ca02a2565bf73b86e6e8ddc76b':
Ensure the IME is rendered above the surface when we z-order the surface to be on top.
2010-03-01 12:09:10 -08:00
Gilles Debunne
a2af5bc9ea
Merge "Take headers into account when expanding a ExpListView group."
2010-03-01 11:55:25 -08:00
Wei Huang
f7ffcbd566
Merge "define the "seen" column for sms and pdu tables."
2010-03-01 11:25:45 -08:00
Derek Sollenberger
ecde72fe41
Ensure the IME is rendered above the surface when we z-order the surface to be on top.
2010-03-01 14:11:10 -05:00