Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1008cc25 authored by Sid Soundararajan's avatar Sid Soundararajan
Browse files

Add Launch Task Animation, re-do values for red-lines. 

This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/859952/
Adjusted to fix merge conflicts.

Change-Id: I8395a4172bd34faff88094913ee4afd97f71076a
parent 2ab93cb2

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ 
                  android:stateNotNeeded="true"

                  android:resumeWhilePausing="true"

                  android:screenOrientation="behind"

                  android:theme="@style/RecentsTheme.Wallpaper">

                  android:theme="@style/RecentsTvTheme.Wallpaper">

            <intent-filter>

                <action android:name="com.android.systemui.recents.TOGGLE_RECENTS" />

            </intent-filter>

packages/SystemUI/res/drawable/recents_tv_background_gradient.xml

0 → 100644
+22 −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.

-->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

       android:shape="rectangle">

    <gradient

            android:startColor="#99000000"

            android:endColor="#E6000000"

            android:angle="90"/>

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/recents_on_tv.xml

+3 −2
Original line number Diff line number Diff line
@@ -18,9 +18,10 @@ 
    android:id="@+id/recents_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@drawable/recents_tv_background_gradient"

    android:clipChildren="false"

    android:clipToPadding="false" >



    android:clipToPadding="false"

    android:layoutDirection="rtl">

    <com.android.systemui.recents.tv.views.TaskStackHorizontalGridView

        android:id="@+id/task_list"

        android:layout_width="wrap_content"

packages/SystemUI/res/layout/recents_task_card_view.xml→packages/SystemUI/res/layout/recents_tv_task_card_view.xml

+32 −40
Original line number Diff line number Diff line
@@ -20,28 +20,28 @@ 
    android:focusable="true"

    android:focusableInTouchMode="true"

    android:layout_gravity="center"

    android:layout_centerInParent="true">

    android:layout_centerInParent="true"

    android:layoutDirection="ltr">



    <RelativeLayout

    <LinearLayout

            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:layout_gravity="center"

            android:orientation="vertical" >

        <LinearLayout

                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" >

                android:layout_height="wrap_content">

            <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:layout_marginEnd="@dimen/recents_tv_icon_padding_end"

                    android:scaleType="fitCenter"

                    android:layout_centerVertical="true"

                    android:layout_alignParentRight="true" />

            <TextView

                    android:id="@+id/card_title_text"

                    android:layout_width="match_parent"
@@ -49,29 +49,21 @@ 
                    android:layout_alignParentTop="false"

                    android:includeFontPadding="true"

                    android:minLines="1"

                    android:maxLines="2"

                    android:maxLines="1"

                    android:textColor="@color/recents_tv_card_title_text_color"

                    android:fontFamily="@string/font_roboto_regular"

                    android:textSize="@dimen/recents_tv_title_text_size"

                    android:layout_marginBottom="@dimen/recents_tv_text_padding_bottom"

                    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" />

        </LinearLayout>

        <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>

                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"

                android:layout_below="@id/card_title_text" />

    </LinearLayout>

</com.android.systemui.recents.tv.views.TaskCardView>
 
 No newline at end of file

packages/SystemUI/res/values/colors_tv.xml

+1 −3
Original line number Diff line number Diff line
@@ -18,7 +18,5 @@ 
-->

<resources>

    <color name="recents_tv_card_background_color">#FF37474F</color>

    <color name="recents_tv_card_title_text_color">#FFEEEEEE</color>

    <color name="recents_tv_card_content_text_color">#99EEEEEE</color>

    <color name="recents_tv_card_source_text_color">#99EEEEEE</color>

    <color name="recents_tv_card_title_text_color">#CCEEEEEE</color>

</resources>
 
 No newline at end of file