diff options
| author | maxwelb <maxwelb@google.com> | 2018-03-21 13:00:28 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-03-21 13:02:00 -0700 |
| commit | 33c901987a7010754fc1eddcc1933bfd63458322 (patch) | |
| tree | 060db800b9356a3ee86cfc619cbcad0b752270e6 /java/com/android/incallui | |
| parent | 7642b8011e00bf353504440754ffa3f3a7cd8f8c (diff) | |
Display "Emergency number" in the call log for emergency numbers
This CL updates the call log to show "Emergency number" for call log rows from
numbers that PhoneNumberUtils.isEmergencyNumber considers to be emergency
numbers.
Bug: 66926712
Test: Manual, see above
PiperOrigin-RevId: 189953302
Change-Id: Ibaae243ead8b918a26f6058164316e042a4f82fd
Diffstat (limited to 'java/com/android/incallui')
| -rw-r--r-- | java/com/android/incallui/CallerInfo.java | 2 | ||||
| -rw-r--r-- | java/com/android/incallui/res/values/strings.xml | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/java/com/android/incallui/CallerInfo.java b/java/com/android/incallui/CallerInfo.java index fd9855f24..0aedea531 100644 --- a/java/com/android/incallui/CallerInfo.java +++ b/java/com/android/incallui/CallerInfo.java @@ -485,7 +485,7 @@ public class CallerInfo { * @return this instance. */ /* package */ CallerInfo markAsEmergency(Context context) { - name = context.getString(R.string.emergency_call_dialog_number_for_display); + name = context.getString(R.string.emergency_number); phoneNumber = null; isEmergency = true; diff --git a/java/com/android/incallui/res/values/strings.xml b/java/com/android/incallui/res/values/strings.xml index af6125366..15cd2e02d 100644 --- a/java/com/android/incallui/res/values/strings.xml +++ b/java/com/android/incallui/res/values/strings.xml @@ -172,9 +172,6 @@ <!-- Label for "Manage conference call" panel [CHAR LIMIT=40] --> <string name="manageConferenceLabel" tools:ignore="UnusedResources">Manage conference call</string> - <!-- This can be used in any application wanting to disable the text "Emergency number" --> - <string name="emergency_call_dialog_number_for_display">Emergency number</string> - <!-- Used to inform the user that a call was received via a number other than the primary phone number associated with their device. [CHAR LIMIT=16] --> <string name="child_number">via <xliff:g example="650-555-1212" id="child_number">%s</xliff:g></string> |