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 --- java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/com/android/dialer/app/voicemail') diff --git a/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java b/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java index 05da8e752..009fb9e10 100644 --- a/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java +++ b/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java @@ -234,7 +234,7 @@ public class VoicemailPlaybackLayout extends LinearLayout getResources().getDrawable(R.drawable.ic_voicemail_seek_handle, context.getTheme()); voicemailSeekHandleDisabled = getResources() - .getDrawable(R.drawable.ic_voicemail_seek_handle_disabled, context.getTheme()); + .getDrawable(R.drawable.old_ic_voicemail_seek_handle_disabled, context.getTheme()); } @Override -- cgit v1.2.3