diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-03-23 01:12:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-23 01:12:14 +0000 |
| commit | d847d7d0a92bbf599ab1664431bbb04beab8ea92 (patch) | |
| tree | c150db1957b4d68e33c93574a7dc1d27b557fdba /core/java | |
| parent | 0f4545ac6489e726dc6625853fcbd4732230b0ff (diff) | |
| parent | 3a582e73c115e693bab8cb6f213d275704b9c5d7 (diff) | |
Merge "Hide Media*2 APIs" into pi-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/widget/MediaControlView2.java | 1 | ||||
| -rw-r--r-- | core/java/android/widget/VideoView2.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/widget/MediaControlView2.java b/core/java/android/widget/MediaControlView2.java index dab0f7357e4b..f52854a87159 100644 --- a/core/java/android/widget/MediaControlView2.java +++ b/core/java/android/widget/MediaControlView2.java @@ -33,6 +33,7 @@ import java.lang.annotation.RetentionPolicy; // TODO: Use link annotation to refer VideoView2 once VideoView2 became unhidden. /** + * @hide * A View that contains the controls for MediaPlayer2. * It provides a wide range of UI including buttons such as "Play/Pause", "Rewind", "Fast Forward", * "Subtitle", "Full Screen", and it is also possible to add multiple custom buttons. diff --git a/core/java/android/widget/VideoView2.java b/core/java/android/widget/VideoView2.java index 214ff3a93538..388eae2ad400 100644 --- a/core/java/android/widget/VideoView2.java +++ b/core/java/android/widget/VideoView2.java @@ -47,6 +47,7 @@ import java.util.concurrent.Executor; // TODO: Replace MediaSession wtih MediaSession2 once MediaSession2 is submitted. /** + * @hide * Displays a video file. VideoView2 class is a View class which is wrapping {@link MediaPlayer2} * so that developers can easily implement a video rendering application. * |