summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Merge "Changes to support MediaProvider refactoring"Mike Lockwood2010-09-221-131/+1
|\ \ \ \
| * | | | Changes to support MediaProvider refactoringMike Lockwood2010-09-161-131/+1
* | | | | Merge "MTP host: Use Java longs for storage and object IDs"Mike Lockwood2010-09-222-12/+12
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | MTP host: Use Java longs for storage and object IDsMike Lockwood2010-09-212-12/+12
* | | | | am 6943b94b: am a6dc4699: Merge "Fix issue 2913071." into gingerbreadEric Laurent2010-09-211-5/+8
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am a6dc4699: Merge "Fix issue 2913071." into gingerbreadEric Laurent2010-09-211-5/+8
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fix issue 2913071.Eric Laurent2010-09-211-5/+8
* | | | | Merge "Added the behavior paramter to transition constructors"Gil Dobjanschi2010-09-216-76/+239
|\ \ \ \ \
| * | | | | Added the behavior paramter to transition constructorsGil Dobjanschi2010-09-216-76/+239
| | |_|/ / | |/| | |
* | | | | am 96d5c17e: am 8d1513e1: Merge "Made audio effect control panel intents publ...Eric Laurent2010-09-211-35/+33
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 8d1513e1: Merge "Made audio effect control panel intents public." into gin...Eric Laurent2010-09-211-35/+33
| |\ \ \ | | |/ /
| | * | Made audio effect control panel intents public.Eric Laurent2010-09-211-35/+33
* | | | Merge "I splitted the start and end transtions into separate classes."Gil Dobjanschi2010-09-176-127/+171
|\ \ \ \
| * | | | I splitted the start and end transtions into separate classes.Gil Dobjanschi2010-09-176-127/+171
* | | | | Merge "Adding default profiles for specific levels."Nipun Kwatra2010-09-171-0/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Adding default profiles for specific levels.Nipun Kwatra2010-09-171-0/+4
* | | | | Merge "Initial Video Editor API"Gil Dobjanschi2010-09-1621-0/+4328
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Initial Video Editor APIGil Dobjanschi2010-09-1621-0/+4328
| |/ / /
* | | | am 23b8054e: am eea35ce8: Merge "Added intents for audio effects control appl...Eric Laurent2010-09-152-4/+127
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am eea35ce8: Merge "Added intents for audio effects control application" into...Eric Laurent2010-09-142-4/+127
| |\ \ | | |/
| | * Added intents for audio effects control applicationEric Laurent2010-09-142-4/+127