Merge "Add a fall back for when the thumbnail is not generated for a task" into nyc-dev (ac5a240f) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/recents_tv_background_gradient.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@
		<shape xmlns:android="http://schemas.android.com/apk/res/android"
		android:shape="rectangle">
		<gradient
		android:startColor="#99000000"
		android:endColor="#E6000000"
		android:startColor="#4C000000"
		android:endColor="#72000000"
		android:angle="90"/>
		</shape>
		No newline at end of file

packages/SystemUI/res/layout/recents_on_tv.xml→packages/SystemUI/res/layout-television/recents_on_tv.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,8 @@
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:clipChildren="false"
		android:clipToPadding="false">
		android:clipToPadding="false"
		android:background="@drawable/recents_tv_background_gradient">
		<com.android.systemui.recents.tv.views.TaskStackHorizontalGridView
		android:id="@+id/task_list"
		android:layout_width="wrap_content"

packages/SystemUI/res/layout-television/recents_tv_card_dismiss.xml

0 → 100644

+43 −0

Original line number	Diff line number	Diff line
		<?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"
		xmlns:tools="http://schemas.android.com/tools"
		android:id="@+id/card_dismiss"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:layout_gravity="center_horizontal"
		android:alpha="0.0"
		tools:showIn="@layout/recents_tv_task_card_view">
		<ImageView
		android:id="@+id/card_dismiss_icon"
		android:layout_width="@dimen/recents_tv_dismiss_icon_size"
		android:layout_height="@dimen/recents_tv_dismiss_icon_size"
		android:layout_gravity="center_horizontal"
		android:layout_marginTop="@dimen/recents_tv_dismiss_icon_top_margin"
		android:layout_marginBottom="@dimen/recents_tv_dismiss_icon_bottom_margin"
		android:src="@drawable/ic_cancel_white_24dp"/>
		<TextView
		android:id="@+id/card_dismiss_text"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textSize="@dimen/recents_tv_dismiss_text_size"
		android:fontFamily="@string/font_roboto_light"
		android:textColor="@color/recents_tv_dismiss_text_color"
		android:text="@string/recents_tv_dismiss"
		android:layout_gravity="center_horizontal"/>
		</LinearLayout>
		No newline at end of file

packages/SystemUI/res/layout-television/recents_tv_card_info_field.xml

0 → 100644

+47 −0

Original line number	Diff line number	Diff line
		<?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"
		xmlns:tools="http://schemas.android.com/tools"
		android:id="@+id/card_info_field"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		tools:showIn="@layout/recents_tv_task_card_view_fallback_banner">
		<ImageView
		android:id="@+id/card_extra_badge"
		android:layout_width="@dimen/recents_tv_card_extra_badge_size"
		android:layout_height="@dimen/recents_tv_card_extra_badge_size"
		android:layout_marginBottom="@dimen/recents_tv_icon_padding_bottom"
		android:scaleType="fitCenter"
		android:layout_centerVertical="true"
		android:layout_alignParentEnd="true"/>
		<TextView
		android:id="@+id/card_title_text"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:includeFontPadding="true"
		android:singleLine="true"
		android:shadowColor="@color/recents_tv_text_shadow_color"
		android:shadowRadius="5"
		android:shadowDx="0"
		android:shadowDy="0"
		android:textColor="@color/recents_tv_card_title_text_color"
		android:fontFamily="@string/font_roboto_regular"
		android:textSize="@dimen/recents_tv_title_text_size"
		android:paddingStart="@dimen/recents_tv_text_padding_start"
		android:layout_marginBottom="@dimen/recents_tv_text_padding_bottom"
		android:ellipsize="end"/>
		</LinearLayout>
		No newline at end of file

packages/SystemUI/res/layout-television/recents_tv_task_card_view.xml

0 → 100644

+46 −0

Original line number	Diff line number	Diff line
		<?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.systemui.recents.tv.views.TaskCardView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:focusable="true"
		android:focusableInTouchMode="true"
		android:layout_gravity="center"
		android:layout_centerInParent="true"
		android:clipToPadding="false"
		android:orientation="vertical" >
		<include layout="@layout/recents_tv_card_info_field"/>
		<LinearLayout
		android:id="@+id/card_view_thumbnail"
		android:layout_width="@dimen/recents_tv_card_width"
		android:layout_height="@dimen/recents_tv_screenshot_height"
		android:gravity="center"
		android:orientation="vertical"
		android:background="@color/recents_tv_card_background_color"
		android:layout_centerHorizontal="true" >

		<ImageView
		android:id="@+id/card_view_banner_icon"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_centerHorizontal="true"
		android:scaleType="centerCrop"
		android:gravity="center" />

		</LinearLayout>
		<include layout="@layout/recents_tv_card_dismiss"/>
		</com.android.systemui.recents.tv.views.TaskCardView>
		No newline at end of file