2620 Commits

Author SHA1 Message Date
RoboErik
58af2199a5 am ddbdcd09: Merge "Add a way to get the package/pid of the session" into lmp-preview-dev
* commit 'ddbdcd092d1b71b987d680a8b1a5140832625410':
  Add a way to get the package/pid of the session
2014-06-09 19:29:48 +00:00
Jae Seo
8799179638 am a6b44fe7: Merge "Fix a typo in TvContract" into lmp-preview-dev
* commit 'a6b44fe7d3ab727de2b82d73209efdc9bdb57b41':
  Fix a typo in TvContract
2014-06-09 19:29:28 +00:00
Jae Seo
9aea9c93c5 am 73fe04a4: Merge "TIF: Address the feedback from the API review - 3/3" into lmp-preview-dev
* commit '73fe04a41f88eb9e4a9da8e229351ce8458d0e0d':
  TIF: Address the feedback from the API review - 3/3
2014-06-09 19:29:17 +00:00
RoboErik
20685929a4 Merge "Add a way to get the package/pid of the session" into lmp-preview-dev 2014-06-09 19:07:20 +00:00
Jae Seo
085eefd184 Merge "Fix a typo in TvContract" into lmp-preview-dev 2014-06-09 18:43:27 +00:00
Jae Seo
182dc33e9e Merge "TIF: Address the feedback from the API review - 3/3" into lmp-preview-dev 2014-06-09 18:38:43 +00:00
Julia Reynolds
dc920984f2 Merge "Allow profile and device owners to change and get the master volume mute state." 2014-06-09 18:25:06 +00:00
Julia Reynolds
4a21b25fad Allow profile and device owners to change and get the master volume mute state.
Also protect muting master volume with op code OP_AUDIO_MASTER_VOLUME.
Bug: 13585918
Change-Id: I91fe7ee60cd291cca15966b3127c0bb8a4828f6a
2014-06-09 14:18:01 -04:00
Jae Seo
f30ea53306 Fix a typo in TvContract
Assigned a new value to TYPE_ATSC_M_H so that it differs from TYPE_ATSC_C.

Change-Id: I65494fdf625a3b4840c9e8cfa4b728214d63e6df
2014-06-09 17:50:07 +00:00
Wonsik Kim
32c67ee119 am 8be96a6f: Merge "Make TvInputs aware of whether it\'s hardware-based or not" into lmp-preview-dev
* commit '8be96a6ffa5ce1783310fe490f615ff323d1d5ed':
  Make TvInputs aware of whether it's hardware-based or not
2014-06-09 17:44:37 +00:00
Dongwon Kang
0a5b778495 am c523b768: Merge "Make TvView keep the volume value and set later once the connecation is made." into lmp-preview-dev
* commit 'c523b768331f8e3e1d355dd688f47946702cb425':
  Make TvView keep the volume value and set later once the connecation is made.
2014-06-09 15:55:56 +00:00
Wonsik Kim
55f933f715 Merge "Make TvInputs aware of whether it's hardware-based or not" into lmp-preview-dev 2014-06-09 06:07:21 +00:00
RoboErik
fb442b0384 Add a way to get the package/pid of the session
We need a package/pid to connect a session to a notification. This
adds a way to get those from the controller of a session.

Change-Id: I7700a341beebd46116dfb7dc82f1a667c718e728
2014-06-08 13:20:43 -07:00
Jae Seo
1bfce9fb9b TIF: Address the feedback from the API review - 3/3
- Change TvView to be a generic ViewGroup with a single SurfaceView child

Bug: 15345342
Change-Id: I86ed94b7020aabb6e093e391ab9477c1f801919a
2014-06-08 21:42:39 +09:00
Dongwon Kang
336cdf20dd Make TvView keep the volume value and set later once the connecation is made.
Bug: 15483740
Change-Id: Id4272bffb556587707b641ec8296bc5a9e57807e
2014-06-08 18:20:55 +09:00
Wonsik Kim
af743eeaec Make TvInputs aware of whether it's hardware-based or not
Bug: 15326724
Change-Id: I1f418150ba29ee50afc50a811198115fdc6f9c42
2014-06-07 13:36:19 +09:00
Dongwon Kang
4ba840f183 am 1a4d3d02: Merge "TIF: Address the feedback from the API review - 2/3" into lmp-preview-dev
* commit '1a4d3d02f32ba5e50f2b0da9058dedfbd6342ef9':
  TIF: Address the feedback from the API review - 2/3
2014-06-06 12:36:19 +00:00
Dongwon Kang
929c6912a8 am 77b29f1f: Merge "TIF: Address the feedback from the API review - 1/3" into lmp-preview-dev
* commit '77b29f1f7a0dfc7305ed49d2b68bb35b9cc11f4c':
  TIF: Address the feedback from the API review - 1/3
2014-06-06 12:36:13 +00:00
Dongwon Kang
7012db741c Merge "TIF: Address the feedback from the API review - 2/3" into lmp-preview-dev 2014-06-06 06:59:17 +00:00
Dongwon Kang
2750d21d8b Merge "TIF: Address the feedback from the API review - 1/3" into lmp-preview-dev 2014-06-06 06:58:02 +00:00
Jae Seo
b8a64416e5 TIF: Address the feedback from the API review - 2/3
This change addresses the following comments from the council:
- Change the TvView API to be tune(String inputId, Uri channelUri) and
  reset()
- @hide TvInputSession class, including createSession() and
  SessionCallback
- Define a listener interface specific to TvView, allowing you to hide
  the session details and keep the API simpler.  Add
  setTvInputListener().

Bug: 15345342
Change-Id: I931662841b41d862ebc4a700ccb245889a5f87a5
2014-06-06 09:13:28 +09:00
Ji-Hwan Lee
4a2e599b5a am b3412adf: Merge "TvContract: Add channel logo and program thumbnail" into lmp-preview-dev
* commit 'b3412adf92b9d932b600acf44c4463cf06387a8e':
  TvContract: Add channel logo and program thumbnail
2014-06-05 22:23:11 +00:00
Ji-Hwan Lee
cc15afbe12 Merge "TvContract: Add channel logo and program thumbnail" into lmp-preview-dev 2014-06-05 22:12:08 +00:00
Alan Viverette
c954e61cd7 am 3966c960: Merge "Add defaults for caption colors and edge type" into lmp-preview-dev
* commit '3966c9604e55c9183a6d1ba8b3540add3be4434f':
  Add defaults for caption colors and edge type
2014-06-05 21:00:32 +00:00
Alan Viverette
4586b0da63 Merge "Add defaults for caption colors and edge type" into lmp-preview-dev 2014-06-05 20:37:22 +00:00
Ji-Hwan Lee
4c1959cc45 TvContract: Add channel logo and program thumbnail
Channel logo is exposed via its own content URI,
"content://android.media.tv/channel/#/logo".

Program thumbnail is added as an URI column in existing program table.

Change-Id: I8dd636bbea9d3fa991ad42ccc03a198e8c1d051d
2014-06-06 05:12:12 +09:00
Jean-Michel Trivi
9f47b84c04 Merge "AudioAttributes: parcelable, hide support for tags" 2014-06-05 18:06:06 +00:00
Eric Laurent
42cdf48b2f am e637e614: Merge "remove debug log in AudioPortEventHandler." into lmp-preview-dev
* commit 'e637e614b95eb8bb5b4d69ad5ab89ce92e4b5a29':
  remove debug log in AudioPortEventHandler.
2014-06-05 16:47:45 +00:00
Eric Laurent
a335e14b6b Merge "remove debug log in AudioPortEventHandler." into lmp-preview-dev 2014-06-05 15:18:35 +00:00
Jae Seo
782f734547 TIF: Address the feedback from the API review - 1/3
This change addresses the following comments from the council:
- Change TvView.setVolume() --> setStreamVolume()
- Surface only TvInputInfo.getServiceInfo() instead of the separate
  getPackage/getService/getComponent calls.  However, keep loadLabel()
  at the top level.
- @hide register/unregisterListener() for the preview, since it binds
  out to each service.
- TvInputService should document which permission it should protect
  itself with.
- Remove TvInputService.setAvailable() for third-party developers.
- Change class name TvInputSessionImpl --> Session
- Change callback name to onSetStreamVolume() to match earlier change

Bug: 15345342
Change-Id: I3ce5cba7dad2622b78d16c408f81c4b0eba837a4
2014-06-05 19:22:18 +09:00
Eric Laurent
e94379beba remove debug log in AudioPortEventHandler.
Bug: 14815883.
Change-Id: Ib5076fcfe8a36d1dd772b072fdf3400e57acc61c
2014-06-04 20:09:13 -07:00
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