diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
index dfd137e723..56abe9fa40 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
@@ -304,9 +304,8 @@ public final class TrackSelectionDialog extends DialogFragment {
         @Nullable Bundle savedInstanceState) {
       View rootView =
           inflater.inflate(
-              R.layout.track_selection_dialog_tab, container, /* attachToRoot= */ false);
-      TrackSelectionView trackSelectionView =
-          rootView.findViewById(R.id.download_dialog_track_selection_view);
+              R.layout.exo_track_selection_dialog, container, /* attachToRoot= */ false);
+      TrackSelectionView trackSelectionView = rootView.findViewById(R.id.exo_track_selection_view);
       trackSelectionView.setShowDisableOption(true);
       trackSelectionView.setAllowMultipleOverrides(allowMultipleOverrides);
       trackSelectionView.setAllowAdaptiveSelections(allowAdaptiveSelections);
diff --git a/demos/main/src/main/res/layout/track_selection_dialog.xml b/demos/main/src/main/res/layout/track_selection_dialog.xml
index 922d6ee825..7f6c45e131 100644
--- a/demos/main/src/main/res/layout/track_selection_dialog.xml
+++ b/demos/main/src/main/res/layout/track_selection_dialog.xml
@@ -14,35 +14,46 @@
      limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
+
   <androidx.viewpager.widget.ViewPager
       android:id="@+id/track_selection_dialog_view_pager"
       android:layout_width="match_parent"
       android:layout_height="0dp"
       android:layout_weight="1">
+
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/track_selection_dialog_tab_layout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        app:tabGravity="fill"
+        app:tabMode="fixed"/>
+
   </androidx.viewpager.widget.ViewPager>
+
   <LinearLayout
       android:orientation="horizontal"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:gravity="end">
+
     <Button
         android:id="@+id/track_selection_dialog_cancel_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@android:string/cancel"
         style="?android:attr/borderlessButtonStyle"/>
+
     <Button
         android:id="@+id/track_selection_dialog_ok_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@android:string/ok"
         style="?android:attr/borderlessButtonStyle"/>
+
   </LinearLayout>
+
 </LinearLayout>
diff --git a/demos/main/src/main/res/layout/track_selection_dialog_tab.xml b/demos/main/src/main/res/layout/track_selection_dialog_tab.xml
deleted file mode 100644
index 33e69e5bee..0000000000
--- a/demos/main/src/main/res/layout/track_selection_dialog_tab.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 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.
--->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-  <com.google.android.exoplayer2.ui.TrackSelectionView
-      android:id="@+id/download_dialog_track_selection_view"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"/>
-
-</ScrollView>