Commit Graph

13005 Commits

Author SHA1 Message Date
Jason Sams
f9ce46435b 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
78bf238fd8 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
d95f2426cf Merge "Begin implementation of generated java files from RS files." 2010-03-01 15:40:37 -08:00
Andreas Huber
d8f28fe15c 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
Fred Quintana
7fe21a393c Merge "fix a system crash that occurs when ChooseAccountActivity is restarted from the icicle" 2010-03-01 14:47:22 -08:00
Vasu Nori
d3914628f7 Merge "register a logging func with sqlite, to get extra info on errors" 2010-03-01 14:22:08 -08:00
Paul Westbrook
a0fc5d763c Merge "Bug 2464063" 2010-03-01 14:21:03 -08:00
Grace Kloba
9d1a35ceeb 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
f9ae233be1 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
0f6b41c6a1 Merge "Switch the services library to using the new Slog" 2010-03-01 13:08:31 -08:00
Grace Kloba
11e78d48b0 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
598836cff0 Merge "If zoom scale is set to minimum, treat it as in overview mode." 2010-03-01 13:06:58 -08:00
Joe Onorato
d76e820bd5 Merge "Add new Slog class." 2010-03-01 13:03:52 -08:00
Fred Quintana
bfb14e360d 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
Derek Sollenberger
fcaa899a0c 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
2a0d882c4d 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
6b554fc818 Merge "Take headers into account when expanding a ExpListView group." 2010-03-01 11:55:25 -08:00
Dianne Hackborn
5aa7efa748 Merge "resolved conflicts for merge of 4dcd2ee8 to master" 2010-03-01 11:33:15 -08:00
Dianne Hackborn
664e53dd23 resolved conflicts for merge of 4dcd2ee8 to master 2010-03-01 11:30:02 -08:00
Wei Huang
e88da1cfbc Merge "define the "seen" column for sms and pdu tables." 2010-03-01 11:25:45 -08:00
Dianne Hackborn
ffead1e216 Merge "cleanup Exit car mode in UI." 2010-03-01 11:12:27 -08:00
Grace Kloba
55a8bbb271 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
ecaff33574 Merge "check offset and don't crash" 2010-03-01 10:56:19 -08:00
Steve Block
7a8d85c2e2 Merge "Removes a Geolocation test from the DumpRenderTree skipped list" 2010-03-01 10:54:30 -08:00
Steve Block
1d99b98d5b Merge "Adds to DumpRenderTree the ability to look for Android-specific results" 2010-03-01 10:53:22 -08:00
Wei Huang
99a418cabe define the "seen" column for sms and pdu tables. 2010-03-01 10:26:31 -08:00
Paul Westbrook
e26f4a308f Merge "Bug 2306842" 2010-03-01 09:41:49 -08:00
The Android Open Source Project
05d7350329 merge from open-source master 2010-03-01 09:30:21 -08:00
Marc Blank
121181af47 Merge "Put _SYNC_LOCAL_ID into event entities" 2010-03-01 08:37:20 -08:00
Dave Sparks
01058d3646 Merge "Stop previous ringtone when silent is selected. Bug 2256593." 2010-03-01 07:55:11 -08:00
Derek Sollenberger
8ccb632005 Merge "force plugins to render on top of browser content." 2010-03-01 05:35:21 -08:00
Andrei Popescu
a8133ffe12 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
Gilles Debunne
227c650d76 Merge "Fixes for ExpandableListView with headers/footers" 2010-02-27 13:13:11 -08:00
Mike Lockwood
1b960bb8ff Merge "Fix synchronization problem in PowerManagerService.dump()" 2010-02-27 06:16:54 -08:00
Jacek Surazski
78528bb55f Merge "Add BatteryInfo to ApplicationErrorReport." 2010-02-27 04:00:44 -08:00
Mathias Agopian
07f8949946 Merge "to help debugging [2461567] Home screen redraw messed up" 2010-02-26 19:01:06 -08:00
Mathias Agopian
c8ff222963 Merge "fix [2475541] Deprecate Sensor.TYPE_ORIENTATION" 2010-02-26 19:00:56 -08:00
Mathias Agopian
45853c9759 to help debugging [2461567] Home screen redraw messed up
log SF's idea of the front buffer in dumpsys.
2010-02-26 18:59:23 -08:00
James Dong
be4da7f9f1 Merge "Don't allow MediaRecorder.setParameter() to be invoked in the following states: error, prepared or recording" 2010-02-26 18:56:22 -08:00
Eric Fischer
2b94c46e2a Merge "Import new translations." 2010-02-26 18:12:37 -08:00
Robert Greenwalt
35e22bb2c0 Merge "Add build options for tethering." 2010-02-26 18:01:28 -08:00
Adam Powell
32820ca5f9 Merge "ListView now tries to keep the position containing focused child views on-screen." 2010-02-26 17:06:50 -08:00
Adam Powell
4524176014 Merge "FastScroller now reports scroll state changes for its associated AbsListView" 2010-02-26 16:46:35 -08:00
Mike LeBeau
9b6381e033 Merge "Add an extra which allows to query *only* for the voice search language preference. This will be used by e.g. LatinIME to avoid extra computation when this is all that's needed (probably a common use case for this API)." 2010-02-26 15:21:29 -08:00
Mike Lockwood
443b18ea4e Merge "Tethering: Use battery changed broadcast instead of UMS broadcast to determine when USB is connected and disconnected." 2010-02-26 15:19:10 -08:00
Robert Greenwalt
3c8ce50ecc Merge "Fix hipri status notifications" 2010-02-26 14:58:45 -08:00
Chris Tate
3db1ec312c Merge "Make sure to apply the auto-restore setting when the system is restored" 2010-02-26 14:16:59 -08:00
Romain Guy
98cc14afb1 Merge "Do not detach headers and footers from the list view." 2010-02-26 14:15:42 -08:00
Fred Quintana
d39c84f544 Merge "remove redundant @hides" 2010-02-26 13:43:09 -08:00
Mike Lockwood
990262693b Merge "CdmaDataConnectionTracker: Add DUN to list of supported APN types." 2010-02-26 13:37:34 -08:00