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

Commit d403c2a4 authored by Jin Seok Park's avatar Jin Seok Park Committed by Android (Google) Code Review
Browse files

Merge "Remove showCCButton API"

parents 34abab10 76ff4648

packages/MediaComponents/src/com/android/widget/MediaControlView2Impl.java

+0 −7
Original line number Diff line number Diff line
@@ -160,13 +160,6 @@ public class MediaControlView2Impl implements MediaControlView2Provider { 
        }

    }



    @Override

    public void showCCButton_impl() {

        if (mCCButton != null) {

            mCCButton.setVisibility(View.VISIBLE);

        }

    }



    @Override

    public boolean isPlaying_impl() {

        if (mPlaybackState != null) {

packages/MediaComponents/src/com/android/widget/VideoView2Impl.java

+0 −3
Original line number Diff line number Diff line
@@ -559,9 +559,6 @@ public class VideoView2Impl implements VideoView2Provider, VideoViewInterface.Su 
    ///////////////////////////////////////////////////



    private void attachMediaControlView() {

        // TODO: change this so that the CC button appears only where there is a subtitle track.

        // mMediaControlView.showCCButton();



        // Get MediaController from MediaSession and set it inside MediaControlView

        mMediaControlView.setController(mMediaSession.getController());