Remove outdated qualifiers on resources folders

libraries/ui/src/main/res/drawable-anydpi/exo_icon_circular_play.xml

@@ -0,0 +1,25 @@
+<?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="960"
+        android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/black"
+        android:pathData="M380,660L660,480L380,300L380,660ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>

libraries/session/src/main/res/values-v24/styles.xml → libraries/ui/src/main/res/drawable-anydpi/exo_icon_stop.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2024 The Android Open Source Project
+<!-- Copyright 2025 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.
@@ -13,13 +13,15 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<resources>
-  <!-- Use platform styles, Media is dark again -->
-  <style name="TextAppearance.Compat.Notification.Media" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
 
-  <style name="TextAppearance.Compat.Notification.Title.Media" />
-
-  <style name="TextAppearance.Compat.Notification.Info.Media" />
-
-  <style name="TextAppearance.Compat.Notification.Time.Media" />
-</resources>
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M6 6h12v12H6z" />
+</vector>

libraries/ui/src/main/res/layout/exo_player_control_ffwd_button.xml

@@ -15,22 +15,10 @@
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-  <FrameLayout
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_margin="0dp"
-      android:addStatesFromChildren="true"
-      style="@style/ExoStyledControls.Button.Center">
-    <!-- View's don't have foreground until API 23 so we have to nest in a parent. -->
-    <!-- Override of singleLine needed to avoid layout bugs with Material Design.
-         See https://github.com/androidx/media/issues/511.
-    -->
-    <Button android:id="@id/exo_ffwd_with_amount"
-        android:background="@drawable/exo_styled_controls_fastforward"
-        android:layout_marginLeft="0dp"
-        android:layout_marginRight="0dp"
-        android:singleLine="false"
-        style="@style/ExoStyledControls.Button.Center.FfwdWithAmount"/>
-
-  </FrameLayout>
+  <!-- Override of singleLine needed to avoid layout bugs with Material Design.
+       See https://github.com/androidx/media/issues/511.
+  -->
+  <Button android:id="@+id/exo_ffwd_with_amount"
+    android:singleLine="false"
+    style="@style/ExoStyledControls.Button.Center.FfwdWithAmount"/>
 </merge>

libraries/ui/src/main/res/layout/exo_player_control_rewind_button.xml

@@ -15,22 +15,10 @@
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-  <FrameLayout
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_margin="0dp"
-      android:addStatesFromChildren="true"
-      style="@style/ExoStyledControls.Button.Center">
-    <!-- View's don't have foreground until API 23 so we have to nest in a parent. -->
-    <!-- Override of singleLine needed to avoid layout bugs with Material Design.
+  <!-- Override of singleLine needed to avoid layout bugs with Material Design.
        See https://github.com/androidx/media/issues/511.
-    -->
-    <Button android:id="@id/exo_rew_with_amount"
-        android:background="@drawable/exo_styled_controls_rewind"
-        android:layout_marginLeft="0dp"
-        android:layout_marginRight="0dp"
-        android:singleLine="false"
-        style="@style/ExoStyledControls.Button.Center.RewWithAmount"/>
-
-  </FrameLayout>
+  -->
+  <Button android:id="@+id/exo_rew_with_amount"
+    android:singleLine="false"
+    style="@style/ExoStyledControls.Button.Center.RewWithAmount"/>
 </merge>

libraries/ui/src/main/res/values/dimens.xml

@@ -44,7 +44,7 @@
     <dimen name="exo_styled_bottom_bar_height">60dp</dimen>
     <dimen name="exo_styled_bottom_bar_time_padding">10dp</dimen>
     <dimen name="exo_styled_bottom_bar_margin_top">10dp</dimen>
-    <dimen name="exo_styled_controls_padding">0dp</dimen>
+    <dimen name="exo_styled_controls_padding">24dp</dimen>
     <dimen name="exo_styled_minimal_controls_margin_bottom">4dp</dimen>
 
     <dimen name="exo_error_message_height">32dp</dimen>

libraries/ui/src/main/res/values/styles.xml

@@ -27,6 +27,7 @@
   <style name="ExoStyledControls.Button.Center">
     <item name="android:layout_width">@dimen/exo_icon_size</item>
     <item name="android:layout_height">@dimen/exo_icon_size</item>
+    <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
   </style>
 
   <style name="ExoStyledControls.Button.Center.Previous">