From e760e4204887acd9fb6e4b8b00059659a1367c3b Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Thu, 15 Mar 2018 15:56:30 -0700 Subject: Resolve all build resource conflicts. For simplicity, instead of resolve the nui shortcut string, I deleted it since it isn't used anymore. Test: build log PiperOrigin-RevId: 189260472 Change-Id: I67d5a49d78916a8960e41ad1c7b7f59efad6d718 --- .../android/dialer/historyitemactions/SharedModules.java | 2 +- .../res/drawable-xxxhdpi/bottomsheet_unblock.png | Bin 0 -> 1034 bytes .../res/drawable-xxxhdpi/ic_unblock.png | Bin 1034 -> 0 bytes 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/bottomsheet_unblock.png delete mode 100644 java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/ic_unblock.png (limited to 'java/com/android/dialer/historyitemactions') diff --git a/java/com/android/dialer/historyitemactions/SharedModules.java b/java/com/android/dialer/historyitemactions/SharedModules.java index fa7062653..468661feb 100644 --- a/java/com/android/dialer/historyitemactions/SharedModules.java +++ b/java/com/android/dialer/historyitemactions/SharedModules.java @@ -179,7 +179,7 @@ public class SharedModules { @Override public int getDrawableId() { return isBlocked - ? R.drawable.ic_unblock // TODO(a bug): use a vector icon + ? R.drawable.bottomsheet_unblock // TODO(a bug): use a vector icon : R.drawable.quantum_ic_block_vd_theme_24; } diff --git a/java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/bottomsheet_unblock.png b/java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/bottomsheet_unblock.png new file mode 100644 index 000000000..01551e2fc Binary files /dev/null and b/java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/bottomsheet_unblock.png differ diff --git a/java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/ic_unblock.png b/java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/ic_unblock.png deleted file mode 100644 index 01551e2fc..000000000 Binary files a/java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/ic_unblock.png and /dev/null differ -- cgit v1.2.3