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/blocking | |
| 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/blocking')
| -rw-r--r-- | java/com/android/dialer/blocking/BlockNumberDialogFragment.java | 2 | ||||
| -rw-r--r-- | java/com/android/dialer/blocking/res/values/strings.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/com/android/dialer/blocking/BlockNumberDialogFragment.java b/java/com/android/dialer/blocking/BlockNumberDialogFragment.java index dfd6ef076..621287f6c 100644 --- a/java/com/android/dialer/blocking/BlockNumberDialogFragment.java +++ b/java/com/android/dialer/blocking/BlockNumberDialogFragment.java @@ -137,7 +137,7 @@ public class BlockNumberDialogFragment extends DialogFragment { } else { title = ContactDisplayUtils.getTtsSpannedPhoneNumber( - getResources(), R.string.block_number_confirmation_title, displayNumber); + getResources(), R.string.old_block_number_confirmation_title, displayNumber); okText = getString(R.string.block_number_ok); if (FilteredNumberCompat.useNewFiltering(getContext())) { message = getString(R.string.block_number_confirmation_message_new_filtering); diff --git a/java/com/android/dialer/blocking/res/values/strings.xml b/java/com/android/dialer/blocking/res/values/strings.xml index 7b344da4a..e5f6c8000 100644 --- a/java/com/android/dialer/blocking/res/values/strings.xml +++ b/java/com/android/dialer/blocking/res/values/strings.xml @@ -29,7 +29,7 @@ </string> <!-- Confirmation dialog title for blocking a number. [CHAR LIMIT=NONE] --> - <string name="block_number_confirmation_title"> + <string name="old_block_number_confirmation_title"> Block<xliff:g example="(555) 555-5555" id="number">%1$s</xliff:g>? </string> |