1 files changed, 32 insertions, 80 deletions
diff --git a/res/layout/activity_tv.xml b/res/layout/activity_tv.xml
index e2fd6280..b484ed60 100644
--- a/res/layout/activity_tv.xml
+++ b/res/layout/activity_tv.xml
@@ -1,91 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
+<!--
+  ~ 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.
+  -->
+
+<!-- Foreground is the transparent color. Without the foreground, UIs above SurfaceView
+     sometimes show some artifacts. -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     android:foreground="@android:color/transparent"
-    android:keepScreenOn="true" >
+    android:keepScreenOn="true">
 
-    <com.android.tv.ui.TunableTvView android:id="@+id/main_tv_view"
+    <com.android.tv.ui.AppLayerTvView android:id="@+id/main_tv_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="center" />
+        android:layout_gravity="start|center_vertical" />
 
-    <com.android.tv.ui.TunableTvView android:id="@+id/pip_tv_view"
-        android:visibility="gone"
-        android:layout_marginLeft="56dp"
-        android:layout_marginRight="56dp"
-        android:layout_marginTop="27dp"
-        android:layout_marginBottom="27dp"
-        android:layout_width="240dp"
-        android:layout_height="135dp"
-        android:layout_gravity="right|bottom" />
-
-    <LinearLayout
-        android:id="@+id/control_guide"
+    <com.android.tv.ui.TunableTvView android:id="@+id/main_tunable_tv_view"
         android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:layout_gravity="center"
-        android:orientation="horizontal" >
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_margin="8dp"
-            android:background="@android:drawable/ic_media_previous" />
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="8" />
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:layout_weight="1"
-            android:background="@android:drawable/ic_media_next" />
-    </LinearLayout>
-
-    <include layout="@layout/channel_banner" />
-
-    <include layout="@layout/main_menu" />
-
-    <FrameLayout
-        android:layout_width="150dp"
-        android:layout_height="200dp"
-        android:layout_gravity="left|top"
-        android:layout_marginLeft="50dp"
-        android:layout_marginTop="50dp">
-        <include layout="@layout/channel_number" />
-    </FrameLayout>
-
-    <com.android.tv.ui.sidepanel.SidePanelContainer
-        android:id="@+id/right_panel"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <com.android.tv.ui.KeypadView
-        android:id="@+id/keypad"
-        android:visibility="gone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="32dp"
-        android:layout_gravity="left|bottom" />
+        android:layout_height="match_parent"
+        android:layout_gravity="start|center_vertical" />
+
+    <com.android.tv.ui.AppLayerTvView android:id="@+id/pip_tv_view"
+        android:layout_marginLeft="@dimen/pipview_margin_horizontal"
+        android:layout_marginRight="@dimen/pipview_margin_horizontal"
+        android:layout_marginTop="@dimen/pipview_margin_top"
+        android:layout_marginBottom="@dimen/pipview_margin_bottom"
+        android:layout_width="@dimen/pipview_small_size_width"
+        android:layout_height="@dimen/pipview_small_size_height" />
 </FrameLayout>