summaryrefslogtreecommitdiff
path: root/core/java/android/widget/VideoView2.java
diff options
context:
space:
mode:
authorChristofer Ã…kersten <akersten@google.com>2018-01-31 15:02:37 +0900
committerChristofer Ã…kersten <akersten@google.com>2018-02-01 21:41:53 +0900
commitf38d8fb9344954ed28ccaaee8e29dcd4d65f1fe0 (patch)
tree5c67b65a26d0720284647a67ecd785593ecb425d /core/java/android/widget/VideoView2.java
parent9d3986bdc3b9fe5a85a54bf6a4f787e198eade40 (diff)
Make VV2 & MCV2 extend ViewGroup
Test: VideoViewTest Change-Id: I91410847de55bef834360d99fcb112b50cef1cea
Diffstat (limited to 'core/java/android/widget/VideoView2.java')
-rw-r--r--core/java/android/widget/VideoView2.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/widget/VideoView2.java b/core/java/android/widget/VideoView2.java
index 78ca0114b798..3cbba8d8b211 100644
--- a/core/java/android/widget/VideoView2.java
+++ b/core/java/android/widget/VideoView2.java
@@ -27,8 +27,8 @@ import android.media.session.MediaController;
import android.media.session.MediaSession;
import android.media.session.PlaybackState;
import android.media.update.ApiLoader;
-import android.media.update.FrameLayoutHelper;
import android.media.update.VideoView2Provider;
+import android.media.update.ViewGroupHelper;
import android.net.Uri;
import android.os.Bundle;
import android.util.AttributeSet;
@@ -101,7 +101,7 @@ import java.util.concurrent.Executor;
*
* @hide
*/
-public class VideoView2 extends FrameLayoutHelper<VideoView2Provider> {
+public class VideoView2 extends ViewGroupHelper<VideoView2Provider> {
/** @hide */
@IntDef({
VIEW_TYPE_TEXTUREVIEW,
@@ -139,10 +139,12 @@ public class VideoView2 extends FrameLayoutHelper<VideoView2Provider> {
public VideoView2(
@NonNull Context context, @Nullable AttributeSet attrs,
int defStyleAttr, int defStyleRes) {
- super((instance, superProvider) ->
+ super((instance, superProvider, privateProvider) ->
ApiLoader.getProvider(context).createVideoView2(
- (VideoView2) instance, superProvider, attrs, defStyleAttr, defStyleRes),
+ (VideoView2) instance, superProvider, privateProvider,
+ attrs, defStyleAttr, defStyleRes),
context, attrs, defStyleAttr, defStyleRes);
+ mProvider.initialize(attrs, defStyleAttr, defStyleRes);
}
/**