aboutsummaryrefslogtreecommitdiff
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/activity_dvr_playback.xml6
-rw-r--r--res/layout/activity_tv.xml19
-rw-r--r--res/layout/dvr_main.xml2
-rw-r--r--res/layout/dvr_play.xml28
-rw-r--r--res/layout/dvr_recording_card_view.xml37
-rw-r--r--res/layout/dvr_schedules_item.xml12
-rw-r--r--res/layout/guided_action_editable.xml41
-rw-r--r--res/layout/input_banner.xml2
-rw-r--r--res/layout/list_item_dvr_history.xml59
-rw-r--r--res/layout/menu_card_action.xml57
-rw-r--r--res/layout/menu_card_app_link.xml7
-rw-r--r--res/layout/menu_card_channel.xml7
-rw-r--r--res/layout/menu_card_dvr.xml16
-rw-r--r--res/layout/menu_card_guide.xml16
-rw-r--r--res/layout/menu_card_setup.xml16
-rw-r--r--res/layout/menu_card_text.xml1
-rw-r--r--res/layout/play_controls_contents.xml218
-rw-r--r--res/layout/select_input_item.xml2
-rw-r--r--res/layout/tuning_block.xml30
19 files changed, 315 insertions, 261 deletions
diff --git a/res/layout/activity_dvr_playback.xml b/res/layout/activity_dvr_playback.xml
index 204001c7..02641d84 100644
--- a/res/layout/activity_dvr_playback.xml
+++ b/res/layout/activity_dvr_playback.xml
@@ -34,7 +34,11 @@
</FrameLayout>
<fragment android:id="@+id/dvr_playback_controls_fragment"
- android:name="com.android.tv.dvr.ui.DvrPlaybackOverlayFragment"
+ android:name="com.android.tv.dvr.ui.playback.DvrPlaybackOverlayFragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
+ <FrameLayout android:id="@+id/dvr_playback_side_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
diff --git a/res/layout/activity_tv.xml b/res/layout/activity_tv.xml
index f766ae00..4e8afbb7 100644
--- a/res/layout/activity_tv.xml
+++ b/res/layout/activity_tv.xml
@@ -28,28 +28,13 @@
android:layout_height="match_parent"
android:layout_gravity="start|center_vertical" />
+ <include layout="@layout/tuning_block" />
+
<com.android.tv.ui.TunableTvView android:id="@+id/main_tunable_tv_view"
android:layout_width="match_parent"
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" />
-
- <com.android.tv.ui.TunableTvView android:id="@+id/pip_tunable_tv_view"
- android:visibility="gone"
- 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
android:id="@+id/scene_container"
android:layout_height="match_parent"
diff --git a/res/layout/dvr_main.xml b/res/layout/dvr_main.xml
index bac1cc91..6e18a834 100644
--- a/res/layout/dvr_main.xml
+++ b/res/layout/dvr_main.xml
@@ -16,6 +16,6 @@
-->
<fragment xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/dvr_frame"
- android:name="com.android.tv.dvr.ui.DvrBrowseFragment"
+ android:name="com.android.tv.dvr.ui.browse.DvrBrowseFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" /> \ No newline at end of file
diff --git a/res/layout/dvr_play.xml b/res/layout/dvr_play.xml
deleted file mode 100644
index 4df13686..00000000
--- a/res/layout/dvr_play.xml
+++ /dev/null
@@ -1,28 +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:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:text="@string/no_program_information"
- android:id="@+id/placeHolderText" android:layout_gravity="center"/>
-</FrameLayout> \ No newline at end of file
diff --git a/res/layout/dvr_recording_card_view.xml b/res/layout/dvr_recording_card_view.xml
index d3808a31..53a7cf3d 100644
--- a/res/layout/dvr_recording_card_view.xml
+++ b/res/layout/dvr_recording_card_view.xml
@@ -16,12 +16,12 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tv="http://schemas.android.com/apk/res/com.android.tv"
- android:layout_width="@dimen/dvr_card_layout_width"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content">
<FrameLayout
- android:layout_width="@dimen/dvr_card_image_layout_width"
- android:layout_height="@dimen/dvr_card_image_layout_height"
+ android:layout_width="@dimen/dvr_library_card_image_layout_width"
+ android:layout_height="@dimen/dvr_library_card_image_layout_height"
android:layout_margin="2dp">
<ImageView android:id="@+id/image"
@@ -35,7 +35,7 @@
<ProgressBar android:id="@+id/recording_progress"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="match_parent"
- android:layout_height="@dimen/dvr_card_progress_height"
+ android:layout_height="@dimen/dvr_library_card_progress_height"
android:mirrorForRtl="false"
android:progressTint="@color/play_controls_progress_bar_watched"
android:progressDrawable="@drawable/progress_horizontal"
@@ -70,13 +70,30 @@
android:background="@color/dvr_card_info"
tv:layout_viewType="info">
- <TextView android:id="@+id/title"
+ <FrameLayout android:id="@+id/title_area"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="1dp"
- android:gravity="start"
- style="@style/dvr_card_view_title_text"
- tv:layout_viewType="main"/>
+ android:layout_height="@dimen/dvr_library_card_folded_title_height">
+
+ <TextView android:id="@+id/title_one_line"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="1dp"
+ android:gravity="start"
+ android:maxLines="1"
+ style="@style/dvr_card_view_title_text"
+ tv:layout_viewType="main"/>
+
+ <TextView android:id="@+id/title_two_lines"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="1dp"
+ android:gravity="start"
+ android:maxLines="2"
+ android:alpha="0"
+ style="@style/dvr_card_view_title_text"
+ tv:layout_viewType="main"/>
+
+ </FrameLayout>
<RelativeLayout
android:layout_width="match_parent"
diff --git a/res/layout/dvr_schedules_item.xml b/res/layout/dvr_schedules_item.xml
index 1d97cb98..90e1123d 100644
--- a/res/layout/dvr_schedules_item.xml
+++ b/res/layout/dvr_schedules_item.xml
@@ -44,19 +44,23 @@
android:layout_height="match_parent"
android:alpha="0"/>
+ <!-- Make parent focusable in case when the info_container is not focusable.
+ As the actions are GONE when the row is not selected, if info_container is not
+ focusable, there are no focusable views in the row, which causes that the row can't be
+ selected by the DPAD. To avoid this case, the parent should be focusable. -->
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:focusable="true"
+ android:descendantFocusability="afterDescendants">
<LinearLayout android:id="@+id/info_container"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/dvr_schedules_item_section_margin"
android:layout_weight="1"
- android:clickable="true"
- android:focusableInTouchMode="true"
- android:focusable="true">
+ android:clickable="true">
<TextView android:id="@+id/time"
android:layout_width="@dimen/dvr_schedules_item_time_width"
diff --git a/res/layout/guided_action_editable.xml b/res/layout/guided_action_editable.xml
new file mode 100644
index 00000000..84f56f8d
--- /dev/null
+++ b/res/layout/guided_action_editable.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2017 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.
+ -->
+
+<android.support.v17.leanback.widget.GuidedActionItemContainer
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/guidedactions_editable"
+ style="?attr/guidedActionItemContainerStyle"
+ android:layout_height="88dp">
+
+ <android.support.v17.leanback.widget.NonOverlappingLinearLayout
+ android:id="@+id/guidedactions_item_content"
+ style="?attr/guidedActionItemContentStyle" >
+
+ <EditText
+ android:id="@+id/guidedactions_item_title"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:textColor="@color/lb_guidedactions_item_unselected_text_color"
+ android:textSize="16sp" />
+
+ <android.support.v17.leanback.widget.GuidedActionEditText
+ android:id="@+id/guidedactions_item_description"
+ style="?attr/guidedActionItemDescriptionStyle" />
+
+ </android.support.v17.leanback.widget.NonOverlappingLinearLayout>
+
+</android.support.v17.leanback.widget.GuidedActionItemContainer> \ No newline at end of file
diff --git a/res/layout/input_banner.xml b/res/layout/input_banner.xml
index cd8770c8..f4035fcb 100644
--- a/res/layout/input_banner.xml
+++ b/res/layout/input_banner.xml
@@ -34,6 +34,7 @@
<TextView android:id="@+id/input_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:maxWidth="@dimen/input_banner_item_label_max_width"
android:fontFamily="@string/condensed_font"
android:textColor="@color/select_input_text_color_primary"
android:singleLine="true"
@@ -44,6 +45,7 @@
android:layout_marginStart="16dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:maxWidth="@dimen/input_banner_item_label_max_width"
android:fontFamily="@string/condensed_font"
android:textColor="@color/select_input_text_color_secondary"
android:singleLine="true"
diff --git a/res/layout/list_item_dvr_history.xml b/res/layout/list_item_dvr_history.xml
new file mode 100644
index 00000000..a9eb4c02
--- /dev/null
+++ b/res/layout/list_item_dvr_history.xml
@@ -0,0 +1,59 @@
+<?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"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:padding="2dp" >
+
+ <TextView
+ android:id="@+id/state"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingStart="4dp"
+ android:paddingEnd="0dp" />
+
+ <TextView
+ android:id="@+id/schedule_time"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingStart="4dp"
+ android:paddingEnd="0dp" />
+
+ <TextView
+ android:id="@+id/program_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingStart="4dp"
+ android:paddingEnd="0dp" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingStart="4dp"
+ android:paddingEnd="0dp"
+ android:text="@string/dvr_schedules_information_separator" />
+
+ <TextView
+ android:id="@+id/channel_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingStart="4dp"
+ android:paddingEnd="0dp" />
+
+</LinearLayout>
diff --git a/res/layout/menu_card_action.xml b/res/layout/menu_card_action.xml
index f17c5b6a..e8114b52 100644
--- a/res/layout/menu_card_action.xml
+++ b/res/layout/menu_card_action.xml
@@ -19,50 +19,43 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="@dimen/action_card_width"
android:layout_height="@dimen/action_card_height"
- android:orientation="vertical"
android:focusable="true"
android:background="@drawable/action_card_background">
- <LinearLayout
- android:orientation="vertical"
+ <TextView
+ android:id="@+id/action_card_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="@dimen/action_card_padding"
- android:clipChildren="false"
- android:clipToPadding="false"
- android:layout_gravity="top">
+ android:layout_alignParentTop="true"
+ android:layout_marginStart="12dp"
+ android:layout_marginEnd="12dp"
+ android:layout_marginTop="6dp"
+ android:fontFamily="@string/condensed_font"
+ android:maxLines="1"
+ android:textColor="@color/action_card_label_color"
+ android:textSize="@dimen/action_card_label_font_size" />
- <TextView
- android:id="@+id/action_card_label"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="-6dp"
- android:singleLine="true"
- android:fontFamily="@string/condensed_font"
- android:textColor="@color/action_card_label_color"
- android:textSize="@dimen/action_card_label_font_size" />
-
- <TextView
- android:id="@+id/action_card_state"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="4dp"
- android:singleLine="true"
- android:fontFamily="@string/condensed_font"
- android:textColor="@color/action_card_state_color"
- android:textSize="@dimen/action_card_state_font_size" />
-
- </LinearLayout>
+ <TextView
+ android:id="@+id/action_card_state"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/action_card_label"
+ android:layout_marginStart="12dp"
+ android:layout_marginEnd="12dp"
+ android:paddingTop="4dp"
+ android:fontFamily="@string/condensed_font"
+ android:maxLines="1"
+ android:textColor="@color/action_card_state_color"
+ android:textSize="@dimen/action_card_state_font_size" />
<ImageView
android:id="@+id/action_card_icon"
android:layout_width="@dimen/action_card_icon_width"
android:layout_height="@dimen/action_card_icon_height"
android:layout_margin="@dimen/action_card_icon_padding"
- android:layout_gravity="end|bottom"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentEnd="true"
android:contentDescription="@null"
- android:scaleType="fitCenter"
- android:src="@drawable/ic_tvoption_aspect"
- android:duplicateParentState="true" />
+ android:scaleType="fitCenter" />
</com.android.tv.menu.ActionCardView>
diff --git a/res/layout/menu_card_app_link.xml b/res/layout/menu_card_app_link.xml
index 918cb788..a7e3bd4a 100644
--- a/res/layout/menu_card_app_link.xml
+++ b/res/layout/menu_card_app_link.xml
@@ -33,13 +33,6 @@
android:layout_gravity="top"
android:scaleType="centerCrop"/>
- <View android:id="@+id/image_gradient"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center_horizontal"
- android:background="@drawable/card_image_gradient"
- android:visibility="gone" />
-
<TextView android:id="@+id/app_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/res/layout/menu_card_channel.xml b/res/layout/menu_card_channel.xml
index 4e49636f..ed7b8273 100644
--- a/res/layout/menu_card_channel.xml
+++ b/res/layout/menu_card_channel.xml
@@ -32,13 +32,6 @@
android:layout_gravity="top"
android:scaleType="centerCrop"/>
- <View android:id="@+id/image_gradient"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center_horizontal"
- android:background="@drawable/card_image_gradient"
- android:visibility="gone" />
-
<!-- The bottom margin specified in the redline is 8dp, but the redline doesn't consider
the descenders. So actually, if the bottom margin is set to 8dp, the bottom line of
the text lies 11dp above the bottom of the poster art due to the descenders.
diff --git a/res/layout/menu_card_dvr.xml b/res/layout/menu_card_dvr.xml
index cc589775..4f159083 100644
--- a/res/layout/menu_card_dvr.xml
+++ b/res/layout/menu_card_dvr.xml
@@ -23,17 +23,15 @@
android:focusable="true"
android:clickable="true">
- <FrameLayout
+ <ImageView
android:layout_width="@dimen/card_image_layout_width"
android:layout_height="@dimen/card_image_layout_height"
- android:background="@color/channel_card_guide">
- <ImageView
- android:layout_width="82dp"
- android:layout_height="48dp"
- android:layout_marginTop="16dp"
- android:src="@drawable/ic_dvr"
- android:layout_gravity="center_horizontal" />
- </FrameLayout>
+ android:background="@color/channel_card_guide"
+ android:paddingBottom="16dp"
+ android:paddingEnd="30dp"
+ android:paddingStart="30dp"
+ android:paddingTop="16dp"
+ android:src="@drawable/ic_dvr" />
<FrameLayout
android:layout_width="match_parent"
diff --git a/res/layout/menu_card_guide.xml b/res/layout/menu_card_guide.xml
index 6b724b12..c36b7df5 100644
--- a/res/layout/menu_card_guide.xml
+++ b/res/layout/menu_card_guide.xml
@@ -23,17 +23,15 @@
android:focusable="true"
android:clickable="true">
- <FrameLayout
+ <ImageView
android:layout_width="@dimen/card_image_layout_width"
android:layout_height="@dimen/card_image_layout_height"
- android:background="@color/channel_card_guide">
- <ImageView
- android:layout_width="82dp"
- android:layout_height="48dp"
- android:layout_marginTop="16dp"
- android:src="@drawable/ic_channel_guide"
- android:layout_gravity="center_horizontal" />
- </FrameLayout>
+ android:background="@color/channel_card_guide"
+ android:paddingBottom="16dp"
+ android:paddingEnd="30dp"
+ android:paddingStart="30dp"
+ android:paddingTop="16dp"
+ android:src="@drawable/ic_channel_guide" />
<TextView
android:layout_width="match_parent"
diff --git a/res/layout/menu_card_setup.xml b/res/layout/menu_card_setup.xml
index 38abd4e5..520cb4e5 100644
--- a/res/layout/menu_card_setup.xml
+++ b/res/layout/menu_card_setup.xml
@@ -22,17 +22,15 @@
android:focusable="true"
android:clickable="true">
- <FrameLayout
+ <ImageView
android:layout_width="@dimen/card_image_layout_width"
android:layout_height="@dimen/card_image_layout_height"
- android:background="@color/channel_card_guide">
- <ImageView
- android:layout_width="82dp"
- android:layout_height="48dp"
- android:layout_marginTop="16dp"
- android:src="@drawable/ic_setup_channels"
- android:layout_gravity="center_horizontal" />
- </FrameLayout>
+ android:background="@color/channel_card_guide"
+ android:paddingBottom="16dp"
+ android:paddingEnd="30dp"
+ android:paddingStart="30dp"
+ android:paddingTop="16dp"
+ android:src="@drawable/ic_setup_channels" />
<TextView
android:layout_width="match_parent"
diff --git a/res/layout/menu_card_text.xml b/res/layout/menu_card_text.xml
index 777b100f..7674f816 100644
--- a/res/layout/menu_card_text.xml
+++ b/res/layout/menu_card_text.xml
@@ -16,7 +16,6 @@
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tv="http://schemas.android.com/apk/res/com.android.tv"
android:layout_width="match_parent"
android:layout_height="wrap_content">
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>
diff --git a/res/layout/select_input_item.xml b/res/layout/select_input_item.xml
index 1ff6df29..12fedca6 100644
--- a/res/layout/select_input_item.xml
+++ b/res/layout/select_input_item.xml
@@ -28,6 +28,7 @@
<TextView android:id="@+id/input_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:maxWidth="@dimen/input_banner_item_label_max_width"
android:fontFamily="@string/condensed_font"
android:singleLine="true"
android:ellipsize="end"
@@ -37,6 +38,7 @@
android:layout_marginStart="16dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:maxWidth="@dimen/input_banner_item_label_max_width"
android:fontFamily="@string/condensed_font"
android:singleLine="true"
android:ellipsize="end"
diff --git a/res/layout/tuning_block.xml b/res/layout/tuning_block.xml
new file mode 100644
index 00000000..a7604f0c
--- /dev/null
+++ b/res/layout/tuning_block.xml
@@ -0,0 +1,30 @@
+<?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.
+ -->
+
+<com.android.tv.ui.TuningBlockView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/tuning_block"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@android:color/black">
+ <ImageView
+ android:id="@+id/image"
+ android:visibility="gone"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:scaleType="fitCenter"/>
+
+</com.android.tv.ui.TuningBlockView> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 16:02:29 +0000