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

716 Commits

Author SHA1 Message Date
Andreas Huber
81a602958f Merge "Add http live mime types to MediaFile, add support for playlist mime types to browser." 2010-11-15 10:07:17 -08:00
Andreas Huber
5dffd0e3af Add http live mime types to MediaFile, add support for playlist mime types to browser. 
Change-Id: I1f0b31dd2f4e6cfa33a61ff8505e8396aca3c20f
related-to-bug: 2368598
 2010-11-15 08:54:40 -08:00
Mike Lockwood
e2ad6ec171 MTP: Partial implementation of the GetObjectPropList command 
In this initial implementation we only support fetching one property at a time.
Support depth = 0 (single object) or depth = 1 (all objects in a directory)
Reimplemented GetObjectPropValue on top of GetObjectPropList, since the former
is a special case of the latter.

Change-Id: Ia76ee61741d6ee3902b5c5d9fc094cf86dfaf650
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2010-11-15 11:46:51 -05:00
Mike Lockwood
44d47ad565 Merge "MediaScanner: Add support for importing file based playlists copied over MTP" 2010-11-15 08:39:00 -08:00
Gil Dobjanschi
75159247d8 Transition invalidation bug fix. 
Change-Id: I2ca901a805e377fb7d3374281a986b82bcf02590
 2010-11-12 15:29:57 -08:00
Mike Lockwood
caf7e43a40 MediaScanner: Add support for importing file based playlists copied over MTP 
Change-Id: I53a9f204297ff29d4df994d2174bd6d6288f2c97
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-12 18:23:19 -05:00
Gil Dobjanschi
0bf3075241 Merge "Invalidate transitions when an image media item duration changes." 2010-11-11 19:09:25 -08:00
Mike Lockwood
5c7d5ae094 Merge "MediaFile: Recognize MPG file extension as MPEG video" 2010-11-11 13:15:57 -08:00
Mike Lockwood
28d1a4aaf3 MediaFile: Recognize MPG file extension as MPEG video 
Change-Id: Ief7308e5f562754a27f07e4fda970ffd7b1eb98e
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-11 16:14:19 -05:00
Gil Dobjanschi
34fad15699 Invalidate transitions when an image media item duration changes. 
Change-Id: I3cff920ef629df49dcfcb63065afeeb47a649287
 2010-11-11 11:55:19 -08:00
Gil Dobjanschi
1fbeece669 Close the file input stream if the XML file parsing fails. 
Change-Id: I254633a173d61ff8be3f2f399a2d41305076ed78
 2010-11-10 09:27:13 -08:00
Jean-Michel Trivi
820b9e0d3b Add recording source for voice communication 
Add a recording source used to designate a recording stream for
voice communications such as VoIP.

Change-Id: I4091d67069b1a0170c1a5ca5e6acd51eb0aa08f9
 2010-11-09 14:32:43 -08:00
Wu-cheng Li
482083c57f am f6bd761f: Use back-facing camera as default in camera/camcorder profile.do not merge 
* commit 'f6bd761f9407a35cc1c4a4b9e199e6a0dc8e4943':
  Use back-facing camera as default in camera/camcorder profile.do not merge
 2010-11-08 23:56:20 -08:00
Wu-cheng Li
5680635f39 Use back-facing camera as default in camera/camcorder profile. 
bug:3173302
Change-Id: Iae9565eb58949a1c9c2f2a1f5251b2df097ec167
 2010-11-09 15:36:59 +08:00
Wu-cheng Li
f6bd761f94 Use back-facing camera as default in camera/camcorder profile.do not merge 
bug:3173302
Change-Id: I11eaed32bb393206b560834d52c412f3e5a1a7d9
 2010-11-09 14:11:45 +08:00
James Dong
d1604c7313 am 9cebb86c: am 1b2efbca: Merge "Update a comment about when setOrientationHint() should be called" into gingerbread 
* commit '9cebb86c95ad4846ecc771e4b40d2dbd5cf1494b':
  Update a comment about when setOrientationHint() should be called
 2010-11-08 20:43:10 -08:00
James Dong
9cebb86c95 am 1b2efbca: Merge "Update a comment about when setOrientationHint() should be called" into gingerbread 
* commit '1b2efbca7120cf799d1242d277af354df7b0a9bb':
  Update a comment about when setOrientationHint() should be called
 2010-11-08 20:14:19 -08:00
Gil Dobjanschi
8346ad0a8f Merge "Fix invalidateTransition method" 2010-11-08 19:06:41 -08:00
Gil Dobjanschi
549a65b5a4 Fix invalidateTransition method 
Change-Id: I12d5b7256d2956007b65c8304053717dd7b9b7ef
 2010-11-08 18:44:43 -08:00
Joe Onorato
51387974f0 Merge "Move the volume, media, call, camera and search key handling from PhoneWindow to a new PhoneFallbackEventHandler class that is used for all windows, not just ones with decors." 2010-11-08 10:59:27 -08:00
James Dong
5aa95dd36c Update a comment about when setOrientationHint() should be called 
Change-Id: I389089390a552ee7a86823c050048dcec0a0eb2a
 2010-11-08 10:36:53 -08:00
Wu-cheng Li
76f15bcb8b Do not use CAMERA_ID_DEFAULT because it is removed. 
bug:3173302
Change-Id: I360e55f2665b2e121c8cf017e17c4cb4dd181e88
 2010-11-08 23:40:29 +08:00
James Dong
08caf9e84f am bb97d7bb: am 0467b0ab: Merge "Add a new public API to support recording rotated videos" into gingerbread 
* commit 'bb97d7bbf33393af842de1d8fd8512a24c73b6b3':
  Add a new public API to support recording rotated videos
 2010-11-06 16:25:39 -07:00
James Dong
bb97d7bbf3 am 0467b0ab: Merge "Add a new public API to support recording rotated videos" into gingerbread 
* commit '0467b0abfc94f959163d84eadedf6941e41c1882':
  Add a new public API to support recording rotated videos
 2010-11-06 14:21:53 -07:00
Owen Lin
a726e12fb7 Merge "Add more EXIF tags." 2010-11-06 01:20:19 -07:00
Joe Onorato
86f6786032 Move the volume, media, call, camera and search key handling from 
PhoneWindow to a new PhoneFallbackEventHandler class that is used
for all windows, not just ones with decors.

Bug: 3155146
Change-Id: Ib070fa3e523e3564b225bca576c08012fef4f416
 2010-11-05 18:58:29 -07:00
Gil Dobjanschi
d141305f93 Fix: FileInputStream not closed after parsing XML file 
Change-Id: I8ea69738d5ba1e91c9c759f76c49a8a324c24b88
 2010-11-05 17:41:42 -07:00
Gil Dobjanschi
c7481cd56f Merge "Added an export method without codec parameters." 2010-11-05 17:39:04 -07:00
James Dong
ad8f19c6b3 Add a new public API to support recording rotated videos 
o changed a comment about the rotation orientation from counter-clockwise
  to clockwise.

Change-Id: I16ad73ce1a55cc627d9a516e23d1325753b3037e
 2010-11-05 15:53:00 -07:00
Mike Lockwood
250528e5b2 MediaScanner: Fix mismatch between internal and external file paths. 
Change-Id: If2fac90a466c4d63fc90f96e91733c9e9ca14680
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-05 17:31:03 -04:00
Gil Dobjanschi
c006e8ef64 Added an export method without codec parameters. 
Change-Id: If0a1c34f2266c441cd16c46da5c07ab1a509314b
 2010-11-05 11:59:15 -07:00
Ray Chen
4414eb4b29 Add more EXIF tags. 
Change-Id: I77a02a6de6bb4c364bb9718f7bed15468a38a279
 2010-11-05 16:18:29 +08:00
Gil Dobjanschi
a7ccd13083 Merge "Added audio and video codec parameters to the export method." 2010-11-04 15:43:54 -07:00
Gil Dobjanschi
289f08990c Added audio and video codec parameters to the export method. 
Change-Id: I1badd08ce7148da540bf91df0e19c3da59287756
 2010-11-04 15:35:42 -07:00
James Dong
c25c28a496 am c0fa1d47: Merge "Revert "Support rotation in media recorder"" into gingerbread 
* commit 'c0fa1d4791667ee8d1a9685749e42426fe8bd38b':
  Revert "Support rotation in media recorder"
 2010-11-03 19:44:45 -07:00
James Dong
c80c28801d Revert "Support rotation in media recorder" 
This reverts commit f1febe470ac30f8992066cb263c10f58493c4c34.
 2010-11-03 19:22:47 -07:00
Hiroshi Lockheimer
0ce42c9d31 am c181a082: Merge "Support rotation in media recorder" into gingerbread 
* commit 'c181a08209dc85c80e4da5d20cd3980998def40d':
  Support rotation in media recorder
 2010-11-03 17:59:43 -07:00
James Dong
f1febe470a Support rotation in media recorder 
o needs to be tested with camera hal and camcorder application

Change-Id: Ie343185c8ad3ec55da8850efbdcf19cf98993232
 2010-11-03 17:49:55 -07:00
Praveen Bharathi
26e3734983 frameworks/base: switch audio to hdmi when cable is plugged in 
Change-Id: I01c4ee968bc0ffbb6ce75370935571cc1ff6f8c7
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2010-11-03 15:38:12 -07:00
Jaikumar Ganesh
de04e5242a Merge "Add STATE_AUDIO_CONNECTING state." 2010-11-03 14:58:00 -07:00
Jaikumar Ganesh
30d181690e Add STATE_AUDIO_CONNECTING state. 
Why is it needed: SCO audio connections can fail.
Currently no indication is given to clients which are waiting
for SCO connections. This was working fine before because
SCO connections where blocking calls, which was wrong in itself.

Change-Id: Ic449b2db8506a7a5ae6be6c68715f1a7343f9e40
 2010-11-03 11:05:12 -07:00
Gil Dobjanschi
82415bed34 Merge "Use SoftReference for WaveformData" 2010-11-02 20:26:22 -07:00
Gil Dobjanschi
db963e9c64 Use SoftReference for WaveformData 
Change-Id: I801a4eb4f55e0c6244f868bf8b474a2a79d81642
 2010-11-02 19:19:04 -07:00
Gloria Wang
1f89c4f9f8 Use SystemProperties.get() instead of System.getProperty() 
Change-Id: I92571fa217e6623345bbd84cf87ab939fbe63b0a
 2010-11-02 16:56:42 -07:00
Marco Nelissen
e4eb4d9de3 In java, System.getProperty returns null when the property doesn't exist, 
rather than an empty string like it does in native code.
b/3157546

Change-Id: I7985a405e4d2d1f20be0a151aa2cf2e5a83b380b
 2010-11-02 13:47:20 -07:00
Praveen Bharathi
21e941bf43 Added support for dock headset observer 
Change-Id: I06b2e65e3bfa10735e6c7fd3349afa9ae7d45292
Signed-off-by: Praveen Bharathi <pbharathi@motorola.com>
 2010-11-01 18:41:19 -07:00
Mike Lockwood
2b5f9ad1ea MTP: Changes to support /mnt/sdcard paths from MediaProvider. 
Change-Id: I337f0514c20ed31738c73e1f7ab6fb71cc744057
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-01 19:15:55 -04:00
Gloria Wang
5d143ad4a8 Media scanner support for FL(Forward Lock) DRM file types 
Change-Id: Id85edbfc2851d9054a7433d24bb5cf33a457a4e5
 2010-11-01 14:08:39 -07:00
Andreas Huber
69b8d69aad Squashed commit of the following: 
commit 0d5694ba2d399dd0869532a4d6256448185a1be0
Author: Andreas Huber <andih@google.com>
Date:   Fri Oct 29 11:59:23 2010 -0700

    suspend() and resume() methods on VideoView are back but don't do anything.

    They need to be back because they were public before.

    Change-Id: Iddfd1021ffcf341f26e8d55ba761fd33701e2425

commit 16192891ed7d349ee97e47d1729d20a2d0d247b8
Author: Andreas Huber <andih@google.com>
Date:   Fri Oct 29 11:47:05 2010 -0700

    Revert "New API on VideoView widget to suspend/resume a session. Do not release the MediaPlayer client for video suspending/resuming."

    This reverts commit 2e1818a4d16c3309660f27286c77d8d1eee95a25.

    Conflicts:

    	api/current.xml

    Change-Id: I68dd1d05871044faf3f832d0838aa40bc7f890e5

commit 8f934dc1a3ae4e60f0790fcf97671e063fa20fad
Author: Andreas Huber <andih@google.com>
Date:   Fri Oct 29 11:44:16 2010 -0700

    Revert "Release mediaplayer if the current state is not suspending. Fix for bug 2480093."

    This reverts commit efb882cf75eef39ecaf9f8920ed302a019fa629f.

commit f2ed03550887986f39d36b5dabcd9e919949c7cf
Author: Andreas Huber <andih@google.com>
Date:   Fri Oct 29 11:44:08 2010 -0700

    Revert "Release MediaPlayer if suspend() returns false."

    This reverts commit 047212fd4ea360675e94d3ce83c7f5544f65b268.

commit 441ecce678bd24e9660a72c8627b5bd94433ff8b
Author: Andreas Huber <andih@google.com>
Date:   Fri Oct 29 11:40:46 2010 -0700

    manually.

    Change-Id: I4fdd43c9f7c8b3eedddb31a196da4984e1c58e87

Change-Id: I60d4b10e7a9e4ed8d9a796f1711618f557eb6e89
 2010-10-29 13:20:06 -07:00
Gil Dobjanschi
6ea92ecabb Bug fix: Use getDuration vs. getTimelineDuration in Effect and Overlay limits calculations. 
Change-Id: I5f619807435dc75c285446bfd60327bc1c1ecacd
 2010-10-28 16:24:41 -07:00