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

Merge pull request #8539 from larryng:patch-1

Browse Source 
PiperOrigin-RevId: 359000734
This commit is contained in:
marcbaechinger 2021-02-23 12:30:31 +00:00
commit 95fcfdd71d
6 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/ui/src/main/res/layout/exo_styled_player_control_ffwd_button.xml
View File

@ -22,7 +22,7 @@
android:addStatesFromChildren="true" android:addStatesFromChildren="true"
style="@style/ExoStyledControls.Button.Center"> style="@style/ExoStyledControls.Button.Center">
<!-- View's don't have foreground until API 23 so we have to nest in a parent. --> <!-- View's don't have foreground until API 23 so we have to nest in a parent. -->
<Button android:id="@+id/exo_ffwd_with_amount" <Button android:id="@id/exo_ffwd_with_amount"
android:background="@drawable/exo_styled_controls_fastforward" android:background="@drawable/exo_styled_controls_fastforward"
android:layout_marginLeft="0dp" android:layout_marginLeft="0dp"
android:layout_marginRight="0dp" android:layout_marginRight="0dp"

2
library/ui/src/main/res/layout/exo_styled_player_control_rewind_button.xml
View File

@ -22,7 +22,7 @@
android:addStatesFromChildren="true" android:addStatesFromChildren="true"
style="@style/ExoStyledControls.Button.Center"> style="@style/ExoStyledControls.Button.Center">
<!-- View's don't have foreground until API 23 so we have to nest in a parent. --> <!-- View's don't have foreground until API 23 so we have to nest in a parent. -->
<Button android:id="@+id/exo_rew_with_amount" <Button android:id="@id/exo_rew_with_amount"
android:background="@drawable/exo_styled_controls_rewind" android:background="@drawable/exo_styled_controls_rewind"
android:layout_marginLeft="0dp" android:layout_marginLeft="0dp"
android:layout_marginRight="0dp" android:layout_marginRight="0dp"

47
library/ui/src/main/res/layout/exo_styled_player_control_view.xml
View File

@ -15,13 +15,13 @@
--> -->
<merge xmlns:android="http://schemas.android.com/apk/res/android"> <merge xmlns:android="http://schemas.android.com/apk/res/android">
<View android:id="@+id/exo_controls_background" <View android:id="@id/exo_controls_background"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@color/exo_black_opacity_60"/> android:background="@color/exo_black_opacity_60"/>
<FrameLayout android:id="@+id/exo_bottom_bar" <FrameLayout android:id="@id/exo_bottom_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/exo_styled_bottom_bar_height" android:layout_height="@dimen/exo_styled_bottom_bar_height"
android:layout_marginTop="@dimen/exo_styled_bottom_bar_margin_top" android:layout_marginTop="@dimen/exo_styled_bottom_bar_margin_top"
@ -29,7 +29,7 @@
android:background="@color/exo_bottom_bar_background" android:background="@color/exo_bottom_bar_background"
android:layoutDirection="ltr"> android:layoutDirection="ltr">
<LinearLayout android:id="@+id/exo_time" <LinearLayout android:id="@id/exo_time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="@dimen/exo_styled_bottom_bar_time_padding" android:paddingStart="@dimen/exo_styled_bottom_bar_time_padding"
@ -39,58 +39,58 @@
android:layout_gravity="center_vertical|start" android:layout_gravity="center_vertical|start"
android:layoutDirection="ltr"> android:layoutDirection="ltr">
<TextView android:id="@+id/exo_position" <TextView android:id="@id/exo_position"
style="@style/ExoStyledControls.TimeText.Position"/> style="@style/ExoStyledControls.TimeText.Position"/>
<TextView <TextView
style="@style/ExoStyledControls.TimeText.Separator"/> style="@style/ExoStyledControls.TimeText.Separator"/>
<TextView android:id="@+id/exo_duration" <TextView android:id="@id/exo_duration"
style="@style/ExoStyledControls.TimeText.Duration"/> style="@style/ExoStyledControls.TimeText.Duration"/>
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/exo_basic_controls" <LinearLayout android:id="@id/exo_basic_controls"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end" android:layout_gravity="center_vertical|end"
android:layoutDirection="ltr"> android:layoutDirection="ltr">
<ImageButton android:id="@+id/exo_vr" <ImageButton android:id="@id/exo_vr"
style="@style/ExoStyledControls.Button.Bottom.VR"/> style="@style/ExoStyledControls.Button.Bottom.VR"/>
<ImageButton android:id="@+id/exo_shuffle" <ImageButton android:id="@id/exo_shuffle"
style="@style/ExoStyledControls.Button.Bottom.Shuffle"/> style="@style/ExoStyledControls.Button.Bottom.Shuffle"/>
<ImageButton android:id="@+id/exo_repeat_toggle" <ImageButton android:id="@id/exo_repeat_toggle"
style="@style/ExoStyledControls.Button.Bottom.RepeatToggle"/> style="@style/ExoStyledControls.Button.Bottom.RepeatToggle"/>
<ImageButton android:id="@+id/exo_subtitle" <ImageButton android:id="@id/exo_subtitle"
style="@style/ExoStyledControls.Button.Bottom.CC"/> style="@style/ExoStyledControls.Button.Bottom.CC"/>
<ImageButton android:id="@+id/exo_settings" <ImageButton android:id="@id/exo_settings"
style="@style/ExoStyledControls.Button.Bottom.Settings"/> style="@style/ExoStyledControls.Button.Bottom.Settings"/>
<ImageButton android:id="@+id/exo_fullscreen" <ImageButton android:id="@id/exo_fullscreen"
style="@style/ExoStyledControls.Button.Bottom.FullScreen"/> style="@style/ExoStyledControls.Button.Bottom.FullScreen"/>
<ImageButton android:id="@+id/exo_overflow_show" <ImageButton android:id="@id/exo_overflow_show"
style="@style/ExoStyledControls.Button.Bottom.OverflowShow"/> style="@style/ExoStyledControls.Button.Bottom.OverflowShow"/>
</LinearLayout> </LinearLayout>
<HorizontalScrollView android:id="@+id/exo_extra_controls_scroll_view" <HorizontalScrollView android:id="@id/exo_extra_controls_scroll_view"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end" android:layout_gravity="center_vertical|end"
android:visibility="invisible"> android:visibility="invisible">
<LinearLayout android:id="@+id/exo_extra_controls" <LinearLayout android:id="@id/exo_extra_controls"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layoutDirection="ltr"> android:layoutDirection="ltr">
<ImageButton android:id="@+id/exo_overflow_hide" <ImageButton android:id="@id/exo_overflow_hide"
style="@style/ExoStyledControls.Button.Bottom.OverflowHide"/> style="@style/ExoStyledControls.Button.Bottom.OverflowHide"/>
</LinearLayout> </LinearLayout>
@ -99,13 +99,13 @@
</FrameLayout> </FrameLayout>
<View android:id="@+id/exo_progress_placeholder" <View android:id="@id/exo_progress_placeholder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/exo_styled_progress_layout_height" android:layout_height="@dimen/exo_styled_progress_layout_height"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginBottom="@dimen/exo_styled_progress_margin_bottom"/> android:layout_marginBottom="@dimen/exo_styled_progress_margin_bottom"/>
<LinearLayout android:id="@+id/exo_minimal_controls" <LinearLayout android:id="@id/exo_minimal_controls"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
@ -114,13 +114,13 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:layoutDirection="ltr"> android:layoutDirection="ltr">
<ImageButton android:id="@+id/exo_minimal_fullscreen" <ImageButton android:id="@id/exo_minimal_fullscreen"
style="@style/ExoStyledControls.Button.Bottom.FullScreen"/> style="@style/ExoStyledControls.Button.Bottom.FullScreen"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/exo_center_controls" android:id="@id/exo_center_controls"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
@ -128,18 +128,17 @@
android:gravity="center" android:gravity="center"
android:padding="@dimen/exo_styled_controls_padding"> android:padding="@dimen/exo_styled_controls_padding">
<ImageButton android:id="@id/exo_prev"
<ImageButton android:id="@+id/exo_prev"
style="@style/ExoStyledControls.Button.Center.Previous"/> style="@style/ExoStyledControls.Button.Center.Previous"/>
<include layout="@layout/exo_styled_player_control_rewind_button" /> <include layout="@layout/exo_styled_player_control_rewind_button" />
<ImageButton android:id="@+id/exo_play_pause" <ImageButton android:id="@id/exo_play_pause"
style="@style/ExoStyledControls.Button.Center.PlayPause"/> style="@style/ExoStyledControls.Button.Center.PlayPause"/>
<include layout="@layout/exo_styled_player_control_ffwd_button" /> <include layout="@layout/exo_styled_player_control_ffwd_button" />
<ImageButton android:id="@+id/exo_next" <ImageButton android:id="@id/exo_next"
style="@style/ExoStyledControls.Button.Center.Next"/> style="@style/ExoStyledControls.Button.Center.Next"/>
</LinearLayout> </LinearLayout>

1
library/ui/src/main/res/layout/exo_styled_settings_list_item.xml
View File

@ -58,4 +58,5 @@
android:textDirection="locale" android:textDirection="locale"
android:textSize="@dimen/exo_settings_sub_text_size"/> android:textSize="@dimen/exo_settings_sub_text_size"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

1
library/ui/src/main/res/layout/exo_styled_sub_settings_list_item.xml
View File

@ -43,4 +43,5 @@
android:textColor="@color/exo_white" android:textColor="@color/exo_white"
android:textDirection="locale" android:textDirection="locale"
android:textSize="@dimen/exo_settings_main_text_size"/> android:textSize="@dimen/exo_settings_main_text_size"/>
</LinearLayout> </LinearLayout>

15
library/ui/src/main/res/values/ids.xml
View File

@ -27,7 +27,9 @@
<item name="exo_pause" type="id"/> <item name="exo_pause" type="id"/>
<item name="exo_play_pause" type="id"/> <item name="exo_play_pause" type="id"/>
<item name="exo_rew" type="id"/> <item name="exo_rew" type="id"/>
<item name="exo_rew_with_amount" type="id"/>
<item name="exo_ffwd" type="id"/> <item name="exo_ffwd" type="id"/>
<item name="exo_ffwd_with_amount" type="id"/>
<item name="exo_prev" type="id"/> <item name="exo_prev" type="id"/>
<item name="exo_next" type="id"/> <item name="exo_next" type="id"/>
<item name="exo_shuffle" type="id"/> <item name="exo_shuffle" type="id"/>
@ -41,4 +43,17 @@
<item name="exo_vr" type="id"/> <item name="exo_vr" type="id"/>
<item name="exo_subtitle" type="id"/> <item name="exo_subtitle" type="id"/>
<item name="exo_fullscreen" type="id"/> <item name="exo_fullscreen" type="id"/>
<item name="exo_settings" type="id"/>
<item name="exo_controls_background" type="id"/>
<item name="exo_basic_controls" type="id"/>
<item name="exo_center_controls" type="id"/>
<item name="exo_bottom_bar" type="id"/>
<item name="exo_time" type="id"/>
<item name="exo_overflow_show" type="id"/>
<item name="exo_overflow_hide" type="id"/>
<item name="exo_extra_controls" type="id"/>
<item name="exo_extra_controls_scroll_view" type="id"/>
<item name="exo_minimal_fullscreen" type="id"/>
<item name="exo_minimal_controls" type="id"/>
</resources> </resources>