From 4580b52454c8403dbb047c560c8aff65e6498efb Mon Sep 17 00:00:00 2001
From: insun <insun@google.com>
Date: Tue, 28 Apr 2020 17:50:19 +0100
Subject: [PATCH] Clean up old xml files which are not referenced anymore.

PiperOrigin-RevId: 308841370
---
 RELEASENOTES.md                               |  2 +
 .../res/layout/exo_playback_control_view.xml  | 96 -------------------
 .../res/layout/exo_player_control_view.xml    | 86 ++++++++++++++++-
 .../src/main/res/layout/exo_player_view.xml   | 55 ++++++++++-
 .../res/layout/exo_simple_player_view.xml     | 67 -------------
 5 files changed, 136 insertions(+), 170 deletions(-)
 delete mode 100644 library/ui/src/main/res/layout/exo_playback_control_view.xml
 delete mode 100644 library/ui/src/main/res/layout/exo_simple_player_view.xml

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 7bd66cb86d..62e18b1301 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -147,6 +147,8 @@
     *   Upgrade Truth dependency from 0.44 to 1.0.
     *   Upgrade to JUnit 4.13-rc-2.
 *   UI
+    *   Remove deperecated `exo_simpe_player_view.xml` and
+        `exo_playback_control_view.xml` from resource.
     *   Add `showScrubber` and `hideScrubber` methods to DefaultTimeBar.
     *   Move logic of prev, next, fast forward and rewind to ControlDispatcher
         ([#6926](https://github.com/google/ExoPlayer/issues/6926)).
diff --git a/library/ui/src/main/res/layout/exo_playback_control_view.xml b/library/ui/src/main/res/layout/exo_playback_control_view.xml
deleted file mode 100644
index acfddf1146..0000000000
--- a/library/ui/src/main/res/layout/exo_playback_control_view.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:layout_gravity="bottom"
-  android:layoutDirection="ltr"
-  android:background="#CC000000"
-  android:orientation="vertical"
-  tools:targetApi="28">
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:paddingTop="4dp"
-    android:orientation="horizontal">
-
-    <ImageButton android:id="@id/exo_prev"
-      style="@style/ExoMediaButton.Previous"/>
-
-    <ImageButton android:id="@id/exo_rew"
-      style="@style/ExoMediaButton.Rewind"/>
-
-    <ImageButton android:id="@id/exo_shuffle"
-      style="@style/ExoMediaButton"/>
-
-    <ImageButton android:id="@id/exo_repeat_toggle"
-      style="@style/ExoMediaButton"/>
-
-    <ImageButton android:id="@id/exo_play"
-      style="@style/ExoMediaButton.Play"/>
-
-    <ImageButton android:id="@id/exo_pause"
-      style="@style/ExoMediaButton.Pause"/>
-
-    <ImageButton android:id="@id/exo_ffwd"
-      style="@style/ExoMediaButton.FastForward"/>
-
-    <ImageButton android:id="@id/exo_next"
-      style="@style/ExoMediaButton.Next"/>
-
-    <ImageButton android:id="@id/exo_vr"
-      style="@style/ExoMediaButton.VR"/>
-
-  </LinearLayout>
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="4dp"
-    android:gravity="center_vertical"
-    android:orientation="horizontal">
-
-    <TextView android:id="@id/exo_position"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:textSize="14sp"
-      android:textStyle="bold"
-      android:paddingLeft="4dp"
-      android:paddingRight="4dp"
-      android:includeFontPadding="false"
-      android:textColor="#FFBEBEBE"/>
-
-    <View android:id="@id/exo_progress_placeholder"
-      android:layout_width="0dp"
-      android:layout_weight="1"
-      android:layout_height="26dp"/>
-
-    <TextView android:id="@id/exo_duration"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:textSize="14sp"
-      android:textStyle="bold"
-      android:paddingLeft="4dp"
-      android:paddingRight="4dp"
-      android:includeFontPadding="false"
-      android:textColor="#FFBEBEBE"/>
-
-  </LinearLayout>
-
-</LinearLayout>
diff --git a/library/ui/src/main/res/layout/exo_player_control_view.xml b/library/ui/src/main/res/layout/exo_player_control_view.xml
index fd221e5d84..acfddf1146 100644
--- a/library/ui/src/main/res/layout/exo_player_control_view.xml
+++ b/library/ui/src/main/res/layout/exo_player_control_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
+<!-- Copyright (C) 2016 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,6 +13,84 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<merge>
-  <include layout="@layout/exo_playback_control_view"/>
-</merge>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:layout_gravity="bottom"
+  android:layoutDirection="ltr"
+  android:background="#CC000000"
+  android:orientation="vertical"
+  tools:targetApi="28">
+
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:paddingTop="4dp"
+    android:orientation="horizontal">
+
+    <ImageButton android:id="@id/exo_prev"
+      style="@style/ExoMediaButton.Previous"/>
+
+    <ImageButton android:id="@id/exo_rew"
+      style="@style/ExoMediaButton.Rewind"/>
+
+    <ImageButton android:id="@id/exo_shuffle"
+      style="@style/ExoMediaButton"/>
+
+    <ImageButton android:id="@id/exo_repeat_toggle"
+      style="@style/ExoMediaButton"/>
+
+    <ImageButton android:id="@id/exo_play"
+      style="@style/ExoMediaButton.Play"/>
+
+    <ImageButton android:id="@id/exo_pause"
+      style="@style/ExoMediaButton.Pause"/>
+
+    <ImageButton android:id="@id/exo_ffwd"
+      style="@style/ExoMediaButton.FastForward"/>
+
+    <ImageButton android:id="@id/exo_next"
+      style="@style/ExoMediaButton.Next"/>
+
+    <ImageButton android:id="@id/exo_vr"
+      style="@style/ExoMediaButton.VR"/>
+
+  </LinearLayout>
+
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="4dp"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+
+    <TextView android:id="@id/exo_position"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:textSize="14sp"
+      android:textStyle="bold"
+      android:paddingLeft="4dp"
+      android:paddingRight="4dp"
+      android:includeFontPadding="false"
+      android:textColor="#FFBEBEBE"/>
+
+    <View android:id="@id/exo_progress_placeholder"
+      android:layout_width="0dp"
+      android:layout_weight="1"
+      android:layout_height="26dp"/>
+
+    <TextView android:id="@id/exo_duration"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:textSize="14sp"
+      android:textStyle="bold"
+      android:paddingLeft="4dp"
+      android:paddingRight="4dp"
+      android:includeFontPadding="false"
+      android:textColor="#FFBEBEBE"/>
+
+  </LinearLayout>
+
+</LinearLayout>
diff --git a/library/ui/src/main/res/layout/exo_player_view.xml b/library/ui/src/main/res/layout/exo_player_view.xml
index dc6dda1667..65dea9271e 100644
--- a/library/ui/src/main/res/layout/exo_player_view.xml
+++ b/library/ui/src/main/res/layout/exo_player_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
+<!-- Copyright (C) 2016 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,6 +13,55 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<merge>
-  <include layout="@layout/exo_simple_player_view"/>
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <com.google.android.exoplayer2.ui.AspectRatioFrameLayout android:id="@id/exo_content_frame"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_gravity="center">
+
+    <!-- Video surface will be inserted as the first child of the content frame. -->
+
+    <View android:id="@id/exo_shutter"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/black"/>
+
+    <ImageView android:id="@id/exo_artwork"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitXY"/>
+
+    <com.google.android.exoplayer2.ui.SubtitleView android:id="@id/exo_subtitles"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <ProgressBar android:id="@id/exo_buffering"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        android:layout_gravity="center"/>
+
+    <TextView android:id="@id/exo_error_message"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:background="@color/exo_error_message_background_color"
+        android:padding="16dp"/>
+
+  </com.google.android.exoplayer2.ui.AspectRatioFrameLayout>
+
+  <FrameLayout android:id="@id/exo_ad_overlay"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"/>
+
+  <FrameLayout android:id="@id/exo_overlay"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"/>
+
+  <View android:id="@id/exo_controller_placeholder"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"/>
+
 </merge>
diff --git a/library/ui/src/main/res/layout/exo_simple_player_view.xml b/library/ui/src/main/res/layout/exo_simple_player_view.xml
deleted file mode 100644
index 65dea9271e..0000000000
--- a/library/ui/src/main/res/layout/exo_simple_player_view.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <com.google.android.exoplayer2.ui.AspectRatioFrameLayout android:id="@id/exo_content_frame"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:layout_gravity="center">
-
-    <!-- Video surface will be inserted as the first child of the content frame. -->
-
-    <View android:id="@id/exo_shutter"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@android:color/black"/>
-
-    <ImageView android:id="@id/exo_artwork"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="fitXY"/>
-
-    <com.google.android.exoplayer2.ui.SubtitleView android:id="@id/exo_subtitles"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-    <ProgressBar android:id="@id/exo_buffering"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:indeterminate="true"
-        android:layout_gravity="center"/>
-
-    <TextView android:id="@id/exo_error_message"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:background="@color/exo_error_message_background_color"
-        android:padding="16dp"/>
-
-  </com.google.android.exoplayer2.ui.AspectRatioFrameLayout>
-
-  <FrameLayout android:id="@id/exo_ad_overlay"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"/>
-
-  <FrameLayout android:id="@id/exo_overlay"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"/>
-
-  <View android:id="@id/exo_controller_placeholder"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"/>
-
-</merge>