diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlViewLayoutManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlViewLayoutManager.java index a5e6e40df6..9ce2c53758 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlViewLayoutManager.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlViewLayoutManager.java @@ -34,7 +34,7 @@ import java.util.ArrayList; private static final long DURATION_FOR_HIDING_ANIMATION_MS = 250; private static final long DURATION_FOR_SHOWING_ANIMATION_MS = 250; - // Int for defining the UX state where all the views (TitleBar, ProgressBar, BottomBar) are + // Int for defining the UX state where all the views (ProgressBar, BottomBar) are // all visible. private static final int UX_STATE_ALL_VISIBLE = 0; // Int for defining the UX state where only the ProgressBar view is visible. @@ -61,7 +61,6 @@ import java.util.ArrayList; @Nullable private StyledPlayerControlView styledPlayerControlView; - @Nullable private ViewGroup titleBar; @Nullable private ViewGroup embeddedTransportControls; @Nullable private ViewGroup bottomBar; @Nullable private ViewGroup minimalControls; @@ -165,9 +164,6 @@ import java.util.ArrayList; v.addOnLayoutChangeListener(onLayoutChangeListener); - // Relating to Title Bar View - ViewGroup titleBar = v.findViewById(R.id.exo_title_bar); - // Relating to Center View ViewGroup centerView = v.findViewById(R.id.exo_center_view); embeddedTransportControls = v.findViewById(R.id.exo_embedded_transport_controls); @@ -193,12 +189,10 @@ import java.util.ArrayList; overflowHideButton.setOnClickListener(this::onOverflowButtonClick); } - this.titleBar = titleBar; this.bottomBar = bottomBar; this.timeBar = timeBar; Resources resources = v.getResources(); - float titleBarHeight = resources.getDimension(R.dimen.exo_title_bar_height); float progressBarHeight = resources.getDimension(R.dimen.exo_custom_progress_thumb_size); float bottomBarHeight = resources.getDimension(R.dimen.exo_bottom_bar_height); @@ -286,7 +280,6 @@ import java.util.ArrayList; }); hideMainBarsAnimator .play(fadeOutAnimator) - .with(ofTranslationY(0, -titleBarHeight, titleBar)) .with(ofTranslationY(0, bottomBarHeight, timeBar)) .with(ofTranslationY(0, bottomBarHeight, bottomBar)); @@ -336,7 +329,6 @@ import java.util.ArrayList; }); hideAllBarsAnimator .play(fadeOutAnimator) - .with(ofTranslationY(0, -titleBarHeight, titleBar)) .with(ofTranslationY(0, bottomBarHeight + progressBarHeight, timeBar)) .with(ofTranslationY(0, bottomBarHeight + progressBarHeight, bottomBar)); @@ -356,7 +348,6 @@ import java.util.ArrayList; }); showMainBarsAnimator .play(fadeInAnimator) - .with(ofTranslationY(-titleBarHeight, 0, titleBar)) .with(ofTranslationY(bottomBarHeight, 0, timeBar)) .with(ofTranslationY(bottomBarHeight, 0, bottomBar)); @@ -376,7 +367,6 @@ import java.util.ArrayList; }); showAllBarsAnimator .play(fadeInAnimator) - .with(ofTranslationY(-titleBarHeight, 0, titleBar)) .with(ofTranslationY(bottomBarHeight + progressBarHeight, 0, timeBar)) .with(ofTranslationY(bottomBarHeight + progressBarHeight, 0, bottomBar)); @@ -584,7 +574,6 @@ import java.util.ArrayList; getWidth(embeddedTransportControls), getWidth(timeView) + getWidth(overflowShowButton)); int defaultModeHeight = getHeight(embeddedTransportControls) - + getHeight(titleBar) + getHeight(timeBar) + getHeight(bottomBar); @@ -636,7 +625,6 @@ import java.util.ArrayList; } int[] idsToHideInMinimalMode = { - R.id.exo_title_bar, R.id.exo_bottom_bar, R.id.exo_prev, R.id.exo_next, diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_ic_forward_30.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_ic_forward_30.xml deleted file mode 100644 index b55831ec57..0000000000 --- a/library/ui/src/main/res/drawable-anydpi-v21/exo_ic_forward_30.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_ic_rewind_10.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_ic_rewind_10.xml deleted file mode 100644 index 942fe5b76f..0000000000 --- a/library/ui/src/main/res/drawable-anydpi-v21/exo_ic_rewind_10.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/library/ui/src/main/res/drawable/exo_title_bar_gradient.xml b/library/ui/src/main/res/drawable/exo_title_bar_gradient.xml deleted file mode 100644 index fd3b0745fe..0000000000 --- a/library/ui/src/main/res/drawable/exo_title_bar_gradient.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - diff --git a/library/ui/src/main/res/layout/exo_styled_player_control_view.xml b/library/ui/src/main/res/layout/exo_styled_player_control_view.xml index 25948ffa97..c869beac43 100644 --- a/library/ui/src/main/res/layout/exo_styled_player_control_view.xml +++ b/library/ui/src/main/res/layout/exo_styled_player_control_view.xml @@ -36,37 +36,6 @@ layout="@layout/exo_styled_embedded_transport_controls" /> - - - - - - - - #ffffff #B3ffffff #B3000000 - #d0000000 - #00000000 #90000000 #b0000000 diff --git a/library/ui/src/main/res/values/dimens.xml b/library/ui/src/main/res/values/dimens.xml index 630b7cb263..cc1620aac1 100644 --- a/library/ui/src/main/res/values/dimens.xml +++ b/library/ui/src/main/res/values/dimens.xml @@ -34,7 +34,6 @@ 16dp 41dp - 48dp 48dp 10dp diff --git a/library/ui/src/main/res/values/styles.xml b/library/ui/src/main/res/values/styles.xml index 2f083f18c9..64e3b9cd42 100644 --- a/library/ui/src/main/res/values/styles.xml +++ b/library/ui/src/main/res/values/styles.xml @@ -118,11 +118,6 @@ @string/exo_controls_play_description - -