From 90cd2a213152b845bc994ccc5a6728dc624c9d5b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 22 Jun 2021 09:33:38 +0100
Subject: [PATCH] Fix expansion of items within StyledPlayerView popup

Issue: #9086
PiperOrigin-RevId: 380756562
---
 RELEASENOTES.md                                                | 3 +++
 library/ui/src/main/res/layout/exo_styled_settings_list.xml    | 3 +--
 .../ui/src/main/res/layout/exo_styled_settings_list_item.xml   | 2 +-
 .../src/main/res/layout/exo_styled_sub_settings_list_item.xml  | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 2c1cfde1ea..eef9fa8337 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -40,6 +40,9 @@
         ([#9061](https://github.com/google/ExoPlayer/issues/9061)).
     *   Fix progress bar flickering immediately after the user seeks
         ([#9049](https://github.com/google/ExoPlayer/pull/9049)).
+    *   Fix `StyledPlayerView` and `StyledPlayerControlView` popup menu items
+        not expanding to occupy the full width of the popup
+        ([#9086](https://github.com/google/ExoPlayer/issues/9086)).
 
 ### 2.14.1 (2021-06-11)
 
diff --git a/library/ui/src/main/res/layout/exo_styled_settings_list.xml b/library/ui/src/main/res/layout/exo_styled_settings_list.xml
index 3dea7a4c9c..70b44c8d76 100644
--- a/library/ui/src/main/res/layout/exo_styled_settings_list.xml
+++ b/library/ui/src/main/res/layout/exo_styled_settings_list.xml
@@ -16,8 +16,7 @@
 <androidx.recyclerview.widget.RecyclerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/exo_settings_listview"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_gravity="center_vertical"
     android:background="@color/exo_black_opacity_70"
     android:scrollbars="vertical"/>
diff --git a/library/ui/src/main/res/layout/exo_styled_settings_list_item.xml b/library/ui/src/main/res/layout/exo_styled_settings_list_item.xml
index 25204ffc7d..c93fc01985 100644
--- a/library/ui/src/main/res/layout/exo_styled_settings_list_item.xml
+++ b/library/ui/src/main/res/layout/exo_styled_settings_list_item.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minWidth="@dimen/exo_setting_width"
     android:minHeight="@dimen/exo_settings_height"
diff --git a/library/ui/src/main/res/layout/exo_styled_sub_settings_list_item.xml b/library/ui/src/main/res/layout/exo_styled_sub_settings_list_item.xml
index 72b7f1570d..aa936c4084 100644
--- a/library/ui/src/main/res/layout/exo_styled_sub_settings_list_item.xml
+++ b/library/ui/src/main/res/layout/exo_styled_sub_settings_list_item.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minWidth="@dimen/exo_setting_width"
     android:minHeight="@dimen/exo_settings_height"