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

Commit 0668d18e authored by Sid Soundararajan's avatar Sid Soundararajan Committed by android-build-merger
Browse files

Merge "Add a dimmed dismiss icon below task card view" into nyc-dev am: e44ff8fd 

am: cdc18128

* commit 'cdc18128':
  Add a dimmed dismiss icon below task card view

Change-Id: I230ee8f5045b011e3266fbf8aba646c4b112a7e0
parents 54e7ccf8 cdc18128

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

0 → 100755
+557 B
Loading image diff...

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

0 → 100755
+377 B
Loading image diff...

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

0 → 100755
+755 B
Loading image diff...

packages/SystemUI/res/layout-television/recents_tv_card_dismiss.xml→packages/SystemUI/res/drawable/recents_tv_dismiss_icon.xml

+19 −0
Original line number Diff line number Diff line
@@ -13,31 +13,7 @@ 
     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
 
<transition xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:drawable="@drawable/ic_dismiss_outline" />

    <item android:drawable="@drawable/ic_cancel_white_24dp" />

</transition>
 
 No newline at end of file

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

+19 −1
Original line number Diff line number Diff line
@@ -42,5 +42,23 @@ 
                android:gravity="center" />



    </LinearLayout>

    <include layout="@layout/recents_tv_card_dismiss"/>

    <ImageView

            android:id="@+id/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:alpha="@integer/dismiss_unselected_alpha"

            android:src="@drawable/recents_tv_dismiss_icon" />

    <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:alpha="0.0"

            android:layout_gravity="center_horizontal" />

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