Merge pull request #3149 from androideveloper/patch-1

Fix ids in exo_player_control_view
This commit is contained in:
Olivier Bouillet 2023-07-08 12:48:53 +02:00 committed by GitHub
commit ca50dbde05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -14,27 +14,27 @@
android:paddingTop="4dp" android:paddingTop="4dp"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageButton android:id="@id/exo_prev" <ImageButton android:id="@+id/exo_prev"
style="@style/ExoMediaButton.Previous"/> style="@style/ExoMediaButton.Previous"/>
<ImageButton android:id="@id/exo_rew" <ImageButton android:id="@+id/exo_rew"
style="@style/ExoMediaButton.Rewind"/> style="@style/ExoMediaButton.Rewind"/>
<FrameLayout <FrameLayout
android:id="@+id/exo_play_pause_container" android:id="@+id/exo_play_pause_container"
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">
<ImageButton android:id="@id/exo_play" <ImageButton android:id="@+id/exo_play"
style="@style/ExoMediaButton.Play"/> style="@style/ExoMediaButton.Play"/>
<ImageButton android:id="@id/exo_pause" <ImageButton android:id="@+id/exo_pause"
style="@style/ExoMediaButton.Pause"/> style="@style/ExoMediaButton.Pause"/>
</FrameLayout> </FrameLayout>
<ImageButton android:id="@id/exo_ffwd" <ImageButton android:id="@+id/exo_ffwd"
style="@style/ExoMediaButton.FastForward"/> style="@style/ExoMediaButton.FastForward"/>
<ImageButton android:id="@id/exo_next" <ImageButton android:id="@+id/exo_next"
style="@style/ExoMediaButton.Next"/> style="@style/ExoMediaButton.Next"/>
</LinearLayout> </LinearLayout>
@ -46,7 +46,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView android:id="@id/exo_position" <TextView android:id="@+id/exo_position"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="14sp" android:textSize="14sp"
@ -57,12 +57,12 @@
android:textColor="#FFBEBEBE"/> android:textColor="#FFBEBEBE"/>
<com.google.android.exoplayer2.ui.DefaultTimeBar <com.google.android.exoplayer2.ui.DefaultTimeBar
android:id="@id/exo_progress" android:id="@+id/exo_progress"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
android:layout_height="26dp"/> android:layout_height="26dp"/>
<TextView android:id="@id/exo_duration" <TextView android:id="@+id/exo_duration"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="14sp" android:textSize="14sp"
@ -73,7 +73,7 @@
android:textColor="#FFBEBEBE"/> android:textColor="#FFBEBEBE"/>
<ImageButton <ImageButton
android:id="@id/exo_fullscreen" android:id="@+id/exo_fullscreen"
style="@style/ExoMediaButton.FullScreen" style="@style/ExoMediaButton.FullScreen"
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="30dp" android:layout_height="30dp"