Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "VV2 & MCV2: Move handling MediaControlView2 visibility logic to VV2"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-05 10:17:33 +00:00
committed by Android (Google) Code Review
parent 1bb9f29909 718c1d122f
commit d11dc140bc
6 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/java/android/widget/MediaControlView2.java
View File

@@ -49,9 +49,8 @@ import java.lang.annotation.RetentionPolicy;
* There is no separate method that handles the show/hide behavior for MediaControlView2. Instead,
* one can directly change the visibility of this view by calling View.setVisibility(int). The
* values supported are View.VISIBLE and View.GONE.
* In addition, the following customizations are supported:
* 1. Modify default timeout value of 2 seconds by calling setTimeout(long).
* 2. Set focus to the play/pause button by calling requestPlayButtonFocus().
* In addition, the following customization is supported:
* Set focus to the play/pause button by calling requestPlayButtonFocus().
*
* <p>
* It is also possible to add custom buttons with custom icons and actions inside MediaControlView2.
@@ -200,23 +199,6 @@ public class MediaControlView2 extends ViewGroupHelper<MediaControlView2Provider
mProvider.requestPlayButtonFocus_impl();
}
/**
* Sets a new timeout value (in milliseconds) for showing MediaControlView2. The default value
* is set as 2 seconds.
* @param timeout the
*/
public void setTimeout(long timeout) {
mProvider.setTimeout_impl(timeout);
}
/**
* Retrieves current timeout value (in milliseconds) for showing MediaControlView2. The default
* value is set as 2 seconds.
*/
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);

5
core/java/android/widget/VideoView2.java
View File

@@ -152,9 +152,10 @@ public class VideoView2 extends ViewGroupHelper<VideoView2Provider> {
* instance if any.
*
* @param mediaControlView a media control view2 instance.
* @param intervalMs a time interval in milliseconds until VideoView2 hides MediaControlView2.
*/
public void setMediaControlView2(MediaControlView2 mediaControlView) {
mProvider.setMediaControlView2_impl(mediaControlView);
public void setMediaControlView2(MediaControlView2 mediaControlView, long intervalMs) {
mProvider.setMediaControlView2_impl(mediaControlView, intervalMs);
}
/**