19136 Commits

Author SHA1 Message Date
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
Vasu Nori
e0dab5bf67 Merge "register a logging func with sqlite, to get extra info on errors" 2010-03-01 14:22:08 -08:00
Paul Westbrook
37acc3122c Merge "Bug 2464063" 2010-03-01 14:21:03 -08:00
Joe Onorato
5d3bea6229 fix the build 2010-03-01 13:44:29 -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
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
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
Vasu Nori
54dd0f25ac register a logging func with sqlite, to get extra info on errors
sqlite3 (latest patch) from DRH included this functionality.
us it to get more useful debugging info from sqlite
2010-03-01 11:50:32 -08:00
Dianne Hackborn
54330c311c Merge "resolved conflicts for merge of 4dcd2ee8 to master" 2010-03-01 11:33:15 -08:00
Dianne Hackborn
28a8c2bc14 resolved conflicts for merge of 4dcd2ee8 to master 2010-03-01 11:30:02 -08:00
Wei Huang
f7ffcbd566 Merge "define the "seen" column for sms and pdu tables." 2010-03-01 11:25:45 -08:00
Dianne Hackborn
47a52f32a3 Merge "cleanup Exit car mode in UI." 2010-03-01 11:12:27 -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
Gilles Debunne
52b65d39aa Take headers into account when expanding a ExpListView group.
The possible scroll that happen after expanding a group did not take the possible
existing headers into account.

Change-Id: I5dc381baa7c54580e992e26a1ed55102afcb16b0
2010-03-01 11:04:28 -08:00
Grace Kloba
5e747dd602 Merge "Add a new WebCoreWorker thread to handle the tasks which should not block either UI or WebKit. It handles local file access, cache access and trim cache." 2010-03-01 10:58:01 -08:00
Mark Wagner
1c63b341d7 Merge "check offset and don't crash" 2010-03-01 10:56:19 -08:00
Steve Block
e60f6730b6 Merge "Removes a Geolocation test from the DumpRenderTree skipped list" 2010-03-01 10:54:30 -08:00
Steve Block
666eecc1e3 Merge "Adds to DumpRenderTree the ability to look for Android-specific results" 2010-03-01 10:53:22 -08:00
Grace Kloba
2036dbab17 Add a new WebCoreWorker thread to handle the tasks
which should not block either UI or WebKit. It handles
local file access, cache access and trim cache.

Move createCache, saveCache and most of getCache out
of WebCore thread so that slow IO and database will
not affect loading performance. getCache can be still
called from WebCore thread in the uncommon cases
like redirect and POST validation.

Move cache ticker from WebCore thread to WebViewWorkerThread.

Move setCookie from WebCore thread to WebViewWorkerThread.

Remove the unreferenced files in the cache directory
while trim cache.

Confirmed with our SQL expert, Vasu, there is no need
to wrap clearCache with end/startTransaction any more.

http://b/issue?id=2414792
http://b/issue?id=2475242
2010-03-01 10:36:15 -08:00
Wei Huang
ee49fedc26 define the "seen" column for sms and pdu tables. 2010-03-01 10:26:31 -08:00
Leon Scroggins
1be4098528 Make nativeMoveCursorToNextInput return a boolean and use it.
If nativeMoveCursorToNextTextInput does not succeed, do not set the
default selection or perform the other actions which assumed that the
move worked.

Part of fix for http://b/issue?id=2478052

Requires a change to external/webkit.
2010-03-01 12:50:12 -05:00
Paul Westbrook
b4e193991f Merge "Bug 2306842" 2010-03-01 09:41:49 -08:00
The Android Open Source Project
4dcd2ee8ca merge from open-source master 2010-03-01 09:30:21 -08:00
Mark Wagner
60919953ce check offset and don't crash 2010-03-01 09:28:29 -08:00
Magnus Edlund
7bb2581e6f Fix problem with restarting an application process that recently has died.
There exists a race condition when starting a process that recently has died.
If the ActivityManager receives the death notification for the died process
after the new process has been started but before an application thread has
been attached to the new process will the newly created process be removed
during the cleanup of the died process. If this happens when sending a broadcast
could it result in an ANR.

This is solved by doing the clean up before starting a new process that uses
the same process record.
2010-03-01 09:12:07 -08:00
Joe Onorato
00bb93823d Add new Slog class. 2010-03-01 09:07:37 -08:00
Marc Blank
7c02ef117e Merge "Put _SYNC_LOCAL_ID into event entities" 2010-03-01 08:37:20 -08:00
Dave Sparks
a3afae33b7 Merge "Stop previous ringtone when silent is selected. Bug 2256593." 2010-03-01 07:55:11 -08:00
Derek Sollenberger
247c7275a1 Merge "force plugins to render on top of browser content." 2010-03-01 05:35:21 -08:00
Derek Sollenberger
2120cd663f force plugins to render on top of browser content. 2010-03-01 08:31:28 -05:00
Andrei Popescu
02e274321c Merge "VideoPlayer::onPrepared() can be called after the user pressed back in the VideoView. This can cass a NPE since our Timer would have been destroyed by then." 2010-03-01 05:30:05 -08:00
Bernd Holzhey
a3015b3e13 cleanup Exit car mode in UI.
Change notification text from 'disable car mode" to 'exit car mode'.
2010-03-01 10:26:46 +01:00
Marc Blank
2bd4fd279f Put _SYNC_LOCAL_ID into event entities
* This column is used by the Exchange sync adapter when sending change
  emails to attendees.

Change-Id: Ib23c07a30b41bfcbae874ae8aaa448fae2cfb6c3
2010-02-28 09:51:51 -08:00
Gilles Debunne
7628fbe031 Merge "Fixes for ExpandableListView with headers/footers" 2010-02-27 13:13:11 -08:00
Andrei Popescu
8aab46abca VideoPlayer::onPrepared() can be called after the user pressed back in the VideoView.
This can cass a NPE since our Timer would have been destroyed by then.

Add call to VideoView.stopPlayback() when the view is dismissed by the user.

Fix b: 2476002, 2475786, 2475786
2010-02-27 16:14:04 +00:00
Mike Lockwood
a33097d6d1 Merge "Fix synchronization problem in PowerManagerService.dump()" 2010-02-27 06:16:54 -08:00