diff options
4 files changed, 14 insertions, 8 deletions
diff --git a/core/java/android/widget/MediaControlView2.java b/core/java/android/widget/MediaControlView2.java index 923699c9127f..e58e62f972c6 100644 --- a/core/java/android/widget/MediaControlView2.java +++ b/core/java/android/widget/MediaControlView2.java @@ -171,13 +171,6 @@ public class MediaControlView2 extends ViewGroupHelper<MediaControlView2Provider } /** - * Returns whether the control view is currently shown or hidden. - */ - public boolean isShowing() { - return mProvider.isShowing_impl(); - } - - /** * Changes the visibility state of an individual button. Default value is View.Visible. * * @param button the {@code Button} assigned to individual buttons @@ -223,4 +216,9 @@ public class MediaControlView2 extends ViewGroupHelper<MediaControlView2Provider public long getTimeout() { return mProvider.getTimeout_impl(); } + + @Override + protected void onLayout(boolean changed, int l, int t, int r, int b) { + mProvider.onLayout_impl(changed, l, t, r, b); + } } diff --git a/core/java/android/widget/VideoView2.java b/core/java/android/widget/VideoView2.java index 3cbba8d8b211..30811803bf9a 100644 --- a/core/java/android/widget/VideoView2.java +++ b/core/java/android/widget/VideoView2.java @@ -489,4 +489,9 @@ public class VideoView2 extends ViewGroupHelper<VideoView2Provider> { */ void onCustomAction(String action, Bundle extras); } + + @Override + protected void onLayout(boolean changed, int l, int t, int r, int b) { + mProvider.onLayout_impl(changed, l, t, r, b); + } } diff --git a/media/java/android/media/update/MediaControlView2Provider.java b/media/java/android/media/update/MediaControlView2Provider.java index 9957a06204bf..e155e5f0d8b9 100644 --- a/media/java/android/media/update/MediaControlView2Provider.java +++ b/media/java/android/media/update/MediaControlView2Provider.java @@ -39,7 +39,6 @@ public interface MediaControlView2Provider extends ViewGroupProvider { void initialize(AttributeSet attrs, int defStyleAttr, int defStyleRes); void setController_impl(MediaController controller); - boolean isShowing_impl(); void setButtonVisibility_impl(int button, int visibility); void requestPlayButtonFocus_impl(); void setTimeout_impl(long timeout); diff --git a/media/java/android/media/update/VideoView2Provider.java b/media/java/android/media/update/VideoView2Provider.java index c0fda878e7f9..7251180cb6a9 100644 --- a/media/java/android/media/update/VideoView2Provider.java +++ b/media/java/android/media/update/VideoView2Provider.java @@ -16,6 +16,7 @@ package android.media.update; +import android.annotation.SystemApi; import android.media.AudioAttributes; import android.media.MediaPlayerInterface; import android.media.session.MediaController; @@ -55,6 +56,9 @@ public interface VideoView2Provider extends ViewGroupProvider { void setSpeed_impl(float speed); void setAudioFocusRequest_impl(int focusGain); void setAudioAttributes_impl(AudioAttributes attributes); + /** + * @hide + */ void setRouteAttributes_impl(List<String> routeCategories, MediaPlayerInterface player); // TODO: remove setRouteAttributes_impl with MediaSession.Callback once MediaSession2 is ready. void setRouteAttributes_impl(List<String> routeCategories, MediaSession.Callback sessionPlayer); |