Commit b95c984d by insun Committed by kim-vde

Cleanup unused ui resources and code

PiperOrigin-RevId: 326390725
parent a0088f06
...@@ -1667,13 +1667,6 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -1667,13 +1667,6 @@ public class StyledPlayerControlView extends FrameLayout {
return true; return true;
} }
private boolean shouldShowPauseButton() {
return player != null
&& player.getPlaybackState() != Player.STATE_ENDED
&& player.getPlaybackState() != Player.STATE_IDLE
&& player.getPlayWhenReady();
}
@SuppressLint("InlinedApi") @SuppressLint("InlinedApi")
private static boolean isHandledMediaKey(int keyCode) { private static boolean isHandledMediaKey(int keyCode) {
return keyCode == KeyEvent.KEYCODE_MEDIA_FAST_FORWARD return keyCode == KeyEvent.KEYCODE_MEDIA_FAST_FORWARD
......
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2020 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.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFF"
android:pathData="M19,19H5V5h7V3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2v7zM14,3v2h3.59l-9.83,9.83 1.41,1.41L19,6.41V10h2V3h-7z"/>
</vector>
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2020 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.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="40dp"
android:height="40dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M0,0h24v24H0V0z" />
<path
android:fillColor="#FFFFFF"
android:fillType="evenOdd"
android:pathData="M12,2C6.48,2,2,6.48,2,12c0,5.52,4.48,10,10,10c5.52,0,10-4.48,10-10
C22,6.48,17.52,2,12,2z
M18,12c0,3.31-2.69,6-6,6c-3.31,0-6-2.69-6-6h2c0,2.21,1.79,4,4,4s4-1.79,4-4s-1.79-4-4-4v3L8,7l4-4v3
C15.31,6,18,8.69,18,12z" />
</vector>
...@@ -38,17 +38,4 @@ ...@@ -38,17 +38,4 @@
<dimen name="exo_time_view_padding">10dp</dimen> <dimen name="exo_time_view_padding">10dp</dimen>
<dimen name="exo_time_view_width">170sp</dimen> <dimen name="exo_time_view_width">170sp</dimen>
<!-- Rounded corner radius for video subtitles. -->
<dimen name="exo_subtitle_corner_radius">2dp</dimen>
<!-- Shadow radius for video subtitles. -->
<dimen name="exo_subtitle_shadow_radius">2dp</dimen>
<!-- Shadow offset for video subtitles. -->
<dimen name="exo_subtitle_shadow_offset">2dp</dimen>
<!-- Outline width for video subtitles. -->
<dimen name="exo_subtitle_outline_width">2dp</dimen>
</resources> </resources>
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
<drawable name="exo_styled_controls_play">@drawable/exo_ic_play_circle_filled</drawable> <drawable name="exo_styled_controls_play">@drawable/exo_ic_play_circle_filled</drawable>
<drawable name="exo_styled_controls_pause">@drawable/exo_ic_pause_circle_filled</drawable> <drawable name="exo_styled_controls_pause">@drawable/exo_ic_pause_circle_filled</drawable>
<drawable name="exo_styled_controls_replay">@drawable/exo_ic_replay_circle_filled</drawable>
<drawable name="exo_styled_controls_next">@drawable/exo_ic_skip_next</drawable> <drawable name="exo_styled_controls_next">@drawable/exo_ic_skip_next</drawable>
<drawable name="exo_styled_controls_previous">@drawable/exo_ic_skip_previous</drawable> <drawable name="exo_styled_controls_previous">@drawable/exo_ic_skip_previous</drawable>
<drawable name="exo_styled_controls_fastforward">@drawable/exo_ic_forward</drawable> <drawable name="exo_styled_controls_fastforward">@drawable/exo_ic_forward</drawable>
......
...@@ -105,19 +105,6 @@ ...@@ -105,19 +105,6 @@
<item name="android:textColor">@color/exo_white</item> <item name="android:textColor">@color/exo_white</item>
</style> </style>
<style name="ExoStyledControls.Button.Minimal" />
<!-- TODO(insun): Merge play and pause buttons in minimal mode as well. -->
<style name="ExoStyledControls.Button.Minimal.Pause">
<item name="android:src">@drawable/exo_styled_controls_pause</item>
<item name="android:contentDescription">@string/exo_controls_pause_description</item>
</style>
<style name="ExoStyledControls.Button.Minimal.Play">
<item name="android:src">@drawable/exo_styled_controls_play</item>
<item name="android:contentDescription">@string/exo_controls_play_description</item>
</style>
<style name="ExoStyledControls.TimeText"> <style name="ExoStyledControls.TimeText">
<item name="android:layout_width">wrap_content</item> <item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment