2740 Commits

Author SHA1 Message Date
Alan Viverette
e88aee8ad8 Add defaults for caption colors and edge type
BUG: 8151470
Change-Id: I4d7b75bf647aeded77b4000cdcd37e9ace46a374
2014-06-04 18:35:42 -07:00
Jean-Michel Trivi
b45c273033 AudioAttributes: parcelable, hide support for tags
Make the AudioAttributes class parcelable.

Hide support for adding and querying tags, there is no SDK-backed
  use case for this feature.

Bug 15306334

Change-Id: Idb67a735778e687d73020ed0120643f31fc230a6
2014-06-04 17:22:16 -07:00
Eric Laurent
7d10873c5c am dd76759d: Merge "AudioManager: fix AudioPort gain query" into lmp-preview-dev
* commit 'dd76759d3e279cd56d6b1ce16a0b9488af35e0ab':
  AudioManager: fix AudioPort gain query
2014-06-04 18:44:26 +00:00
Dongwon Kang
450758a55c am 65d95bfa: Merge "Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application." into lmp-preview-dev
* commit '65d95bfa011fa50e50403f41e08afa2af5d9746e':
  Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application.
2014-06-04 17:01:47 +00:00
Eric Laurent
8da213917e Merge "AudioManager: fix AudioPort gain query" into lmp-preview-dev 2014-06-04 00:27:50 +00:00
Glenn Kasten
6dd6a3dfa0 Merge "Update android.media.AudioTrack.getTimestamp API documentation" 2014-06-03 20:38:08 +00:00
Jean-Michel Trivi
39f5300ebc Merge "AudioFormat class" 2014-06-03 20:17:38 +00:00
Jae Seo
2e0bacc2a3 am 594ac157: Merge "TvContract: Address the feedback from the API review" into lmp-preview-dev
* commit '594ac1575f8301023d37c329f8c676ba9bda396c':
  TvContract: Address the feedback from the API review
2014-06-03 17:17:00 +00:00
Chulwoo Lee
f573765bf1 am b9c0a8ae: Merge "Add a way to get the class name of SetupActivity and SettingsActivity" into lmp-preview-dev
* commit 'b9c0a8ae7b0e69829a663fa2ca6bbdededa02d93':
  Add a way to get the class name of SetupActivity and SettingsActivity
2014-06-03 17:16:33 +00:00
Jae Seo
4c9e57f156 resolved conflicts for merge of ebe661c4 to master
Change-Id: Ic25dc762ee43654b439de3ec237ead007bee3df4
2014-06-03 17:06:58 +00:00
Dongwon Kang
7b2ae34b97 Merge "Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application." into lmp-preview-dev 2014-06-03 02:31:28 +00:00
Jean-Michel Trivi
f723f8e9cf AudioFormat class
Change-Id: I425c80c6caed98f6fa31e8cad8f15435c99ebc20
2014-06-02 19:31:05 -07:00
Eric Laurent
b4e0909fc4 AudioManager: fix AudioPort gain query
Fix bug causing AudioPort.gain(int) to always return null.

Also removed debug log from AudioManager.

Bug: 14815883.
Change-Id: Ie65bab233ec8b4d974061e11ec5b8f0de18275d9
2014-06-02 19:22:48 -07:00
Dongwon Kang
a3be12a236 Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application.
Bug: 14628404
Change-Id: I40abf647e9d608c2c793d007fd2fe0d511535bdd
2014-06-03 09:53:05 +09:00
Jae Seo
6fbe3982b0 Merge "TvContract: Address the feedback from the API review" into lmp-preview-dev 2014-06-03 00:26:05 +00:00
Chulwoo Lee
e7bb7d6bb2 Add a way to get the class name of SetupActivity and SettingsActivity
Now, there can be only one SetupActivity and one SettingsActivity for
one TIS apk though one TIS apk can contain several services. Each TIS
need to be able to have its own SetupActivity and SettingsActivity.

BUG: 15177340
Change-Id: I2d944e3ef35c3a981483ba643fd27b15925bab16
2014-06-03 08:56:35 +09:00
Jae Seo
bd23fa0ba1 TvContract: Address the feedback from the API review
This change addresses the following comments from the council:
- Provider authority should be "android.media.tv"
- Rename COLUMN_DATA to COLUMN_INTERNAL_PROVIDER_DATA and add comment to
  indicate data is internal to the provider that inserted it, and should
  not be decoded by other apps. It would be nice to restrict read access
  to this column, but not essential.
- Hide COLUMN_LOCKED since implementation isn't defined yet, also
  questions about how it interacts with Unicorn.
- Fix typo in ORIGINAL_NETWORK documentation.
- All provider MIME types need to be changed to follow platform
  conventions: "vnd.android.cursor.dir/channel",
  "vnd.android.cursor.dir/program", etc. (Notice singular tense and no
  package prefixes since they're part of the platform API.)
- Rename Programs.COLUMN_DATA to COLUMN_INTERNAL_PROVIDER_DATA, along
  with docs update, for the same reasons as above.
- Rename COLUMN_DESCRIPTION to COLUMN_SHORT_DESCRIPTION and update docs
  to indicate it's a recommended maximum length, not a hard cap.
- COLUMN_GENRE should be split into two columns: COLUMN_BROADCAST_GENRE
  (from broadcast standard) and COLUMN_CANONICAL_GENRE (from an Android
  standard). Define a subclass with the Android canonical genres, which
  are simple strings that are comma-separated when inserted into
  COLUMN_CANONICAL_GENRE.

Bug: 15345342
Change-Id: I7f8e70aef617475a59d096fd73a551e7df8a1d3a
2014-06-02 16:44:37 -07:00
Jae Seo
d5cc4a281e Put TV Input Framework under android.media.tv, including TvContract
Bug: 15345342
Change-Id: I665ca23f0f074ce29cb2e047109b209178532107
2014-06-02 11:02:52 -07:00
RoboErik
830fd7036e am c7ed6f69: Merge "Minimum work to make volume handling work with sessions" into lmp-preview-dev
* commit 'c7ed6f69d474f23df89d36ed94ff0062daa8dcbc':
  Minimum work to make volume handling work with sessions
2014-06-02 17:15:14 +00:00
RoboErik
e78755e180 Merge "Minimum work to make volume handling work with sessions" into lmp-preview-dev 2014-06-02 17:10:07 +00:00
Eric Laurent
3a4398a76c am 209fc1ae: AudioManager: do not mandate a looper
* commit '209fc1ae7abb6965cb4f18bf68ff8c350e9d40d9':
  AudioManager: do not mandate a looper
2014-06-02 16:49:15 +00:00
Eric Laurent
ddc93ce343 AudioManager: do not mandate a looper
Having a listener for audio port updates is not mandatory.
do not throw an excepion when AudioManager is contructed
from a thread without looper.

Bug: 15368707.
Change-Id: If5ce54bf4efdff8b785098649fa1cd0564861e1e
2014-06-02 09:16:02 -07:00
John Spurlock
41792644d9 am bfea31fd: VolumeZen: Prevent raising ringer volume in silent mode.
* commit 'bfea31fd6dd88c94deae1122874b4e0737380d25':
  VolumeZen: Prevent raising ringer volume in silent mode.
2014-06-01 15:59:47 +00:00
John Spurlock
a11b4affca VolumeZen: Prevent raising ringer volume in silent mode.
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
2014-06-01 11:52:23 -04:00
Eric Laurent
3ed851bd07 am f2e19a36: Merge "AudioManager: add audio port gain control" into lmp-preview-dev
* commit 'f2e19a36973331bbc09284993f772bf6981c10da':
  AudioManager: add audio port gain control
2014-05-31 01:56:09 +00:00
Eric Laurent
086995c6da am b4499f84: Merge "audio routing update listener" into lmp-preview-dev
* commit 'b4499f84605faf06479cbb793e945d0af50fdead':
  audio routing update listener
2014-05-31 01:56:03 +00:00
Eric Laurent
ec2f4b0aec am 47615317: Merge "AudioSystem: added JNI for routing extensions" into lmp-preview-dev
* commit '476153173b5a1b6b1fb5fc41af8b87d7e1ec36b3':
  AudioSystem: added JNI for routing extensions
2014-05-31 01:55:58 +00:00
Eric Laurent
54b5e5bdf6 Merge "AudioManager: add audio port gain control" into lmp-preview-dev 2014-05-31 00:49:58 +00:00
Eric Laurent
8725859ee3 Merge "audio routing update listener" into lmp-preview-dev 2014-05-31 00:49:44 +00:00
Eric Laurent
a89eb2d8e5 Merge "AudioSystem: added JNI for routing extensions" into lmp-preview-dev 2014-05-31 00:49:27 +00:00
Eric Laurent
3a24199a0f AudioManager: add audio port gain control
Implement AudioManager.setAudioPortGain() API.

Bug: 14815883.

Change-Id: Ib54bd1fd1392c474f4767a00228b0a617c51ec5e
2014-05-30 17:13:10 -07:00
Eric Laurent
700e73471d audio routing update listener
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
2014-05-30 17:13:10 -07:00
Eric Laurent
b69681c894 AudioSystem: added JNI for routing extensions
Bug: 14815883.

Change-Id: Ia0c0d14a8e3051a4bc0ce502b6e979135b170c97
2014-05-30 17:12:48 -07:00
Lajos Molnar
2a48d42285 am 7c9ed471: Merge changes I1fd178b6,I5093672e into lmp-preview-dev
* commit '7c9ed471c6f5e7d21b49be1105c973d3a8473d59':
  DO NOT MERGE: media.MediaCodec: hide NotificationCallback listener
  media.MediaCodec: document and fix-up setNotificationCallback
2014-05-30 23:21:09 +00:00
Lajos Molnar
a6716aade1 Merge changes I1fd178b6,I5093672e into lmp-preview-dev
* changes:
  DO NOT MERGE: media.MediaCodec: hide NotificationCallback listener
  media.MediaCodec: document and fix-up setNotificationCallback
2014-05-30 23:14:55 +00:00
RoboErik
b69ffd4dc2 Minimum work to make volume handling work with sessions
This is the minimum change to make adjusting volume work with
MediaSessions. This only affects adjusting the volume and adjusting
the volume with a suggested stream. Adjusting a specific stream or
setting a specific stream will still use the same code.

This does not fix existing remote volume handling in RCC, which
will require a separate change to MediaController.

Change-Id: I5b957ff4bece1ee11e2364e1f216e1c08343c983
2014-05-30 15:47:58 -07:00
RoboErik
4e4160cd5e am 80ec18a9: Merge changes I16ad392e,Ie26a7d01 into lmp-preview-dev
* commit '80ec18a90a1ce3d1b68deba8bcf81abcca04e520':
  Refactor transport controls APIs
  API changes to sessions
2014-05-30 22:21:07 +00:00
RoboErik
c47fa84b0a Refactor transport controls APIs
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
2014-05-30 10:35:44 -07:00
Eric Laurent
7b587884ba Merge "indicate in and out audio device connection separately" 2014-05-30 17:08:43 +00:00
Eric Laurent
ae4506e9b5 indicate in and out audio device connection separately
Modified AudioService and WiredAccessoryManager to use separate
device connection indications for input and oputput devices in case
of combined devices like wired headset or BT SCO headset.

Change-Id: Ifebaaab177191e2f505824420a13998d7a424aec
2014-05-29 17:36:35 -07:00
RoboErik
79fa4630bb API changes to sessions
Changes requested by API Council review. A second CL will refactor
TransportController and TransportPerformer based on feedback.

Change-Id: Ie26a7d01d7021232a66c2edf1eb58120437fdfde
2014-05-29 11:28:48 -07:00
Glenn Kasten
c52f4e25e2 Update android.media.AudioTrack.getTimestamp API documentation
Bug: 15320704
Change-Id: I5343ec3db1617b1b66f156fb4499ec44fc2381b8
2014-05-29 09:45:45 -07:00
Lajos Molnar
8c5d0f2120 DO NOT MERGE: media.MediaCodec: hide NotificationCallback listener
Bug: 15091403
Change-Id: I1fd178b6872997055c2ee0b7edfa0264a7d6718b
2014-05-28 19:13:17 -07:00
Lajos Molnar
acfcf645ff media.MediaCodec: document and fix-up setNotificationCallback
change from interface to abstrace class

Bug: 15091403
Change-Id: I5093672e36681670934a5ebaa49484441af5bcdd
2014-05-28 19:12:15 -07:00
Eric Laurent
0abcc5a0bb DO NOT MERGE - AudioManager: audio routing extensions
Added API and classes allowing framework components
to have direct control over audio routing and volumes.

Change-Id: I28225a6ebad86a7836e1ed749d93c0e964e215f1
2014-05-28 14:41:28 -07:00
Mike Lockwood
0a40ec2192 Add Audio Manager support for Bluetooth A2DP Sink profile
Change-Id: Iff6035e85faf52647cc41a59f98ba2924300eb8d
2014-05-28 13:32:08 -07:00
Jean-Michel Trivi
1ad0192800 DO NOT MERGE temporary hide of AudioAttributes
Bug 15089989

Change-Id: I6077d4906d5624be4dd2b8a5c3378a04c848b6d8
2014-05-27 12:44:05 -07:00
Eric Laurent
bac10fa652 Merge "AudioManager: audio routing extensions" 2014-05-27 17:35:30 +00:00
Eric Laurent
a198a29250 AudioManager: audio routing extensions
Added API and classes allowing framework components
to have direct control over audio routing and volumes.

Change-Id: I28225a6ebad86a7836e1ed749d93c0e964e215f1
2014-05-27 08:46:56 -07:00
John Spurlock
53bd26335c am c5890bb9: Merge "VolumeZen: combine ringer/notification volume and zen." into lmp-preview-dev
* commit 'c5890bb9c2361adf64efa7a2680536edaa527d1f':
  VolumeZen: combine ringer/notification volume and zen.
2014-05-27 14:23:40 +00:00