From 0d9afde2712b09020fe4a591f6b6bb8ef91cbb54 Mon Sep 17 00:00:00 2001 From: Antony Sargent Date: Thu, 17 May 2018 11:55:40 -0700 Subject: [PATCH] Updated delete icon Also remove the duplicate ic_menu_delete.xml and fix up places where it was used. Bug: 77982107 Test: manual Change-Id: I23ede37b7cdf9bea59b44cd0f817bf0ad0cd1d69 --- res/drawable/ic_delete.xml | 16 ++++++++---- res/drawable/ic_menu_delete.xml | 25 ------------------- ...stricted_preference_user_delete_widget.xml | 2 +- res/layout/user_info_header.xml | 2 +- res/layout/zen_rule_widget.xml | 4 +-- res/menu/misc_files_menu.xml | 2 +- res/xml/vpn_app_management.xml | 2 +- .../accounts/AccountPreferenceController.java | 2 +- .../android/settings/network/ApnEditor.java | 2 +- 9 files changed, 19 insertions(+), 38 deletions(-) delete mode 100644 res/drawable/ic_menu_delete.xml diff --git a/res/drawable/ic_delete.xml b/res/drawable/ic_delete.xml index d4f79e3233b..d1290c50a02 100644 --- a/res/drawable/ic_delete.xml +++ b/res/drawable/ic_delete.xml @@ -16,10 +16,16 @@ Copyright (C) 2015 The Android Open Source Project + android:viewportWidth="24.0" + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> + android:fillColor="#FF000000" + android:pathData="M15,4V3H9v1H4v2h1v13c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V6h1V4H15zM17,19H7V6h10V19z"/> + + diff --git a/res/drawable/ic_menu_delete.xml b/res/drawable/ic_menu_delete.xml deleted file mode 100644 index f1ff04a5b04..00000000000 --- a/res/drawable/ic_menu_delete.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - diff --git a/res/layout/restricted_preference_user_delete_widget.xml b/res/layout/restricted_preference_user_delete_widget.xml index 7fd5d88a04c..7bafacc7ccc 100644 --- a/res/layout/restricted_preference_user_delete_widget.xml +++ b/res/layout/restricted_preference_user_delete_widget.xml @@ -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" /> diff --git a/res/layout/user_info_header.xml b/res/layout/user_info_header.xml index 583c8473010..57f01c7673a 100644 --- a/res/layout/user_info_header.xml +++ b/res/layout/user_info_header.xml @@ -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" /> diff --git a/res/layout/zen_rule_widget.xml b/res/layout/zen_rule_widget.xml index aa1175b5b1f..d502243049b 100644 --- a/res/layout/zen_rule_widget.xml +++ b/res/layout/zen_rule_widget.xml @@ -25,8 +25,8 @@ 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" /> - \ No newline at end of file + diff --git a/res/menu/misc_files_menu.xml b/res/menu/misc_files_menu.xml index 80fdd2f652f..1170ade841a 100644 --- a/res/menu/misc_files_menu.xml +++ b/res/menu/misc_files_menu.xml @@ -17,7 +17,7 @@ + android:icon="@drawable/ic_delete"/> diff --git a/res/xml/vpn_app_management.xml b/res/xml/vpn_app_management.xml index e18a0746795..bcaa6b0a62f 100644 --- a/res/xml/vpn_app_management.xml +++ b/res/xml/vpn_app_management.xml @@ -43,7 +43,7 @@ diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java index d9410b261d5..f33b34dc1c9 100644 --- a/src/com/android/settings/accounts/AccountPreferenceController.java +++ b/src/com/android/settings/accounts/AccountPreferenceController.java @@ -361,7 +361,7 @@ public class AccountPreferenceController extends AbstractPreferenceController RestrictedPreference preference = new RestrictedPreference( mParent.getPreferenceManager().getContext()); preference.setTitle(R.string.remove_managed_profile_label); - preference.setIcon(R.drawable.ic_menu_delete); + preference.setIcon(R.drawable.ic_delete); preference.setOnPreferenceClickListener(this); preference.setOrder(ORDER_LAST); return preference; diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java index e2853a64d95..cceb31d29e7 100644 --- a/src/com/android/settings/network/ApnEditor.java +++ b/src/com/android/settings/network/ApnEditor.java @@ -721,7 +721,7 @@ public class ApnEditor extends SettingsPreferenceFragment // If it's a new APN, then cancel will delete the new entry in onPause if (!mNewApn && !mReadOnlyApn) { menu.add(0, MENU_DELETE, 0, R.string.menu_delete) - .setIcon(R.drawable.ic_menu_delete); + .setIcon(R.drawable.ic_delete); } menu.add(0, MENU_SAVE, 0, R.string.menu_save) .setIcon(android.R.drawable.ic_menu_save);