Merge "Initial Commit of a Horizontal Grid View based recents UI for TV." (d1e2332e) · Commits · e / os / android_frameworks_base

packages/SystemUI/Android.mk

+5 −2

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
		android-support-v7-preference \
		android-support-v7-appcompat \
		android-support-v14-preference \
		android-support-v17-leanback \
		framework-protos

		LOCAL_JAVA_LIBRARIES := telephony-common
		@@ -30,10 +31,12 @@ LOCAL_RESOURCE_DIR := \
		frameworks/support/v7/preference/res \
		frameworks/support/v14/preference/res \
		frameworks/support/v7/appcompat/res \
		frameworks/support/v7/recyclerview/res
		frameworks/support/v7/recyclerview/res \
		frameworks/support/v17/leanback/res

		LOCAL_AAPT_FLAGS := --auto-add-overlay \
		--extra-packages com.android.keyguard:android.support.v7.recyclerview:android.support.v7.preference:android.support.v14.preference:android.support.v7.appcompat
		--extra-packages com.android.keyguard:android.support.v7.recyclerview:android.support.v7.preference:android.support.v14.preference:android.support.v7.appcompat \
		--extra-packages android.support.v17.leanback

		ifneq ($(SYSTEM_UI_INCREMENTAL_BUILDS),)
		LOCAL_PROGUARD_ENABLED := disabled

packages/SystemUI/AndroidManifest.xml

+14 −0

Original line number	Diff line number	Diff line
		@@ -236,6 +236,20 @@
		</intent-filter>
		</activity>

		<activity android:name=".recents.tv.RecentsTvActivity"
		android:label="@string/accessibility_desc_recent_apps"
		android:exported="false"
		android:launchMode="singleInstance"
		android:excludeFromRecents="true"
		android:stateNotNeeded="true"
		android:resumeWhilePausing="true"
		android:screenOrientation="behind"
		android:theme="@style/RecentsTheme.Wallpaper">
		<intent-filter>
		<action android:name="com.android.systemui.recents.TOGGLE_RECENTS" />
		</intent-filter>
		</activity>

		<!-- Callback for dismissing screenshot notification after a share target is picked -->
		<receiver android:name=".screenshot.GlobalScreenshot$TargetChosenReceiver"
		android:process=":screenshot"

packages/SystemUI/res/layout/recents_on_tv.xml

0 → 100644

+37 −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.RecentsTvView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/recents_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:clipChildren="false"
		android:clipToPadding="false" >

		<com.android.systemui.recents.tv.views.TaskStackHorizontalGridView
		android:id="@+id/task_list"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:descendantFocusability="beforeDescendants"
		android:gravity="center"
		android:paddingStart="@dimen/recents_tv_grid_row_padding"
		android:paddingEnd="@dimen/recents_tv_grid_row_padding"
		android:focusable="true"/>

		</com.android.systemui.recents.tv.views.RecentsTvView>

packages/SystemUI/res/layout/recents_task_card_view.xml

0 → 100644

+77 −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">

		<RelativeLayout
		android:layout_width="@dimen/recents_tv_card_width"
		android:layout_height="wrap_content"
		android:layout_centerInParent="true"
		android:layout_gravity="center">
		<ImageView
		android:id="@+id/card_view_thumbnail"
		android:layout_width="match_parent"
		android:layout_height="@dimen/recents_tv_card_height"
		android:scaleType="centerCrop"
		android:gravity="center"
		android:layout_alignParentTop="true"
		android:layout_centerHorizontal="true"/>

		<RelativeLayout
		android:id="@+id/card_info_field"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_below="@id/card_view_thumbnail"
		android:background="@color/recents_tv_card_background_color" >
		<TextView
		android:id="@+id/card_title_text"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_alignParentTop="false"
		android:includeFontPadding="true"
		android:minLines="1"
		android:maxLines="2"
		android:textColor="@color/recents_tv_card_title_text_color"
		android:ellipsize="end" />
		<TextView
		android:id="@+id/card_content_text"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_alignParentStart="true"
		android:layout_below="@id/card_title_text"
		android:includeFontPadding="true"
		android:minLines="1"
		android:maxLines="2"
		android:textColor="@color/recents_tv_card_content_text_color"
		android:ellipsize="end" />
		<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:scaleType="fitCenter"
		android:background="@android:color/transparent"
		android:contentDescription="@null"
		android:layout_centerVertical="true"
		android:layout_alignParentRight="true"/>
		</RelativeLayout>
		</RelativeLayout>
		</com.android.systemui.recents.tv.views.TaskCardView>
		No newline at end of file

packages/SystemUI/res/values/attrs.xml

+0 −3

Original line number	Diff line number	Diff line
		@@ -28,9 +28,6 @@
		<declare-styleable name="NotificationLinearLayout">
		<attr name="insetLeft" format="dimension" />
		</declare-styleable>
		<declare-styleable name="NotificationRowLayout">
		<attr name="rowHeight" format="dimension" />
		</declare-styleable>
		<declare-styleable name="RecentsPanelView">
		<attr name="recentItemLayout" format="reference" />
		</declare-styleable>