Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dced4bb3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "MediaControlView2: Add Support for Ad"

parents b5d3d670 b9f6febc

core/java/android/widget/VideoView2.java

+22 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.annotation.Nullable; 
import android.content.Context;

import android.media.AudioAttributes;

import android.media.AudioManager;

import android.media.MediaMetadata2;

import android.media.MediaPlayerInterface;

import android.media.session.MediaController;

import android.media.session.MediaSession;
@@ -168,6 +169,27 @@ public class VideoView2 extends ViewGroupHelper<VideoView2Provider> { 
        return mProvider.getMediaControlView2_impl();

    }



    /**

     * Sets MediaMetadata2 instance. It will replace the previously assigned MediaMetadata2 instance

     * if any.

     *

     * @param metadata a MediaMetadata2 instance.

     * @hide

     */

    public void setMediaMetadata(MediaMetadata2 metadata) {

        mProvider.setMediaMetadata_impl(metadata);

    }



    /**

     * Returns MediaMetadata2 instance which is retrieved from MediaPlayer2 inside VideoView2 by

     * default or by {@link #setMediaMetadata} method.

     * @hide

     */

    public MediaMetadata2 getMediaMetadata() {

        // TODO: add to Javadoc whether this value can be null or not when integrating with

        // MediaSession2.

        return mProvider.getMediaMetadata_impl();

    }



    /**

     * Returns MediaController instance which is connected with MediaSession that VideoView2 is

media/java/android/media/update/VideoView2Provider.java

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.media.update; 


import android.annotation.SystemApi;

import android.media.AudioAttributes;

import android.media.MediaMetadata2;

import android.media.MediaPlayerInterface;

import android.media.session.MediaController;

import android.media.session.PlaybackState;
@@ -51,8 +52,10 @@ public interface VideoView2Provider extends ViewGroupProvider { 
    void initialize(AttributeSet attrs, int defStyleAttr, int defStyleRes);



    void setMediaControlView2_impl(MediaControlView2 mediaControlView, long intervalMs);

    void setMediaMetadata_impl(MediaMetadata2 metadata);

    MediaController getMediaController_impl();

    MediaControlView2 getMediaControlView2_impl();

    MediaMetadata2 getMediaMetadata_impl();

    void setSubtitleEnabled_impl(boolean enable);

    boolean isSubtitleEnabled_impl();

    // TODO: remove setSpeed_impl once MediaController2 is ready.