Commit Graph

6343 Commits

Author SHA1 Message Date
Julia Reynolds
ce9bcc4977 Merge "Show the connected device more reliably" 2018-01-31 14:21:57 +00:00
TreeHugger Robot
2e3569d711 Merge changes from topics "move_playbackstate2", "command_code"
* changes:
  MediaSession2: Move PlaybackState2 to updatable
  MediaSession2: Polish command codes
2018-01-31 14:17:27 +00:00
Jaewan Kim
bc55661b11 Merge "MediaSession2: Hide system apis" 2018-01-31 14:12:56 +00:00
Hyundo Moon
c79d6b4fdf MediaSession2: Move MediaController2.PlaybackInfo to updatable
Bug: 72716294
Test: Builds successfully
Change-Id: I6c1f7afdc49df6fe345db17fc41563a511c665e0
2018-01-31 20:55:02 +09:00
Jaewan Kim
f029ae9511 MediaSession2: Move PlaybackState2 to updatable
Test: Run all MediaComponents test once
Bug: 72670371
Change-Id: Ic7953bf4bb7841238dec7082d8e9d9b412775e6d
2018-01-31 17:50:26 +09:00
Hyundo Moon
196e1de5af MediaSession2: Create VolumeProvider2
Bug: 72721358
Test: Builds successfully
Change-Id: Ia7eca3f92deff7ba3fd5633d94748b0b80e86104
2018-01-31 17:04:57 +09:00
Jaewan Kim
71a96f27c6 MediaSession2: Polish command codes
This is the preliminary step toward permission check.

Bug: 72618604
Test: Run all MediaComponents test once
Change-Id: I64679dce0c70fd322fa7819e4ba15ba52601d021
2018-01-31 17:01:13 +09:00
Sungsoo Lim
7d30e1c554 MediaSession2: Hide system apis
Test: build
Change-Id: I6c56c260a002086bbd2c20420b301c66635215c3
2018-01-31 15:43:55 +09:00
TreeHugger Robot
2043082f96 Merge "Move View related methods to helper class" 2018-01-31 04:48:32 +00:00
Christofer Åkersten
a6c97e4615 Move View related methods to helper class
Test: Instantiate MediaControlView2
Change-Id: Ia958a97b38e67f236ee510978c379af9249d2887
2018-01-31 11:27:40 +09:00
Christofer Åkersten
622b1f1b64 Move MediaSession2 builder to impl
Bug: 72665881
Test: runtest-MediaComponents
Change-Id: I22a299dac9d9576e4383fe9538fe696f09afaae5
2018-01-31 11:12:06 +09:00
TreeHugger Robot
4cc91d0611 Merge changes from topics "rating2_updatable", "mediasession2_playlistparams", "mediametadata2_updatable"
* changes:
  MediaSession2: Move Rating2 to updatable
  MediaSession2: Move MediaSession2.PlaylistParams to updatable
  MediaSession2: Move MediaMetadata2 to updatable
2018-01-30 23:41:35 +00:00
Julia Reynolds
24cc759de9 Show the connected device more reliably
Test: manual
Change-Id: Ief39215321e0a283f724dd0b0cdf5b9eeab1e116
Fixes: 72494077
2018-01-30 16:56:52 -05:00
Insun Kang
dda4a8e17b Merge "VideoView: Change showSubtitle() to get boolean parameter" 2018-01-30 15:40:35 +00:00
TreeHugger Robot
cbd5a384d7 Merge "MediaController2: Rename onAudioInfoChanged" 2018-01-30 13:19:26 +00:00
Jaewan Kim
bb6ca486d1 MediaSession2: Move Rating2 to updatable
Test: Run all MediaComponents tests once
Bug: 72670051
Change-Id: I5c405e34569c1ccc469dad09bbc8aad1cd7fdcf4
2018-01-30 22:13:16 +09:00
Jaewan Kim
3117c0c263 MediaSession2: Move MediaSession2.PlaylistParams to updatable
Bug: 72670266
Test: Run all MediaComponents tests once
Change-Id: I5bf0ae9b97f2f60baabfe05e9df893308ee8d41a
2018-01-30 22:13:05 +09:00
Jaewan Kim
f641c09772 MediaSession2: Move MediaMetadata2 to updatable
Bug: 72670468
Test: Run all MediaComponents test once
Change-Id: I2351f63e00a3ed6adfe5a61b995fd8143d67bb35
2018-01-30 22:12:53 +09:00
Insun Kang
4fa8064378 VideoView: Change showSubtitle() to get boolean parameter
- Adds VideoView2 attributes
  - enableControlView
  - showSubtitle (boolean)
  - viewType (enum)
      - surfaceView
      - textureView

- showSubtitle() --> showSubtitle(boolean)
- hideSubtitle() removed.

Test: build

Change-Id: Ib21722af1c9c1caf036e047a18d27d46097e8f03
2018-01-30 21:42:58 +09:00
Hyundo Moon
a79de7da8b MediaController2: Rename onAudioInfoChanged
This CL renames the controller callback method onAudioInfoChanged into
onPlaybackInfoChanged.

Bug: 72616099
Test: Builds successfully
Change-Id: I6a0059790d65b55fdb6edcab18743fd94c4bdf6c
2018-01-30 18:37:17 +09:00
TreeHugger Robot
ff3ba299ae Merge "Make MediaSession2.CommandGroup updatable" 2018-01-30 07:58:14 +00:00
TreeHugger Robot
916cdd364c Merge "Remove show/hide API" 2018-01-30 07:55:32 +00:00
TreeHugger Robot
11890afe54 Merge "Make MediaSession2.Command updatable" 2018-01-30 05:33:32 +00:00
Sungsoo Lim
fe46402e22 Make MediaSession2.CommandGroup updatable
Bug: 72665979
Test: build
Change-Id: I1ba53c0bd5eb8b72847733693f4975d53e97f2d9
2018-01-30 13:37:33 +09:00
TreeHugger Robot
37db47ddb1 Merge "AudioPolicy: fix typos" 2018-01-30 03:08:52 +00:00
Sungsoo Lim
2a981a0cb5 Make MediaSession2.Command updatable
Bug: 72619281
Test: build
Change-Id: I2b86b68f2d4840da76c992aac056512ac0cb2e20
2018-01-30 12:04:02 +09:00
TreeHugger Robot
0bdcee3b45 Merge "Add new secure stop methods" 2018-01-30 02:16:44 +00:00
Jin Seok Park
dde80a9cf4 Remove show/hide API
This CL removes the show/hide API from MediaControlView2 and instead
provides the developer with the same function by calling
setVisibility(View.VISIBLE | View.GONE), and calling the new APIs
set/getTimeout() and requestPlayButtonFocus(). The original Runnable
code has been moved to onVisibilityAggregated() as per API council's
request.

Test: build
Change-Id: If53fb8849b4e086619a9c93c85e61da70272976e
2018-01-30 10:48:10 +09:00
Jean-Michel Trivi
1b926e7ece AudioPolicy: fix typos
Test: build
Change-Id: I6f99fcf23d7d154280b86c93892e0d0f9d856702
2018-01-29 16:24:27 -08:00
Jin Seok Park
0719db7681 Update MediaControlView2/Provider
This CL does the following 5 things:

1) REMOVE setPrevNextListener API
2) REMOVE show/hideSubtitle API
3) EXPOSE Command related strings as public
4) CHANGE time parameter in show(timeout) from integer to long
5) CHANGE setButtonVisibility(visible) parameter from boolean to int

All changes are based on API review.

Test: build
Change-Id: Ia6ffb454100be6a2f75a145e9d6a87bd88faac0c
2018-01-29 22:53:09 +00:00
TreeHugger Robot
4705e590a1 Merge "MediaPlayer2: allow multiple EventCallback's" 2018-01-29 22:22:30 +00:00
Jean-Michel Trivi
975f900f22 Merge "Add support for external volume handler of volume adjustements" 2018-01-29 21:58:51 +00:00
Wei Jia
63f793f0f3 MediaPlayer2: allow multiple EventCallback's
Test: MediaPlayer2 plays
Bug: 63934228
Change-Id: Ie1be29c10d73126d9ebdad8358110ba507a034d5
2018-01-29 11:20:03 -08:00
Jean-Michel Trivi
610aa9b416 Add support for external volume handler of volume adjustements
For devices that use the config_handleVolumeKeysInWindowManager
  configuration, add API to receive volume key-related events
  directly, without them being processed by the framework
  (already not received by apps).

Bug: b/63906162
Test: set config_handleVolumeKeysInWindowManager, use
    "adb shell dumpsys audio" to verify adjustVolume methods aren't
    logged

Change-Id: I432b14fa9980764d69077b9f1b23b8c95f30814d
2018-01-29 09:39:10 -08:00
Hyundo Moon
15fe634246 MediaSession2/Controller2: Add playlist support
This CL does the following:
 - Removes PlaylistParams argument from all playlist related methods.
   (i.e. setPlaylist(List, PlaylistParams) becomes setPlaylist(List))
 - Adds methods (to/fromBundle, to/fromBundleList) into MediaItem2.

Bug: 72537268
Test: Passed MediaSession2Test
Change-Id: I48ef69ad2728fb7de7efab10f4e077aec552dd0b
2018-01-29 22:51:56 +09:00
Jaewan Kim
44fec2d66c MediaSession2: Simplify constructor of SessionToken2
Test: Run all MediaComponents tests once
Change-Id: Ic99d5916d354815a57fe37d04dfeb625c493076d
2018-01-29 22:43:13 +09:00
Jaewan Kim
c599ba36e3 MediaSession2: Move binder interfaces into the updatable
Test: Run all MediaComponents tests once
Change-Id: I29a7aa9d649ea212ad4728ebabff40ec0d47ecb1
2018-01-29 22:43:06 +09:00
Jaewan Kim
6d959eaaf0 MediaSession2: Move MediaItem2 to updatable
Bug: 72627815
Test: Run all MediaComponents test once
Change-Id: Iced94541233145b928e480f3d062a64cc0814a26
2018-01-29 22:43:02 +09:00
Jaewan Kim
a70b3e570c MediaSession2: Implements sendCustomCommand()
Bug: 72543316
Test: Run all MediaComponents tests once
Change-Id: Iad4fff6d6d41fb39f632735244cc7ecbec93fa0f
2018-01-29 22:42:43 +09:00
TreeHugger Robot
650fa8579e Merge "MediaController2: Implement get/setPlaylistParams" 2018-01-29 09:53:07 +00:00
Hyundo Moon
f6a39e4906 MediaController2: Implement get/setPlaylistParams
Bug: 72537520
Test: Passed MediaController2Test
Change-Id: If9b3107084f3f4b063967f079bf229bb43b95cbd
2018-01-29 16:45:02 +09:00
TreeHugger Robot
00715bc435 Merge changes from topic "session2_playlist_add_remove"
* changes:
  MediaSession2: Add listeners for change in session token
  MediaSession2: Add from add/remove an item from playlist
2018-01-29 07:16:34 +00:00
Insun Kang
7933daec0a Merge "VideoView2: Adds Executor paramter to setFooListener methods" 2018-01-29 05:10:12 +00:00
Insun Kang
620b7f328f VideoView2: Adds Executor paramter to setFooListener methods
- Added Executor parameter to setFooListeners
- Removed setFullScreen()
- Renamed OnFullScreenChangedListener --> OnFullScreenRequestListener

Test: build
Change-Id: I1822876ecf55566182281a76ea7919d7c0112146
2018-01-29 04:00:23 +00:00
Jaewan Kim
379e30d90d MediaSession2: Add listeners for change in session token
Test: Run all MediaComponents tests once
Change-Id: Ic46ad9e4e4c9e1ce43b3dbad904eae7fc30d52a0
2018-01-29 11:57:04 +09:00
Sungsoo Lim
d58f145726 VideoView2: MediaRouter integration with MediaSession
Bug: 72526814
Test: build
Change-Id: Iace25522b433152022bdd3458b6791a89618464b
2018-01-29 11:15:40 +09:00
Jaewan Kim
543566fed3 MediaSession2: Add from add/remove an item from playlist
Bug: 72527248, Bug: 72527150
Test: Run all MediaComponents test once
Change-Id: Ie75e1a7fa3cd3bea786445aab827afc62cf189b5
2018-01-28 23:32:26 +09:00
Jaewan Kim
6a13e1b483 MediaSession2: Initial commit of SessionPlayer2
Bug: 72537268, 72527248
Test: Run MediaComponents test once
Change-Id: I6d8239bbf90ca34b0a8a0d3d0270a06999bb3fe8
2018-01-27 03:39:51 +09:00
Jeff Tinker
1bfb3d2160 Add new secure stop methods
Methods are needed to release a secure stop by ID and
return a list of secure stops.

Test: gts media tests

bug:67361434
bug:64001680
Change-Id: Id35fb082175a0b152e7a6032b147f1d3b221719b
2018-01-26 10:39:17 -08:00
Insun Kang
ecdf034b87 MediaSession2 API set for audio focus handling
MediaPlayerInterface has:
- setAudioAttributes
- getAudioAttributes

MediaSession2 has:
- setAudioFocusRequest

Test: build
Bug: 72529899
Change-Id: I3b200198bc44c568d3c06583c23d9918c6380e32
2018-01-27 03:17:32 +09:00