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/contacts | |
| parent | e1c143a195540baf5ddc2525129ced08cddccbc0 (diff) | |
| download | android_packages_apps_Dialer-e760e4204887acd9fb6e4b8b00059659a1367c3b.tar.gz android_packages_apps_Dialer-e760e4204887acd9fb6e4b8b00059659a1367c3b.tar.bz2 android_packages_apps_Dialer-e760e4204887acd9fb6e4b8b00059659a1367c3b.zip | |
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/contacts')
| -rw-r--r-- | java/com/android/contacts/common/dialog/CallSubjectDialog.java | 2 | ||||
| -rw-r--r-- | java/com/android/contacts/common/res/values/strings.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/com/android/contacts/common/dialog/CallSubjectDialog.java b/java/com/android/contacts/common/dialog/CallSubjectDialog.java index 2ba2476a6..7bc13fe72 100644 --- a/java/com/android/contacts/common/dialog/CallSubjectDialog.java +++ b/java/com/android/contacts/common/dialog/CallSubjectDialog.java @@ -331,7 +331,7 @@ public class CallSubjectDialog extends Activity { mNumberView.setText( TextUtils.isEmpty(mNumberLabel) ? mDisplayNumber - : getString(R.string.call_subject_type_and_number, mNumberLabel, mDisplayNumber)); + : getString(R.string.old_call_subject_type_and_number, mNumberLabel, mDisplayNumber)); } else { mNumberView.setVisibility(View.GONE); mNumberView.setText(null); diff --git a/java/com/android/contacts/common/res/values/strings.xml b/java/com/android/contacts/common/res/values/strings.xml index 809439ee5..cf24a8867 100644 --- a/java/com/android/contacts/common/res/values/strings.xml +++ b/java/com/android/contacts/common/res/values/strings.xml @@ -395,7 +395,7 @@ <!-- String used to build a phone number type and phone number string. Example: Mobile 650-555-1212 --> - <string name="call_subject_type_and_number"><xliff:g example="Mobile" id="type">%1$s</xliff:g> <xliff:g example="(650) 555-1212" id="number">%2$s</xliff:g></string> + <string name="old_call_subject_type_and_number"><xliff:g example="Mobile" id="type">%1$s</xliff:g> <xliff:g example="(650) 555-1212" id="number">%2$s</xliff:g></string> <!-- String format to describe a tab e.g.call history tab. --> <string name="tab_title"><xliff:g id="title">%1$s</xliff:g> tab.</string> |