aboutsummaryrefslogtreecommitdiff
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/channel_banner.xml11
-rw-r--r--res/layout/dvr_details_description.xml21
-rw-r--r--res/layout/dvr_recording_card_view.xml27
-rw-r--r--res/layout/dvr_schedules_item.xml25
-rw-r--r--res/layout/menu_card_down.xml50
-rw-r--r--res/layout/menu_card_up.xml50
-rw-r--r--res/layout/pin_dialog.xml35
-rw-r--r--res/layout/pin_number_picker.xml51
-rw-r--r--res/layout/tunable_tv_view.xml21
9 files changed, 166 insertions, 125 deletions
diff --git a/res/layout/channel_banner.xml b/res/layout/channel_banner.xml
index 3f105fe3..4d3cc244 100644
--- a/res/layout/channel_banner.xml
+++ b/res/layout/channel_banner.xml
@@ -83,13 +83,22 @@
android:layout_toEndOf="@id/anchor"
android:visibility="gone" />
+ <ImageView android:id="@+id/channel_signal_strength"
+ android:layout_width="@dimen/channel_banner_input_logo_size"
+ android:layout_height="@dimen/channel_banner_input_logo_size"
+ android:layout_marginEnd="8dp"
+ android:layout_marginBottom="-2dp"
+ android:layout_alignBottom="@id/anchor"
+ android:layout_toEndOf="@id/tvinput_logo"
+ android:visibility="gone" />
+
<TextView android:id="@+id/channel_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:layout_marginBottom="-4sp"
android:layout_alignBottom="@id/anchor"
- android:layout_toEndOf="@id/tvinput_logo"
+ android:layout_toEndOf="@id/channel_signal_strength"
android:singleLine="true"
android:ellipsize="end"
android:maxWidth="@dimen/channel_name_max_width"
diff --git a/res/layout/dvr_details_description.xml b/res/layout/dvr_details_description.xml
index d55688ba..ee749526 100644
--- a/res/layout/dvr_details_description.xml
+++ b/res/layout/dvr_details_description.xml
@@ -42,6 +42,27 @@
android:orientation="vertical"
android:background="?android:attr/selectableItemBackground">
+ <LinearLayout android:id="@+id/dvr_details_description_error_message"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:visibility="gone">
+
+ <ImageView android:layout_width="30dp"
+ android:layout_height="27dp"
+ android:paddingTop="9dp"
+ android:paddingLeft="12dp"
+ android:src="@drawable/ic_error_outline_pink_24dp"/>
+
+ <TextView android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="9dp"
+ android:paddingRight="12dp"
+ android:textColor="@color/dvr_recording_failed_text_color"
+ android:text="@string/dvr_recording_failed"
+ style="?attr/detailsDescriptionBodyStyle" />
+ </LinearLayout>
+
<TextView android:id="@+id/dvr_details_description_body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/res/layout/dvr_recording_card_view.xml b/res/layout/dvr_recording_card_view.xml
index 3e953510..3bf9bf6f 100644
--- a/res/layout/dvr_recording_card_view.xml
+++ b/res/layout/dvr_recording_card_view.xml
@@ -30,7 +30,7 @@
android:layout_gravity="center_horizontal"
android:scaleType="centerCrop"
android:contentDescription="@null"
- tv:layout_viewType="main" />
+ tv:layout_viewType="main"/>
<ProgressBar android:id="@+id/recording_progress"
style="@android:style/Widget.ProgressBar.Horizontal"
@@ -42,21 +42,7 @@
android:indeterminate="false"
android:visibility="gone"
android:max="100"
- android:layout_gravity="bottom" />
-
- <FrameLayout android:id="@+id/affiliated_icon_container"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@drawable/card_image_gradient"
- android:visibility="invisible">
-
- <ImageView android:id="@+id/affiliated_icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom|right"
- android:layout_margin="12dp" />
-
- </FrameLayout>
+ android:layout_gravity="bottom"/>
</FrameLayout>
<LinearLayout android:id="@+id/info_area"
@@ -99,10 +85,17 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" >
+ <ImageView android:id="@+id/content_icon"
+ android:paddingTop="2dp"
+ android:layout_width="13dp"
+ android:layout_height="15dp"
+ android:gravity="start"
+ android:visibility="gone"/>
+
<TextView android:id="@+id/content_major"
+ android:layout_toEndOf="@+id/content_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:gravity="start"
style="@style/dvr_card_view_content_text" />
<TextView android:id="@+id/content_minor"
diff --git a/res/layout/dvr_schedules_item.xml b/res/layout/dvr_schedules_item.xml
index 90e1123d..9e9ee6af 100644
--- a/res/layout/dvr_schedules_item.xml
+++ b/res/layout/dvr_schedules_item.xml
@@ -100,14 +100,25 @@
android:lines="1"
android:textColor="@color/dvr_schedules_item_info"/>
</LinearLayout>
- <TextView android:id="@+id/conflict_info"
- android:layout_width="match_parent"
+
+ <LinearLayout android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:gravity="start"
- android:textSize="10sp"
- android:layout_marginBottom="@dimen/dvr_schedules_item_conflict_info_bottom_margin"
- android:textColor="@color/dvr_schedules_item_info"
- android:visibility="gone"/>
+ android:orientation="horizontal">
+ <ImageView android:id="@+id/extra_info_icon"
+ android:layout_width="13dp"
+ android:layout_height="13dp"
+ android:paddingTop="2dp"
+ android:src="@drawable/ic_error_outline_pink_24dp"
+ android:visibility="gone"/>
+ <TextView android:id="@+id/extra_info"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="start"
+ android:textSize="10sp"
+ android:layout_marginBottom="@dimen/dvr_schedules_item_conflict_info_bottom_margin"
+ android:textColor="@color/dvr_schedules_item_info"
+ android:visibility="gone"/>
+ </LinearLayout>
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/menu_card_down.xml b/res/layout/menu_card_down.xml
new file mode 100644
index 00000000..0ccfc897
--- /dev/null
+++ b/res/layout/menu_card_down.xml
@@ -0,0 +1,50 @@
+<?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.
+ -->
+
+<com.android.tv.menu.SimpleCardView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="@dimen/card_layout_width"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:elevation="@dimen/card_elevation_normal"
+ android:focusable="true"
+ android:clickable="true">
+
+ <ImageView
+ android:layout_width="@dimen/card_image_layout_width"
+ android:layout_height="@dimen/card_image_layout_height"
+ android:background="@color/channel_card_guide"
+ android:paddingBottom="16dp"
+ android:paddingEnd="30dp"
+ android:paddingStart="30dp"
+ android:paddingTop="16dp"
+ android:src="@drawable/quantum_ic_arrow_downward_white_36" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/card_meta_layout_height"
+ android:paddingStart="@dimen/card_meta_padding_start"
+ android:paddingEnd="@dimen/card_meta_padding_end"
+ android:paddingTop="@dimen/card_meta_padding_top"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:fontFamily="@string/condensed_font"
+ android:textColor="@color/card_meta_text_color"
+ android:background="@color/guide_card_meta_background"
+ android:text="@string/channels_item_down"
+ android:textSize="12sp" />
+
+</com.android.tv.menu.SimpleCardView>
diff --git a/res/layout/menu_card_up.xml b/res/layout/menu_card_up.xml
new file mode 100644
index 00000000..2ba365ef
--- /dev/null
+++ b/res/layout/menu_card_up.xml
@@ -0,0 +1,50 @@
+<?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.
+ -->
+
+<com.android.tv.menu.SimpleCardView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="@dimen/card_layout_width"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:elevation="@dimen/card_elevation_normal"
+ android:focusable="true"
+ android:clickable="true">
+
+ <ImageView
+ android:layout_width="@dimen/card_image_layout_width"
+ android:layout_height="@dimen/card_image_layout_height"
+ android:background="@color/channel_card_guide"
+ android:paddingBottom="16dp"
+ android:paddingEnd="30dp"
+ android:paddingStart="30dp"
+ android:paddingTop="16dp"
+ android:src="@drawable/quantum_ic_arrow_upward_white_36" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/card_meta_layout_height"
+ android:paddingStart="@dimen/card_meta_padding_start"
+ android:paddingEnd="@dimen/card_meta_padding_end"
+ android:paddingTop="@dimen/card_meta_padding_top"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:fontFamily="@string/condensed_font"
+ android:textColor="@color/card_meta_text_color"
+ android:background="@color/guide_card_meta_background"
+ android:text="@string/channels_item_up"
+ android:textSize="12sp" />
+
+</com.android.tv.menu.SimpleCardView>
diff --git a/res/layout/pin_dialog.xml b/res/layout/pin_dialog.xml
index 5071717d..d40d70ec 100644
--- a/res/layout/pin_dialog.xml
+++ b/res/layout/pin_dialog.xml
@@ -35,7 +35,8 @@
android:textColor="@color/pin_dialog_text_color"
android:fontFamily="@string/font"
android:visibility="invisible"
- android:singleLine="false"/>
+ android:singleLine="false"
+ android:focusableInTouchMode="true"/>
<LinearLayout
android:id="@+id/enter_pin"
@@ -54,36 +55,14 @@
android:fontFamily="@string/font"
android:singleLine="false" />
- <LinearLayout
+ <com.android.tv.dialog.picker.PinPicker
+ android:id="@+id/pin_picker"
+ android:importantForAccessibility="yes"
android:layout_width="match_parent"
- android:layout_height="144dp"
+ android:layout_height="154dp"
android:paddingStart="24dp"
android:paddingEnd="24dp"
android:gravity="center"
- android:orientation="horizontal">
-
- <view class="com.android.tv.dialog.PinDialogFragment$PinNumberPicker"
- android:id="@+id/first"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
-
- <view class="com.android.tv.dialog.PinDialogFragment$PinNumberPicker"
- android:id="@+id/second"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="8dp" />
-
- <view class="com.android.tv.dialog.PinDialogFragment$PinNumberPicker"
- android:id="@+id/third"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="8dp" />
-
- <view class="com.android.tv.dialog.PinDialogFragment$PinNumberPicker"
- android:id="@+id/fourth"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="8dp" />
- </LinearLayout>
+ />
</LinearLayout>
</FrameLayout>
diff --git a/res/layout/pin_number_picker.xml b/res/layout/pin_number_picker.xml
deleted file mode 100644
index 8e8de9f5..00000000
--- a/res/layout/pin_number_picker.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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"
- android:layout_width="48dp"
- android:layout_height="144dp">
-
- <TextView android:id="@+id/focused_background"
- android:layout_width="@dimen/pin_number_picker_text_view_width"
- android:layout_height="@dimen/pin_number_picker_text_view_height"
- android:layout_gravity="center"
- android:gravity="center"
- android:textSize="@dimen/pin_number_picker_text_size"
- android:textColor="@color/pin_number_picker_text_color"
- android:fontFamily="@string/light_font"
- android:background="@drawable/pin_number_picker_focused_background" />
-
- <LinearLayout
- android:id="@+id/number_view_holder"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:focusable="true"
- android:orientation="vertical">
-
- <TextView android:id="@+id/previous2_number"
- style="@style/pin_number_view"/>
- <TextView android:id="@+id/previous_number"
- style="@style/pin_number_view"/>
- <TextView android:id="@+id/current_number"
- style="@style/pin_number_view"/>
- <TextView android:id="@+id/next_number"
- style="@style/pin_number_view"/>
- <TextView android:id="@+id/next2_number"
- style="@style/pin_number_view"/>
- </LinearLayout>
-
-</FrameLayout>
diff --git a/res/layout/tunable_tv_view.xml b/res/layout/tunable_tv_view.xml
index 549d0535..00c9908c 100644
--- a/res/layout/tunable_tv_view.xml
+++ b/res/layout/tunable_tv_view.xml
@@ -17,27 +17,6 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android" >
- <View android:id="@+id/channel_up"
- android:layout_width="wrap_content"
- android:focusable="false"
- android:focusableInTouchMode="true"
- android:layout_height="1dp"
- android:layout_gravity="top" />
- <View android:id="@+id/placeholder"
- android:layout_width="1dp"
- android:layout_height="1dp"
- android:focusable="false"
- android:focusableInTouchMode="true"
- android:focusedByDefault="true"
- android:layout_gravity="center" />
-
- <View android:id="@+id/channel_down"
- android:layout_width="wrap_content"
- android:focusable="false"
- android:focusableInTouchMode="true"
- android:layout_height="1dp"
- android:layout_gravity="bottom" />
-
<com.android.tv.ui.AppLayerTvView android:id="@+id/tv_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 22:10:34 +0000