From 2ca4318cc1ee57dda907ba2069bd61d162b1baef Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Thu, 31 Aug 2017 06:57:16 -0700 Subject: Update Dialer source to latest internal Google revision. Previously, Android's Dialer app was developed in an internal Google source control system and only exported to public during AOSP drops. The Dialer team is now switching to a public development model similar to the telephony team. This CL represents all internal Google changes that were committed to Dialer between the public O release and today's tip of tree on internal master. This CL squashes those changes into a single commit. In subsequent changes, changes will be exported on a per-commit basis. Test: make, flash install, run Merged-In: I45270eaa8ce732d71a1bd84b08c7fa0e99af3160 Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8 PiperOrigin-RevId: 167068436 --- .../dialer/calllogutils/CallEntryFormatter.java | 158 -------------------- .../android/dialer/calllogutils/CallLogDates.java | 166 +++++++++++++++++++++ .../dialer/calllogutils/CallLogDurations.java | 127 ++++++++++++++++ .../dialer/calllogutils/CallTypeHelper.java | 28 +++- .../dialer/calllogutils/PhoneCallDetails.java | 3 + .../dialer/calllogutils/res/values-af/strings.xml | 1 + .../dialer/calllogutils/res/values-am/strings.xml | 5 +- .../dialer/calllogutils/res/values-ar/strings.xml | 1 + .../dialer/calllogutils/res/values-az/strings.xml | 5 +- .../calllogutils/res/values-b+sr+Latn/strings.xml | 1 + .../dialer/calllogutils/res/values-be/strings.xml | 1 + .../dialer/calllogutils/res/values-bg/strings.xml | 1 + .../dialer/calllogutils/res/values-bn/strings.xml | 1 + .../dialer/calllogutils/res/values-bs/strings.xml | 1 + .../dialer/calllogutils/res/values-ca/strings.xml | 1 + .../dialer/calllogutils/res/values-cs/strings.xml | 1 + .../dialer/calllogutils/res/values-da/strings.xml | 5 +- .../dialer/calllogutils/res/values-de/strings.xml | 5 +- .../dialer/calllogutils/res/values-el/strings.xml | 1 + .../calllogutils/res/values-en-rAU/strings.xml | 1 + .../calllogutils/res/values-en-rGB/strings.xml | 1 + .../calllogutils/res/values-en-rIN/strings.xml | 1 + .../calllogutils/res/values-es-rUS/strings.xml | 1 + .../dialer/calllogutils/res/values-es/strings.xml | 1 + .../dialer/calllogutils/res/values-et/strings.xml | 1 + .../dialer/calllogutils/res/values-eu/strings.xml | 3 +- .../dialer/calllogutils/res/values-fa/strings.xml | 1 + .../dialer/calllogutils/res/values-fi/strings.xml | 1 + .../calllogutils/res/values-fr-rCA/strings.xml | 1 + .../dialer/calllogutils/res/values-fr/strings.xml | 1 + .../dialer/calllogutils/res/values-gl/strings.xml | 1 + .../dialer/calllogutils/res/values-gu/strings.xml | 1 + .../dialer/calllogutils/res/values-hi/strings.xml | 5 +- .../dialer/calllogutils/res/values-hr/strings.xml | 1 + .../dialer/calllogutils/res/values-hu/strings.xml | 1 + .../dialer/calllogutils/res/values-hy/strings.xml | 1 + .../dialer/calllogutils/res/values-in/strings.xml | 1 + .../dialer/calllogutils/res/values-is/strings.xml | 1 + .../dialer/calllogutils/res/values-it/strings.xml | 1 + .../dialer/calllogutils/res/values-iw/strings.xml | 3 +- .../dialer/calllogutils/res/values-ja/strings.xml | 1 + .../dialer/calllogutils/res/values-ka/strings.xml | 1 + .../dialer/calllogutils/res/values-kk/strings.xml | 1 + .../dialer/calllogutils/res/values-km/strings.xml | 1 + .../dialer/calllogutils/res/values-kn/strings.xml | 1 + .../dialer/calllogutils/res/values-ko/strings.xml | 1 + .../dialer/calllogutils/res/values-ky/strings.xml | 3 +- .../dialer/calllogutils/res/values-lo/strings.xml | 1 + .../dialer/calllogutils/res/values-lt/strings.xml | 1 + .../dialer/calllogutils/res/values-lv/strings.xml | 3 +- .../dialer/calllogutils/res/values-mk/strings.xml | 1 + .../dialer/calllogutils/res/values-ml/strings.xml | 3 +- .../dialer/calllogutils/res/values-mn/strings.xml | 1 + .../dialer/calllogutils/res/values-mr/strings.xml | 5 +- .../dialer/calllogutils/res/values-ms/strings.xml | 1 + .../dialer/calllogutils/res/values-my/strings.xml | 1 + .../dialer/calllogutils/res/values-nb/strings.xml | 5 +- .../dialer/calllogutils/res/values-ne/strings.xml | 1 + .../dialer/calllogutils/res/values-nl/strings.xml | 5 +- .../dialer/calllogutils/res/values-no/strings.xml | 5 +- .../dialer/calllogutils/res/values-pa/strings.xml | 1 + .../dialer/calllogutils/res/values-pl/strings.xml | 1 + .../calllogutils/res/values-pt-rBR/strings.xml | 5 +- .../calllogutils/res/values-pt-rPT/strings.xml | 9 +- .../dialer/calllogutils/res/values-pt/strings.xml | 5 +- .../dialer/calllogutils/res/values-ro/strings.xml | 1 + .../dialer/calllogutils/res/values-ru/strings.xml | 1 + .../dialer/calllogutils/res/values-si/strings.xml | 1 + .../dialer/calllogutils/res/values-sk/strings.xml | 1 + .../dialer/calllogutils/res/values-sl/strings.xml | 1 + .../dialer/calllogutils/res/values-sq/strings.xml | 1 + .../dialer/calllogutils/res/values-sr/strings.xml | 1 + .../dialer/calllogutils/res/values-sv/strings.xml | 1 + .../dialer/calllogutils/res/values-sw/strings.xml | 5 +- .../dialer/calllogutils/res/values-ta/strings.xml | 1 + .../dialer/calllogutils/res/values-te/strings.xml | 1 + .../dialer/calllogutils/res/values-th/strings.xml | 1 + .../dialer/calllogutils/res/values-tl/strings.xml | 1 + .../dialer/calllogutils/res/values-tr/strings.xml | 5 +- .../dialer/calllogutils/res/values-uk/strings.xml | 1 + .../dialer/calllogutils/res/values-ur/strings.xml | 5 +- .../dialer/calllogutils/res/values-uz/strings.xml | 1 + .../dialer/calllogutils/res/values-vi/strings.xml | 1 + .../calllogutils/res/values-zh-rCN/strings.xml | 1 + .../calllogutils/res/values-zh-rHK/strings.xml | 1 + .../calllogutils/res/values-zh-rTW/strings.xml | 1 + .../dialer/calllogutils/res/values-zu/strings.xml | 1 + .../dialer/calllogutils/res/values/strings.xml | 3 + 88 files changed, 444 insertions(+), 197 deletions(-) delete mode 100644 java/com/android/dialer/calllogutils/CallEntryFormatter.java create mode 100644 java/com/android/dialer/calllogutils/CallLogDates.java create mode 100644 java/com/android/dialer/calllogutils/CallLogDurations.java (limited to 'java/com/android/dialer/calllogutils') diff --git a/java/com/android/dialer/calllogutils/CallEntryFormatter.java b/java/com/android/dialer/calllogutils/CallEntryFormatter.java deleted file mode 100644 index 6aa93af52..000000000 --- a/java/com/android/dialer/calllogutils/CallEntryFormatter.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.dialer.calllogutils; - -import android.content.Context; -import android.content.res.Resources; -import android.icu.lang.UCharacter; -import android.icu.text.BreakIterator; -import android.os.Build.VERSION; -import android.os.Build.VERSION_CODES; -import android.text.format.DateUtils; -import android.text.format.Formatter; -import com.android.dialer.util.DialerUtils; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Locale; -import java.util.concurrent.TimeUnit; - -/** Utility class for formatting data and data usage in call log entries. */ -public class CallEntryFormatter { - - /** - * Formats the provided date into a value suitable for display in the current locale. - * - *

For example, returns a string like "Wednesday, May 25, 2016, 8:02PM" or "Chorshanba, 2016 - * may 25,20:02". - * - *

For pre-N devices, the returned value may not start with a capital if the local convention - * is to not capitalize day names. On N+ devices, the returned value is always capitalized. - */ - public static CharSequence formatDate(Context context, long callDateMillis) { - CharSequence dateValue = - DateUtils.formatDateRange( - context, - callDateMillis /* startDate */, - callDateMillis /* endDate */, - DateUtils.FORMAT_SHOW_TIME - | DateUtils.FORMAT_SHOW_DATE - | DateUtils.FORMAT_SHOW_WEEKDAY - | DateUtils.FORMAT_SHOW_YEAR); - - // We want the beginning of the date string to be capitalized, even if the word at the beginning - // of the string is not usually capitalized. For example, "Wednesdsay" in Uzbek is "chorshanba” - // (not capitalized). To handle this issue we apply title casing to the start of the sentence so - // that "chorshanba, 2016 may 25,20:02" becomes "Chorshanba, 2016 may 25,20:02". - // - // The ICU library was not available in Android until N, so we can only do this in N+ devices. - // Pre-N devices will still see incorrect capitalization in some languages. - if (VERSION.SDK_INT < VERSION_CODES.N) { - return dateValue; - } - - // Using the ICU library is safer than just applying toUpperCase() on the first letter of the - // word because in some languages, there can be multiple starting characters which should be - // upper-cased together. For example in Dutch "ij" is a digraph in which both letters should be - // capitalized together. - - // TITLECASE_NO_LOWERCASE is necessary so that things that are already capitalized like the - // month ("May") are not lower-cased as part of the conversion. - return UCharacter.toTitleCase( - Locale.getDefault(), - dateValue.toString(), - BreakIterator.getSentenceInstance(), - UCharacter.TITLECASE_NO_LOWERCASE); - } - - private static CharSequence formatDuration(Context context, long elapsedSeconds) { - Resources res = context.getResources(); - String formatPattern; - if (elapsedSeconds >= 60) { - String minutesString = res.getString(R.string.call_details_minutes_abbreviation); - String secondsString = res.getString(R.string.call_details_seconds_abbreviation); - // example output: "1m 1s" - formatPattern = - context.getString( - R.string.call_duration_format_pattern, "m", minutesString, "s", secondsString); - } else { - String secondsString = res.getString(R.string.call_details_seconds_abbreviation); - // example output: "1s" - formatPattern = - context.getString(R.string.call_duration_short_format_pattern, "s", secondsString); - } - SimpleDateFormat format = new SimpleDateFormat(formatPattern); - return format.format(new Date(TimeUnit.SECONDS.toMillis(elapsedSeconds))); - } - - private static CharSequence formatDurationA11y(Context context, long elapsedSeconds) { - Resources res = context.getResources(); - if (elapsedSeconds >= 60) { - int minutes = (int) (elapsedSeconds / 60); - int seconds = (int) elapsedSeconds - minutes * 60; - String minutesString = res.getQuantityString(R.plurals.a11y_minutes, minutes); - String secondsString = res.getQuantityString(R.plurals.a11y_seconds, seconds); - // example output: "1 minute 1 second", "2 minutes 2 seconds", ect. - return context.getString( - R.string.a11y_call_duration_format, minutes, minutesString, seconds, secondsString); - } else { - String secondsString = res.getQuantityString(R.plurals.a11y_seconds, (int) elapsedSeconds); - // example output: "1 second", "2 seconds" - return context.getString( - R.string.a11y_call_duration_short_format, elapsedSeconds, secondsString); - } - } - - /** - * Formats a string containing the call duration and the data usage (if specified). - * - * @param elapsedSeconds Total elapsed seconds. - * @param dataUsage Data usage in bytes, or null if not specified. - * @return String containing call duration and data usage. - */ - public static CharSequence formatDurationAndDataUsage( - Context context, long elapsedSeconds, long dataUsage) { - return formatDurationAndDataUsageInternal( - context, formatDuration(context, elapsedSeconds), dataUsage); - } - - /** - * Formats a string containing the call duration and the data usage (if specified) for TalkBack. - * - * @param elapsedSeconds Total elapsed seconds. - * @param dataUsage Data usage in bytes, or null if not specified. - * @return String containing call duration and data usage. - */ - public static CharSequence formatDurationAndDataUsageA11y( - Context context, long elapsedSeconds, long dataUsage) { - return formatDurationAndDataUsageInternal( - context, formatDurationA11y(context, elapsedSeconds), dataUsage); - } - - private static CharSequence formatDurationAndDataUsageInternal( - Context context, CharSequence duration, long dataUsage) { - List durationItems = new ArrayList<>(); - if (dataUsage > 0) { - durationItems.add(duration); - durationItems.add(Formatter.formatShortFileSize(context, dataUsage)); - return DialerUtils.join(durationItems); - } else { - return duration; - } - } -} diff --git a/java/com/android/dialer/calllogutils/CallLogDates.java b/java/com/android/dialer/calllogutils/CallLogDates.java new file mode 100644 index 000000000..82e8e404e --- /dev/null +++ b/java/com/android/dialer/calllogutils/CallLogDates.java @@ -0,0 +1,166 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.dialer.calllogutils; + +import android.content.Context; +import android.icu.lang.UCharacter; +import android.icu.text.BreakIterator; +import android.os.Build.VERSION; +import android.os.Build.VERSION_CODES; +import android.text.format.DateUtils; +import java.util.Calendar; +import java.util.Locale; +import java.util.concurrent.TimeUnit; + +/** Static methods for formatting dates in the call log. */ +public final class CallLogDates { + + /** + * Uses the new date formatting rules to format dates in the new call log. + * + *

Rules: + * + * 

+   *   if < 1 minute ago: "Now";
+   *   else if today: "12:15 PM"
+   *   else if < 3 days ago: "Wednesday";
+   *   else: "Jan 15"
+   *
+ */ + public static CharSequence newCallLogTimestampLabel( + Context context, long nowMillis, long timestampMillis) { + if (nowMillis - timestampMillis < TimeUnit.MINUTES.toMillis(1)) { + return context.getString(R.string.now); + } + if (isSameDay(nowMillis, timestampMillis)) { + return DateUtils.formatDateTime( + context, timestampMillis, DateUtils.FORMAT_SHOW_TIME); // e.g. 12:15 PM + } + if (isWithin3Days(nowMillis, timestampMillis)) { + return formatDayOfWeek(context, timestampMillis); // e.g. "Wednesday" + } + return formatAbbreviatedMonthAndDay(context, timestampMillis); // e.g. "Jan 15" + } + + /** + * Formats the provided date into a value suitable for display in the current locale. + * + *

For example, returns a string like "Wednesday, May 25, 2016, 8:02PM" or "Chorshanba, 2016 + * may 25,20:02". + * + *

For pre-N devices, the returned value may not start with a capital if the local convention + * is to not capitalize day names. On N+ devices, the returned value is always capitalized. + */ + public static CharSequence formatDate(Context context, long callDateMillis) { + return toTitleCase( + DateUtils.formatDateTime( + context, + callDateMillis, + DateUtils.FORMAT_SHOW_TIME + | DateUtils.FORMAT_SHOW_DATE + | DateUtils.FORMAT_SHOW_WEEKDAY + | DateUtils.FORMAT_SHOW_YEAR)); + } + + /** + * Formats the provided date into the day of week. + * + *

For example, returns a string like "Wednesday" or "Chorshanba". + * + *

For pre-N devices, the returned value may not start with a capital if the local convention + * is to not capitalize day names. On N+ devices, the returned value is always capitalized. + */ + private static CharSequence formatDayOfWeek(Context context, long callDateMillis) { + return toTitleCase( + DateUtils.formatDateTime(context, callDateMillis, DateUtils.FORMAT_SHOW_WEEKDAY)); + } + + /** + * Formats the provided date into the month abbreviation and day. + * + *

For example, returns a string like "Jan 15". + * + *

For pre-N devices, the returned value may not start with a capital if the local convention + * is to not capitalize day names. On N+ devices, the returned value is always capitalized. + */ + private static CharSequence formatAbbreviatedMonthAndDay(Context context, long callDateMillis) { + return toTitleCase( + DateUtils.formatDateTime( + context, callDateMillis, DateUtils.FORMAT_ABBREV_MONTH | DateUtils.FORMAT_NO_YEAR)); + } + + private static CharSequence toTitleCase(CharSequence value) { + // We want the beginning of the date string to be capitalized, even if the word at the beginning + // of the string is not usually capitalized. For example, "Wednesdsay" in Uzbek is "chorshanba” + // (not capitalized). To handle this issue we apply title casing to the start of the sentence so + // that "chorshanba, 2016 may 25,20:02" becomes "Chorshanba, 2016 may 25,20:02". + // + // The ICU library was not available in Android until N, so we can only do this in N+ devices. + // Pre-N devices will still see incorrect capitalization in some languages. + if (VERSION.SDK_INT < VERSION_CODES.N) { + return value; + } + + // Using the ICU library is safer than just applying toUpperCase() on the first letter of the + // word because in some languages, there can be multiple starting characters which should be + // upper-cased together. For example in Dutch "ij" is a digraph in which both letters should be + // capitalized together. + + // TITLECASE_NO_LOWERCASE is necessary so that things that are already capitalized are not + // lower-cased as part of the conversion. + return UCharacter.toTitleCase( + Locale.getDefault(), + value.toString(), + BreakIterator.getSentenceInstance(), + UCharacter.TITLECASE_NO_LOWERCASE); + } + + private static boolean isWithin3Days(long nowMillis, long timestampMillis) { + Calendar threeDaysAgoStartOfDay = Calendar.getInstance(); + threeDaysAgoStartOfDay.setTimeInMillis(nowMillis); + + // This is attempting to find the start of the current day, but it's not quite right due to + // daylight savings. Unfortunately there doesn't seem to be a way to get the correct start of + // the day without using Joda or Java8, both of which are disallowed. This means that the wrong + // formatting may be applied on days with time changes (though the displayed values will be + // correct). + threeDaysAgoStartOfDay.add( + Calendar.HOUR_OF_DAY, -threeDaysAgoStartOfDay.get(Calendar.HOUR_OF_DAY)); + threeDaysAgoStartOfDay.add(Calendar.MINUTE, -threeDaysAgoStartOfDay.get(Calendar.MINUTE)); + threeDaysAgoStartOfDay.add(Calendar.SECOND, -threeDaysAgoStartOfDay.get(Calendar.SECOND)); + + threeDaysAgoStartOfDay.add(Calendar.DATE, -2); + + Calendar then = Calendar.getInstance(); + then.setTimeInMillis(timestampMillis); + + return then.equals(threeDaysAgoStartOfDay) || then.after(threeDaysAgoStartOfDay); + } + + /** Returns true if the provided timestamps are from the same day in the default time zone. */ + public static boolean isSameDay(long firstMillis, long secondMillis) { + Calendar first = Calendar.getInstance(); + first.setTimeInMillis(firstMillis); + + Calendar second = Calendar.getInstance(); + second.setTimeInMillis(secondMillis); + + return first.get(Calendar.YEAR) == second.get(Calendar.YEAR) + && first.get(Calendar.MONTH) == second.get(Calendar.MONTH) + && first.get(Calendar.DAY_OF_MONTH) == second.get(Calendar.DAY_OF_MONTH); + } +} diff --git a/java/com/android/dialer/calllogutils/CallLogDurations.java b/java/com/android/dialer/calllogutils/CallLogDurations.java new file mode 100644 index 000000000..20998deb4 --- /dev/null +++ b/java/com/android/dialer/calllogutils/CallLogDurations.java @@ -0,0 +1,127 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.dialer.calllogutils; + +import android.content.Context; +import android.content.res.Resources; +import android.text.format.Formatter; +import com.android.dialer.util.DialerUtils; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.concurrent.TimeUnit; + +/** Utility class for formatting duration and data usage in call log entries. */ +public class CallLogDurations { + + private static CharSequence formatDuration(Context context, long elapsedSeconds) { + Resources res = context.getResources(); + String formatPattern; + if (elapsedSeconds >= 60) { + String minutesString = res.getString(R.string.call_details_minutes_abbreviation); + String secondsString = res.getString(R.string.call_details_seconds_abbreviation); + // example output: "1m 1s" + formatPattern = + context.getString( + R.string.call_duration_format_pattern, "m", minutesString, "s", secondsString); + } else { + String secondsString = res.getString(R.string.call_details_seconds_abbreviation); + // example output: "1s" + formatPattern = + context.getString(R.string.call_duration_short_format_pattern, "s", secondsString); + + // Temporary work around for a broken Hebrew(iw) translation. + if (formatPattern.endsWith("\'\'")) { + formatPattern = formatPattern.substring(0, formatPattern.length() - 1); + } + } + + // If new translation issues arise, we should catch them here to prevent crashes. + try { + Date date = new Date(TimeUnit.SECONDS.toMillis(elapsedSeconds)); + SimpleDateFormat format = new SimpleDateFormat(formatPattern); + String duration = format.format(date); + + // SimpleDateFormat cannot display more than 59 minutes, instead it displays MINUTES % 60. + // Here we check for that value and replace it with the correct value. + if (elapsedSeconds >= TimeUnit.MINUTES.toSeconds(60)) { + int minutes = (int) (elapsedSeconds / 60); + duration = duration.replaceFirst(Integer.toString(minutes % 60), Integer.toString(minutes)); + } + return duration; + } catch (Exception e) { + return ""; + } + } + + private static CharSequence formatDurationA11y(Context context, long elapsedSeconds) { + Resources res = context.getResources(); + if (elapsedSeconds >= 60) { + int minutes = (int) (elapsedSeconds / 60); + int seconds = (int) elapsedSeconds - minutes * 60; + String minutesString = res.getQuantityString(R.plurals.a11y_minutes, minutes); + String secondsString = res.getQuantityString(R.plurals.a11y_seconds, seconds); + // example output: "1 minute 1 second", "2 minutes 2 seconds", ect. + return context.getString( + R.string.a11y_call_duration_format, minutes, minutesString, seconds, secondsString); + } else { + String secondsString = res.getQuantityString(R.plurals.a11y_seconds, (int) elapsedSeconds); + // example output: "1 second", "2 seconds" + return context.getString( + R.string.a11y_call_duration_short_format, elapsedSeconds, secondsString); + } + } + + /** + * Formats a string containing the call duration and the data usage (if specified). + * + * @param elapsedSeconds Total elapsed seconds. + * @param dataUsage Data usage in bytes, or null if not specified. + * @return String containing call duration and data usage. + */ + public static CharSequence formatDurationAndDataUsage( + Context context, long elapsedSeconds, long dataUsage) { + return formatDurationAndDataUsageInternal( + context, formatDuration(context, elapsedSeconds), dataUsage); + } + + /** + * Formats a string containing the call duration and the data usage (if specified) for TalkBack. + * + * @param elapsedSeconds Total elapsed seconds. + * @param dataUsage Data usage in bytes, or null if not specified. + * @return String containing call duration and data usage. + */ + public static CharSequence formatDurationAndDataUsageA11y( + Context context, long elapsedSeconds, long dataUsage) { + return formatDurationAndDataUsageInternal( + context, formatDurationA11y(context, elapsedSeconds), dataUsage); + } + + private static CharSequence formatDurationAndDataUsageInternal( + Context context, CharSequence duration, long dataUsage) { + List durationItems = new ArrayList<>(); + if (dataUsage > 0) { + durationItems.add(duration); + durationItems.add(Formatter.formatShortFileSize(context, dataUsage)); + return DialerUtils.join(durationItems); + } else { + return duration; + } + } +} diff --git a/java/com/android/dialer/calllogutils/CallTypeHelper.java b/java/com/android/dialer/calllogutils/CallTypeHelper.java index d3b5b67d7..783f799f3 100644 --- a/java/com/android/dialer/calllogutils/CallTypeHelper.java +++ b/java/com/android/dialer/calllogutils/CallTypeHelper.java @@ -18,6 +18,7 @@ package com.android.dialer.calllogutils; import android.content.res.Resources; import com.android.dialer.compat.AppCompatConstants; +import com.android.dialer.lightbringer.Lightbringer; /** Helper class to perform operations related to call types. */ public class CallTypeHelper { @@ -50,8 +51,12 @@ public class CallTypeHelper { private final CharSequence mBlockedName; /** Name used to identify calls which were answered on another device. */ private final CharSequence mAnsweredElsewhereName; + /** Name used to identify incoming lightbringer calls. */ + private final CharSequence mIncomingLightbringerCall; + /** Name used to identify outgoing lightbringer calls. */ + private final CharSequence mOutgoingLightbringerCall; - public CallTypeHelper(Resources resources) { + public CallTypeHelper(Resources resources, Lightbringer lightbringer) { // Cache these values so that we do not need to look them up each time. mIncomingName = resources.getString(R.string.type_incoming); mIncomingPulledName = resources.getString(R.string.type_incoming_pulled); @@ -67,6 +72,18 @@ public class CallTypeHelper { mRejectedName = resources.getString(R.string.type_rejected); mBlockedName = resources.getString(R.string.type_blocked); mAnsweredElsewhereName = resources.getString(R.string.type_answered_elsewhere); + + if (lightbringer.getIncomingCallTypeText() != -1) { + mIncomingLightbringerCall = resources.getString(lightbringer.getIncomingCallTypeText()); + } else { + mIncomingLightbringerCall = mIncomingVideoName; + } + + if (lightbringer.getOutgoingCallTypeText() != -1) { + mOutgoingLightbringerCall = resources.getString(lightbringer.getOutgoingCallTypeText()); + } else { + mOutgoingLightbringerCall = mOutgoingVideoName; + } } public static boolean isMissedCallType(int callType) { @@ -77,13 +94,17 @@ public class CallTypeHelper { } /** Returns the text used to represent the given call type. */ - public CharSequence getCallTypeText(int callType, boolean isVideoCall, boolean isPulledCall) { + public CharSequence getCallTypeText( + int callType, boolean isVideoCall, boolean isPulledCall, boolean isLightbringerCall) { switch (callType) { case AppCompatConstants.CALLS_INCOMING_TYPE: if (isVideoCall) { if (isPulledCall) { return mIncomingVideoPulledName; } else { + if (isLightbringerCall) { + return mIncomingLightbringerCall; + } return mIncomingVideoName; } } else { @@ -99,6 +120,9 @@ public class CallTypeHelper { if (isPulledCall) { return mOutgoingVideoPulledName; } else { + if (isLightbringerCall) { + return mOutgoingLightbringerCall; + } return mOutgoingVideoName; } } else { diff --git a/java/com/android/dialer/calllogutils/PhoneCallDetails.java b/java/com/android/dialer/calllogutils/PhoneCallDetails.java index 13c528ad2..869a3d099 100644 --- a/java/com/android/dialer/calllogutils/PhoneCallDetails.java +++ b/java/com/android/dialer/calllogutils/PhoneCallDetails.java @@ -99,6 +99,9 @@ public class PhoneCallDetails { // Voicemail transcription public String transcription; + // Voicemail transcription state, ie. in-progress, failed, etc. + public int transcriptionState; + // The display string for the number. public String displayNumber; diff --git a/java/com/android/dialer/calllogutils/res/values-af/strings.xml b/java/com/android/dialer/calllogutils/res/values-af/strings.xml index 0f9dd3b19..557532ddc 100644 --- a/java/com/android/dialer/calllogutils/res/values-af/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-af/strings.xml @@ -49,4 +49,5 @@ "via %1$s" "op %1$s, via %2$s" "Stemboodskap" + "Nou" diff --git a/java/com/android/dialer/calllogutils/res/values-am/strings.xml b/java/com/android/dialer/calllogutils/res/values-am/strings.xml index c5da1c6c0..fec0691d7 100644 --- a/java/com/android/dialer/calllogutils/res/values-am/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-am/strings.xml @@ -34,8 +34,8 @@ "ሰ" "%d %s %d %s" "%d %s" - "%s\'%s\' %s\'%s\'" - "%s\'%s\'" + "%s \'%s\' %s \'%s\'" + "%s \'%s\'" ሰከንዶች ሰከንዶች @@ -49,4 +49,5 @@ "በ %1$s በኩል" "በ %1$s ላይ፣ በ %2$s በኩል" "የድምፅ መልዕክት" + "አሁን" diff --git a/java/com/android/dialer/calllogutils/res/values-ar/strings.xml b/java/com/android/dialer/calllogutils/res/values-ar/strings.xml index 39afb6d1d..101eb2cc2 100644 --- a/java/com/android/dialer/calllogutils/res/values-ar/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ar/strings.xml @@ -57,4 +57,5 @@ "من خلال %1$s" "على %1$s من خلال %2$s" "البريد الصوتي" + "الآن" diff --git a/java/com/android/dialer/calllogutils/res/values-az/strings.xml b/java/com/android/dialer/calllogutils/res/values-az/strings.xml index c280c8eda..938d2d6d6 100644 --- a/java/com/android/dialer/calllogutils/res/values-az/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-az/strings.xml @@ -34,8 +34,8 @@ "san" "%d %s %d %s" "%d %s" - "%s\"%s\" %s\"%s\"" - "%s\"%s\"" + "%s\'%s\' %s\'%s\'" + "%s\'%s\'" saniyə saniyə @@ -49,4 +49,5 @@ "%1$s vasitəsilə" "%2$s vasitəsilə %1$s hesabında" "Səsli e-məktub" + "İndi" diff --git a/java/com/android/dialer/calllogutils/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/calllogutils/res/values-b+sr+Latn/strings.xml index 74c9f7873..0bf6a6215 100644 --- a/java/com/android/dialer/calllogutils/res/values-b+sr+Latn/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-b+sr+Latn/strings.xml @@ -51,4 +51,5 @@ "preko %1$s" "na %1$s, preko %2$s" "Govorna pošta" + "Sada" diff --git a/java/com/android/dialer/calllogutils/res/values-be/strings.xml b/java/com/android/dialer/calllogutils/res/values-be/strings.xml index 1099e320c..d7b74aba9 100644 --- a/java/com/android/dialer/calllogutils/res/values-be/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-be/strings.xml @@ -53,4 +53,5 @@ "праз %1$s" "на %1$s, праз %2$s" "Галасавая пошта" + "Зараз" diff --git a/java/com/android/dialer/calllogutils/res/values-bg/strings.xml b/java/com/android/dialer/calllogutils/res/values-bg/strings.xml index 216981c91..cb1dc7299 100644 --- a/java/com/android/dialer/calllogutils/res/values-bg/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-bg/strings.xml @@ -49,4 +49,5 @@ "през %1$s" "в/ъв %1$s, през %2$s" "Гласова поща" + "Сега" diff --git a/java/com/android/dialer/calllogutils/res/values-bn/strings.xml b/java/com/android/dialer/calllogutils/res/values-bn/strings.xml index 7d51fe74e..11f475f0c 100644 --- a/java/com/android/dialer/calllogutils/res/values-bn/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-bn/strings.xml @@ -49,4 +49,5 @@ "%1$s এর মাধ্যমে" "%1$s এ, %2$s এর মাধ্যমে" "ভয়েসমেল" + "এখনই" diff --git a/java/com/android/dialer/calllogutils/res/values-bs/strings.xml b/java/com/android/dialer/calllogutils/res/values-bs/strings.xml index 405d9c3f6..7526ef4f5 100644 --- a/java/com/android/dialer/calllogutils/res/values-bs/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-bs/strings.xml @@ -51,4 +51,5 @@ "preko %1$s" "na %1$s, preko %2$s" "Govorna pošta" + "Sada" diff --git a/java/com/android/dialer/calllogutils/res/values-ca/strings.xml b/java/com/android/dialer/calllogutils/res/values-ca/strings.xml index ad993e39f..6441b44e2 100644 --- a/java/com/android/dialer/calllogutils/res/values-ca/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ca/strings.xml @@ -49,4 +49,5 @@ "al número %1$s" "a %1$s, al número %2$s" "Bústia de veu" + "Ara" diff --git a/java/com/android/dialer/calllogutils/res/values-cs/strings.xml b/java/com/android/dialer/calllogutils/res/values-cs/strings.xml index 8889941ad..9e0fb0e5d 100644 --- a/java/com/android/dialer/calllogutils/res/values-cs/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-cs/strings.xml @@ -53,4 +53,5 @@ "z čísla %1$s" "na účet %1$s, z čísla %2$s" "Hlasová schránka" + "Právě teď" diff --git a/java/com/android/dialer/calllogutils/res/values-da/strings.xml b/java/com/android/dialer/calllogutils/res/values-da/strings.xml index 123002a26..9032f81e3 100644 --- a/java/com/android/dialer/calllogutils/res/values-da/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-da/strings.xml @@ -34,8 +34,8 @@ "sek." "%d %s %d %s" "%d %s" - "%s\' %s\' %s\' %s\'" - "%s\' %s\'" + "%s \'%s\' %s \'%s\'" + "%s \'%s\'" sekund sekunder @@ -49,4 +49,5 @@ "via %1$s" "til %1$s, via %2$s" "Telefonsvarer" + "Nu" diff --git a/java/com/android/dialer/calllogutils/res/values-de/strings.xml b/java/com/android/dialer/calllogutils/res/values-de/strings.xml index 5867b7344..7980d9747 100644 --- a/java/com/android/dialer/calllogutils/res/values-de/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-de/strings.xml @@ -34,8 +34,8 @@ "s" "%d %s %d %s" "%d %s" - "%s \"%s\" %s \"%s\"" - "%s \"%s\"" + "%s \'%s\' %s \'%s\'" + "%s \'%s\'"  Sekunden  Sekunde @@ -49,4 +49,5 @@ "über %1$s" "mit %1$s, über %2$s" "Mailbox" + "Jetzt" diff --git a/java/com/android/dialer/calllogutils/res/values-el/strings.xml b/java/com/android/dialer/calllogutils/res/values-el/strings.xml index 018a7266b..20abded84 100644 --- a/java/com/android/dialer/calllogutils/res/values-el/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-el/strings.xml @@ -49,4 +49,5 @@ "μέσω %1$s" "στον λογαριασμό %1$s, μέσω %2$s" "Αυτόματος τηλεφωνητής" + "Τώρα" diff --git a/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml b/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml index d0294c641..51c5215a4 100644 --- a/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml @@ -49,4 +49,5 @@ "via %1$s" "on %1$s, via %2$s" "Voicemail" + "Now" diff --git a/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml b/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml index d0294c641..51c5215a4 100644 --- a/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml @@ -49,4 +49,5 @@ "via %1$s" "on %1$s, via %2$s" "Voicemail" + "Now" diff --git a/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml b/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml index d0294c641..51c5215a4 100644 --- a/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml @@ -49,4 +49,5 @@ "via %1$s" "on %1$s, via %2$s" "Voicemail" + "Now" diff --git a/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml b/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml index 2988f9117..5deb0a2be 100644 --- a/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml @@ -49,4 +49,5 @@ "por medio de %1$s" "en %1$s por medio de %2$s" "Buzón de voz" + "Ahora" diff --git a/java/com/android/dialer/calllogutils/res/values-es/strings.xml b/java/com/android/dialer/calllogutils/res/values-es/strings.xml index fb13bccc3..ac8992c93 100644 --- a/java/com/android/dialer/calllogutils/res/values-es/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-es/strings.xml @@ -49,4 +49,5 @@ "a través del %1$s" "en %1$s, a través del %2$s" "Buzón de voz" + "Ahora" diff --git a/java/com/android/dialer/calllogutils/res/values-et/strings.xml b/java/com/android/dialer/calllogutils/res/values-et/strings.xml index 3781133d8..e52f580ff 100644 --- a/java/com/android/dialer/calllogutils/res/values-et/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-et/strings.xml @@ -49,4 +49,5 @@ "numbri %1$s kaudu" "kontol %1$s, numbri %2$s kaudu" "Kõnepost" + "Praegu" diff --git a/java/com/android/dialer/calllogutils/res/values-eu/strings.xml b/java/com/android/dialer/calllogutils/res/values-eu/strings.xml index a097ec857..6aa2aa64f 100644 --- a/java/com/android/dialer/calllogutils/res/values-eu/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-eu/strings.xml @@ -34,7 +34,7 @@ "s" "%d %s eta %d %s" "%d %s" - "%s \'%s\' eta %s \'%s\'" + "%s \'%s\' \'eta\' %s \'%s\'" "%s \'%s\'" segundo @@ -49,4 +49,5 @@ "%1$s bidez" "%1$s kontuan, %2$s bidez" "Erantzungailua" + "Oraintxe bertan" diff --git a/java/com/android/dialer/calllogutils/res/values-fa/strings.xml b/java/com/android/dialer/calllogutils/res/values-fa/strings.xml index 1a457d41a..4439ca456 100644 --- a/java/com/android/dialer/calllogutils/res/values-fa/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-fa/strings.xml @@ -49,4 +49,5 @@ "ازطریق %1$s" "در %1$s، ازطریق %2$s" "پست صوتی" + "اکنون" diff --git a/java/com/android/dialer/calllogutils/res/values-fi/strings.xml b/java/com/android/dialer/calllogutils/res/values-fi/strings.xml index 70b3d53c4..41ff5825f 100644 --- a/java/com/android/dialer/calllogutils/res/values-fi/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-fi/strings.xml @@ -49,4 +49,5 @@ "numerosta %1$s" "tililtä %1$s numerosta %2$s" "Vastaaja" + "Nyt" diff --git a/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml b/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml index 01e2d64cd..0c828937f 100644 --- a/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml @@ -49,4 +49,5 @@ "au %1$s" "sur %1$s, au %2$s" "Messagerie vocale" + "Maintenant" diff --git a/java/com/android/dialer/calllogutils/res/values-fr/strings.xml b/java/com/android/dialer/calllogutils/res/values-fr/strings.xml index 8f8c797c4..c1b9ea6f7 100644 --- a/java/com/android/dialer/calllogutils/res/values-fr/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-fr/strings.xml @@ -49,4 +49,5 @@ "au %1$s" "sur %1$s, au %2$s" "Messagerie vocale" + "À l\'instant" diff --git a/java/com/android/dialer/calllogutils/res/values-gl/strings.xml b/java/com/android/dialer/calllogutils/res/values-gl/strings.xml index 72c0d5a7b..bbf75e219 100644 --- a/java/com/android/dialer/calllogutils/res/values-gl/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-gl/strings.xml @@ -49,4 +49,5 @@ "a través do %1$s" "en %1$s, a través do %2$s" "Correo de voz" + "Agora" diff --git a/java/com/android/dialer/calllogutils/res/values-gu/strings.xml b/java/com/android/dialer/calllogutils/res/values-gu/strings.xml index 29c162425..37c855184 100644 --- a/java/com/android/dialer/calllogutils/res/values-gu/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-gu/strings.xml @@ -49,4 +49,5 @@ "%1$s મારફતે" "%1$s પર, %2$s મારફતે" "વૉઇસમેઇલ" + "હમણાં" diff --git a/java/com/android/dialer/calllogutils/res/values-hi/strings.xml b/java/com/android/dialer/calllogutils/res/values-hi/strings.xml index d20e88e02..44e9b90f7 100644 --- a/java/com/android/dialer/calllogutils/res/values-hi/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-hi/strings.xml @@ -34,8 +34,8 @@ "से." "%d %s %d %s" "%d %s" - "%s\'%s\' %s\'%s\'" - "%s\'%s\'" + "%s \'%s\' %s \'%s\'" + "%s \'%s\'" सेकंड सेकंड @@ -49,4 +49,5 @@ "%1$s से" "%1$s पर, %2$s से" "वॉइसमेल" + "अभी" diff --git a/java/com/android/dialer/calllogutils/res/values-hr/strings.xml b/java/com/android/dialer/calllogutils/res/values-hr/strings.xml index 72281bf49..560e8e513 100644 --- a/java/com/android/dialer/calllogutils/res/values-hr/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-hr/strings.xml @@ -51,4 +51,5 @@ "putem broja %1$s" "na računu %1$s, putem broja %2$s" "Govorna pošta" + "Sad" diff --git a/java/com/android/dialer/calllogutils/res/values-hu/strings.xml b/java/com/android/dialer/calllogutils/res/values-hu/strings.xml index f85e9f1db..f2bdd2402 100644 --- a/java/com/android/dialer/calllogutils/res/values-hu/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-hu/strings.xml @@ -49,4 +49,5 @@ "szám: %1$s" "fiók: %1$s, szám: %2$s" "Hangposta" + "Most" diff --git a/java/com/android/dialer/calllogutils/res/values-hy/strings.xml b/java/com/android/dialer/calllogutils/res/values-hy/strings.xml index db21fecbd..04f02d73f 100644 --- a/java/com/android/dialer/calllogutils/res/values-hy/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-hy/strings.xml @@ -49,4 +49,5 @@ "%1$s համարից" "%1$s-ին %2$s համարից" "Ձայնային փոստ" + "Հիմա" diff --git a/java/com/android/dialer/calllogutils/res/values-in/strings.xml b/java/com/android/dialer/calllogutils/res/values-in/strings.xml index 11f407c67..83367ace1 100644 --- a/java/com/android/dialer/calllogutils/res/values-in/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-in/strings.xml @@ -49,4 +49,5 @@ "melalui %1$s" "di %1$s, melalui %2$s" "Pesan suara" + "Sekarang" diff --git a/java/com/android/dialer/calllogutils/res/values-is/strings.xml b/java/com/android/dialer/calllogutils/res/values-is/strings.xml index 1716649cc..639881d35 100644 --- a/java/com/android/dialer/calllogutils/res/values-is/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-is/strings.xml @@ -49,4 +49,5 @@ "í gegnum %1$s" "á %1$s, í gegnum %2$s" "Talhólf" + "Núna" diff --git a/java/com/android/dialer/calllogutils/res/values-it/strings.xml b/java/com/android/dialer/calllogutils/res/values-it/strings.xml index 2dd4dca88..e40a846eb 100644 --- a/java/com/android/dialer/calllogutils/res/values-it/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-it/strings.xml @@ -49,4 +49,5 @@ "tramite %1$s" "su %1$s, tramite %2$s" "Messaggi vocali" + "Ora" diff --git a/java/com/android/dialer/calllogutils/res/values-iw/strings.xml b/java/com/android/dialer/calllogutils/res/values-iw/strings.xml index 2f298558e..82dbd85da 100644 --- a/java/com/android/dialer/calllogutils/res/values-iw/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-iw/strings.xml @@ -34,7 +34,7 @@ "שנ\'" "%d %s ו-%d %s" "%d %s" - "%s\'%s\' ו-%s\'%s\'" + "%s\'%s\' %s\'%s\'" "%s\'%s\'" שניות @@ -53,4 +53,5 @@ "דרך %1$s" "בחשבון %1$s, דרך %2$s" "דואר קולי" + "עכשיו" diff --git a/java/com/android/dialer/calllogutils/res/values-ja/strings.xml b/java/com/android/dialer/calllogutils/res/values-ja/strings.xml index 1a4b7ee4c..4cfd61716 100644 --- a/java/com/android/dialer/calllogutils/res/values-ja/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ja/strings.xml @@ -49,4 +49,5 @@ "%1$s で受信" "%1$s（%2$s）で受信" "ボイスメール" + "たった今" diff --git a/java/com/android/dialer/calllogutils/res/values-ka/strings.xml b/java/com/android/dialer/calllogutils/res/values-ka/strings.xml index 2ce05376f..62f72ad7c 100644 --- a/java/com/android/dialer/calllogutils/res/values-ka/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ka/strings.xml @@ -49,4 +49,5 @@ "%1$s-ის მეშვეობით" "%1$s-ზე, %2$s-ის მეშვეობით" "ხმოვანი ფოსტა" + "ახლა" diff --git a/java/com/android/dialer/calllogutils/res/values-kk/strings.xml b/java/com/android/dialer/calllogutils/res/values-kk/strings.xml index b213dd521..3025979fa 100644 --- a/java/com/android/dialer/calllogutils/res/values-kk/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-kk/strings.xml @@ -49,4 +49,5 @@ "%1$s арқылы" "%1$s, %2$s арқылы" "Дауыстық хабар" + "Қазір" diff --git a/java/com/android/dialer/calllogutils/res/values-km/strings.xml b/java/com/android/dialer/calllogutils/res/values-km/strings.xml index 765bb61cf..650d4b82e 100644 --- a/java/com/android/dialer/calllogutils/res/values-km/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-km/strings.xml @@ -49,4 +49,5 @@ "តាមរយៈ %1$s" "នៅ​លើ %1$s តាមរយៈ %2$s" "សារ​ជា​សំឡេង" + "ឥឡូវនេះ" diff --git a/java/com/android/dialer/calllogutils/res/values-kn/strings.xml b/java/com/android/dialer/calllogutils/res/values-kn/strings.xml index cd6eaed26..07efc0bbb 100644 --- a/java/com/android/dialer/calllogutils/res/values-kn/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-kn/strings.xml @@ -49,4 +49,5 @@ "%1$s ಮೂಲಕ" "%1$s ರಲ್ಲಿ, %2$s ಮೂಲಕ" "ಧ್ವನಿಮೇಲ್" + "ಈಗ" diff --git a/java/com/android/dialer/calllogutils/res/values-ko/strings.xml b/java/com/android/dialer/calllogutils/res/values-ko/strings.xml index e1cc957e2..b372e23a5 100644 --- a/java/com/android/dialer/calllogutils/res/values-ko/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ko/strings.xml @@ -49,4 +49,5 @@ "%1$s번으로 수신" "%1$s에서 %2$s번으로 수신" "음성사서함" + "조금 전" diff --git a/java/com/android/dialer/calllogutils/res/values-ky/strings.xml b/java/com/android/dialer/calllogutils/res/values-ky/strings.xml index f758dab7b..633bbaec4 100644 --- a/java/com/android/dialer/calllogutils/res/values-ky/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ky/strings.xml @@ -35,7 +35,7 @@ "%d %s %d %s" "%d %s" "%s\'%s\' %s\'%s\'" - "%s\'%s\'" + "%s \'%s\'" секундалар секунда @@ -49,4 +49,5 @@ "%1$s аркылуу" "%1$s боюнча %2$s аркылуу" "Үн почтасы" + "Учурда" diff --git a/java/com/android/dialer/calllogutils/res/values-lo/strings.xml b/java/com/android/dialer/calllogutils/res/values-lo/strings.xml index 3107b3b02..7a7a869b5 100644 --- a/java/com/android/dialer/calllogutils/res/values-lo/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-lo/strings.xml @@ -49,4 +49,5 @@ "ຜ່ານ %1$s" "ຢູ່ %1$s, ຜ່ານ %2$s" "ຂໍ້ຄວາມສຽງ" + "ຕອນນີ້" diff --git a/java/com/android/dialer/calllogutils/res/values-lt/strings.xml b/java/com/android/dialer/calllogutils/res/values-lt/strings.xml index cdac53584..eca5ea324 100644 --- a/java/com/android/dialer/calllogutils/res/values-lt/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-lt/strings.xml @@ -53,4 +53,5 @@ "numeriu %1$s" "%1$s, numeriu %2$s" "Balso paštas" + "Dabar" diff --git a/java/com/android/dialer/calllogutils/res/values-lv/strings.xml b/java/com/android/dialer/calllogutils/res/values-lv/strings.xml index c87dbb622..5b469a56e 100644 --- a/java/com/android/dialer/calllogutils/res/values-lv/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-lv/strings.xml @@ -35,7 +35,7 @@ "%d %s %d %s" "%d %s" "%s \'%s\' %s \'%s\'" - "%s \'%s\'" + "%s\'%s\'" sekunžu sekunde @@ -51,4 +51,5 @@ "izmantojot numuru %1$s" "kontā %1$s, izmantojot numuru %2$s" "Balss pasts" + "Tikko" diff --git a/java/com/android/dialer/calllogutils/res/values-mk/strings.xml b/java/com/android/dialer/calllogutils/res/values-mk/strings.xml index 7c3c84ec0..72dfc07e3 100644 --- a/java/com/android/dialer/calllogutils/res/values-mk/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-mk/strings.xml @@ -49,4 +49,5 @@ "на %1$s" "на %1$s, на %2$s" "Говорна пошта" + "Сега" diff --git a/java/com/android/dialer/calllogutils/res/values-ml/strings.xml b/java/com/android/dialer/calllogutils/res/values-ml/strings.xml index 0064401f1..7a819e95f 100644 --- a/java/com/android/dialer/calllogutils/res/values-ml/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ml/strings.xml @@ -35,7 +35,7 @@ "%d %s %d %s" "%d %s" "%s\'%s\' %s\'%s\'" - "%s\'%s\'" + "%s \'%s\'" സെക്കൻഡ് സെക്കൻഡ് @@ -49,4 +49,5 @@ "%1$s നമ്പർ വഴി" "%2$s നമ്പർ വഴി, %1$s അക്കൗണ്ടിൽ" "വോയ്‌സ്‌മെയിൽ" + "ഇപ്പോൾ" diff --git a/java/com/android/dialer/calllogutils/res/values-mn/strings.xml b/java/com/android/dialer/calllogutils/res/values-mn/strings.xml index 915c1adfd..77f03404e 100644 --- a/java/com/android/dialer/calllogutils/res/values-mn/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-mn/strings.xml @@ -49,4 +49,5 @@ "%1$s-р" "%1$s дээр, %2$s-р" "Дуут шуудан" + "Одоо" diff --git a/java/com/android/dialer/calllogutils/res/values-mr/strings.xml b/java/com/android/dialer/calllogutils/res/values-mr/strings.xml index c01f7c171..3329b1c22 100644 --- a/java/com/android/dialer/calllogutils/res/values-mr/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-mr/strings.xml @@ -34,8 +34,8 @@ "से" "%d %s %d %s" "%d %s" - "%s\'%s\' %s\'%s\'" - "%s\'%s\'" + "%s \'%s\' %s \'%s\'" + "%s \'%s\'" सेकंद सेकंद @@ -49,4 +49,5 @@ "%1$s द्वारे" "%1$s वर, %2$s द्वारे" "व्हॉइसमेल" + "आत्ता" diff --git a/java/com/android/dialer/calllogutils/res/values-ms/strings.xml b/java/com/android/dialer/calllogutils/res/values-ms/strings.xml index 441a9ab93..76ada6cf7 100644 --- a/java/com/android/dialer/calllogutils/res/values-ms/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ms/strings.xml @@ -49,4 +49,5 @@ "melalui %1$s" "pada %1$s, melalui %2$s" "Mel suara" + "Sekarang" diff --git a/java/com/android/dialer/calllogutils/res/values-my/strings.xml b/java/com/android/dialer/calllogutils/res/values-my/strings.xml index f05d5b235..5744c2be2 100644 --- a/java/com/android/dialer/calllogutils/res/values-my/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-my/strings.xml @@ -49,4 +49,5 @@ "%1$s မှတစ်ဆင့်" "%1$s တွင်၊ %2$s မှတစ်ဆင့်" "အသံမေးလ်" + "ယခု" diff --git a/java/com/android/dialer/calllogutils/res/values-nb/strings.xml b/java/com/android/dialer/calllogutils/res/values-nb/strings.xml index 2f744036a..7a989d4bf 100644 --- a/java/com/android/dialer/calllogutils/res/values-nb/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-nb/strings.xml @@ -34,8 +34,8 @@ "sek." "%d %s %d %s" "%d %s" - "%s\'%s\' %s\'%s\'" - "%s\'%s\'" + "%s \'%s\' %s \'%s\'" + "%s \'%s\'" sekunder sekund @@ -49,4 +49,5 @@ "via %1$s" "på %1$s via %2$s" "Talepost" + "Nå" diff --git a/java/com/android/dialer/calllogutils/res/values-ne/strings.xml b/java/com/android/dialer/calllogutils/res/values-ne/strings.xml index a83d6fb98..bb1b25c3e 100644 --- a/java/com/android/dialer/calllogutils/res/values-ne/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ne/strings.xml @@ -49,4 +49,5 @@ "%1$s मार्फत" "%1$s मा, %2$s मार्फत" "भ्वाइस मेल" + "अहिले भर्खरै" diff --git a/java/com/android/dialer/calllogutils/res/values-nl/strings.xml b/java/com/android/dialer/calllogutils/res/values-nl/strings.xml index d15610917..9b28f6f5b 100644 --- a/java/com/android/dialer/calllogutils/res/values-nl/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-nl/strings.xml @@ -34,8 +34,8 @@ "s" "%d %s %d %s" "%d %s" - "%s\'%s\' %s\'%s\'" - "%s\'%s\'" + "%s \'%s\' %s \'%s\'" + "%s \'%s\'" seconden seconde @@ -49,4 +49,5 @@ "via %1$s" "op %1$s, via %2$s" "Voicemail" + "Nu" diff --git a/java/com/android/dialer/calllogutils/res/values-no/strings.xml b/java/com/android/dialer/calllogutils/res/values-no/strings.xml index 2f744036a..7a989d4bf 100644 --- a/java/com/android/dialer/calllogutils/res/values-no/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-no/strings.xml @@ -34,8 +34,8 @@ "sek." "%d %s %d %s" "%d %s" - "%s\'%s\' %s\'%s\'" - "%s\'%s\'" + "%s \'%s\' %s \'%s\'" + "%s \'%s\'" sekunder sekund @@ -49,4 +49,5 @@ "via %1$s" "på %1$s via %2$s" "Talepost" + "Nå" diff --git a/java/com/android/dialer/calllogutils/res/values-pa/strings.xml b/java/com/android/dialer/calllogutils/res/values-pa/strings.xml index ba77fa1da..6e2c137fc 100644 --- a/java/com/android/dialer/calllogutils/res/values-pa/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-pa/strings.xml @@ -49,4 +49,5 @@ "%1$s ਰਾਹੀਂ" "%1$s \'ਤੇ, %2$s ਰਾਹੀਂ" "ਵੌਇਸਮੇਲ" + "ਹੁਣੇ" diff --git a/java/com/android/dialer/calllogutils/res/values-pl/strings.xml b/java/com/android/dialer/calllogutils/res/values-pl/strings.xml index 3d9e9d98a..b30171f11 100644 --- a/java/com/android/dialer/calllogutils/res/values-pl/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-pl/strings.xml @@ -53,4 +53,5 @@ "przez %1$s" "na koncie %1$s, przez %2$s" "Poczta głosowa" + "Przed chwilą" diff --git a/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml b/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml index 8c13e813e..4d64d22ad 100644 --- a/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml @@ -34,8 +34,8 @@ "s" "%d %s %d %s" "%d %s" - "%s \"%s\" %s \"%s\"" - "%s \"%s\"" + "%s \'%s\' %s \'%s\'" + "%s \'%s\'" segundo segundos @@ -49,4 +49,5 @@ "pelo número %1$s" "em %1$s, pelo número %2$s" "Correio de voz" + "Agora" diff --git a/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml b/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml index e24d245a3..c10be92b0 100644 --- a/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml @@ -34,14 +34,14 @@ "seg" "%d %s, %d %s" "%d %s" - "%s\"%s\", %s\"%s\"" - "%s \"%s\"" + "%s\'%s\', %s\'%s\'" + "%s \'%s\'" - seconds + segundo segundos - minutes + minuto minutos "Chamada atendida noutro dispositivo" @@ -49,4 +49,5 @@ "através do número %1$s" "em %1$s, através do número %2$s" "Correio de voz" + "Agora" diff --git a/java/com/android/dialer/calllogutils/res/values-pt/strings.xml b/java/com/android/dialer/calllogutils/res/values-pt/strings.xml index 8c13e813e..4d64d22ad 100644 --- a/java/com/android/dialer/calllogutils/res/values-pt/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-pt/strings.xml @@ -34,8 +34,8 @@ "s" "%d %s %d %s" "%d %s" - "%s \"%s\" %s \"%s\"" - "%s \"%s\"" + "%s \'%s\' %s \'%s\'" + "%s \'%s\'" segundo segundos @@ -49,4 +49,5 @@ "pelo número %1$s" "em %1$s, pelo número %2$s" "Correio de voz" + "Agora" diff --git a/java/com/android/dialer/calllogutils/res/values-ro/strings.xml b/java/com/android/dialer/calllogutils/res/values-ro/strings.xml index 0443bda9c..791bf4e44 100644 --- a/java/com/android/dialer/calllogutils/res/values-ro/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ro/strings.xml @@ -51,4 +51,5 @@ "prin %1$s" "pe %1$s, prin %2$s" "Mesagerie vocală" + "Acum" diff --git a/java/com/android/dialer/calllogutils/res/values-ru/strings.xml b/java/com/android/dialer/calllogutils/res/values-ru/strings.xml index c64d25f45..378dc4118 100644 --- a/java/com/android/dialer/calllogutils/res/values-ru/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ru/strings.xml @@ -53,4 +53,5 @@ "Номер %1$s" "%1$s, номер %2$s" "Голосовая почта" + "Только что" diff --git a/java/com/android/dialer/calllogutils/res/values-si/strings.xml b/java/com/android/dialer/calllogutils/res/values-si/strings.xml index 36297f188..1e17d184e 100644 --- a/java/com/android/dialer/calllogutils/res/values-si/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-si/strings.xml @@ -49,4 +49,5 @@ "%1$s හරහා" "%1$s මත, %2$s හරහා" "හඬ තැපෑල" + "දැන්" diff --git a/java/com/android/dialer/calllogutils/res/values-sk/strings.xml b/java/com/android/dialer/calllogutils/res/values-sk/strings.xml index 49196299c..7abfafc3e 100644 --- a/java/com/android/dialer/calllogutils/res/values-sk/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sk/strings.xml @@ -53,4 +53,5 @@ "prostredníctvom čísla %1$s" "v účte %1$s, prostredníctvom čísla %2$s" "Hlasová schránka" + "Teraz" diff --git a/java/com/android/dialer/calllogutils/res/values-sl/strings.xml b/java/com/android/dialer/calllogutils/res/values-sl/strings.xml index 88bb0a10a..21c117756 100644 --- a/java/com/android/dialer/calllogutils/res/values-sl/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sl/strings.xml @@ -53,4 +53,5 @@ "prek številke %1$s" "v računu %1$s, prek številke %2$s" "Odzivnik" + "Zdaj" diff --git a/java/com/android/dialer/calllogutils/res/values-sq/strings.xml b/java/com/android/dialer/calllogutils/res/values-sq/strings.xml index b79ad1911..1124ffacd 100644 --- a/java/com/android/dialer/calllogutils/res/values-sq/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sq/strings.xml @@ -49,4 +49,5 @@ "nëpërmjet %1$s" "në %1$s, nëpërmjet %2$s" "Posta zanore" + "Tani" diff --git a/java/com/android/dialer/calllogutils/res/values-sr/strings.xml b/java/com/android/dialer/calllogutils/res/values-sr/strings.xml index eb991860f..5653dae06 100644 --- a/java/com/android/dialer/calllogutils/res/values-sr/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sr/strings.xml @@ -51,4 +51,5 @@ "преко %1$s" "на %1$s, преко %2$s" "Говорна пошта" + "Сада" diff --git a/java/com/android/dialer/calllogutils/res/values-sv/strings.xml b/java/com/android/dialer/calllogutils/res/values-sv/strings.xml index 69d97fa5d..190213294 100644 --- a/java/com/android/dialer/calllogutils/res/values-sv/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sv/strings.xml @@ -49,4 +49,5 @@ "med %1$s" "på %1$s, med %2$s" "Röstbrevlåda" + "Nu" diff --git a/java/com/android/dialer/calllogutils/res/values-sw/strings.xml b/java/com/android/dialer/calllogutils/res/values-sw/strings.xml index 5a5a6909a..57eb4ebfd 100644 --- a/java/com/android/dialer/calllogutils/res/values-sw/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sw/strings.xml @@ -34,8 +34,8 @@ "sek" "%d %s %d %s" "%d %s" - "%s\'%s\' %s\'%s\'" - "%s\'%s\'" + "\'%s\'%s \'%s\'%s" + "\'%s\'%s" Sekunde Sekunde @@ -49,4 +49,5 @@ "kupitia %1$s" "kwenye %1$s, kupitia %2$s" "Ujumbe wa sauti" + "Sasa" diff --git a/java/com/android/dialer/calllogutils/res/values-ta/strings.xml b/java/com/android/dialer/calllogutils/res/values-ta/strings.xml index 34b191be6..481e4a904 100644 --- a/java/com/android/dialer/calllogutils/res/values-ta/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ta/strings.xml @@ -49,4 +49,5 @@ "%1$s மூலம்" "%1$s இல் %2$s மூலம்" "குரலஞ்சல்" + "இப்போது" diff --git a/java/com/android/dialer/calllogutils/res/values-te/strings.xml b/java/com/android/dialer/calllogutils/res/values-te/strings.xml index 17e20c1e9..bbea73b02 100644 --- a/java/com/android/dialer/calllogutils/res/values-te/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-te/strings.xml @@ -49,4 +49,5 @@ "%1$s ద్వారా" "%1$sలో, %2$s ద్వారా" "వాయిస్ మెయిల్" + "ఇప్పుడు" diff --git a/java/com/android/dialer/calllogutils/res/values-th/strings.xml b/java/com/android/dialer/calllogutils/res/values-th/strings.xml index 53c2e9208..184cb260e 100644 --- a/java/com/android/dialer/calllogutils/res/values-th/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-th/strings.xml @@ -49,4 +49,5 @@ "ผ่าน %1$s" "ใน %1$s ผ่าน %2$s" "ข้อความเสียง" + "ตอนนี้" diff --git a/java/com/android/dialer/calllogutils/res/values-tl/strings.xml b/java/com/android/dialer/calllogutils/res/values-tl/strings.xml index e88bf7227..19660a634 100644 --- a/java/com/android/dialer/calllogutils/res/values-tl/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-tl/strings.xml @@ -49,4 +49,5 @@ "sa pamamagitan ng %1$s" "sa %1$s, sa pamamagitan ng %2$s" "Voicemail" + "Ngayon" diff --git a/java/com/android/dialer/calllogutils/res/values-tr/strings.xml b/java/com/android/dialer/calllogutils/res/values-tr/strings.xml index 78e0b5be5..6a6a1f7bb 100644 --- a/java/com/android/dialer/calllogutils/res/values-tr/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-tr/strings.xml @@ -34,8 +34,8 @@ "sn." "%d %s %d %s" "%d %s" - "%s \"%s\" %s \"%s\"" - "%s \"%s\"" + "%s \'%s\' %s \'%s\'" + "%s \'%s\'" saniye saniye @@ -49,4 +49,5 @@ "%1$s kullanılarak" "%2$s kullanılarak %1$s hesabında" "Sesli mesaj" + "Şimdi" diff --git a/java/com/android/dialer/calllogutils/res/values-uk/strings.xml b/java/com/android/dialer/calllogutils/res/values-uk/strings.xml index d9e155645..b2026c8ca 100644 --- a/java/com/android/dialer/calllogutils/res/values-uk/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-uk/strings.xml @@ -53,4 +53,5 @@ "на номер %1$s" "на %1$s на номер %2$s" "Голосова пошта" + "Зараз" diff --git a/java/com/android/dialer/calllogutils/res/values-ur/strings.xml b/java/com/android/dialer/calllogutils/res/values-ur/strings.xml index 4f73a49bd..d110d2250 100644 --- a/java/com/android/dialer/calllogutils/res/values-ur/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ur/strings.xml @@ -34,8 +34,8 @@ "سیکنڈ" "%d %s %d %s" "%d %s" - "%s\'%s\' %s\'%s\'" - "%s\'%s\'" + "%s \'%s\' %s \'%s\'‎" + "%s \'%s\'‎" سیکنڈز سیکنڈ @@ -49,4 +49,5 @@ "بذریعہ %1$s" "%1$s پر، بذریعہ %2$s" "صوتی میل" + "ابھی" diff --git a/java/com/android/dialer/calllogutils/res/values-uz/strings.xml b/java/com/android/dialer/calllogutils/res/values-uz/strings.xml index b73ea5cff..dec50603f 100644 --- a/java/com/android/dialer/calllogutils/res/values-uz/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-uz/strings.xml @@ -49,4 +49,5 @@ "%1$s raqami orqali" "%1$s, %2$s raqami orqali" "Ovozli pochta" + "Hozir" diff --git a/java/com/android/dialer/calllogutils/res/values-vi/strings.xml b/java/com/android/dialer/calllogutils/res/values-vi/strings.xml index b583d4049..14d9695ff 100644 --- a/java/com/android/dialer/calllogutils/res/values-vi/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-vi/strings.xml @@ -49,4 +49,5 @@ "qua %1$s" "trên %1$s, qua %2$s" "Thư thoại" + "Bây giờ" diff --git a/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml b/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml index 9484e3b38..b9aca90f2 100644 --- a/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml @@ -49,4 +49,5 @@ "通过 %1$s" "帐号：%1$s，通过 %2$s" "语音邮件" + "现在" diff --git a/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml b/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml index 131e4ed6e..97fc21d72 100644 --- a/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml @@ -49,4 +49,5 @@ "透過 %1$s" "在 %1$s 上透過 %2$s" "留言" + "現在" diff --git a/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml b/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml index c06e5cded..d65f3c03c 100644 --- a/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml @@ -49,4 +49,5 @@ "透過 %1$s" "%1$s，透過 %2$s" "語音留言" + "剛剛" diff --git a/java/com/android/dialer/calllogutils/res/values-zu/strings.xml b/java/com/android/dialer/calllogutils/res/values-zu/strings.xml index f6a473971..90a80f089 100644 --- a/java/com/android/dialer/calllogutils/res/values-zu/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-zu/strings.xml @@ -49,4 +49,5 @@ "nge-%1$s" "ku-%1$s, nge-%2$s" "Ivoyisimeyili" + "Manje" diff --git a/java/com/android/dialer/calllogutils/res/values/strings.xml b/java/com/android/dialer/calllogutils/res/values/strings.xml index 255990399..56cd94a9e 100644 --- a/java/com/android/dialer/calllogutils/res/values/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values/strings.xml @@ -127,4 +127,7 @@ Voicemail + + + Now \ No newline at end of file -- cgit v1.2.3