diff options
| author | calderwoodra <calderwoodra@google.com> | 2018-03-15 15:56:30 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-03-15 15:59:02 -0700 |
| commit | e760e4204887acd9fb6e4b8b00059659a1367c3b (patch) | |
| tree | 24876ae821f27b5238d5c72c17db16b04e7d7871 /java/com/android/dialer/historyitemactions | |
| parent | e1c143a195540baf5ddc2525129ced08cddccbc0 (diff) | |
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
Diffstat (limited to 'java/com/android/dialer/historyitemactions')
| -rw-r--r-- | java/com/android/dialer/historyitemactions/SharedModules.java | 2 | ||||
| -rw-r--r-- | java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/bottomsheet_unblock.png (renamed from java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/ic_unblock.png) | bin | 1034 -> 1034 bytes |
2 files changed, 1 insertions, 1 deletions
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/ic_unblock.png b/java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/bottomsheet_unblock.png Binary files differindex 01551e2fc..01551e2fc 100644 --- a/java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/ic_unblock.png +++ b/java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/bottomsheet_unblock.png |
