diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java index 1f076846b5..8b13a935ce 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java @@ -1667,13 +1667,6 @@ public class StyledPlayerControlView extends FrameLayout { return true; } - private boolean shouldShowPauseButton() { - return player != null - && player.getPlaybackState() != Player.STATE_ENDED - && player.getPlaybackState() != Player.STATE_IDLE - && player.getPlayWhenReady(); - } - @SuppressLint("InlinedApi") private static boolean isHandledMediaKey(int keyCode) { return keyCode == KeyEvent.KEYCODE_MEDIA_FAST_FORWARD diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_ic_launch.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_ic_launch.xml deleted file mode 100644 index 1646f2a0e4..0000000000 --- a/library/ui/src/main/res/drawable-anydpi-v21/exo_ic_launch.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - diff --git a/library/ui/src/main/res/drawable-anydpi-v24/exo_ic_replay_circle_filled.xml b/library/ui/src/main/res/drawable-anydpi-v24/exo_ic_replay_circle_filled.xml deleted file mode 100644 index e57acb5db6..0000000000 --- a/library/ui/src/main/res/drawable-anydpi-v24/exo_ic_replay_circle_filled.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - diff --git a/library/ui/src/main/res/drawable-hdpi/exo_ic_launch.png b/library/ui/src/main/res/drawable-hdpi/exo_ic_launch.png deleted file mode 100644 index 43f6b63a2c..0000000000 Binary files a/library/ui/src/main/res/drawable-hdpi/exo_ic_launch.png and /dev/null differ diff --git a/library/ui/src/main/res/drawable-hdpi/exo_ic_replay_circle_filled.png b/library/ui/src/main/res/drawable-hdpi/exo_ic_replay_circle_filled.png deleted file mode 100644 index cf275837ae..0000000000 Binary files a/library/ui/src/main/res/drawable-hdpi/exo_ic_replay_circle_filled.png and /dev/null differ diff --git a/library/ui/src/main/res/drawable-ldpi/exo_ic_launch.png b/library/ui/src/main/res/drawable-ldpi/exo_ic_launch.png deleted file mode 100644 index cc7e1deb89..0000000000 Binary files a/library/ui/src/main/res/drawable-ldpi/exo_ic_launch.png and /dev/null differ diff --git a/library/ui/src/main/res/drawable-ldpi/exo_ic_replay_circle_filled.png b/library/ui/src/main/res/drawable-ldpi/exo_ic_replay_circle_filled.png deleted file mode 100644 index a5ac2da5de..0000000000 Binary files a/library/ui/src/main/res/drawable-ldpi/exo_ic_replay_circle_filled.png and /dev/null differ diff --git a/library/ui/src/main/res/drawable-mdpi/exo_ic_launch.png b/library/ui/src/main/res/drawable-mdpi/exo_ic_launch.png deleted file mode 100644 index dbf0ba2c97..0000000000 Binary files a/library/ui/src/main/res/drawable-mdpi/exo_ic_launch.png and /dev/null differ diff --git a/library/ui/src/main/res/drawable-mdpi/exo_ic_replay_circle_filled.png b/library/ui/src/main/res/drawable-mdpi/exo_ic_replay_circle_filled.png deleted file mode 100644 index e73489a571..0000000000 Binary files a/library/ui/src/main/res/drawable-mdpi/exo_ic_replay_circle_filled.png and /dev/null differ diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_ic_launch.png b/library/ui/src/main/res/drawable-xhdpi/exo_ic_launch.png deleted file mode 100644 index 2a9dae6c56..0000000000 Binary files a/library/ui/src/main/res/drawable-xhdpi/exo_ic_launch.png and /dev/null differ diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_ic_replay_circle_filled.png b/library/ui/src/main/res/drawable-xhdpi/exo_ic_replay_circle_filled.png deleted file mode 100644 index e700831f6e..0000000000 Binary files a/library/ui/src/main/res/drawable-xhdpi/exo_ic_replay_circle_filled.png and /dev/null differ diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_ic_launch.png b/library/ui/src/main/res/drawable-xxhdpi/exo_ic_launch.png deleted file mode 100644 index ded2c2b859..0000000000 Binary files a/library/ui/src/main/res/drawable-xxhdpi/exo_ic_launch.png and /dev/null differ diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_ic_replay_circle_filled.png b/library/ui/src/main/res/drawable-xxhdpi/exo_ic_replay_circle_filled.png deleted file mode 100644 index 8a8f11a31d..0000000000 Binary files a/library/ui/src/main/res/drawable-xxhdpi/exo_ic_replay_circle_filled.png and /dev/null differ diff --git a/library/ui/src/main/res/drawable-xxxhdpi/exo_ic_launch.png b/library/ui/src/main/res/drawable-xxxhdpi/exo_ic_launch.png deleted file mode 100644 index 476022a980..0000000000 Binary files a/library/ui/src/main/res/drawable-xxxhdpi/exo_ic_launch.png and /dev/null differ diff --git a/library/ui/src/main/res/drawable-xxxhdpi/exo_ic_replay_circle_filled.png b/library/ui/src/main/res/drawable-xxxhdpi/exo_ic_replay_circle_filled.png deleted file mode 100644 index 9be0765ae2..0000000000 Binary files a/library/ui/src/main/res/drawable-xxxhdpi/exo_ic_replay_circle_filled.png and /dev/null differ diff --git a/library/ui/src/main/res/values/dimens.xml b/library/ui/src/main/res/values/dimens.xml index cc1620aac1..25e367caa3 100644 --- a/library/ui/src/main/res/values/dimens.xml +++ b/library/ui/src/main/res/values/dimens.xml @@ -38,17 +38,4 @@ 10dp 170sp - - - 2dp - - - 2dp - - - 2dp - - - 2dp - diff --git a/library/ui/src/main/res/values/drawables.xml b/library/ui/src/main/res/values/drawables.xml index ed1f85865c..f72c57f8a9 100644 --- a/library/ui/src/main/res/values/drawables.xml +++ b/library/ui/src/main/res/values/drawables.xml @@ -39,7 +39,6 @@ @drawable/exo_ic_play_circle_filled @drawable/exo_ic_pause_circle_filled - @drawable/exo_ic_replay_circle_filled @drawable/exo_ic_skip_next @drawable/exo_ic_skip_previous @drawable/exo_ic_forward diff --git a/library/ui/src/main/res/values/styles.xml b/library/ui/src/main/res/values/styles.xml index 64e3b9cd42..3f0081cf05 100644 --- a/library/ui/src/main/res/values/styles.xml +++ b/library/ui/src/main/res/values/styles.xml @@ -105,19 +105,6 @@ @color/exo_white - - - -