Remove unused media2 widgets (b23d6a5c) · Commits · e / os / android_frameworks_base

core/java/android/widget/MediaControlView2.java

deleted100644 → 0

+0 −229

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.widget;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.content.Context;
		import android.media.SessionToken2;
		import android.media.session.MediaController;
		import android.media.update.ApiLoader;
		import android.media.update.MediaControlView2Provider;
		import android.media.update.ViewGroupHelper;
		import android.util.AttributeSet;
		import android.view.View;

		import java.lang.annotation.Retention;
		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.
		*
		* <p>
		* <em> MediaControlView2 can be initialized in two different ways: </em>
		* 1) When VideoView2 is initialized, it automatically initializes a MediaControlView2 instance and
		* adds it to the view.
		* 2) Initialize MediaControlView2 programmatically and add it to a ViewGroup instance.
		*
		* In the first option, VideoView2 automatically connects MediaControlView2 to MediaController,
		* which is necessary to communicate with MediaSession2. In the second option, however, the
		* developer needs to manually retrieve a MediaController instance and set it to MediaControlView2
		* by calling setController(MediaController controller).
		*
		* <p>
		* 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 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.
		* Those buttons will be shown when the overflow button is clicked.
		* See VideoView2#setCustomActions for more details on how to add.
		*/
		public class MediaControlView2 extends ViewGroupHelper<MediaControlView2Provider> {
		/** @hide */
		@IntDef({
		BUTTON_PLAY_PAUSE,
		BUTTON_FFWD,
		BUTTON_REW,
		BUTTON_NEXT,
		BUTTON_PREV,
		BUTTON_SUBTITLE,
		BUTTON_FULL_SCREEN,
		BUTTON_OVERFLOW,
		BUTTON_MUTE,
		BUTTON_ASPECT_RATIO,
		BUTTON_SETTINGS
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface Button {}

		/**
		* MediaControlView2 button value for playing and pausing media.
		* @hide
		*/
		public static final int BUTTON_PLAY_PAUSE = 1;
		/**
		* MediaControlView2 button value for jumping 30 seconds forward.
		* @hide
		*/
		public static final int BUTTON_FFWD = 2;
		/**
		* MediaControlView2 button value for jumping 10 seconds backward.
		* @hide
		*/
		public static final int BUTTON_REW = 3;
		/**
		* MediaControlView2 button value for jumping to next media.
		* @hide
		*/
		public static final int BUTTON_NEXT = 4;
		/**
		* MediaControlView2 button value for jumping to previous media.
		* @hide
		*/
		public static final int BUTTON_PREV = 5;
		/**
		* MediaControlView2 button value for showing/hiding subtitle track.
		* @hide
		*/
		public static final int BUTTON_SUBTITLE = 6;
		/**
		* MediaControlView2 button value for toggling full screen.
		* @hide
		*/
		public static final int BUTTON_FULL_SCREEN = 7;
		/**
		* MediaControlView2 button value for showing/hiding overflow buttons.
		* @hide
		*/
		public static final int BUTTON_OVERFLOW = 8;
		/**
		* MediaControlView2 button value for muting audio.
		* @hide
		*/
		public static final int BUTTON_MUTE = 9;
		/**
		* MediaControlView2 button value for adjusting aspect ratio of view.
		* @hide
		*/
		public static final int BUTTON_ASPECT_RATIO = 10;
		/**
		* MediaControlView2 button value for showing/hiding settings page.
		* @hide
		*/
		public static final int BUTTON_SETTINGS = 11;

		public MediaControlView2(@NonNull Context context) {
		this(context, null);
		}

		public MediaControlView2(@NonNull Context context, @Nullable AttributeSet attrs) {
		this(context, attrs, 0);
		}

		public MediaControlView2(@NonNull Context context, @Nullable AttributeSet attrs,
		int defStyleAttr) {
		this(context, attrs, defStyleAttr, 0);
		}

		public MediaControlView2(@NonNull Context context, @Nullable AttributeSet attrs,
		int defStyleAttr, int defStyleRes) {
		super((instance, superProvider, privateProvider) ->
		ApiLoader.getProvider().createMediaControlView2(
		(MediaControlView2) instance, superProvider, privateProvider,
		attrs, defStyleAttr, defStyleRes),
		context, attrs, defStyleAttr, defStyleRes);
		mProvider.initialize(attrs, defStyleAttr, defStyleRes);
		}

		/**
		* Sets MediaSession2 token to control corresponding MediaSession2.
		*/
		public void setMediaSessionToken(SessionToken2 token) {
		mProvider.setMediaSessionToken_impl(token);
		}

		/**
		* Registers a callback to be invoked when the fullscreen mode should be changed.
		* @param l The callback that will be run
		*/
		public void setOnFullScreenListener(OnFullScreenListener l) {
		mProvider.setOnFullScreenListener_impl(l);
		}

		/**
		* @hide TODO: remove once the implementation is revised
		*/
		public void setController(MediaController controller) {
		mProvider.setController_impl(controller);
		}

		/**
		* Changes the visibility state of an individual button. Default value is View.Visible.
		*
		* @param button the {@code Button} assigned to individual buttons
		* <ul>
		* <li>{@link #BUTTON_PLAY_PAUSE}
		* <li>{@link #BUTTON_FFWD}
		* <li>{@link #BUTTON_REW}
		* <li>{@link #BUTTON_NEXT}
		* <li>{@link #BUTTON_PREV}
		* <li>{@link #BUTTON_SUBTITLE}
		* <li>{@link #BUTTON_FULL_SCREEN}
		* <li>{@link #BUTTON_MUTE}
		* <li>{@link #BUTTON_OVERFLOW}
		* <li>{@link #BUTTON_ASPECT_RATIO}
		* <li>{@link #BUTTON_SETTINGS}
		* </ul>
		* @param visibility One of {@link #VISIBLE}, {@link #INVISIBLE}, or {@link #GONE}.
		* @hide
		*/
		public void setButtonVisibility(@Button int button, @Visibility int visibility) {
		mProvider.setButtonVisibility_impl(button, visibility);
		}

		/**
		* Requests focus for the play/pause button.
		*/
		public void requestPlayButtonFocus() {
		mProvider.requestPlayButtonFocus_impl();
		}

		@Override
		protected void onLayout(boolean changed, int l, int t, int r, int b) {
		mProvider.onLayout_impl(changed, l, t, r, b);
		}

		/**
		* Interface definition of a callback to be invoked to inform the fullscreen mode is changed.
		* Application should handle the fullscreen mode accordingly.
		*/
		public interface OnFullScreenListener {
		/**
		* Called to indicate a fullscreen mode change.
		*/
		void onFullScreen(View view, boolean fullScreen);
		}
		}

core/java/android/widget/VideoView2.java

deleted100644 → 0

+0 −452

File deleted.

Preview size limit exceeded, changes collapsed.

media/java/android/media/update/MediaControlView2Provider.java

deleted100644 → 0

+0 −52

Original line number	Diff line number	Diff line
		/*
		* Copyright 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.media.update;

		import android.media.SessionToken2;
		import android.media.session.MediaController;
		import android.util.AttributeSet;
		import android.widget.MediaControlView2;

		/**
		* Interface for connecting the public API to an updatable implementation.
		*
		* Each instance object is connected to one corresponding updatable object which implements the
		* runtime behavior of that class. There should a corresponding provider method for all public
		* methods.
		*
		* All methods behave as per their namesake in the public API.
		*
		* @see android.widget.MediaControlView2
		*
		* @hide
		*/
		// TODO: @SystemApi
		public interface MediaControlView2Provider extends ViewGroupProvider {
		void initialize(AttributeSet attrs, int defStyleAttr, int defStyleRes);

		void setMediaSessionToken_impl(SessionToken2 token);
		void setOnFullScreenListener_impl(MediaControlView2.OnFullScreenListener l);
		/**
		* @hide TODO: remove
		*/
		void setController_impl(MediaController controller);
		/**
		* @hide
		*/
		void setButtonVisibility_impl(int button, int visibility);
		void requestPlayButtonFocus_impl();
		}

media/java/android/media/update/StaticProvider.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package android.media.update;

		import android.annotation.Nullable;
		import android.app.Notification;
		import android.content.Context;
		import android.media.MediaBrowser2;
		@@ -48,9 +47,6 @@ import android.media.update.MediaSession2Provider.ControllerInfoProvider;
		import android.media.update.MediaSessionService2Provider.MediaNotificationProvider;
		import android.os.Bundle;
		import android.os.IInterface;
		import android.util.AttributeSet;
		import android.widget.MediaControlView2;
		import android.widget.VideoView2;

		import java.util.concurrent.Executor;

		@@ -62,13 +58,6 @@ import java.util.concurrent.Executor;
		* @hide
		*/
		public interface StaticProvider {
		MediaControlView2Provider createMediaControlView2(MediaControlView2 instance,
		ViewGroupProvider superProvider, ViewGroupProvider privateProvider,
		@Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes);
		VideoView2Provider createVideoView2(VideoView2 instance,
		ViewGroupProvider superProvider, ViewGroupProvider privateProvider,
		@Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes);

		CommandProvider createMediaSession2Command(SessionCommand2 instance,
		int commandCode, String action, Bundle extra);
		SessionCommand2 fromBundle_MediaSession2Command(Bundle bundle);

media/java/android/media/update/VideoView2Provider.java

deleted100644 → 0

+0 −99

Original line number	Diff line number	Diff line
		/*
		* Copyright 2018 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.media.update;

		import android.annotation.SystemApi;
		import android.media.AudioAttributes;
		import android.media.DataSourceDesc;
		import android.media.MediaItem2;
		import android.media.MediaMetadata2;
		import android.media.MediaPlayerBase;
		import android.media.SessionToken2;
		import android.media.session.MediaController;
		import android.media.session.PlaybackState;
		import android.media.session.MediaSession;
		import android.net.Uri;
		import android.util.AttributeSet;
		import android.widget.MediaControlView2;
		import android.widget.VideoView2;

		import com.android.internal.annotations.VisibleForTesting;

		import java.util.List;
		import java.util.Map;
		import java.util.concurrent.Executor;

		/**
		* Interface for connecting the public API to an updatable implementation.
		*
		* Each instance object is connected to one corresponding updatable object which implements the
		* runtime behavior of that class. There should a corresponding provider method for all public
		* methods.
		*
		* All methods behave as per their namesake in the public API.
		*
		* @see android.widget.VideoView2
		*
		* @hide
		*/
		// TODO @SystemApi
		public interface VideoView2Provider extends ViewGroupProvider {
		void initialize(AttributeSet attrs, int defStyleAttr, int defStyleRes);

		void setMediaControlView2_impl(MediaControlView2 mediaControlView, long intervalMs);
		void setMediaMetadata_impl(MediaMetadata2 metadata);
		/**
		* @hide TODO: remove
		*/
		MediaController getMediaController_impl();
		SessionToken2 getMediaSessionToken_impl();
		MediaControlView2 getMediaControlView2_impl();
		MediaMetadata2 getMediaMetadata_impl();
		void setSubtitleEnabled_impl(boolean enable);
		boolean isSubtitleEnabled_impl();
		// TODO: remove setSpeed_impl once MediaController2 is ready.
		void setSpeed_impl(float speed);
		void setAudioFocusRequest_impl(int focusGain);
		void setAudioAttributes_impl(AudioAttributes attributes);
		void setVideoPath_impl(String path);
		/**
		* @hide TODO: remove
		*/
		void setVideoUri_impl(Uri uri);
		/**
		* @hide TODO: remove
		*/
		void setVideoUri_impl(Uri uri, Map<String, String> headers);
		void setMediaItem_impl(MediaItem2 mediaItem);
		void setDataSource_impl(DataSourceDesc dsd);
		void setViewType_impl(int viewType);
		int getViewType_impl();
		/**
		* @hide TODO: remove
		*/
		void setCustomActions_impl(List<PlaybackState.CustomAction> actionList,
		Executor executor, VideoView2.OnCustomActionListener listener);
		/**
		* @hide
		*/
		@VisibleForTesting
		void setOnViewTypeChangedListener_impl(VideoView2.OnViewTypeChangedListener l);
		/**
		* @hide TODO: remove
		*/
		void setFullScreenRequestListener_impl(VideoView2.OnFullScreenRequestListener l);
		}