summaryrefslogtreecommitdiffstats
path: root/media/java/android
Commit message (Expand)AuthorAgeFilesLines
* Finalized the audio track ducking APIGil Dobjanschi2010-10-192-14/+44
* Save the color for gradient effectsGil Dobjanschi2010-10-151-1/+2
* resolved conflicts for merge of a127c07c to masterKenny Root2010-10-141-0/+3
|\
| * am 312644cd: Merge "Support for writing to MPEG2 transport stream files." int...Andreas Huber2010-10-131-0/+3
| |\
| | * Support for writing to MPEG2 transport stream files.Andreas Huber2010-10-121-0/+3
* | | Merge "Test implementation bug fix."Gil Dobjanschi2010-10-121-11/+14
|\ \ \
| * | | Test implementation bug fix.Gil Dobjanschi2010-10-121-11/+14
* | | | MTP: allow renaming directoriesMike Lockwood2010-10-121-10/+5
* | | | MTP: Add support for renaming filesMike Lockwood2010-10-121-1/+77
|/ / /
* | | Merge "Color effect comments and method name changes."Gil Dobjanschi2010-10-112-16/+35
|\ \ \
| * | | Color effect comments and method name changes.Gil Dobjanschi2010-10-112-16/+35
* | | | MTP: Fix copying files to root of storage using parent handle = 0Mike Lockwood2010-10-111-1/+10
|/ / /
* | | am 2b4f1f4c: am f72dd019: Merge "Disable 10secs forward/backward seeking for ...Andreas Huber2010-10-101-1/+2
|\ \ \ | |/ /
| * | am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek ...Andreas Huber2010-10-081-1/+2
| |\ \ | | |/
| | * Disable 10secs forward/backward seeking for rtsp as seek is a very expensive ...Andreas Huber2010-10-081-1/+2
* | | Merge "Hide project media by creating the .nomedia file"Gil Dobjanschi2010-10-081-0/+6
|\ \ \
| * | | Hide project media by creating the .nomedia fileGil Dobjanschi2010-10-081-0/+6
* | | | MTP: Throw a NullPointerException if client is null in MtpCursor constructorMike Lockwood2010-10-081-0/+3
* | | | Merge "MediaScanner: don't call pruneDeadThumbnailFiles unless the images tab...Mike Lockwood2010-10-071-0/+12
|\ \ \ \
| * | | | MediaScanner: don't call pruneDeadThumbnailFiles unless the images table is e...Mike Lockwood2010-10-071-0/+12
| |/ / /
* | | | Remove MediaVideoItem and AudioTrack playback APIs.Gil Dobjanschi2010-10-072-363/+0
|/ / /
* | | Added VideoEditor reference to protected AudioTrack constructorGil Dobjanschi2010-10-062-3/+5
* | | Added the video editor to the media items and audio track constructors.Gil Dobjanschi2010-10-065-13/+23
* | | Adjust start time and duration for overlays and effects.Gil Dobjanschi2010-10-055-88/+111
* | | Added mute APIs for MediaVideoItem and AudioTrackGil Dobjanschi2010-10-043-8/+65
* | | Save AudioTrack to XMLGil Dobjanschi2010-10-044-10/+117
* | | Added audio track playback APIGil Dobjanschi2010-10-042-9/+178
* | | Added ability to instantiate various implementations of the VideoEditorGil Dobjanschi2010-09-294-13/+141
* | | Update code for new BT APIs.Jaikumar Ganesh2010-09-281-56/+62
* | | Save overlays to XMLGil Dobjanschi2010-09-284-9/+143
* | | Merge "Validate Overlay and effect duration and start time."Gil Dobjanschi2010-09-286-16/+86
|\ \ \
| * | | Validate Overlay and effect duration and start time.Gil Dobjanschi2010-09-286-16/+86
* | | | MtpCursor: Remove some unused variablesMike Lockwood2010-09-281-13/+1
|/ / /
* | | work on review comments and code formating.Dharmaray Kundargi2010-09-272-12/+53
* | | Merge "Bug fix: getDuration vs. getDurationTimeline"Gil Dobjanschi2010-09-276-35/+119
|\ \ \
| * | | Bug fix: getDuration vs. getDurationTimelineGil Dobjanschi2010-09-276-35/+119
* | | | MTP: Implement extra object properties for audio, video and image filesMike Lockwood2010-09-271-44/+259
|/ / /
* | | Merge "Adjust the duration of transitions if needed."Gil Dobjanschi2010-09-244-5/+66
|\ \ \
| * | | Adjust the duration of transitions if needed.Gil Dobjanschi2010-09-244-5/+66
* | | | Send album artist to the media provider again.Marco Nelissen2010-09-241-3/+2
* | | | Merge changes Ie8bd9107,I1065179aMike Lockwood2010-09-231-0/+9
|\ \ \ \
| * | | | MTP: Reenable GetObjectPropValue and SetObjectPropValueMike Lockwood2010-09-231-0/+9
* | | | | Merge changes I75c4c7dc,Ie9f3dea3Mike Lockwood2010-09-231-0/+22
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | MTP: List all the formats we support in addition to FORMAT_UNDEFINEDMike Lockwood2010-09-231-0/+22
* | | | Merge "1. Added OverlayFrame constuctor 2. Invalidate transitions when trimmi...Gil Dobjanschi2010-09-236-110/+228
|\ \ \ \
| * | | | 1. Added OverlayFrame constuctorGil Dobjanschi2010-09-226-110/+228
* | | | | resolved conflicts for merge of ac4a284a to masterEric Laurent2010-09-2310-88/+207
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | am 7864c72b: Merge "Fix issue 3022800." into gingerbreadEric Laurent2010-09-2310-88/+207
| |\ \ \ | | | |/ | | |/|
| | * | Fix issue 3022800.Eric Laurent2010-09-2310-88/+207
* | | | MediaScanner: disable album artist support until MediaProvider really support...Mike Lockwood2010-09-221-2/+3