drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,671 Commits 1 Branch 0 Tags
Commit Graph

603 Commits

Author SHA1 Message Date
Gil Dobjanschi
7bfcabbb9e Finalized the audio track ducking API 
Change-Id: I12b966c1898eaae76e9de71a6d745678dc489092
 2010-10-19 13:23:56 -07:00
Gil Dobjanschi
f958f0fe9d Save the color for gradient effects 
Change-Id: I21e14344aa7410b5c99102ab41b4ec94db2fbe61
 2010-10-15 13:38:03 -07:00
Kenny Root
4a90f93781 resolved conflicts for merge of a127c07c to master 
Change-Id: Ifdfc6681cba00f36456eaf7a97f34a75b9d0c086
 2010-10-14 23:58:41 -07:00
Andreas Huber
a127c07c42 am 312644cd: Merge "Support for writing to MPEG2 transport stream files." into gingerbread 
Merge commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7' into gingerbread-plus-aosp

* commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7':
  Support for writing to MPEG2 transport stream files.
 2010-10-13 09:19:28 -07:00
Gil Dobjanschi
2fd0c94a11 Merge "Test implementation bug fix." 2010-10-12 18:34:03 -07:00
Andreas Huber
9adf466021 Support for writing to MPEG2 transport stream files. 
Change-Id: If3b7a807bc224a4b1cb2236537c3ebdc5aee0d97
 2010-10-12 16:05:23 -07:00
Gil Dobjanschi
e2c28468a5 Test implementation bug fix. 
Change-Id: I1448d06662e2538f01d9c462d4a86fcbf57d7125
 2010-10-12 15:55:14 -07:00
Mike Lockwood
6a6a3aff17 MTP: allow renaming directories 
Change-Id: I90849e7924f33a2f39dae400968f2eda64710beb
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-10-12 14:19:51 -04:00
Mike Lockwood
5ebac83e20 MTP: Add support for renaming files 
Change-Id: I679d674eb4dae88f60165ab2850cc20eec7ceee3
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-10-12 12:41:58 -04:00
Gil Dobjanschi
c5d3229983 Merge "Color effect comments and method name changes." 2010-10-11 12:11:25 -07:00
Gil Dobjanschi
0ce122e38b Color effect comments and method name changes. 
Change-Id: I58a9535e2bc4f61532f980f31bba4140797bf483
 2010-10-11 11:24:14 -07:00
Mike Lockwood
01788562f2 MTP: Fix copying files to root of storage using parent handle = 0 
Change-Id: Ie732c5778e9424512b2ddecd87779f8c55668deb
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-10-11 11:22:19 -04:00
Andreas Huber
37de60c179 am 2b4f1f4c: am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread 
Merge commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7'

* commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7':
  Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
 2010-10-10 17:14:53 -07:00
Gil Dobjanschi
bced934da0 Merge "Hide project media by creating the .nomedia file" 2010-10-08 14:57:05 -07:00
Gil Dobjanschi
ce52d1ff76 Hide project media by creating the .nomedia file 
Change-Id: I4ef1f16ceaa211b7f614cb3dfffa5beb4ae3e8de
 2010-10-08 14:44:36 -07:00
Mike Lockwood
069ead3adc MTP: Throw a NullPointerException if client is null in MtpCursor constructor 
Change-Id: Ia2a19ddcc5cacb54d9fcbe55bce1de1aed515424
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2010-10-08 15:39:48 -04:00
Andreas Huber
2b4f1f4cb8 am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread 
Merge commit 'f72dd0190ee64914161d361be1213eda8cab7b90' into gingerbread-plus-aosp

* commit 'f72dd0190ee64914161d361be1213eda8cab7b90':
  Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
 2010-10-08 11:18:03 -07:00
Andreas Huber
10b9b3f3fe Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality. 
Change-Id: I016e79b688774f8ee91ac53216197b5fb9cb41b2
related-to-bug: 3073955
 2010-10-08 10:16:24 -07:00
Mike Lockwood
170bf59c7c Merge "MediaScanner: don't call pruneDeadThumbnailFiles unless the images table is empty" 2010-10-07 16:15:33 -07:00
Mike Lockwood
6458935331 MediaScanner: don't call pruneDeadThumbnailFiles unless the images table is empty 
BUG: 3063257

Change-Id: I648ff8c4d4026e3d2a97853257865c9b5f712712
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-10-07 17:43:57 -04:00
Gil Dobjanschi
b27f2d3126 Remove MediaVideoItem and AudioTrack playback APIs. 
Change-Id: If3e5f341af7f581c90f04c91afb3681f9e8d5f82
 2010-10-07 13:57:54 -07:00
Gil Dobjanschi
0ca0a12c6b Added VideoEditor reference to protected AudioTrack constructor 
Change-Id: Icfac392f8060d424b27105c6ae718e35b2d6c705
 2010-10-06 10:53:49 -07:00
Gil Dobjanschi
53f89e1230 Added the video editor to the media items and audio track constructors. 
Change-Id: I5db229d28c28e17b487257a9c4ed8c5fb7570a8d
 2010-10-06 09:54:34 -07:00
Gil Dobjanschi
e5867ef3f0 Adjust start time and duration for overlays and effects. 
Change-Id: Ia5030d15a7c98f37307a0e78821052f05fec9fe6
 2010-10-05 17:25:23 -07:00
Gil Dobjanschi
61f9184547 Added mute APIs for MediaVideoItem and AudioTrack 
Change-Id: I2e4e8b213a5d19f895d9e3431b7d4f1acad70762
 2010-10-04 19:02:28 -07:00
Gil Dobjanschi
3398abafca Save AudioTrack to XML 
Change-Id: Ie9afe8c620e21e160b56c36f489870db0a3987cc
 2010-10-04 17:20:43 -07:00
Gil Dobjanschi
52ac301ee1 Added audio track playback API 
Change-Id: I9884ab5d3a7d8d8310f4b4426e50b0496cbbd295
 2010-10-04 13:56:39 -07:00
Gil Dobjanschi
048449ebfa Added ability to instantiate various implementations of the VideoEditor 
Change-Id: I5b09afafff1c009bada4f49a5568286fe3cd9aef
 2010-09-29 16:58:21 -07:00
Jaikumar Ganesh
82aa7f017d Update code for new BT APIs. 
Change-Id: Idf806cba8160e6075e33e26ee9936663b850e96c
 2010-09-28 20:02:58 -07:00
Gil Dobjanschi
5665fd6ac2 Save overlays to XML 
Change-Id: I549c40b55a85022136dbd4899cc0d2d4da6e33de
 2010-09-28 17:54:09 -07:00
Gil Dobjanschi
b0725a4aeb Merge "Validate Overlay and effect duration and start time." 2010-09-28 10:08:53 -07:00
Gil Dobjanschi
f8b04868e6 Validate Overlay and effect duration and start time. 
Change-Id: I3235573f9edc65f148541adacd01eb5caa0b8615
 2010-09-28 09:24:29 -07:00
Mike Lockwood
90bbe5e486 MtpCursor: Remove some unused variables 
Change-Id: Ie1c88bd817c45fc19e34165f8d8557f00514188d
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-28 08:36:15 -04:00
Dharmaray Kundargi
c73305cfd7 work on review comments and code formating. 
Removed white spaces

Change-Id: Ic54817bfc205be536ec086bdfd34b35b0eeac1a3
 2010-09-27 17:32:00 -07:00
Gil Dobjanschi
bf836ec6ed Merge "Bug fix: getDuration vs. getDurationTimeline" 2010-09-27 11:15:24 -07:00
Gil Dobjanschi
4b66f7a53f Bug fix: getDuration vs. getDurationTimeline 
Change-Id: I41a40a3fc3b3674b5fcacecda174e924211b4ad2
 2010-09-27 10:26:11 -07:00
Mike Lockwood
ae078f7dac MTP: Implement extra object properties for audio, video and image files 
Read-only support at this point.

BUG: 2869730

Change-Id: I424ba760c8f5f4af394bd65276f19438fa6da6cb
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-27 13:16:53 -04:00
Gil Dobjanschi
d66a3fe171 Merge "Adjust the duration of transitions if needed." 2010-09-24 18:08:02 -07:00
Gil Dobjanschi
05152ffd67 Adjust the duration of transitions if needed. 
Change-Id: I2e5f9431b1f1c25b30e2d144916140365b10021b
 2010-09-24 14:52:05 -07:00
Marco Nelissen
920d649949 Send album artist to the media provider again. 
Change-Id: I13f44bab2024adcfbc4b9491ac565cfdf15ef9d9
 2010-09-24 09:22:55 -07:00
Mike Lockwood
dbaa3c8f68 Merge changes Ie8bd9107,I1065179a 
* changes:
  MTP: Reenable GetObjectPropValue and SetObjectPropValue
  MTP: Minor debug output cleanup
 2010-09-23 20:09:46 -07:00
Mike Lockwood
d3bfecb0c9 MTP: Reenable GetObjectPropValue and SetObjectPropValue 
Windows no longer chokes now that we implement the minimum set of properties

BUG: 2869730

Change-Id: Ie8bd9107610b9b38f060ad8a2f05334a3b4aff9b
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-23 23:04:28 -04:00
Mike Lockwood
2c2d06da2a Merge changes I75c4c7dc,Ie9f3dea3 
* changes:
  MTP: List all the formats we support in addition to FORMAT_UNDEFINED
  MTP: Fix problems with signed ints in MtpCursor.cpp
 2010-09-23 19:11:21 -07:00
Mike Lockwood
12b8a99fc1 MTP: List all the formats we support in addition to FORMAT_UNDEFINED 
Fixes Windows Media Player support

BUG: 3003770

Change-Id: I75c4c7dcdd833b3b5b200339e24c38d583efb1fa
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-23 22:08:24 -04:00
Gil Dobjanschi
7eb805707f Merge "1. Added OverlayFrame constuctor 2. Invalidate transitions when trimming video 3. Remove image file when removing an OverlayFrame 4. Bug fixes in the VideoEditor implementation" 2010-09-23 13:48:33 -07:00
Eric Laurent
bb7684bafa resolved conflicts for merge of ac4a284a to master 
Change-Id: Ia644f67b5d7d7e7137eef2284e9533b5819c12d8
 2010-09-23 12:22:44 -07:00
Eric Laurent
ac4a284ab4 am 7864c72b: Merge "Fix issue 3022800." into gingerbread 
Merge commit '7864c72b91a21eeb282e2e38d688fbbc3cd3ecb8' into gingerbread-plus-aosp

* commit '7864c72b91a21eeb282e2e38d688fbbc3cd3ecb8':
  Fix issue 3022800.
 2010-09-23 11:34:40 -07:00
Eric Laurent
1a5149e5d7 Fix issue 3022800. 
- Created sub-package android.media.audiofx for audio effects.
- Hid AudioEffect class contructor, methods and variables not needed by
applications
- Added more javadoc comments for AudioEffect Class

Change-Id: Ibbb40d4e714bb248aa32cf82d7763d74efae96d1
 2010-09-23 11:04:03 -07:00
Mike Lockwood
ff371cf0ed MediaScanner: disable album artist support until MediaProvider really supports it 
Fixes a "no such column" exception in MediaProvider.update() that I somehow
missed when testing the MediaProvider refactoring.

Change-Id: Icc502a5c0e3bd150b353972d000b978a9e044abc
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-22 23:25:33 -04:00
Gil Dobjanschi
21e9da6f44 1. Added OverlayFrame constuctor 
2. Invalidate transitions when trimming video
3. Remove image file when removing an OverlayFrame
4. Bug fixes in the VideoEditor implementation

Change-Id: I7bd3c888848edaf659a4faef14ad1c5a6603c3cc
 2010-09-22 20:12:07 -07:00