From fb1c9dee04b8670e29d61c4eeb034d9503e44ddf Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Tue, 18 Oct 2022 10:55:13 +0000
Subject: [PATCH] Remove more references to overriding layouts from
 Player(Control)View

In exoplayer2 this affects StyledPlayer(Control)View

#minor-release

PiperOrigin-RevId: 481878940
(cherry picked from commit a5583c04bb6c199633e2b1edf036060c0d33b616)
---
 .../ui/StyledPlayerControlView.java           | 23 +++++++------------
 .../exoplayer2/ui/StyledPlayerView.java       |  9 ++++----
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java
index 4ef733d039..cd9819bdb5 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java
@@ -84,12 +84,13 @@ import java.util.concurrent.CopyOnWriteArrayList;
 /**
  * A view for controlling {@link Player} instances.
  *
- * <p>A StyledPlayerControlView can be customized by setting attributes (or calling corresponding
- * methods), or overriding drawables.
+ * <p>A {@code StyledPlayerControlView} can be customized by setting attributes (or calling
+ * corresponding methods), or overriding drawables.
  *
  * <h2>Attributes</h2>
  *
- * The following attributes can be set on a StyledPlayerControlView when used in a layout XML file:
+ * The following attributes can be set on a {@code StyledPlayerControlView} when used in a layout
+ * XML file:
  *
  * <ul>
  *   <li><b>{@code show_timeout}</b> - The time between the last user interaction and the controls
@@ -148,22 +149,14 @@ import java.util.concurrent.CopyOnWriteArrayList;
  *         <li>Corresponding method: {@link #setTimeBarMinUpdateInterval(int)}
  *         <li>Default: {@link #DEFAULT_TIME_BAR_MIN_UPDATE_INTERVAL_MS}
  *       </ul>
- *   <li><b>{@code controller_layout_id}</b> - Specifies the id of the layout to be inflated. See
- *       below for more details.
- *       <ul>
- *         <li>Corresponding method: None
- *         <li>Default: {@code R.layout.exo_styled_player_control_view}
- *       </ul>
- *   <li>All attributes that can be set on {@link DefaultTimeBar} can also be set on a
- *       StyledPlayerControlView, and will be propagated to the inflated {@link DefaultTimeBar}
- *       unless the layout is overridden to specify a custom {@code exo_progress} (see below).
+ *   <li>All attributes that can be set on {@link DefaultTimeBar} can also be set on a {@code
+ *       StyledPlayerControlView}, and will be propagated to the inflated {@link DefaultTimeBar}.
  * </ul>
  *
  * <h2>Overriding drawables</h2>
  *
- * The drawables used by StyledPlayerControlView (with its default layout file) can be overridden by
- * drawables with the same names defined in your application. The drawables that can be overridden
- * are:
+ * The drawables used by {@code StyledPlayerControlView} can be overridden by drawables with the
+ * same names defined in your application. The drawables that can be overridden are:
  *
  * <ul>
  *   <li><b>{@code exo_styled_controls_play}</b> - The play icon.
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java
index 9805d7fd6c..da17c4c1c7 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java
@@ -156,15 +156,14 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
  *       </ul>
  *   <li>All attributes that can be set on {@link StyledPlayerControlView} and {@link
  *       DefaultTimeBar} can also be set on a StyledPlayerView, and will be propagated to the
- *       inflated {@link StyledPlayerControlView} unless the layout is overridden to specify a
- *       custom {@code exo_controller}.
+ *       inflated {@link StyledPlayerControlView}.
  * </ul>
  *
  * <h2>Overriding drawables</h2>
  *
- * The drawables used by {@link StyledPlayerControlView} (with its default layout file) can be
- * overridden by drawables with the same names defined in your application. See the {@link
- * StyledPlayerControlView} documentation for a list of drawables that can be overridden.
+ * The drawables used by {@link StyledPlayerControlView} can be overridden by drawables with the
+ * same names defined in your application. See the {@link StyledPlayerControlView} documentation for
+ * a list of drawables that can be overridden.
  */
 public class StyledPlayerView extends FrameLayout implements AdViewProvider {