summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* VolumeZen: Prevent raising ringer volume in silent mode.John Spurlock2014-06-012-9/+32
| | | | | | | | | Instead of breaking out of silent mode when raising the volume using the keys, prevent the change and display a visual hint up in the user interface. Bug:15330217 Change-Id: I74aae44319aadcd6db9841c7799967607f5a1617
* Merge "AudioManager: add audio port gain control" into lmp-preview-devEric Laurent2014-05-313-1/+12
|\
| * AudioManager: add audio port gain controlEric Laurent2014-05-303-1/+12
| | | | | | | | | | | | | | | | Implement AudioManager.setAudioPortGain() API. Bug: 14815883. Change-Id: Ib54bd1fd1392c474f4767a00228b0a617c51ec5e
* | Merge "audio routing update listener" into lmp-preview-devEric Laurent2014-05-312-2/+175
|\ \ | |/
| * audio routing update listenerEric Laurent2014-05-302-2/+175
| | | | | | | | | | | | | | | | | | | | | | Implement audio port and audio patch callback infrastructure for clients to receive notifications when audio routing changes occur via the OnAudioPortUpdateListener interface. Bug: 14815883. Change-Id: I32cbba64eca7369871aec235ff100de1f0c2d344
* | Merge "AudioSystem: added JNI for routing extensions" into lmp-preview-devEric Laurent2014-05-312-5/+133
|\ \ | |/
| * AudioSystem: added JNI for routing extensionsEric Laurent2014-05-302-5/+133
| | | | | | | | | | | | Bug: 14815883. Change-Id: Ia0c0d14a8e3051a4bc0ce502b6e979135b170c97
* | Merge "Fix name error in com.android.mediadrm.signer.xml" into lmp-preview-devJeff Tinker2014-05-312-3/+4
|\ \
| * | Fix name error in com.android.mediadrm.signer.xmlJeff Tinker2014-05-302-3/+4
| | | | | | | | | | | | | | | Change-Id: I33811345d9e01180b736c6d90a43f58fcb45768a related-to: 15341137
* | | Merge changes I1fd178b6,I5093672e into lmp-preview-devLajos Molnar2014-05-301-2/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: DO NOT MERGE: media.MediaCodec: hide NotificationCallback listener media.MediaCodec: document and fix-up setNotificationCallback
| * | | DO NOT MERGE: media.MediaCodec: hide NotificationCallback listenerLajos Molnar2014-05-281-0/+5
| | | | | | | | | | | | | | | | | | | | Bug: 15091403 Change-Id: I1fd178b6872997055c2ee0b7edfa0264a7d6718b
| * | | media.MediaCodec: document and fix-up setNotificationCallbackLajos Molnar2014-05-281-2/+25
| | |/ | |/| | | | | | | | | | | | | | | | change from interface to abstrace class Bug: 15091403 Change-Id: I5093672e36681670934a5ebaa49484441af5bcdd
* | | Merge changes I16ad392e,Ie26a7d01 into lmp-preview-devRoboErik2014-05-3013-938/+719
|\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: Refactor transport controls APIs API changes to sessions
| * | | Refactor transport controls APIsRoboErik2014-05-307-826/+577
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merges TransportPerformer into MediaSession + a TransportControlsCallback and makes TransportController into an inner class on MediaController called TransportControls. Also makes the PlaybackState and Metadata part of the session APIs instead of transport controls. Change-Id: I16ad392e6d318abe3119ad5d89656d253af25e16
| * | | API changes to sessionsRoboErik2014-05-2913-196/+226
| |/ / | | | | | | | | | | | | | | | | | | Changes requested by API Council review. A second CL will refactor TransportController and TransportPerformer based on feedback. Change-Id: Ie26a7d01d7021232a66c2edf1eb58120437fdfde
* | | camera2: Change android.lens.focusRange to Pair<Float,Float>Igor Murashkin2014-05-301-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the focus range is defined in diopters (1/distance), it just so happens that in a range [near, far] near >= far which is against the android.util.Range contract. Change it to pair instead. Also adds a marshaler for Pairs since they didn't have one before (and aren't parcelable). Bug: 15335269 Change-Id: If2f3259aeec072438a1c18c1b9728a4c81e92a40
* | | Merge "Camera2: Test null TonemapCurve behavior" into lmp-preview-devYin-Chia Yeh2014-05-291-4/+7
|\ \ \ | |/ / |/| |
| * | Camera2: Test null TonemapCurve behaviorYin-Chia Yeh2014-05-281-4/+7
| |/ | | | | | | | | | | | | | | Add a test to verify we return null TonemapCurve when at least one channel of tonemap curve is absent. Bug: 14628001 Change-Id: I3e89dbcf00e5f21b01fc78fe43fe5c4200690357
* | Merge "DO NOT MERGE - AudioManager: audio routing extensions" into ↵Eric Laurent2014-05-2811-0/+980
|\ \ | |/ |/| | | lmp-preview-dev
| * DO NOT MERGE - AudioManager: audio routing extensionsEric Laurent2014-05-2811-0/+980
| | | | | | | | | | | | | | Added API and classes allowing framework components to have direct control over audio routing and volumes. Change-Id: I28225a6ebad86a7836e1ed749d93c0e964e215f1
* | Merge changes Ia0f54124,I1e085f5e,Ic0a3ff0a,I141847df,I8ae4efa2 into ↵Eino-Ville Talvala2014-05-281-0/+64
|\ \ | |/ |/| | | | | | | | | | | | | | | | | lmp-preview-dev * changes: camera2: Update native/managed key mappings. Camera2: switch API interface to java classses Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[] camera2: Add new metadata keys, change types for existing range keys Camera2: Replace int[] by MeteringRectangle
| * Camera2: switch API interface to java classsesYin-Chia Yeh2014-05-281-0/+22
| | | | | | | | | | | | | | | | | | android.sensor.info.physicalSize: float[] -> SizeF android.statistics.hotPixelMap: int[] -> Point[] android.tonemap.curve[Red|Green|Blue]: float[] -> TonemapCurve Bug: 14628001 Change-Id: I1e085f5e640a059852fcb504b6dd5f884039e653
| * camera2: Add new metadata keys, change types for existing range keysIgor Murashkin2014-05-281-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds the following keys: * android.control.maxRegionsAe * android.control.maxRegionsAwb * android.control.maxRegionsAf * android.request.maxNumOutputRaw * android.request.maxNumOutputProc * android.request.maxNumOutputProcStalling Changes the following keys' type generations: * android.control.aeTargetFpsRange * (Range<Integer>) * android.control.aeAvailableTargetFpsRanges * (Range<Integer>[]) * android.control.aeCompensationRange * (Range<Integer>) * android.lens.focusRange * (Range<Float>) Bug: 14628001 Change-Id: I141847dffc4b0d89cea37c19a54d6d5faf24a9bb
* | DO NOT MERGE temporary hide of AudioAttributesJean-Michel Trivi2014-05-271-0/+1
|/ | | | | | Bug 15089989 Change-Id: I6077d4906d5624be4dd2b8a5c3378a04c848b6d8
* VolumeZen: combine ringer/notification volume and zen.John Spurlock2014-05-271-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Implement a new volume panel widget, combining volume and zen mode + conditions. - Show zen mode + conditions when modifying ringer or notification streams. - Host the volume panel widget in a dialog when being controlled by the audio service / volume keys. - Remove support for multiple sliders in the volume panel. - Remove support for separate ringer + notification volumes in the volume panel. - Move volume panel resources up to SystemUI. - Create a new combined Notifications quick settings tile. - Host the volume panel widget in the quick settings panel under Notifications. - When the quick settings detail panel is visible, route the volume keys to the embedded widget instead of showing a redundant dialog. - Create common styles for quick settings text to be closer to spec. - Update the framework resources for the ringer stream. - Show the ringer icons in global actions. - Add "until you turn this off" back as a separate zen condition. - Disable time condition buttons when they are N/A. - Don't allow volume changes to set ringer mode silent. Bug:15186070 Change-Id: Id5e321dd1d5e7c4cf3917027ffbdf7e80d38b00d
* Merge "camera2: Move DngCreator to hardware/camera2." into lmp-preview-devRuben Brunk2014-05-244-1149/+0
|\
| * camera2: Move DngCreator to hardware/camera2.Ruben Brunk2014-05-224-1149/+0
| | | | | | | | | | Bug: 15091253 Change-Id: Ibe2ee376436e5c796e33c0b782ea68278589f2e6
* | camera2: Refactor CameraMetadata.Key out into 3 key classesIgor Murashkin2014-05-231-4/+37
|/ | | | | | | | | | | | | | | | | | | | Before: * CameraMetadata.Key<T> After: * CameraCharacteristics.Key<T> * CaptureResult.Key<T> * CaptureRequest.Key<T> CameraMetadata#get has been removed (each metadata subclass has its own #get now) due to java generic limitations (in particular a type bound <T1<T2> extends Key<T2>> is an illegal bound). CameraMetadataNative gets a new #dumpToLog function to dump the native metadata to logcat. Bug: 15091017 Change-Id: Ic56c54c0d184e209e20de374dc8a6d79527c209f
* Merge "camera2: Add HAL1 compatibility shim skeleton."Ruben Brunk2014-05-221-15/+24
|\
| * camera2: Add HAL1 compatibility shim skeleton.Ruben Brunk2014-05-211-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds basic support for running the Camera2 API on a device running a camera HAL version lower than CAMERA_MODULE_API_VERSION_2_0. This CL includes support for: - N-way preview output streams - N-way jpeg output streams - CameraDevice emulation at the binder interface - Basic camera metadata querying in the CameraManager Bug: 15117269 Bug: 15116722 Change-Id: I8322955034c91f34bb348d4b28c2b774dbef38f6
* | Switch to using int stream instead of AudioAttributesRoboErik2014-05-211-8/+7
| | | | | | | | | | | | | | This is an alternate to the submitted API which doesn't use the new AudioAttributes class and just takes the AudioManager.STREAM instead. Change-Id: I0365bc6fb9196fc33852ba6b202ca553efe0cc85
* | Add stream/volume apis to sessionsRoboErik2014-05-212-1/+131
|/ | | | | | | | | | | This adds RemoteVolumeProviders which handle volume change events and a way to switch a session between local stream playback and remote playback handling. This also adds a way for an app to specify the PendingIntent to launch when we want to show their ongoing playback UI. Change-Id: I3a72bf2ec7ca55f61f50859ddc2988eebd491e9d
* Merge changes I1cbdff1d,I23906b4cRoboErik2014-05-213-14/+12
|\ | | | | | | | | | | * changes: Handle headsethook voice launching Add 5s timeout to wakelock
| * Add 5s timeout to wakelockRoboErik2014-05-203-14/+12
| | | | | | | | | | | | | | Also filed a b/15110168 to anr the app if it doesn't finish with the button event in 5s. Change-Id: I23906b4c7f17d3d3a29eef92b523d8653c87017e
* | Merge "Update android.media.AudioTrack.getTimestamp API documentation"Glenn Kasten2014-05-211-4/+12
|\ \
| * | Update android.media.AudioTrack.getTimestamp API documentationGlenn Kasten2014-05-211-4/+12
| | | | | | | | | | | | Change-Id: I0928c73c147ce843ae46565883da209b278fb3b4
* | | Build cast v2 mediadrm signer library as non-staticJeff Tinker2014-05-211-1/+1
|/ / | | | | | | | | bug: 13988104 Change-Id: Ie94074dd46e4489c7d4e0f378d1e35b14bb0c0ac
* | VolumeZen: SystemUI now hosts the volume dialog.John Spurlock2014-05-215-19/+297
|/ | | | | | | | | - Allow SystemUI to set the volume controller interface using a new binder call to audio service. - Remove VolumePanel's dependency on AudioService. - Host the base VolumePanel in the SystemUI process. Change-Id: I095d5a1a579d42b68d0f81abb4087bd0c754b876
* Merge "AudioSystem: add new audio device definitions"Eric Laurent2014-05-203-28/+206
|\
| * AudioSystem: add new audio device definitionsEric Laurent2014-05-193-28/+206
| | | | | | | | Change-Id: Ib7675bc33771365b2dbb7694c522469317b11457
* | Merge "Add getMediaSession to RCC"RoboErik2014-05-201-0/+13
|\ \
| * | Add getMediaSession to RCCRoboErik2014-05-201-0/+13
| | | | | | | | | | | | | | | | | | This is to make integration with Media notifications easier. Change-Id: I783ae5c2620ff0e11bf5584604b9c9623850e2f0
* | | Merge "Fix 64 bit long pointer size for media scanning"Andy Hung2014-05-201-1/+1
|\ \ \
| * | | Fix 64 bit long pointer size for media scanningAndy Hung2014-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 14993718 Change-Id: I98989caddcca67c2b3257cead948382fddb066da
* | | | Merge "Add HEVC decoder support ot MediaCodec bug: 14571712"Rachad2014-05-192-0/+32
|\ \ \ \ | |_|/ / |/| | |
| * | | Add HEVC decoder support ot MediaCodecRachad2014-05-142-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | bug: 14571712 Change-Id: Ic65e1ffd7583f7286728332686dbb92090b5a413
* | | | Merge "Rename session classes to have media prefix, hide routes"RoboErik2014-05-1927-130/+155
|\ \ \ \
| * | | | Rename session classes to have media prefix, hide routesRoboErik2014-05-1627-130/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This renames several of the core session classes to be prefixed with Media. It also adds @hide to all route references for now. Change-Id: Idb42897d490cf24626e4e93ca975b2cb93ec054c
* | | | | Merge "Move media key processing to sessions"RoboErik2014-05-197-37/+166
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Move media key processing to sessionsRoboErik2014-05-167-37/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send all media key events over to the MediaSessionService instead of AudioManager. This does not affect volume handling yet, so it is possible to get into a state where volume will be handled by a different thing than media buttons. Except for corner cases this shouldn't be noticable. Change-Id: I00a576175d9c82937f0836e509b9a98d5cb77b83