drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,154 Commits 1 Branch 0 Tags
Commit Graph

19154 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grace Kloba
d6dc43bf4f am c0524d26: (-s ours) am 3ff7cecd: Merge "DO NOT MERGE" into eclair-mr2 
Merge commit 'c0524d26a6bcfa28a930f446717dffcd9ce3c3f5'

* commit 'c0524d26a6bcfa28a930f446717dffcd9ce3c3f5':
  DO NOT MERGE
 2010-03-01 16:27:44 -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
Vasu Nori
fb9f10f693 Merge "revert due to the sqlite build problem on Mac.." 2010-03-01 15:54:34 -08:00
Vasu Nori
b649ca250a revert due to the sqlite build problem on Mac.. 2010-03-01 15:53:05 -08:00
Jason Sams
108831a72c Merge "Add support for linking to a skia bitmap rather than always copying the data from the bitmap." 2010-03-01 15:42:47 -08:00
Jason Sams
1549257d12 Merge "Support defered generation of mipmaps. With this change we support mipmap generation when the texture is uploaded to GL without requiring RS to retain the full chain." 2010-03-01 15:42:03 -08:00
Jason Sams
053100e6b6 Merge "Begin implementation of generated java files from RS files." 2010-03-01 15:40:37 -08:00
Wu-cheng Li
8cbb8f5e1f Unhide zoom API. 
bug:2458926
 2010-03-01 15:32:33 -08:00
Jason Sams
8a64743f37 Add support for linking to a skia bitmap rather than always copying the data from the bitmap. 2010-03-01 15:31:04 -08:00
Andreas Huber
7714d7132e Merge "Ensure that the audio codec instance is actually going away before we attempt to instantiate another one, otherwise we might end up with the software codec even though the hardware codec would have been available shortly." 2010-03-01 15:07:34 -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
Andreas Huber
5f0d5ce38a Ensure that the audio codec instance is actually going away before we attempt to instantiate another one, otherwise we might end up with the software codec even though the hardware codec would have been available shortly. 2010-03-01 14:58:39 -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
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
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
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