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

Commit 25e378ef authored by Sid Soundararajan's avatar Sid Soundararajan Committed by android-build-merger
Browse files

Merge "Add dismiss animation for Recents TV and Enable Dismiss" into nyc-dev 

am: 6e54775a

* commit '6e54775a':
  Add dismiss animation for Recents TV and Enable Dismiss
parents ed7d7a5b 6e54775a

packages/SystemUI/res/drawable-hdpi/ic_cancel_white_24dp.png

0 → 100644
+414 B
Loading image diff...

packages/SystemUI/res/drawable-mdpi/ic_cancel_white_24dp.png

0 → 100644
+304 B
Loading image diff...

packages/SystemUI/res/drawable-xhdpi/ic_cancel_white_24dp.png

0 → 100644
+536 B
Loading image diff...

packages/SystemUI/res/layout/recents_on_tv.xml

+1 −5
Original line number Original line Diff line number Diff line
@@ -28,12 +28,8 @@ 
        android:clipChildren="false"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:clipToPadding="false"

        android:descendantFocusability="beforeDescendants"

        android:descendantFocusability="beforeDescendants"

        android:layout_gravity="center"

        android:layout_marginTop="@dimen/recents_tv_gird_row_top_margin"

        android:gravity="center"

        android:paddingStart="@dimen/recents_tv_grid_row_padding"

        android:paddingEnd="@dimen/recents_tv_grid_row_padding"

        android:focusable="true" />

        android:focusable="true" />



    <View

    <View

        android:id="@+id/pip_shade"

        android:id="@+id/pip_shade"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

packages/SystemUI/res/layout/recents_tv_task_card_view.xml

+28 −0
Original line number Original line Diff line number Diff line
@@ -21,9 +21,11 @@ 
    android:focusableInTouchMode="true"

    android:focusableInTouchMode="true"

    android:layout_gravity="center"

    android:layout_gravity="center"

    android:layout_centerInParent="true"

    android:layout_centerInParent="true"

    android:orientation="vertical"

    android:layoutDirection="ltr">

    android:layoutDirection="ltr">





    <LinearLayout

    <LinearLayout

            android:id="@+id/recents_tv_card"

            android:layout_width="@dimen/recents_tv_card_width"

            android:layout_width="@dimen/recents_tv_card_width"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_centerInParent="true"

            android:layout_centerInParent="true"
@@ -66,4 +68,30 @@ 
                android:layout_centerHorizontal="true"

                android:layout_centerHorizontal="true"

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

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

    </LinearLayout>

    </LinearLayout>

    <LinearLayout

            android:id="@+id/card_dismiss"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:layout_gravity="center_horizontal"

            android:layout_below="@id/recents_tv_card"

            android:alpha="0.0">

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

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