mirror of
https://github.com/samsonjs/media.git
synced 2026-04-07 11:35:46 +00:00
Move Player(Control)View resource IDs into separate _legacy.xml files
This is a no-op because all the <resource> elements from these XML files are effectively concatenated together during building. PiperOrigin-RevId: 416326534
This commit is contained in:
ibaker
tonihei
parent
89b47413af
commit
69d83a28bb
6 changed files with 171 additions and 119 deletions
|
|
@ -24,7 +24,7 @@
|
|||
<enum name="zoom" value="4"/>
|
||||
</attr>
|
||||
|
||||
<!-- Must be kept in sync with PlayerView -->
|
||||
<!-- Must be kept in sync with PlayerView and StyledPlayerView -->
|
||||
<attr name="surface_type" format="enum">
|
||||
<enum name="none" value="0"/>
|
||||
<enum name="surface_view" value="1"/>
|
||||
|
|
@ -91,42 +91,6 @@
|
|||
<attr name="ad_marker_color" format="color"/>
|
||||
<attr name="played_ad_marker_color" format="color"/>
|
||||
|
||||
<declare-styleable name="PlayerView">
|
||||
<attr name="use_artwork"/>
|
||||
<attr name="shutter_background_color"/>
|
||||
<attr name="default_artwork"/>
|
||||
<attr name="use_controller"/>
|
||||
<attr name="hide_on_touch"/>
|
||||
<attr name="hide_during_ads"/>
|
||||
<attr name="auto_show"/>
|
||||
<attr name="show_buffering"/>
|
||||
<attr name="keep_content_on_player_reset"/>
|
||||
<attr name="player_layout_id"/>
|
||||
<attr name="surface_type"/>
|
||||
<!-- AspectRatioFrameLayout attributes -->
|
||||
<attr name="resize_mode"/>
|
||||
<!-- PlayerControlView attributes -->
|
||||
<attr name="show_timeout"/>
|
||||
<attr name="repeat_toggle_modes"/>
|
||||
<attr name="show_shuffle_button"/>
|
||||
<attr name="time_bar_min_update_interval"/>
|
||||
<attr name="controller_layout_id"/>
|
||||
<!-- DefaultTimeBar attributes -->
|
||||
<attr name="bar_height"/>
|
||||
<attr name="touch_target_height"/>
|
||||
<attr name="ad_marker_width"/>
|
||||
<attr name="scrubber_enabled_size"/>
|
||||
<attr name="scrubber_disabled_size"/>
|
||||
<attr name="scrubber_dragged_size"/>
|
||||
<attr name="scrubber_drawable"/>
|
||||
<attr name="played_color"/>
|
||||
<attr name="scrubber_color"/>
|
||||
<attr name="buffered_color" />
|
||||
<attr name="unplayed_color"/>
|
||||
<attr name="ad_marker_color"/>
|
||||
<attr name="played_ad_marker_color"/>
|
||||
</declare-styleable>
|
||||
|
||||
<declare-styleable name="StyledPlayerView">
|
||||
<attr name="use_artwork"/>
|
||||
<attr name="shutter_background_color"/>
|
||||
|
|
@ -171,33 +135,6 @@
|
|||
<attr name="resize_mode"/>
|
||||
</declare-styleable>
|
||||
|
||||
<declare-styleable name="PlayerControlView">
|
||||
<attr name="show_timeout"/>
|
||||
<attr name="repeat_toggle_modes"/>
|
||||
<attr name="show_rewind_button"/>
|
||||
<attr name="show_fastforward_button"/>
|
||||
<attr name="show_previous_button"/>
|
||||
<attr name="show_next_button"/>
|
||||
<attr name="show_shuffle_button"/>
|
||||
<attr name="time_bar_min_update_interval"/>
|
||||
<attr name="controller_layout_id"/>
|
||||
<!-- DefaultTimeBar attributes -->
|
||||
<attr name="bar_height"/>
|
||||
<attr name="bar_gravity"/>
|
||||
<attr name="touch_target_height"/>
|
||||
<attr name="ad_marker_width"/>
|
||||
<attr name="scrubber_enabled_size"/>
|
||||
<attr name="scrubber_disabled_size"/>
|
||||
<attr name="scrubber_dragged_size"/>
|
||||
<attr name="scrubber_drawable"/>
|
||||
<attr name="played_color"/>
|
||||
<attr name="scrubber_color"/>
|
||||
<attr name="buffered_color" />
|
||||
<attr name="unplayed_color"/>
|
||||
<attr name="ad_marker_color"/>
|
||||
<attr name="played_ad_marker_color"/>
|
||||
</declare-styleable>
|
||||
|
||||
<declare-styleable name="StyledPlayerControlView">
|
||||
<attr name="show_timeout"/>
|
||||
<attr name="repeat_toggle_modes"/>
|
||||
|
|
|
|||
81
libraries/ui/src/main/res/values/attrs_legacy.xml
Normal file
81
libraries/ui/src/main/res/values/attrs_legacy.xml
Normal file
|
|
@ -0,0 +1,81 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2016 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.
|
||||
-->
|
||||
<resources>
|
||||
|
||||
<declare-styleable name="PlayerView">
|
||||
<attr name="use_artwork"/>
|
||||
<attr name="shutter_background_color"/>
|
||||
<attr name="default_artwork"/>
|
||||
<attr name="use_controller"/>
|
||||
<attr name="hide_on_touch"/>
|
||||
<attr name="hide_during_ads"/>
|
||||
<attr name="auto_show"/>
|
||||
<attr name="show_buffering"/>
|
||||
<attr name="keep_content_on_player_reset"/>
|
||||
<attr name="player_layout_id"/>
|
||||
<attr name="surface_type"/>
|
||||
<!-- AspectRatioFrameLayout attributes -->
|
||||
<attr name="resize_mode"/>
|
||||
<!-- PlayerControlView attributes -->
|
||||
<attr name="show_timeout"/>
|
||||
<attr name="repeat_toggle_modes"/>
|
||||
<attr name="show_shuffle_button"/>
|
||||
<attr name="time_bar_min_update_interval"/>
|
||||
<attr name="controller_layout_id"/>
|
||||
<!-- DefaultTimeBar attributes -->
|
||||
<attr name="bar_height"/>
|
||||
<attr name="touch_target_height"/>
|
||||
<attr name="ad_marker_width"/>
|
||||
<attr name="scrubber_enabled_size"/>
|
||||
<attr name="scrubber_disabled_size"/>
|
||||
<attr name="scrubber_dragged_size"/>
|
||||
<attr name="scrubber_drawable"/>
|
||||
<attr name="played_color"/>
|
||||
<attr name="scrubber_color"/>
|
||||
<attr name="buffered_color" />
|
||||
<attr name="unplayed_color"/>
|
||||
<attr name="ad_marker_color"/>
|
||||
<attr name="played_ad_marker_color"/>
|
||||
</declare-styleable>
|
||||
|
||||
<declare-styleable name="PlayerControlView">
|
||||
<attr name="show_timeout"/>
|
||||
<attr name="repeat_toggle_modes"/>
|
||||
<attr name="show_rewind_button"/>
|
||||
<attr name="show_fastforward_button"/>
|
||||
<attr name="show_previous_button"/>
|
||||
<attr name="show_next_button"/>
|
||||
<attr name="show_shuffle_button"/>
|
||||
<attr name="time_bar_min_update_interval"/>
|
||||
<attr name="controller_layout_id"/>
|
||||
<!-- DefaultTimeBar attributes -->
|
||||
<attr name="bar_height"/>
|
||||
<attr name="bar_gravity"/>
|
||||
<attr name="touch_target_height"/>
|
||||
<attr name="ad_marker_width"/>
|
||||
<attr name="scrubber_enabled_size"/>
|
||||
<attr name="scrubber_disabled_size"/>
|
||||
<attr name="scrubber_dragged_size"/>
|
||||
<attr name="scrubber_drawable"/>
|
||||
<attr name="played_color"/>
|
||||
<attr name="scrubber_color"/>
|
||||
<attr name="buffered_color" />
|
||||
<attr name="unplayed_color"/>
|
||||
<attr name="ad_marker_color"/>
|
||||
<attr name="played_ad_marker_color"/>
|
||||
</declare-styleable>
|
||||
|
||||
</resources>
|
||||
|
|
@ -14,20 +14,6 @@
|
|||
limitations under the License.
|
||||
-->
|
||||
<resources>
|
||||
<drawable name="exo_controls_play">@drawable/exo_icon_play</drawable>
|
||||
<drawable name="exo_controls_pause">@drawable/exo_icon_pause</drawable>
|
||||
<drawable name="exo_controls_next">@drawable/exo_icon_next</drawable>
|
||||
<drawable name="exo_controls_previous">@drawable/exo_icon_previous</drawable>
|
||||
<drawable name="exo_controls_fastforward">@drawable/exo_icon_fastforward</drawable>
|
||||
<drawable name="exo_controls_rewind">@drawable/exo_icon_rewind</drawable>
|
||||
<drawable name="exo_controls_repeat_all">@drawable/exo_icon_repeat_all</drawable>
|
||||
<drawable name="exo_controls_repeat_off">@drawable/exo_icon_repeat_off</drawable>
|
||||
<drawable name="exo_controls_repeat_one">@drawable/exo_icon_repeat_one</drawable>
|
||||
<drawable name="exo_controls_shuffle_off">@drawable/exo_icon_shuffle_off</drawable>
|
||||
<drawable name="exo_controls_shuffle_on">@drawable/exo_icon_shuffle_on</drawable>
|
||||
<drawable name="exo_controls_fullscreen_enter">@drawable/exo_icon_fullscreen_enter</drawable>
|
||||
<drawable name="exo_controls_fullscreen_exit">@drawable/exo_icon_fullscreen_exit</drawable>
|
||||
<drawable name="exo_controls_vr">@drawable/exo_icon_vr</drawable>
|
||||
<drawable name="exo_notification_play">@drawable/exo_icon_play</drawable>
|
||||
<drawable name="exo_notification_pause">@drawable/exo_icon_pause</drawable>
|
||||
<drawable name="exo_notification_next">@drawable/exo_icon_next</drawable>
|
||||
|
|
|
|||
31
libraries/ui/src/main/res/values/drawables_legacy.xml
Normal file
31
libraries/ui/src/main/res/values/drawables_legacy.xml
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2019 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.
|
||||
-->
|
||||
<resources>
|
||||
<drawable name="exo_controls_play">@drawable/exo_icon_play</drawable>
|
||||
<drawable name="exo_controls_pause">@drawable/exo_icon_pause</drawable>
|
||||
<drawable name="exo_controls_next">@drawable/exo_icon_next</drawable>
|
||||
<drawable name="exo_controls_previous">@drawable/exo_icon_previous</drawable>
|
||||
<drawable name="exo_controls_fastforward">@drawable/exo_icon_fastforward</drawable>
|
||||
<drawable name="exo_controls_rewind">@drawable/exo_icon_rewind</drawable>
|
||||
<drawable name="exo_controls_repeat_all">@drawable/exo_icon_repeat_all</drawable>
|
||||
<drawable name="exo_controls_repeat_off">@drawable/exo_icon_repeat_off</drawable>
|
||||
<drawable name="exo_controls_repeat_one">@drawable/exo_icon_repeat_one</drawable>
|
||||
<drawable name="exo_controls_shuffle_off">@drawable/exo_icon_shuffle_off</drawable>
|
||||
<drawable name="exo_controls_shuffle_on">@drawable/exo_icon_shuffle_on</drawable>
|
||||
<drawable name="exo_controls_fullscreen_enter">@drawable/exo_icon_fullscreen_enter</drawable>
|
||||
<drawable name="exo_controls_fullscreen_exit">@drawable/exo_icon_fullscreen_exit</drawable>
|
||||
<drawable name="exo_controls_vr">@drawable/exo_icon_vr</drawable>
|
||||
</resources>
|
||||
|
|
@ -15,47 +15,6 @@
|
|||
-->
|
||||
<resources>
|
||||
|
||||
<style name="ExoMediaButton">
|
||||
<item name="android:background">?android:attr/selectableItemBackground</item>
|
||||
<item name="android:layout_width">@dimen/exo_media_button_width</item>
|
||||
<item name="android:layout_height">@dimen/exo_media_button_height</item>
|
||||
</style>
|
||||
|
||||
<style name="ExoMediaButton.Previous">
|
||||
<item name="android:src">@drawable/exo_controls_previous</item>
|
||||
<item name="android:contentDescription">@string/exo_controls_previous_description</item>
|
||||
</style>
|
||||
|
||||
<style name="ExoMediaButton.Next">
|
||||
<item name="android:src">@drawable/exo_controls_next</item>
|
||||
<item name="android:contentDescription">@string/exo_controls_next_description</item>
|
||||
</style>
|
||||
|
||||
<style name="ExoMediaButton.FastForward">
|
||||
<item name="android:src">@drawable/exo_controls_fastforward</item>
|
||||
<item name="android:contentDescription">@string/exo_controls_fastforward_description</item>
|
||||
</style>
|
||||
|
||||
<style name="ExoMediaButton.Rewind">
|
||||
<item name="android:src">@drawable/exo_controls_rewind</item>
|
||||
<item name="android:contentDescription">@string/exo_controls_rewind_description</item>
|
||||
</style>
|
||||
|
||||
<style name="ExoMediaButton.Play">
|
||||
<item name="android:src">@drawable/exo_controls_play</item>
|
||||
<item name="android:contentDescription">@string/exo_controls_play_description</item>
|
||||
</style>
|
||||
|
||||
<style name="ExoMediaButton.Pause">
|
||||
<item name="android:src">@drawable/exo_controls_pause</item>
|
||||
<item name="android:contentDescription">@string/exo_controls_pause_description</item>
|
||||
</style>
|
||||
|
||||
<style name="ExoMediaButton.VR">
|
||||
<item name="android:src">@drawable/exo_controls_vr</item>
|
||||
<item name="android:contentDescription">@string/exo_controls_vr_description</item>
|
||||
</style>
|
||||
|
||||
<style name="ExoStyledControls"/>
|
||||
|
||||
<style name="ExoStyledControls.Button">
|
||||
|
|
|
|||
58
libraries/ui/src/main/res/values/styles_legacy.xml
Normal file
58
libraries/ui/src/main/res/values/styles_legacy.xml
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2016 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.
|
||||
-->
|
||||
<resources>
|
||||
|
||||
<style name="ExoMediaButton">
|
||||
<item name="android:background">?android:attr/selectableItemBackground</item>
|
||||
<item name="android:layout_width">@dimen/exo_media_button_width</item>
|
||||
<item name="android:layout_height">@dimen/exo_media_button_height</item>
|
||||
</style>
|
||||
|
||||
<style name="ExoMediaButton.Previous">
|
||||
<item name="android:src">@drawable/exo_controls_previous</item>
|
||||
<item name="android:contentDescription">@string/exo_controls_previous_description</item>
|
||||
</style>
|
||||
|
||||
<style name="ExoMediaButton.Next">
|
||||
<item name="android:src">@drawable/exo_controls_next</item>
|
||||
<item name="android:contentDescription">@string/exo_controls_next_description</item>
|
||||
</style>
|
||||
|
||||
<style name="ExoMediaButton.FastForward">
|
||||
<item name="android:src">@drawable/exo_controls_fastforward</item>
|
||||
<item name="android:contentDescription">@string/exo_controls_fastforward_description</item>
|
||||
</style>
|
||||
|
||||
<style name="ExoMediaButton.Rewind">
|
||||
<item name="android:src">@drawable/exo_controls_rewind</item>
|
||||
<item name="android:contentDescription">@string/exo_controls_rewind_description</item>
|
||||
</style>
|
||||
|
||||
<style name="ExoMediaButton.Play">
|
||||
<item name="android:src">@drawable/exo_controls_play</item>
|
||||
<item name="android:contentDescription">@string/exo_controls_play_description</item>
|
||||
</style>
|
||||
|
||||
<style name="ExoMediaButton.Pause">
|
||||
<item name="android:src">@drawable/exo_controls_pause</item>
|
||||
<item name="android:contentDescription">@string/exo_controls_pause_description</item>
|
||||
</style>
|
||||
|
||||
<style name="ExoMediaButton.VR">
|
||||
<item name="android:src">@drawable/exo_controls_vr</item>
|
||||
<item name="android:contentDescription">@string/exo_controls_vr_description</item>
|
||||
</style>
|
||||
</resources>
|
||||
Loading…
Reference in a new issue