Fix broken build

This reverts

c9889d1 Update aosp build to use a snapshot of exoplyer. by nchalko · 5
hours ago master
8952aa7 Clean format by nchalko · 20 hours ago
ba3fb16 Merge "Use a snapshot of exoplayer" by TreeHugger Robot · 18
hours ago
ff75e39 Project import generated by Copybara. by Live Channels Team · 22
hours ago
9737fc2 Use a snapshot of exoplayer by Nick Chalko · 20 hours ago
4a5144a Project import generated by Copybara. by Live Channels Team · 6
days ago

Bug: 72092981
Bug: 69474774
Change-Id: Ie756857c10bf052c60b6442c3d61252f65b49143

3 files changed, 206 insertions, 0 deletions

diff --git a/usbtuner-res/layout/ut_channel_list.xml b/usbtuner-res/layout/ut_channel_list.xml
new file mode 100644
index 00000000..430234f8
--- /dev/null
+++ b/usbtuner-res/layout/ut_channel_list.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2015 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"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal" >
+
+    <TextView
+        android:id="@+id/channel_num"
+        android:layout_width="@dimen/ut_scan_channel_num_width"
+        android:layout_height="wrap_content" />
+    <TextView
+        android:id="@+id/channel_name"
+        android:layout_width="@dimen/ut_scan_channel_name_width"
+        android:layout_height="wrap_content" />
+</LinearLayout>
\ No newline at end of file
diff --git a/usbtuner-res/layout/ut_channel_scan.xml b/usbtuner-res/layout/ut_channel_scan.xml
new file mode 100644
index 00000000..415ac929
--- /dev/null
+++ b/usbtuner-res/layout/ut_channel_scan.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2015 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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:animateLayoutChanges="true"
+    android:keepScreenOn="true" >
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal"
+        android:animateLayoutChanges="true" >
+        <RelativeLayout
+            android:id="@+id/progress_holder"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:animateLayoutChanges="true" >
+            <ImageView
+                android:id="@+id/tune_icon"
+                android:layout_width="@dimen/ut_scan_icon_width"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:src="@drawable/usb_antenna" />
+            <TextView
+                android:id="@+id/tune_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@id/tune_icon"
+                android:layout_alignParentTop="true"
+                android:layout_marginTop="@dimen/ut_scan_title_margin_top"
+                android:layout_marginLeft="@dimen/ut_scan_icon_margin_right"
+                android:ellipsize="end"
+                android:fontFamily="sans-serif-light"
+                android:maxLines="@integer/ut_scan_title_max_lines"
+                android:textColor="@color/ut_scan_title_text"
+                android:textSize="@dimen/ut_scan_title_text_size"
+                android:text="@string/bt_channel_scan" />
+            <ProgressBar
+                android:id="@+id/tune_progress"
+                style="@android:style/Widget.ProgressBar.Horizontal"
+                android:layout_width="@dimen/ut_scan_progress_width"
+                android:layout_height="@dimen/ut_scan_progress_height"
+                android:layout_marginTop="@dimen/ut_scan_progress_margin_top"
+                android:layout_marginLeft="@dimen/ut_scan_icon_margin_right"
+                android:layout_below="@id/tune_title"
+                android:layout_toRightOf="@id/tune_icon"
+                android:progressDrawable="@drawable/ut_scan_progress" />
+            <TextView
+                android:id="@+id/tune_description"
+                android:accessibilityLiveRegion="polite"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/ut_scan_description_margin_top"
+                android:layout_marginLeft="@dimen/ut_scan_icon_margin_right"
+                android:layout_below="@id/tune_progress"
+                android:layout_toRightOf="@id/tune_icon"
+                android:fontFamily="sans-serif"
+                android:textColor="@color/ut_scan_description_text"
+                android:textSize="@dimen/ut_scan_description_text_size"
+                android:text="@string/ut_channel_scan_time" />
+            <Button
+                android:id="@+id/tune_cancel"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/ut_scan_button_height"
+                android:layout_marginTop="@dimen/ut_scan_button_margin_top"
+                android:layout_marginLeft="@dimen/ut_scan_icon_margin_right"
+                android:layout_below="@id/tune_description"
+                android:layout_toRightOf="@id/tune_icon"
+                android:paddingLeft="@dimen/ut_scan_button_padding"
+                android:paddingRight="@dimen/ut_scan_button_padding"
+                android:textAllCaps="false"
+                android:focusable="true"
+                android:fontFamily="sans-serif-condensed"
+                android:textColor="@color/ut_scan_button_text"
+                android:textSize="@dimen/ut_scan_button_text_size"
+                android:text="@string/ut_stop_channel_scan"
+                style="?android:attr/borderlessButtonStyle" />
+        </RelativeLayout>
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/channel_holder"
+        android:layout_width="@dimen/ut_scan_channellist_width"
+        android:layout_height="match_parent"
+        android:focusable="false"
+        android:descendantFocusability="blocksDescendants"
+        android:animateLayoutChanges="true"
+        android:visibility="gone">
+        <ListView
+            android:id="@+id/channel_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/ut_scan_channellist_padding_top"
+            android:layout_marginBottom="@dimen/ut_scan_channellist_padding_bottom"
+            android:paddingStart="@dimen/ut_scan_channellist_padding_start"
+            android:divider="@android:color/transparent"
+            android:scrollbars="none"
+            android:dividerHeight="7dp"
+            android:transcriptMode="alwaysScroll" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/usbtuner-res/layout/ut_overlay_view.xml b/usbtuner-res/layout/ut_overlay_view.xml
new file mode 100644
index 00000000..1ee2e340
--- /dev/null
+++ b/usbtuner-res/layout/ut_overlay_view.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2015 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.
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <FrameLayout
+        android:id="@+id/message_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/black">
+        <TextView
+            android:id="@+id/message"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:textSize="40dp"
+            android:textColor="@android:color/white" />
+    </FrameLayout>
+    <TextView
+        android:id="@+id/tuner_status"
+        android:layout_width="270dp"
+        android:layout_height="130dp"
+        android:layout_gravity="right|bottom"
+        android:layout_marginBottom="24dp"
+        android:layout_marginLeft="10dp"
+        android:gravity="left|bottom"
+        android:textSize="17sp" />
+    <TextView
+        android:id="@+id/audio_status"
+        android:layout_width="270dp"
+        android:layout_height="130dp"
+        android:layout_gravity="right|top"
+        android:layout_marginTop="12dp"
+        android:layout_marginRight="10dp"
+        android:gravity="right|top"
+        android:textSize="14sp" />
+    <com.android.tv.tuner.cc.CaptionLayout
+        android:id="@+id/caption"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</FrameLayout>