Alex Gruenstein
49194c1bef
Merge "Add EXTRA_PARTIAL_RESULTS so that clients can enable receiving results via onPartialResults()"
2010-02-09 18:57:11 -08:00
David Turner
46340764bd
Merge "Generate /data/system/packages.list in the PackageManager"
2010-02-09 18:52:40 -08:00
Romain Guy
e3482f2173
Merge "Fix the lock screen."
2010-02-09 18:50:55 -08:00
Dirk Dougherty
8b82dd2c43
am e524ff53: am 859f4556: Merge "Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper." into eclair
...
Merge commit 'e524ff534e1aabc45819e978c26bf61d9b71f444'
* commit 'e524ff534e1aabc45819e978c26bf61d9b71f444':
Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper.
2010-02-09 18:48:59 -08:00
Dirk Dougherty
b34f0a75a0
am 859f4556: Merge "Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper." into eclair
...
Merge commit '859f455645bc49e32330108b1ea9f85ffb80a2cd' into eclair-plus-aosp
* commit '859f455645bc49e32330108b1ea9f85ffb80a2cd':
Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper.
2010-02-09 18:44:18 -08:00
Dirk Dougherty
88d505a68e
Merge "Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper." into eclair
2010-02-09 18:41:32 -08:00
Adam Powell
4904004ee3
am 87da8606: Manually merged VelocityTracker changes
...
Merge commit '87da860616009a86e260e49bbefffe12c1a06607'
* commit '87da860616009a86e260e49bbefffe12c1a06607':
Use a circular buffer in VelocityTracker
2010-02-09 17:35:52 -08:00
Jason Sams
6c7fdf58b7
Merge "Preview seperating RenderScript into RenderScript and RenderScriptGL"
2010-02-09 17:08:50 -08:00
Fred Quintana
56a448dee2
Merge "only make AccountManager throw an exception on blocking calls in the UI thread if the application's SDK is froyo or later"
2010-02-09 17:07:47 -08:00
Shimeng (Simon) Wang
5527f6f7bb
Merge "Regenerate the TopLevelDomain from iana.org website."
2010-02-09 16:40:17 -08:00
Eric Fischer
f73fb232cc
Merge "Make the Date Picker fields more consistent in locales with numeric months."
2010-02-09 16:10:57 -08:00
Mathias Agopian
d7a4fd0fd1
Merge "Add support for physically rotated displays"
2010-02-09 15:26:44 -08:00
Shimeng (Simon) Wang
e757f9f464
Regenerate the TopLevelDomain from iana.org website.
...
This is to capture recently added top level domains.
modified: common/java/com/android/common/Patterns.java
modified: common/tests/src/com/android/common/PatternsTest.java
2010-02-09 15:13:09 -08:00
Andreas Huber
3dca6cebe1
Merge "Defer actual work of setDataSource given a URI to the prepare phase in order to not block the calling thread for any significant amount of time..."
2010-02-09 14:28:32 -08:00
Adam Powell
3a6dc1ed75
Manually merged VelocityTracker changes
2010-02-09 14:25:41 -08:00
Eugene Koh
7a31bae9f1
Merge "Update DroidSansFallback typeface + preserve legacy version"
2010-02-09 14:24:08 -08:00
Andreas Huber
5ed646c5bd
Merge "If the codec's input buffer size is too small to accomodate the buffer read from the source, report and error instead of asserting."
2010-02-09 14:23:30 -08:00
Dianne Hackborn
c6abff44d5
Merge "New external storage APIs."
2010-02-09 14:22:29 -08:00
Leon Scroggins
f50864c5a7
Merge "Set the IME action to GO for normal textfields."
2010-02-09 14:12:07 -08:00
Amith Yamasani
ef22f972db
Merge "Restart input when moving to a new textfield."
2010-02-09 14:09:58 -08:00
Vasu Nori
65f69ac284
Merge "suppress broken tests( http://b/2431671 )"
2010-02-09 14:07:43 -08:00
Ken Shirriff
a6081a49ba
Merge "Change key dispatch timeout logging."
2010-02-09 14:05:48 -08:00
Dan Egnor
17a5d1d2f3
Merge "Fix NPE in FileObserver when multiple events pile in for a defunct observer. Also, fix up some bogus whitespace (hard tabs, etc)."
2010-02-09 13:47:21 -08:00
San Mehat
a8f6674a86
Merge "MountService: Check for failure to unmount when enabling UMS and fix reversed logic"
2010-02-09 13:29:28 -08:00
Romain Guy
6f35d21892
Merge "Properly notifies listener when an animation is cancelled. Bug: #2428005."
2010-02-09 13:21:09 -08:00
Vasu Nori
b9b9fecbaf
Merge "change wording in warning msg printed when compiled-sql cache is full"
2010-02-09 12:29:21 -08:00
Andreas Huber
74ac6abd40
Merge "A little less verbosity in stagefright and special treatment for the error state while shutting down."
2010-02-09 12:10:31 -08:00
Bjorn Bringert
16b0994b3a
Merge "Fix NPE in PackageParser"
2010-02-09 12:09:28 -08:00
Eugene Koh
d38b619cdb
Merge "Update the mdpi resource with 2.0 style icons"
2010-02-09 12:05:49 -08:00
Shimeng (Simon) Wang
9188159c9d
Merge "Take into account the visible title height when scrolling."
2010-02-09 11:39:18 -08:00
Xavier Ducrohet
a479399e57
Merge "Add --auto-add-overlay option to aapt."
2010-02-09 11:29:11 -08:00
San Mehat
6845c6a9b4
Merge "MountService: Harden for pre-boot usage users"
2010-02-09 11:02:44 -08:00
San Mehat
32148c5aa4
Merge "MountService: Add WARN checks to ASEC calls to catch bad users"
2010-02-09 11:02:32 -08:00
Adam Powell
1041df7533
am 18f75bd4: am e88192b9: Cleanup fixes for ScaleGestureDetector
...
Merge commit '18f75bd45cdbfaf175364552f2d0d0dc3b2835c0'
* commit '18f75bd45cdbfaf175364552f2d0d0dc3b2835c0':
Cleanup fixes for ScaleGestureDetector
2010-02-09 11:01:24 -08:00
Adam Powell
459bd6bc23
am e88192b9: Cleanup fixes for ScaleGestureDetector
...
Merge commit 'e88192b9d2a8c364d8545471907c5baa275bb5f6' into eclair-plus-aosp
* commit 'e88192b9d2a8c364d8545471907c5baa275bb5f6':
Cleanup fixes for ScaleGestureDetector
2010-02-09 10:55:57 -08:00
Andreas Huber
e27f6940c7
Merge "During shutdown, don't loop forever on a state transition to OMX_StateInvalid."
2010-02-09 10:04:57 -08:00
San Mehat
160be5c646
Merge "NativeDaemonConnector: Improve error reporting and debug formatting"
2010-02-09 08:59:13 -08:00
San Mehat
4d0b9139e2
Merge changes I1aabef01,I8dbd0f83
...
* changes:
SystemServer: Move MountService startup before NotificationManagerService
StorageManager: Check for a null MountService
2010-02-09 08:58:23 -08:00
Leon Scroggins
0d57dc8da2
Merge "Handle the Tab key by moving to the next textfield. And ensure there is always a way to get to the next field."
2010-02-09 07:53:40 -08:00
Wu-cheng Li
a05c822704
Add exposure compensation parameter.
...
bug:2375993
2010-02-09 18:28:50 +08:00
Suchi Amalapurapu
83d5c71304
resolved conflicts for merge of 37a00a36 to master
2010-02-08 23:55:56 -08:00
Andy Stadler
b2a5affce5
Merge "Fixes to DeviceAdmin & DevicePolicyManager Javadoc"
2010-02-08 23:06:31 -08:00
Suchi Amalapurapu
ddd670c816
am 08be55b8: Add null checks when scanning a package. Delete packages whose code and resource paths haven\'t been set correctly.
...
Merge commit '08be55b8ea917a5273c135a7bdc73e41c8524c05' into eclair-plus-aosp
* commit '08be55b8ea917a5273c135a7bdc73e41c8524c05':
Add null checks when scanning a package.
2010-02-08 17:27:33 -08:00
Andreas Huber
2a2fb8a362
Merge "Properly implement asynchronous preparation of media playback."
2010-02-08 16:39:24 -08:00
Jason Sams
19c78c9988
Merge "Fix fountain and put the demos back in the optional build."
2010-02-08 16:34:04 -08:00
Chris Tate
94ac2b0ed5
Merge "Remember which apps have available restore info in the ancestral dataset"
2010-02-08 16:30:35 -08:00
Marco Nelissen
675c6ae717
Merge "Skip the endianness marker when converting UCS-2 to UTF-8, since it ends up in the UTF-8 string otherwise."
2010-02-08 16:30:14 -08:00
Mathias Agopian
2b92d89e23
Add support for physically rotated displays
...
This feature is currently controled by a system property.
"ro.sf.hwrotation" can be set to either 90 or 270. It'll cause
SF to rotate the screen by 90 and 270 degres respectively.
That is, if the driver reports 800x480 for instance, and
ro.sf.hwrotation is set to 90, applications will "see" a
480x800 display and will run in portrait.
This is implemented by introducing an extra "display"
transformation in the GraphicPlane.
2010-02-08 15:49:35 -08:00
Gloria Wang
a6ce146906
Merge "Use Tremor for sim-eng, and Tremolo for other targets."
2010-02-08 15:16:07 -08:00
Marco Nelissen
b0afa790d1
Merge "Add support for the TPOS/TPA (disc number) id3 tag."
2010-02-08 14:59:31 -08:00