Commit Graph

16820 Commits

Author SHA1 Message Date
jsh
68f2073783 Merge "Add line break between PLMN and SPN in windowshade." into gingerbread 2010-09-28 12:44:47 -07:00
Steve Howard
1277bed788 Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread 2010-09-28 12:38:15 -07:00
Andreas Huber
f3b1fab582 Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread 2010-09-28 12:02:35 -07:00
Andreas Huber
8a5b141433 Merge "Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files." into gingerbread 2010-09-28 11:46:41 -07:00
Andreas Huber
e8d14e3a9f Merge "Squashed commit of the following:" into gingerbread 2010-09-28 11:27:33 -07:00
Dianne Hackborn
e640c7bb94 Merge "Fixes to granting URI permissions - take into account path perms." into gingerbread 2010-09-28 11:21:27 -07:00
Andy Stadler
a31234bb9f Merge "Allow touch events when clickable *or* longClickable" into gingerbread 2010-09-28 09:26:49 -07:00
Dave Sparks
b4a76a3249 Merge "Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669. The dump function whitelists several directories as filters to the output. The mount point changed for SD card in Froyo, and we started filtering files that were open on the SD card. This fix changes the filter for the SD card, and adds the directory for data files as well." into gingerbread 2010-09-28 08:44:39 -07:00
Jeff Brown
ced8172ac1 Merge "Fix pointer index when splitting secondary pointers." into gingerbread 2010-09-27 20:57:02 -07:00
Jeff Brown
ffb16d601b Fix pointer index when splitting secondary pointers.
Change-Id: Ib01e810ea5b64501b1303000bbef0f0a1db2114e
2010-09-27 20:54:28 -07:00
Hung-ying Tyan
813ccddc02 Merge "Don't enter DISCONNECTING state when the call/connection is not alive" into gingerbread 2010-09-27 19:23:35 -07:00
Hung-ying Tyan
6e0e4c4f11 Merge "Move SipService out of SystemServer to phone process." into gingerbread 2010-09-27 16:25:49 -07:00
Gilles Debunne
eec02f9bad Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread 2010-09-27 16:07:47 -07:00
Nick Kralevich
fe5e2b58c3 Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread 2010-09-27 15:23:45 -07:00
Eric Fischer
5e9c93e6e4 Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread 2010-09-27 15:01:33 -07:00
Gilles Debunne
4b21b13986 Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread 2010-09-27 14:26:56 -07:00
Wu-cheng Li
674166e6fc Merge "The old overlay should be destroyed if orientation changes." into gingerbread 2010-09-27 14:09:02 -07:00
Kenny Root
6569e8fb44 Merge "Use buffered I/O during certificate parsing" into gingerbread 2010-09-27 12:45:44 -07:00
Dianne Hackborn
7a0090f88a Merge "Allow all apps to call ContentResolver.getType()." into gingerbread 2010-09-27 12:42:34 -07:00
Jeff Brown
6949f5da66 Merge "Add suuport for splitting touch events across windows." into gingerbread 2010-09-27 12:33:14 -07:00
Joe Onorato
257fe6b330 Merge "We only need at most one tty icon." into gingerbread 2010-09-27 11:41:24 -07:00
Joe Onorato
567e7e0a69 Merge "If an icon add remove get coalesced, don't remove some other icon." into gingerbread 2010-09-27 11:40:15 -07:00
Hung-ying Tyan
5aac807823 Merge "SipAudioCall: remove SipManager dependency." into gingerbread 2010-09-27 10:54:27 -07:00
Dan Morrill
9420e797f9 Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn't yet been settled for Gingerbread, this change doesn't go into details. We can do a docs change later once GB CDD is final." into gingerbread 2010-09-27 10:30:41 -07:00
James Dong
ac06987ae2 Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread 2010-09-27 10:08:52 -07:00
Andreas Huber
c32b23674a Merge "Support other kinds of HTTP redirect in NuHTTPDataSource" into gingerbread 2010-09-27 09:20:58 -07:00
Eric Laurent
61d5a7f8e4 Merge "Fix error in AudioEffect command status reporting." into gingerbread 2010-09-27 08:41:00 -07:00
Kenny Root
ca5eb60743 Merge "Use buffered output during packages.xml write" into gingerbread 2010-09-27 08:03:47 -07:00
Fabrice Di Meglio
1b0fe7a6dc Merge "Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)" into gingerbread 2010-09-27 02:16:01 -07:00
Jeff Brown
d1b0a2bfe5 Add suuport for splitting touch events across windows.
This feature is currently used to enable dragging the start and end
selection handles of a TextView at the same time.  Could be used for
other things later.

Deleted some dead code in ArrowKeyMovementMethod and CursorControllers.

Change-Id: I930accd97ca1ca1917aab8a807db2c950fc7b409
2010-09-26 22:20:12 -07:00
Mindy Pereira
70da97b0dd Merge "DO NOT MERGE. Only 1 edge glow should be growing at a time." into gingerbread 2010-09-26 18:16:26 -07:00
Jean-Baptiste Queru
79f006b69f reconcile froyo-release into gingerbread
Change-Id: I4c6d47421ed7a26b65f4f2df105d8375fcc3d840
2010-09-26 17:29:28 -07:00
John Wang
9110d71aa9 Merge "Add debug functions." into gingerbread 2010-09-26 13:53:33 -07:00
Mathias Agopian
8405dff685 Merge changes I1f7c4535,I741c68a2 into gingerbread
* changes:
  simple test app for screen capture API
  add support for [1974164] Be able to take a screen shot on the device
2010-09-24 18:02:10 -07:00
Patrick Dubroy
84b804678e Merge "do not merge - Asset update (pass #3)" into gingerbread 2010-09-24 16:57:46 -07:00
Dianne Hackborn
03ba4aeda9 Merge "Some debugging support." into gingerbread 2010-09-24 15:28:34 -07:00
Mathias Agopian
06e7056660 simple test app for screen capture API
Change-Id: I1f7c453508ccfd4faaa8b1279968a358ce3f1e5a
2010-09-24 15:01:49 -07:00
Mathias Agopian
1b0b30d043 add support for [1974164] Be able to take a screen shot on the device
screenshots are taken using ISurfaceComposer::captureScreen() which returns
the size of the screenshot and an IMemoryHeap containing the data.
screenshots have limitations:
- they will always fail if a secure window is up on screen
- require GL_OES_framebuffer_object extension
- in some situation, video planes won't been captured

Change-Id: I741c68a2d2984fb139039301c3349e6780e2cd58
2010-09-24 14:56:39 -07:00
Eric Laurent
5b82faf85c Merge "fix problem in AudioEffect JNI setup." into gingerbread 2010-09-24 13:43:54 -07:00
Dianne Hackborn
67f78c4fe8 Some debugging support.
- New feature to "am monitor" to have it automatically launch
  gdbserv for you when a crash/ANR happens, and tell you how to
  run the client.

- Update dumpstate to match new location of binder debug logs

- Various commented out logs that are being used to track down
  issues.

Change-Id: Ia5dd0cd2df983a1fc6be697642a4590aa02a26a5
2010-09-24 13:11:55 -07:00
Nick Kralevich
dcfe15cbf9 Merge "Use the default SecureRandom provider." into gingerbread 2010-09-24 13:10:42 -07:00
Patrick Scott
4c4d8d0efc Merge "Add new Alarm provider class for setting an alarm." into gingerbread 2010-09-24 11:34:10 -07:00
Kenny Root
aea0ae5ad4 Merge "Revert "Revert "Free created FileMap when uncompressing files""" into gingerbread 2010-09-24 11:33:35 -07:00
Kenny Root
7f3a7afc92 Merge "Add locking around ZIP seeking" into gingerbread 2010-09-24 11:33:29 -07:00
Andreas Huber
d3eaa15246 Merge "Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread 2010-09-24 10:44:01 -07:00
Robert Greenwalt
ea871eb0b1 Merge "Move long Connectivity tasks to handler thread." into gingerbread 2010-09-24 10:42:46 -07:00
Eric Fischer
421f2d2566 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-09-24 10:37:04 -07:00
Eric Laurent
b21a6713b9 Merge "Fix issue 3007862" into gingerbread 2010-09-24 09:43:24 -07:00
Kenny Root
b47eafac1d Revert "Revert "Free created FileMap when uncompressing files""
This revert reverts commit a19ef306bd0a257c67b50f5e0e669e9fe52b0889.
2010-09-24 09:11:28 -07:00
Andreas Huber
864ec8e074 Merge "Proper sync-frame detection for sources that don't already provide it." into gingerbread 2010-09-24 08:17:20 -07:00