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

Commit 55642ef9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Updated delete icon" into pi-dev

parents 76a0ef6a 0d9afde2

res/drawable/ic_delete.xml

+11 −5
Original line number Diff line number Diff line
@@ -16,10 +16,16 @@ Copyright (C) 2015 The Android Open Source Project 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24.0dp"

        android:height="24.0dp"

        android:tint="?android:attr/colorControlNormal"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M12.0,38.0c0.0,2.21 1.79,4.0 4.0,4.0l16.0,0.0c2.21,0.0 4.0,-1.79 4.0,-4.0L36.0,14.0L12.0,14.0l0.0,24.0zM38.0,8.0l-7.0,0.0l-2.0,-2.0L19.0,6.0l-2.0,2.0l-7.0,0.0l0.0,4.0l28.0,0.0L38.0,8.0z"/>

        android:fillColor="#FF000000"

        android:pathData="M15,4V3H9v1H4v2h1v13c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V6h1V4H15zM17,19H7V6h10V19z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M9,8h2v9h-2z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M13,8h2v9h-2z"/>

</vector>

res/drawable/ic_menu_delete.xml

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2015 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.

-->

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

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M12.0,38.0c0.0,2.21 1.79,4.0 4.0,4.0l16.0,0.0c2.21,0.0 4.0,-1.79 4.0,-4.0L36.0,14.0L12.0,14.0l0.0,24.0zM38.0,8.0l-7.0,0.0l-2.0,-2.0L19.0,6.0l-2.0,2.0l-7.0,0.0l0.0,4.0l28.0,0.0L38.0,8.0z"/>

</vector>

res/layout/restricted_preference_user_delete_widget.xml

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
            android:layout_height="fill_parent"

            android:paddingStart="16dip"

            android:paddingEnd="16dip"

            android:src="@drawable/ic_menu_delete"

            android:src="@drawable/ic_delete"

            android:contentDescription="@string/user_delete_user_description"

            android:layout_gravity="center"

            android:background="?android:attr/selectableItemBackground" />

res/layout/user_info_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 
                android:layout_height="fill_parent"

                android:paddingStart="16dip"

                android:paddingEnd="16dip"

                android:src="@drawable/ic_menu_delete"

                android:src="@drawable/ic_delete"

                android:contentDescription="@string/user_delete_user_description"

                android:layout_gravity="center"

                android:background="?android:attr/selectableItemBackground" />

res/layout/zen_rule_widget.xml

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
            android:layout_height="fill_parent"

            android:paddingStart="16dip"

            android:paddingEnd="16dip"

            android:src="@drawable/ic_menu_delete"

            android:src="@drawable/ic_delete"

            android:contentDescription="@string/zen_mode_delete_rule"

            android:layout_gravity="center"

            android:background="?android:attr/selectableItemBackground" />