Dianne Hackborn
ab80f2aea5
Merge "More watermark work." into gingerbread
2010-08-23 18:57:37 -07:00
Dirk Dougherty
63301fe5b0
am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo
...
Merge commit '397c0f5a18281e3880b9359feab683a13d271a03' into gingerbread
* commit '397c0f5a18281e3880b9359feab683a13d271a03':
Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
2010-08-23 17:49:49 -07:00
Dirk Dougherty
560e1154dd
Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo
2010-08-23 17:40:46 -07:00
Mathias Agopian
af2ac558a4
Merge "add new sensor types for handling gyro data and device orientation more efficiently." into gingerbread
2010-08-23 13:54:17 -07:00
Scott Main
fab418483e
am 5a98fef3: Merge "docs: add dev guide for getting user location" into froyo
...
Merge commit '5a98fef352ed835406fa74a5563eadd9708f7cf9' into gingerbread
* commit '5a98fef352ed835406fa74a5563eadd9708f7cf9':
docs: add dev guide for getting user location
2010-08-23 12:41:45 -07:00
Scott Main
943100901d
Merge "docs: add dev guide for getting user location" into froyo
2010-08-23 12:32:51 -07:00
Andreas Huber
29c889f5ea
Merge "Better handling of rtsp connection and disconnection." into gingerbread
2010-08-23 12:26:31 -07:00
Chia-chi Yeh
82af40b505
Merge "Visualizer: replace the FFT implementation with a faster one." into gingerbread
2010-08-22 18:31:15 -07:00
Chih-Chung Chang
eed79068c3
Merge "Revert "Don't recycle native bitmap after the finalizer is called."" into gingerbread
2010-08-22 04:23:51 -07:00
Irfan Sheriff
0beb8c5a89
Merge "DO NOT MERGE Enable all networks on screen on" into gingerbread
2010-08-21 11:45:47 -07:00
Steve Howard
7ca94273b4
Merge "Make ProgressBar.setVisibility() remotable." into gingerbread
2010-08-20 19:04:35 -07:00
Trevor Johns
1f508eddc3
am ca9d51b1: Disabling AccessibilityService sample from build system.
...
Merge commit 'ca9d51b15074163521b140dce431cc3a10cb56fe' into gingerbread
* commit 'ca9d51b15074163521b140dce431cc3a10cb56fe':
Disabling AccessibilityService sample from build system.
2010-08-20 18:42:38 -07:00
Wink Saville
f6ad16c48e
am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.
...
Merge commit '3158cf689f4994ec53c3b727f9b6ad7751a5551b' into gingerbread
* commit '3158cf689f4994ec53c3b727f9b6ad7751a5551b':
Change CDMAPhone.getDeviceId to return MEID or ESN.
2010-08-20 16:34:16 -07:00
Romain Guy
fa141f3ac5
Merge "Load bitmaps in the correct format." into gingerbread
2010-08-20 15:43:11 -07:00
Kenny Root
f9ef0e9286
Merge changes I8a257579,I82d16312 into gingerbread
...
* changes:
Add AStorageManager API to NDK
Reorganize MountService IPC
2010-08-20 15:07:34 -07:00
Nipun Kwatra
24a3b041dd
Merge "setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration." into gingerbread
2010-08-20 14:16:08 -07:00
Dianne Hackborn
2b718b6cea
Merge "Fix a few small battery stats problems:" into gingerbread
2010-08-20 14:10:41 -07:00
Dianne Hackborn
eedeeb877f
Merge "Fix aapt dump badging to support xlarge screens." into gingerbread
2010-08-20 13:39:30 -07:00
Kenny Root
e6d429c49b
Merge "Free created FileMap when uncompressing files" into gingerbread
2010-08-20 13:16:20 -07:00
Dianne Hackborn
047dca2130
Merge "DO NOT MERGE 2928156 Accessibility event's parcelableData property not nullified during recycling (GINGERBREAD)" into gingerbread
2010-08-20 12:53:07 -07:00
Robert Greenwalt
d18227e5ce
Merge "DO NOT MERGE Fixing Connectivity" into gingerbread
2010-08-20 12:01:56 -07:00
James Dong
67b7606479
Merge "Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder" into gingerbread
2010-08-20 11:39:29 -07:00
Wu-cheng Li
0968942116
Merge "Add camera fps range API." into gingerbread
2010-08-20 11:19:51 -07:00
Hung-ying Tyan
20fbd0edcf
Merge "SipSession: make potential time-consuming ops run on background thread" into gingerbread
2010-08-20 08:26:31 -07:00
Daniel Sandler
ee0495467a
Merge "Fix periodically disappearing status icons." into gingerbread
2010-08-20 06:01:20 -07:00
Chih-Chung Chang
7df3576df3
Merge "Don't recycle native bitmap after the finalizer is called." into gingerbread
2010-08-20 03:54:21 -07:00
Wu-cheng Li
34473e9156
Merge "Handle the camera open failure better." into gingerbread
2010-08-19 21:45:46 -07:00
Kenny Root
cd9ce313dd
Free created FileMap when uncompressing files
...
Change-Id: Ice22c4ecb7c129b74bf60cd66ae79e110b017a4a
2010-08-19 18:39:58 -07:00
Jake Hamby
2da1ca0d0e
Merge "Cosmetic cleanups to SMSDispatcher classes." into gingerbread
2010-08-19 18:14:18 -07:00
Chia-chi Yeh
8c8949ff9c
Merge "Use getMinFrameCount() instead of querying AudioSystem directly." into gingerbread
2010-08-19 18:08:02 -07:00
James Dong
8c3f6775ff
Merge "Return error from MPEG4Writer stop() if the check on codec specific data failed" into gingerbread
2010-08-19 18:02:23 -07:00
Gilles Debunne
a5be29f03f
Merge "Text selection without trackball." into gingerbread
2010-08-19 17:59:08 -07:00
Jesse Wilson
8c485a41cf
Delete AWT from frameworks/base.
...
This code was never released and doesn't compile. Note that java.awt.font
is a published API that we're stuck with; that code is in libcore.
http://b/issue?id=2732079
Change-Id: If9516b63be8cdffc959b540df18615b159361892
2010-08-19 17:40:36 -07:00
Scott Main
865da3cf6e
am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo
...
Merge commit '11a72482a0cdc45ceaf4ca83957e682381455aee' into gingerbread
* commit '11a72482a0cdc45ceaf4ca83957e682381455aee':
docs: add links from widget classes to tutorials
2010-08-19 17:37:31 -07:00
Scott Main
4673e014ea
Merge "docs: add links from widget classes to tutorials" into froyo
2010-08-19 17:31:12 -07:00
Gilles Debunne
986fef582b
Merge "Fix for a Resource system bug that displayed the wrong name for missing asset." into gingerbread
2010-08-19 15:27:12 -07:00
Doug Zongker
8c02312a82
am 0fe27cf5: make android_id random seed depend on time as well as ro.serialno
...
Merge commit '0fe27cf5bd1407bc7b4eabefaa91ff535582badc' into gingerbread
* commit '0fe27cf5bd1407bc7b4eabefaa91ff535582badc':
make android_id random seed depend on time as well as ro.serialno
2010-08-19 14:05:27 -07:00
James Dong
d8fdc20e29
Merge "Make MediaWriter stop and pause return errors if necessary" into gingerbread
2010-08-19 13:59:32 -07:00
Mathias Agopian
385648ba93
Merge "remove unused pixel format" into gingerbread
2010-08-19 13:37:35 -07:00
Jeff Brown
2008e3efde
Merge "Make the throttling more sensitive to end-to-end latency." into gingerbread
2010-08-19 13:27:58 -07:00
Jeff Brown
869347fc62
Make the throttling more sensitive to end-to-end latency.
...
The code now takes into account the time when the event was generated.
So with a 60Hz throttling rate, it ensures that a motion event will not
be delayed due to throttling by any more than 1/60th of second past
the time it was generated.
Change-Id: Iaea1d4f76e79036b4a18873485230731c3cd63c3
2010-08-19 13:26:58 -07:00
Mathias Agopian
c04cffd570
remove unused pixel format
...
Change-Id: I55bc3cc41385743c07f7e4de06335c922f746f73
2010-08-19 13:11:42 -07:00
Mathias Agopian
d6a9447cbf
Merge "fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used." into gingerbread
2010-08-19 11:44:50 -07:00
Andreas Huber
7237a08b22
Merge "Support for MP4V-ES packetization format according to RFC3016." into gingerbread
2010-08-19 11:19:51 -07:00
Wu-cheng Li
906d4c565f
Merge "Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE" into gingerbread
2010-08-19 11:08:39 -07:00
Wu-cheng Li
427da2fd1c
Merge "Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE" into gingerbread
2010-08-19 11:08:36 -07:00
Andreas Huber
a64447bd61
Merge "In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data." into gingerbread
2010-08-19 10:54:21 -07:00
Eric Laurent
e5f76f354e
Merge "Audio Effects: fixed "strength supported" parameter size." into gingerbread
2010-08-19 10:42:36 -07:00
Kenny Root
1068812158
Merge "Add OBB flags to support overlays" into gingerbread
2010-08-19 09:09:32 -07:00
Andreas Huber
5c5d63cfa8
Merge "Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description." into gingerbread
2010-08-19 09:09:12 -07:00