summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Display a fixed volume silder when docked.Eric Laurent2012-09-252-83/+120
| | | | | | | | | | Align UI indication to volume policy when docked: the music volume cannot be adjusted when docked or connected to HDMI. Display a disabled slider at max volume in this case to be consistent. Bug 4335692. Change-Id: I6f8db143b0e2ecf54e4bdacd88afdeb661a98a18
* Merge into jb-mr1-devJean-Baptiste Queru2012-09-251-5/+8
|\ | | | | | | Change-Id: Iba23d16643b8754f6e0a7288b2ca242f722f1bdd
| * Volume keys control music volume after music stopsEric Laurent2012-09-211-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | On phones, add a short delay during which volume keys still control music volume after music has stopped. This is similar to the tablet behavior for notifications volume. It allows users to control the prompt volume for talk back, voice search or navigation even after the prompt has stopped. Bug 7162364. Change-Id: Iffbca9ec30ebcbe5846f783ddd260b6e736caf2b
* | pause music playback when switching user.Eric Laurent2012-09-211-2/+22
|/ | | | | | | | | | AudioService sends AudioManager.ACTION_AUDIO_BECOMING_NOISY intent when notified of a user switch to pause music playback for all background users. Bug 7128886. Change-Id: I6a24409533bf40c517c43da25b9baeceb3379cb8
* Do not turn safe volume on upon headset connectionEric Laurent2012-09-211-16/+24
| | | | | | | | | | | It is not a requirement to force headphone volume limitation back on when a headset is plugged in. Only turn it back on when the device is power off or after 20 hours of cumulative music listening. Bug 7064975. Change-Id: Idabd417a9a9b8096552119c0ff528ba193cfdb5d
* Merge "Expose android.media.AudioManager.getProperty()" into jb-mr1-devGlenn Kasten2012-09-201-9/+8
|\
| * Expose android.media.AudioManager.getProperty()Glenn Kasten2012-09-201-9/+8
| | | | | | | | | | | | | | Also fix minor documentation errors. Bug: 6635041 Change-Id: I6bbbf1b7c5ab705ac374436ea0c098cb3c27fd4a
* | Merge "Add multi user volume management" into jb-mr1-devEric Laurent2012-09-201-28/+64
|\ \ | |/ |/|
| * Add multi user volume managementEric Laurent2012-09-191-28/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Notification and Alarm volumes are per user: they are saved and restored when the foreground user changes. Media volume is global: it is still saved and restored per user for implentation reasons but is copied from one user to the next to ensure media playback volume continuity when switching users. Ringer mode (silent, vibrate...) is now a global setting. Bug 7128886. Change-Id: I9f4f5a0a3985552bca61c2cc3bbe5a144db755a6
* | Merge "New API for querying audio properties" into jb-mr1-devGlenn Kasten2012-09-191-0/+29
|\ \
| * | New API for querying audio propertiesGlenn Kasten2012-09-171-0/+29
| | | | | | | | | | | | | | | Bug: 6635041 Change-Id: I66e87c75af7c84cdb23cb25a958e79bba8e53baa
* | | Merge "AudioService: Send "becoming noisy" intent when USB accessory audio ↵Mike Lockwood2012-09-181-3/+6
|\ \ \ | | | | | | | | | | | | is disconnected" into jb-mr1-dev
| * | | AudioService: Send "becoming noisy" intent when USB accessory audio is ↵Mike Lockwood2012-09-181-3/+6
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | disconnected Bug: 7051259 Change-Id: I5b5fb3ad7c7e38dbf49700d893fd49354eaecf51 Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | am ad23333f: am 945080b5: am 1e86994c: Merge "MtpData bmp format file can\'t ↵Mike Lockwood2012-09-181-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | recognize when copy bmp into DUT" * commit 'ad23333f728471a7f2c49cd1c9575f1cea2503f6': MtpData bmp format file can't recognize when copy bmp into DUT
| * \ \ am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp ↵Mike Lockwood2012-09-181-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into DUT" * commit '1e86994cd0e13f9084d3f4bd0060b9e34c935490': MtpData bmp format file can't recognize when copy bmp into DUT
| | * \ \ Merge "MtpData bmp format file can't recognize when copy bmp into DUT"Mike Lockwood2012-09-181-0/+1
| | |\ \ \
| | | * | | MtpData bmp format file can't recognize when copy bmp into DUTbo huang2012-08-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add support for bmp format. Change-Id: I67d4703b43cd32abad638bae57bbceb65b4be6de Author: bo huang <bo.b.huang@intel.com> Signed-off-by: bo huang <bo.b.huang@intel.com> Signed-off-by: Wu, Hao <hao.wu@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 24555
* | | | | | Merge "Visualizer only works on sounds >5 sec." into jb-mr1-devMarco Nelissen2012-09-181-0/+0
|\ \ \ \ \ \
| * | | | | | Visualizer only works on sounds >5 sec.Marco Nelissen2012-09-181-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Various media framework tests use a Visualizer to look at the output of another effect, but this requires the played file to be longer than 5 seconds. b/4571740 b/7173543 b/7173545 b/7175623 Change-Id: I066a737542bb50e7245fef99f9e11ae8f2aadd6c
* | | | | | | Merge "Activity.onStop(Bundle) does not exist" into jb-mr1-devMarco Nelissen2012-09-181-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | Activity.onStop(Bundle) does not existMarco Nelissen2012-09-171-1/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since that method doesn't exist, the MediaFrameworkTest wake lock was never released, which caused the test to be killed when the GC collected the still active wake lock. Change-Id: Iee2c0478470be987ade405a45abf42ca61b681ab
* | | | | headphone volume limitationEric Laurent2012-09-161-1/+164
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit music volume when headphones or headset are inserted. Display warning message when user wants to increase the volume above a platform specific volume and request user acknowledgement before proceeding. TODO: exact wording of the warning message must be defined by UX. Change-Id: I00f429f602534c6d8783126b929371c4d432e6e2
* | | | Merge "Fix b/7087723 Patch leftover after tapping the red eye area" into ↵Ruei-sung Lin2012-09-121-5/+1
|\ \ \ \ | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | Fix b/7087723 Patch leftover after tapping the red eye areaRuei-sung Lin2012-09-121-5/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I06f5c491b09cf13698f001e8b11f42506fda5bbd
* | | | | Merge "MtpDatabase: Use actual file size instead of media database size ↵Mike Lockwood2012-09-122-40/+41
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | column" into jb-mr1-dev
| * | | | MtpDatabase: Use actual file size instead of media database size columnMike Lockwood2012-09-122-40/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes problems with file transfer from device to host that can occur if the database size value is wrong. Bug: 6954446 Change-Id: I03c3dd4b75267d1f4613f0b588c8899ded9a70be Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | | | Merge "EffectsTest enhancements" into jb-mr1-devMarco Nelissen2012-09-126-1/+34
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | EffectsTest enhancementsMarco Nelissen2012-09-116-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the session edit boxes, and make the effects list more readable by translating known effect type UUIDs Change-Id: I67e78d8d2781c5a56fa35d994bc21911d15f8715
* | | | | Merge "MtpDatabase: Fix typo affecting parent and format queries" into ↵Mike Lockwood2012-09-111-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | | MtpDatabase: Fix typo affecting parent and format queriesMike Lockwood2012-09-111-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7114350 Change-Id: I80269cfcebf521ea13cae30c1c9bd477d76adbd1 Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | | | Add support for controlling remote submix audio routingJean-Michel Trivi2012-09-105-3/+65
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add method in AudioManager to control remote submix through AudioService. AudioService controls remote submxi: enabling/disabling remote submix will: - make the sink audio device available/unavailable - make the audio source available/unavailable - force/unforce media streams to be routed to WFD Change-Id: I05d9cc7c3e8a720318ec1385737cbd46a21a3207
* | | | Merge "Add support for Wifi display." into jb-mr1-devJeff Brown2012-09-071-0/+153
|\ \ \ \
| * | | | Add support for Wifi display.Jeff Brown2012-09-071-0/+153
| | | | | | | | | | | | | | | | | | | | Change-Id: I99693786cf9d07d07d3400046c55eb4933730b80
* | | | | AudioSystem: new audio device enumsEric Laurent2012-09-071-11/+44
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Update audio device enums to match new definitions in native framework. Change-Id: Ie257ab0423e3567f4af5a02b03e128af6c714da6
* | | | Merge "Add context support to backdropper filter." into jb-mr1-devMike Dodd2012-09-071-0/+3
|\ \ \ \
| * | | | Add context support to backdropper filter.Mike Dodd2012-09-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of b/7028438 Change-Id: Idcae38b452abc847c7b869a5568d1c5d831411b7
* | | | | Audio Effects test appMarco Nelissen2012-09-0623-0/+4593
|/ / / / | | | | | | | | | | | | Change-Id: I93fff0e195af3205207ade32ab31f2a760574c7f
* | | | am 657dba9e: am 4aa83ec3: am bb60bc26: Merge "Musicplayer application can ↵Jean-Baptiste Queru2012-09-061-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | not display DRM files of internal storage." * commit '657dba9e66ff02785c2bf034ebecc3c357cbc333': Musicplayer application can not display DRM files of internal storage.
| * | | am bb60bc26: Merge "Musicplayer application can not display DRM files of ↵Jean-Baptiste Queru2012-09-061-1/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | internal storage." * commit 'bb60bc26020f3aabc50aa93ad9bf812af7f48f9c': Musicplayer application can not display DRM files of internal storage.
| | * | Musicplayer application can not display DRM files of internal storage.Jan Bjernler2012-08-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make DRM-protected files transferred over MTP be detected. Previously it was inserted into the database as MEDIA_TYPE_NONE, the result of this was that the file was not detected properly. With this fix the file is scanned from the beginning. Change-Id: Idf17d39e3d529394cd4a03d71fb250e69b395533
* | | | Merge "Improve multi-user broadcasts." into jb-mr1-devDianne Hackborn2012-08-301-18/+49
|\ \ \ \
| * | | | Improve multi-user broadcasts.Dianne Hackborn2012-08-301-18/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can now use ALL and CURRENT when sending broadcasts, to specify where the broadcast goes. Sticky broadcasts are now correctly separated per user, and registered receivers are filtered based on the requested target user. New Context APIs for more kinds of sending broadcasts as users. Updating a bunch of system code that sends broadcasts to explicitly specify which user the broadcast goes to. Made a single version of the code for interpreting the requested target user ID that all entries to activity manager (start activity, send broadcast, start service) use. Change-Id: Ie29f02dd5242ef8c8fa56c54593a315cd2574e1c
* | | | | Merge "Fix a typo in the sample code" into jb-mr1-devTeng-Hui Zhu2012-08-301-1/+1
|\ \ \ \ \
| * | | | | Fix a typo in the sample codeTeng-Hui Zhu2012-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I27ee1b0ef8abf5decefae1ec1706a9f142016344
* | | | | | AudioService: pause music when undockedEric Laurent2012-08-301-1/+3
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send becomming noisy event also when disconnecting a dock (analog, digital or USB) or HDMI. Bug 6760590. Change-Id: I497df35a3c6817d2b300f532d4cc3f12e3ce9ace
* | | | | Merge "Add plumbing for new surface flinger display API." into jb-mr1-devJeff Brown2012-08-272-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add plumbing for new surface flinger display API.Jeff Brown2012-08-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaned up the implementation of Surface and SurfaceSession to use more consistent naming and structure. Added JNI for all of the new surface flinger display API calls. Enforced the requirement that all Surfaces created by the window manager be named. Updated the display manager service to use the new methods. Change-Id: I2a658f1bfd0437e1c6f9d22df8d4ffcce7284ca2
* | | | | am 3221b333: am 26ad1e78: am 03d16e12: Merge "Make setCaptureRate locale safe"Jean-Baptiste Queru2012-08-271-3/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '3221b33322b480fe9d4ba9dc0e7cd684ebe8c96a': Make setCaptureRate locale safe
| * | | | am 26ad1e78: am 03d16e12: Merge "Make setCaptureRate locale safe"Jean-Baptiste Queru2012-08-271-3/+2
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '26ad1e7874f3151ec331e142fdcb8b3a22ddc26a': Make setCaptureRate locale safe
| | * | | Make setCaptureRate locale safeJohan Redestig2012-08-271-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dont use the default String.format in setCaptureRate as it is both locale unsafe and less efficient than regular string concatenation in this case. Change-Id: I29418ec0352ef8c79967592b6eb8ff66cc9c99f0
generated by cgit v1.1 at 2025-05-04 02:57:30 +0000