Sync to match Live Channels 1.15(ncis)oreo-mr1-dev

aka ub-tv-dev at a73a150bb7d0d1ce867ef980c6ac8411899d40ad

Bug: 64021596
Change-Id: I7c544fd15e2c58784f8babc31877ad0dfeebb4c0
(cherry picked from commit 633eb826b8c97731dfc5ef12c7bf78a63734275d)

1 files changed, 92 insertions, 126 deletions

diff --git a/res/layout/play_controls_contents.xml b/res/layout/play_controls_contents.xml
index ac61a2d4..9afc5f3d 100644
--- a/res/layout/play_controls_contents.xml
+++ b/res/layout/play_controls_contents.xml
@@ -16,6 +16,7 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tv="http://schemas.android.com/apk/res-auto"
     android:id="@+id/play_controls"
     style="@style/menu_row_contents_view"
     android:layoutDirection="ltr">
@@ -28,153 +29,118 @@
         android:layout_alignStart="@+id/body"
         android:layout_marginBottom="@dimen/play_controls_time_bottom_margin"
         android:gravity="center"
-        android:singleLine="true"
+        android:maxLines="1"
         android:textColor="@color/play_controls_time_text_color"
         android:textSize="@dimen/play_controls_time_text_size"
         android:fontFamily="@string/font" />
 
-    <LinearLayout
+    <RelativeLayout
         android:id="@id/body"
-        android:orientation="vertical"
         android:layout_width="@dimen/play_controls_width"
         android:layout_height="wrap_content"
         android:layout_below="@id/time_text"
         android:layout_centerHorizontal="true"
         android:background="@drawable/play_controls_body_shape">
 
-        <RelativeLayout
+        <com.android.tv.menu.PlaybackProgressBar
+            android:id="@+id/progress"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/play_controls_progress_height">
-
-            <ImageView
-                android:id="@+id/timeline_bg_start"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentStart="true"
-                android:src="@color/play_controls_progress_bar_background" />
-            <ImageView
-                android:id="@+id/watched"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_toEndOf="@id/timeline_bg_start"
-                android:src="@color/play_controls_progress_bar_watched" />
-            <ImageView
-                android:id="@+id/buffered"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_toEndOf="@id/watched"
-                android:src="@color/play_controls_progress_bar_buffered" />
-            <ImageView
-                android:id="@+id/timeline_bg_end"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentEnd="true"
-                android:layout_toEndOf="@id/buffered"
-                android:src="@color/play_controls_progress_bar_background" />
-
-        </RelativeLayout>
-
-        <FrameLayout
+            android:layout_height="@dimen/play_controls_progress_height"
+            android:layout_alignParentTop="true"
+            tv:progressDrawable="@drawable/playback_progress_bar" />
+        <TextView
             android:id="@+id/background"
             android:layout_width="match_parent"
+            android:layout_height="@dimen/play_controls_button_height"
+            android:layout_below="@id/progress"
+            android:background="@drawable/play_controls_body_background"
+            android:gravity="center"
+            android:maxLines="1"
+            android:textColor="@color/play_controls_unavailable_message_text_color"
+            android:textSize="@dimen/play_controls_unavailable_message_text_size"
+            android:fontFamily="@string/font" />
+        <TextView
+            android:id="@+id/program_start_time"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/play_controls_body_background">
-
-            <TextView
-                android:id="@+id/program_start_time"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/play_controls_program_time_margin_start"
-                android:layout_marginTop="@dimen/play_controls_program_time_margin_top"
-                android:singleLine="true"
-                android:textColor="@color/play_controls_rec_time_text_color"
-                android:textSize="@dimen/play_controls_rec_time_text_size"
-                android:fontFamily="@string/font" />
-            <TextView
-                android:id="@+id/program_end_time"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/play_controls_program_time_margin_end"
-                android:layout_marginTop="@dimen/play_controls_program_time_margin_top"
-                android:layout_gravity="end"
-                android:singleLine="true"
-                android:textColor="@color/play_controls_rec_time_text_color"
-                android:textSize="@dimen/play_controls_rec_time_text_size"
-                android:fontFamily="@string/font" />
-
-            <RelativeLayout
-                android:id="@+id/play_control_bar"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/play_controls_button_height">
-
-                <com.android.tv.menu.PlayControlsButton
-                    android:id="@+id/play_pause"
-                    android:layout_width="@dimen/play_controls_button_width"
-                    android:layout_height="match_parent"
-                    android:layout_marginLeft="@dimen/play_controls_button_normal_margin"
-                    android:layout_marginRight="@dimen/play_controls_button_normal_margin"
-                    android:layout_centerHorizontal="true" />
-                <com.android.tv.menu.PlayControlsButton
-                    android:id="@+id/rewind"
-                    android:layout_width="@dimen/play_controls_button_width"
-                    android:layout_height="match_parent"
-                    android:layout_marginLeft="@dimen/play_controls_button_normal_margin"
-                    android:layout_marginRight="@dimen/play_controls_button_normal_margin"
-                    android:layout_toLeftOf="@id/play_pause" />
-                <com.android.tv.menu.PlayControlsButton
-                    android:id="@+id/jump_previous"
-                    android:layout_width="@dimen/play_controls_button_width"
-                    android:layout_height="match_parent"
-                    android:layout_marginLeft="@dimen/play_controls_button_normal_margin"
-                    android:layout_marginRight="@dimen/play_controls_button_normal_margin"
-                    android:layout_toLeftOf="@id/rewind" />
-                <com.android.tv.menu.PlayControlsButton
-                    android:id="@+id/fast_forward"
-                    android:layout_width="@dimen/play_controls_button_width"
-                    android:layout_height="match_parent"
-                    android:layout_marginLeft="@dimen/play_controls_button_normal_margin"
-                    android:layout_marginRight="@dimen/play_controls_button_normal_margin"
-                    android:layout_toRightOf="@id/play_pause" />
-                <com.android.tv.menu.PlayControlsButton
-                    android:id="@+id/jump_next"
-                    android:layout_width="@dimen/play_controls_button_width"
-                    android:layout_height="match_parent"
-                    android:layout_marginLeft="@dimen/play_controls_button_normal_margin"
-                    android:layout_marginRight="@dimen/play_controls_button_normal_margin"
-                    android:layout_toRightOf="@id/fast_forward" />
-                <com.android.tv.menu.PlayControlsButton
-                    android:id="@+id/record"
-                    android:layout_width="@dimen/play_controls_button_width"
-                    android:layout_height="match_parent"
-                    android:layout_marginLeft="@dimen/play_controls_button_normal_margin"
-                    android:layout_marginRight="@dimen/play_controls_button_normal_margin"
-                    android:layout_toRightOf="@id/jump_next"
-                    android:visibility="gone" />
-
-            </RelativeLayout>
+            android:layout_alignParentStart="true"
+            android:layout_below="@id/progress"
+            android:layout_marginStart="@dimen/play_controls_program_time_margin_start"
+            android:layout_marginTop="@dimen/play_controls_program_time_margin_top"
+            android:maxLines="1"
+            android:textColor="@color/play_controls_rec_time_text_color"
+            android:textSize="@dimen/play_controls_rec_time_text_size"
+            android:fontFamily="@string/font" />
+        <TextView
+            android:id="@+id/program_end_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_below="@id/progress"
+            android:layout_marginEnd="@dimen/play_controls_program_time_margin_end"
+            android:layout_marginTop="@dimen/play_controls_program_time_margin_top"
+            android:maxLines="1"
+            android:textColor="@color/play_controls_rec_time_text_color"
+            android:textSize="@dimen/play_controls_rec_time_text_size"
+            android:fontFamily="@string/font" />
 
-            <TextView
-                android:id="@+id/unavailable_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:singleLine="true"
-                android:textColor="@color/play_controls_unavailable_message_text_color"
-                android:textSize="@dimen/play_controls_unavailable_message_text_size"
-                android:fontFamily="@string/font"
-                android:visibility="gone"
-                android:text="@string/play_controls_unavailable" />
-        </FrameLayout>
-    </LinearLayout>
+        <com.android.tv.menu.PlayControlsButton
+            android:id="@+id/play_pause"
+            android:layout_width="@dimen/play_controls_button_width"
+            android:layout_height="@dimen/play_controls_button_height"
+            android:layout_below="@id/progress"
+            android:layout_marginLeft="@dimen/play_controls_button_compact_margin"
+            android:layout_marginRight="@dimen/play_controls_button_compact_margin"
+            android:layout_centerHorizontal="true" />
+        <com.android.tv.menu.PlayControlsButton
+            android:id="@+id/rewind"
+            android:layout_width="@dimen/play_controls_button_width"
+            android:layout_height="@dimen/play_controls_button_height"
+            android:layout_below="@id/progress"
+            android:layout_marginLeft="@dimen/play_controls_button_compact_margin"
+            android:layout_marginRight="@dimen/play_controls_button_compact_margin"
+            android:layout_toStartOf="@id/play_pause" />
+        <com.android.tv.menu.PlayControlsButton
+            android:id="@+id/jump_previous"
+            android:layout_width="@dimen/play_controls_button_width"
+            android:layout_height="@dimen/play_controls_button_height"
+            android:layout_below="@id/progress"
+            android:layout_marginLeft="@dimen/play_controls_button_compact_margin"
+            android:layout_marginRight="@dimen/play_controls_button_compact_margin"
+            android:layout_toStartOf="@id/rewind" />
+        <com.android.tv.menu.PlayControlsButton
+            android:id="@+id/fast_forward"
+            android:layout_width="@dimen/play_controls_button_width"
+            android:layout_height="@dimen/play_controls_button_height"
+            android:layout_below="@id/progress"
+            android:layout_marginLeft="@dimen/play_controls_button_compact_margin"
+            android:layout_marginRight="@dimen/play_controls_button_compact_margin"
+            android:layout_toEndOf="@id/play_pause" />
+        <com.android.tv.menu.PlayControlsButton
+            android:id="@+id/jump_next"
+            android:layout_width="@dimen/play_controls_button_width"
+            android:layout_height="@dimen/play_controls_button_height"
+            android:layout_below="@id/progress"
+            android:layout_marginLeft="@dimen/play_controls_button_compact_margin"
+            android:layout_marginRight="@dimen/play_controls_button_compact_margin"
+            android:layout_toEndOf="@id/fast_forward" />
+        <com.android.tv.menu.PlayControlsButton
+            android:id="@+id/record"
+            android:layout_width="@dimen/play_controls_button_width"
+            android:layout_height="@dimen/play_controls_button_height"
+            android:layout_below="@id/progress"
+            android:layout_marginLeft="@dimen/play_controls_button_compact_margin"
+            android:layout_marginRight="@dimen/play_controls_button_compact_margin"
+            android:layout_toEndOf="@id/jump_next" />
+    </RelativeLayout>
 
-    <ImageView
+    <View
         android:id="@+id/time_indicator"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/play_controls_time_indicator_width"
+        android:layout_height="@dimen/play_controls_time_indicator_height"
         android:layout_marginTop="@dimen/play_controls_time_indicator_top_margin"
         android:layout_alignTop="@id/body"
         android:layout_alignStart="@id/body"
         android:background="@drawable/play_controls_time_indicator"
-        android:visibility="invisible"
         android:elevation="1dp" />
 </RelativeLayout>