loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove reference to ExoPlayer from UI module

Browse Source 
PiperOrigin-RevId: 401751490
This commit is contained in:
olly 2021-10-08 13:55:06 +01:00 committed by bachinger
parent 3d67400a8a
commit d45cf6028d
5 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
View File

@ -164,8 +164,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
* To customize the layout of PlayerControlView throughout your app, or just for certain * To customize the layout of PlayerControlView throughout your app, or just for certain
* configurations, you can define {@code exo_player_control_view.xml} layout files in your * configurations, you can define {@code exo_player_control_view.xml} layout files in your
* application {@code res/layout*} directories. These layouts will override the one provided by the * application {@code res/layout*} directories. These layouts will override the one provided by the
* ExoPlayer library, and will be inflated for use by PlayerControlView. The view identifies and * library, and will be inflated for use by PlayerControlView. The view identifies and binds its
* binds its children by looking for the following ids: * children by looking for the following ids:
* *
* <ul> * <ul>
* <li><b>{@code exo_play}</b> - The play button. * <li><b>{@code exo_play}</b> - The play button.

9
library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
View File

@ -47,7 +47,6 @@ import androidx.annotation.RequiresApi;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ControlDispatcher; import com.google.android.exoplayer2.ControlDispatcher;
import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.ForwardingPlayer; import com.google.android.exoplayer2.ForwardingPlayer;
import com.google.android.exoplayer2.MediaMetadata; import com.google.android.exoplayer2.MediaMetadata;
@ -186,9 +185,9 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
* *
* To customize the layout of PlayerView throughout your app, or just for certain configurations, * To customize the layout of PlayerView throughout your app, or just for certain configurations,
* you can define {@code exo_player_view.xml} layout files in your application {@code res/layout*} * you can define {@code exo_player_view.xml} layout files in your application {@code res/layout*}
* directories. These layouts will override the one provided by the ExoPlayer library, and will be * directories. These layouts will override the one provided by the library, and will be inflated
* inflated for use by PlayerView. The view identifies and binds its children by looking for the * for use by PlayerView. The view identifies and binds its children by looking for the following
* following ids: * ids:
* *
* <ul> * <ul>
* <li><b>{@code exo_content_frame}</b> - A frame whose aspect ratio is resized based on the video * <li><b>{@code exo_content_frame}</b> - A frame whose aspect ratio is resized based on the video
@ -935,7 +934,7 @@ public class PlayerView extends FrameLayout implements AdViewProvider {
/** /**
* @deprecated Use a {@link ForwardingPlayer} and pass it to {@link #setPlayer(Player)} instead. * @deprecated Use a {@link ForwardingPlayer} and pass it to {@link #setPlayer(Player)} instead.
* You can also customize some operations when configuring the player (for example by using * You can also customize some operations when configuring the player (for example by using
* {@link ExoPlayer.Builder#setSeekBackIncrementMs(long)}). * {@code ExoPlayer.Builder.setSeekBackIncrementMs(long)}).
*/ */
@Deprecated @Deprecated
public void setControlDispatcher(ControlDispatcher controlDispatcher) { public void setControlDispatcher(ControlDispatcher controlDispatcher) {

3
library/ui/src/main/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverter.java
View File

@ -50,8 +50,7 @@ import java.util.regex.Pattern;
* Utility class to convert from <a * Utility class to convert from <a
* href="https://developer.android.com/guide/topics/text/spans">span-styled text</a> to HTML. * href="https://developer.android.com/guide/topics/text/spans">span-styled text</a> to HTML.
* *
* <p>Supports all of the spans used by ExoPlayer's subtitle decoders, including custom ones found * <p>Supports all of the spans used by subtitle decoders.
* in {@link com.google.android.exoplayer2.text.span}.
*/ */
/* package */ final class SpannedToHtmlConverter { /* package */ final class SpannedToHtmlConverter {

8
library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java
View File

@ -199,9 +199,9 @@ import java.util.concurrent.CopyOnWriteArrayList;
* default animation implementation expects certain relative positions between children. See also <a * default animation implementation expects certain relative positions between children. See also <a
* href="CustomLayout">Specifying a custom layout file</a>. * href="CustomLayout">Specifying a custom layout file</a>.
* *
* <p>The layout files in your {@code res/layout*} will override the one provided by the ExoPlayer * <p>The layout files in your {@code res/layout*} will override the one provided by the library,
* library, and will be inflated for use by StyledPlayerControlView. The view identifies and binds * and will be inflated for use by StyledPlayerControlView. The view identifies and binds its
* its children by looking for the following ids: * children by looking for the following ids:
* *
* <ul> * <ul>
* <li><b>{@code exo_play_pause}</b> - The play and pause button. * <li><b>{@code exo_play_pause}</b> - The play and pause button.
@ -843,7 +843,7 @@ public class StyledPlayerControlView extends FrameLayout {
/** /**
* @deprecated Use a {@link ForwardingPlayer} and pass it to {@link #setPlayer(Player)} instead. * @deprecated Use a {@link ForwardingPlayer} and pass it to {@link #setPlayer(Player)} instead.
* You can also customize some operations when configuring the player (for example by using * You can also customize some operations when configuring the player (for example by using
* {@link ExoPlayer.Builder#setSeekBackIncrementMs(long)}). * {@code ExoPlayer.Builder.setSeekBackIncrementMs(long)}).
*/ */
@Deprecated @Deprecated
public void setControlDispatcher(ControlDispatcher controlDispatcher) { public void setControlDispatcher(ControlDispatcher controlDispatcher) {

7
library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java
View File

@ -48,7 +48,6 @@ import androidx.annotation.RequiresApi;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ControlDispatcher; import com.google.android.exoplayer2.ControlDispatcher;
import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.ForwardingPlayer; import com.google.android.exoplayer2.ForwardingPlayer;
import com.google.android.exoplayer2.MediaMetadata; import com.google.android.exoplayer2.MediaMetadata;
@ -188,8 +187,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
* To customize the layout of StyledPlayerView throughout your app, or just for certain * To customize the layout of StyledPlayerView throughout your app, or just for certain
* configurations, you can define {@code exo_styled_player_view.xml} layout files in your * configurations, you can define {@code exo_styled_player_view.xml} layout files in your
* application {@code res/layout*} directories. These layouts will override the one provided by the * application {@code res/layout*} directories. These layouts will override the one provided by the
* ExoPlayer library, and will be inflated for use by StyledPlayerView. The view identifies and * library, and will be inflated for use by StyledPlayerView. The view identifies and binds its
* binds its children by looking for the following ids: * children by looking for the following ids:
* *
* <ul> * <ul>
* <li><b>{@code exo_content_frame}</b> - A frame whose aspect ratio is resized based on the video * <li><b>{@code exo_content_frame}</b> - A frame whose aspect ratio is resized based on the video
@ -952,7 +951,7 @@ public class StyledPlayerView extends FrameLayout implements AdViewProvider {
/** /**
* @deprecated Use a {@link ForwardingPlayer} and pass it to {@link #setPlayer(Player)} instead. * @deprecated Use a {@link ForwardingPlayer} and pass it to {@link #setPlayer(Player)} instead.
* You can also customize some operations when configuring the player (for example by using * You can also customize some operations when configuring the player (for example by using
* {@link ExoPlayer.Builder#setSeekBackIncrementMs(long)}). * {@code ExoPlayer.Builder.setSeekBackIncrementMs(long)}).
*/ */
@Deprecated @Deprecated
public void setControlDispatcher(ControlDispatcher controlDispatcher) { public void setControlDispatcher(ControlDispatcher controlDispatcher) {