From fc37b02f5d3381a7882770941e461b13b679b6ef Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Tue, 21 Mar 2017 10:11:17 -0700 Subject: Update AOSP Dialer source from internal google3 repository at cl/150756069 Test: make, treehugger This CL updates the AOSP Dialer source with all the changes that have gone into the private google3 repository. This includes all the changes from cl/150392808 (3/16/2017) to cl/150756069 (3/21/2017). This goal of these drops is to keep the AOSP source in sync with the internal google3 repository. Currently these sync are done by hand with very minor modifications to the internal source code. See the Android.mk file for list of modifications. Our current goal is to do frequent drops (daily if possible) and eventually switched to an automated process. Change-Id: I0888b5db52efb28eb8194600e0c7804592f975f3 --- .../dialer/calllogutils/CallTypeIconsView.java | 89 ++++++++++++++-------- .../dialer/calllogutils/res/values-af/strings.xml | 6 +- .../dialer/calllogutils/res/values-am/strings.xml | 6 +- .../dialer/calllogutils/res/values-ar/strings.xml | 6 +- .../dialer/calllogutils/res/values-az/strings.xml | 6 +- .../dialer/calllogutils/res/values-be/strings.xml | 6 +- .../dialer/calllogutils/res/values-bg/strings.xml | 6 +- .../dialer/calllogutils/res/values-bn/strings.xml | 6 +- .../dialer/calllogutils/res/values-bs/strings.xml | 6 +- .../dialer/calllogutils/res/values-ca/strings.xml | 6 +- .../dialer/calllogutils/res/values-cs/strings.xml | 6 +- .../dialer/calllogutils/res/values-da/strings.xml | 6 +- .../dialer/calllogutils/res/values-de/strings.xml | 6 +- .../dialer/calllogutils/res/values-el/strings.xml | 6 +- .../calllogutils/res/values-en-rAU/strings.xml | 6 +- .../calllogutils/res/values-en-rGB/strings.xml | 6 +- .../calllogutils/res/values-en-rIN/strings.xml | 6 +- .../calllogutils/res/values-es-rUS/strings.xml | 6 +- .../dialer/calllogutils/res/values-es/strings.xml | 6 +- .../dialer/calllogutils/res/values-et/strings.xml | 6 +- .../dialer/calllogutils/res/values-eu/strings.xml | 6 +- .../dialer/calllogutils/res/values-fa/strings.xml | 6 +- .../dialer/calllogutils/res/values-fi/strings.xml | 6 +- .../calllogutils/res/values-fr-rCA/strings.xml | 6 +- .../dialer/calllogutils/res/values-fr/strings.xml | 6 +- .../dialer/calllogutils/res/values-gl/strings.xml | 6 +- .../dialer/calllogutils/res/values-gu/strings.xml | 6 +- .../dialer/calllogutils/res/values-hi/strings.xml | 6 +- .../dialer/calllogutils/res/values-hr/strings.xml | 6 +- .../dialer/calllogutils/res/values-hu/strings.xml | 6 +- .../dialer/calllogutils/res/values-hy/strings.xml | 6 +- .../dialer/calllogutils/res/values-in/strings.xml | 6 +- .../dialer/calllogutils/res/values-is/strings.xml | 6 +- .../dialer/calllogutils/res/values-it/strings.xml | 6 +- .../dialer/calllogutils/res/values-iw/strings.xml | 6 +- .../dialer/calllogutils/res/values-ja/strings.xml | 6 +- .../dialer/calllogutils/res/values-ka/strings.xml | 6 +- .../dialer/calllogutils/res/values-kk/strings.xml | 6 +- .../dialer/calllogutils/res/values-km/strings.xml | 6 +- .../dialer/calllogutils/res/values-kn/strings.xml | 6 +- .../dialer/calllogutils/res/values-ko/strings.xml | 6 +- .../dialer/calllogutils/res/values-ky/strings.xml | 6 +- .../dialer/calllogutils/res/values-lo/strings.xml | 6 +- .../dialer/calllogutils/res/values-lt/strings.xml | 6 +- .../dialer/calllogutils/res/values-lv/strings.xml | 6 +- .../dialer/calllogutils/res/values-mk/strings.xml | 6 +- .../dialer/calllogutils/res/values-ml/strings.xml | 6 +- .../dialer/calllogutils/res/values-mn/strings.xml | 6 +- .../dialer/calllogutils/res/values-mr/strings.xml | 6 +- .../dialer/calllogutils/res/values-ms/strings.xml | 6 +- .../dialer/calllogutils/res/values-my/strings.xml | 6 +- .../dialer/calllogutils/res/values-nb/strings.xml | 6 +- .../dialer/calllogutils/res/values-ne/strings.xml | 6 +- .../dialer/calllogutils/res/values-nl/strings.xml | 6 +- .../dialer/calllogutils/res/values-no/strings.xml | 6 +- .../dialer/calllogutils/res/values-pa/strings.xml | 6 +- .../dialer/calllogutils/res/values-pl/strings.xml | 6 +- .../calllogutils/res/values-pt-rBR/strings.xml | 6 +- .../calllogutils/res/values-pt-rPT/strings.xml | 6 +- .../dialer/calllogutils/res/values-pt/strings.xml | 6 +- .../dialer/calllogutils/res/values-ro/strings.xml | 6 +- .../dialer/calllogutils/res/values-ru/strings.xml | 6 +- .../dialer/calllogutils/res/values-si/strings.xml | 6 +- .../dialer/calllogutils/res/values-sk/strings.xml | 6 +- .../dialer/calllogutils/res/values-sl/strings.xml | 6 +- .../dialer/calllogutils/res/values-sq/strings.xml | 6 +- .../dialer/calllogutils/res/values-sr/strings.xml | 6 +- .../dialer/calllogutils/res/values-sv/strings.xml | 6 +- .../dialer/calllogutils/res/values-sw/strings.xml | 6 +- .../dialer/calllogutils/res/values-ta/strings.xml | 6 +- .../dialer/calllogutils/res/values-te/strings.xml | 6 +- .../dialer/calllogutils/res/values-th/strings.xml | 6 +- .../dialer/calllogutils/res/values-tl/strings.xml | 6 +- .../dialer/calllogutils/res/values-tr/strings.xml | 6 +- .../dialer/calllogutils/res/values-uk/strings.xml | 6 +- .../dialer/calllogutils/res/values-ur/strings.xml | 6 +- .../dialer/calllogutils/res/values-uz/strings.xml | 8 +- .../dialer/calllogutils/res/values-vi/strings.xml | 6 +- .../calllogutils/res/values-zh-rCN/strings.xml | 6 +- .../calllogutils/res/values-zh-rHK/strings.xml | 6 +- .../calllogutils/res/values-zh-rTW/strings.xml | 6 +- .../dialer/calllogutils/res/values-zu/strings.xml | 6 +- .../dialer/calllogutils/res/values/attrs.xml | 24 ++++++ 83 files changed, 245 insertions(+), 356 deletions(-) create mode 100644 java/com/android/dialer/calllogutils/res/values/attrs.xml (limited to 'java/com/android/dialer/calllogutils') diff --git a/java/com/android/dialer/calllogutils/CallTypeIconsView.java b/java/com/android/dialer/calllogutils/CallTypeIconsView.java index 61208bc9a..5644dc865 100644 --- a/java/com/android/dialer/calllogutils/CallTypeIconsView.java +++ b/java/com/android/dialer/calllogutils/CallTypeIconsView.java @@ -17,6 +17,7 @@ package com.android.dialer.calllogutils; import android.content.Context; +import android.content.res.TypedArray; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; @@ -32,12 +33,18 @@ import java.util.List; /** * View that draws one or more symbols for different types of calls (missed calls, outgoing etc). - * The symbols are set up horizontally. As this view doesn't create subviews, it is better suited - * for ListView-recycling that a regular LinearLayout using ImageViews. + * The symbols are set up horizontally. If {@code useLargeIcons} is set in the xml attributes, + * alternatively this view will only render one icon (Call Type, HD or Video). + * + *

As this view doesn't create subviews, it is better suited for ListView-recycling than a + * regular LinearLayout using ImageViews. */ public class CallTypeIconsView extends View { + private final boolean useLargeIcons; + private static Resources sResources; + private static Resources sLargeResouces; private List mCallTypes = new ArrayList<>(3); private boolean mShowVideo = false; private boolean mShowHd = false; @@ -50,8 +57,15 @@ public class CallTypeIconsView extends View { public CallTypeIconsView(Context context, AttributeSet attrs) { super(context, attrs); + TypedArray typedArray = + context.getTheme().obtainStyledAttributes(attrs, R.styleable.CallTypeIconsView, 0, 0); + useLargeIcons = typedArray.getBoolean(R.styleable.CallTypeIconsView_useLargeIcons, false); + typedArray.recycle(); if (sResources == null) { - sResources = new Resources(context); + sResources = new Resources(context, false); + } + if (sLargeResouces == null && useLargeIcons) { + sLargeResouces = new Resources(context, true); } } @@ -67,7 +81,7 @@ public class CallTypeIconsView extends View { final Drawable drawable = getCallTypeDrawable(callType); mWidth += drawable.getIntrinsicWidth() + sResources.iconMargin; - mHeight = Math.max(mHeight, drawable.getIntrinsicHeight()); + mHeight = Math.max(mHeight, drawable.getIntrinsicWidth()); invalidate(); } @@ -112,24 +126,25 @@ public class CallTypeIconsView extends View { } private Drawable getCallTypeDrawable(int callType) { + Resources resources = useLargeIcons ? sLargeResouces : sResources; switch (callType) { case AppCompatConstants.CALLS_INCOMING_TYPE: case AppCompatConstants.CALLS_ANSWERED_EXTERNALLY_TYPE: - return sResources.incoming; + return resources.incoming; case AppCompatConstants.CALLS_OUTGOING_TYPE: - return sResources.outgoing; + return resources.outgoing; case AppCompatConstants.CALLS_MISSED_TYPE: - return sResources.missed; + return resources.missed; case AppCompatConstants.CALLS_VOICEMAIL_TYPE: - return sResources.voicemail; + return resources.voicemail; case AppCompatConstants.CALLS_BLOCKED_TYPE: - return sResources.blocked; + return resources.blocked; default: // It is possible for users to end up with calls with unknown call types in their // call history, possibly due to 3rd party call log implementations (e.g. to // distinguish between rejected and missed calls). Instead of crashing, just // assume that all unknown call types are missed calls. - return sResources.missed; + return resources.missed; } } @@ -140,27 +155,32 @@ public class CallTypeIconsView extends View { @Override protected void onDraw(Canvas canvas) { + Resources resources = useLargeIcons ? sLargeResouces : sResources; int left = 0; - for (Integer callType : mCallTypes) { - final Drawable drawable = getCallTypeDrawable(callType); - final int right = left + drawable.getIntrinsicWidth(); - drawable.setBounds(left, 0, right, drawable.getIntrinsicHeight()); - drawable.draw(canvas); - left = right + sResources.iconMargin; + // If we are using large icons, we should only show one icon (video, hd or call type) with + // priority give to HD or Video. So we skip the call type icon if we plan to show them. + if (!useLargeIcons || !(mShowHd || mShowVideo)) { + for (Integer callType : mCallTypes) { + final Drawable drawable = getCallTypeDrawable(callType); + final int right = left + drawable.getIntrinsicWidth(); + drawable.setBounds(left, 0, right, drawable.getIntrinsicHeight()); + drawable.draw(canvas); + left = right + resources.iconMargin; + } } // If showing the video call icon, draw it scaled appropriately. if (mShowVideo) { - final Drawable drawable = sResources.videoCall; - final int right = left + sResources.videoCall.getIntrinsicWidth(); - drawable.setBounds(left, 0, right, sResources.videoCall.getIntrinsicHeight()); + final Drawable drawable = resources.videoCall; + final int right = left + resources.videoCall.getIntrinsicWidth(); + drawable.setBounds(left, 0, right, resources.videoCall.getIntrinsicHeight()); drawable.draw(canvas); } // If showing HD call icon, draw it scaled appropriately. if (mShowHd) { - final Drawable drawable = sResources.hdCall; - final int right = left + sResources.hdCall.getIntrinsicWidth(); - drawable.setBounds(left, 0, right, sResources.hdCall.getIntrinsicHeight()); + final Drawable drawable = resources.hdCall; + final int right = left + resources.hdCall.getIntrinsicWidth(); + drawable.setBounds(left, 0, right, resources.hdCall.getIntrinsicHeight()); drawable.draw(canvas); } } @@ -197,37 +217,44 @@ public class CallTypeIconsView extends View { * * @param context The current context. */ - public Resources(Context context) { + public Resources(Context context, boolean largeIcons) { final android.content.res.Resources r = context.getResources(); - incoming = r.getDrawable(R.drawable.ic_call_arrow); + int iconId = + largeIcons ? R.drawable.quantum_ic_call_received_white_24 : R.drawable.ic_call_arrow; + incoming = r.getDrawable(iconId); incoming.setColorFilter(r.getColor(R.color.answered_call), PorterDuff.Mode.MULTIPLY); // Create a rotated instance of the call arrow for outgoing calls. - outgoing = BitmapUtil.getRotatedDrawable(r, R.drawable.ic_call_arrow, 180f); + outgoing = BitmapUtil.getRotatedDrawable(r, iconId, 180f); outgoing.setColorFilter(r.getColor(R.color.answered_call), PorterDuff.Mode.MULTIPLY); // Need to make a copy of the arrow drawable, otherwise the same instance colored // above will be recolored here. - missed = r.getDrawable(R.drawable.ic_call_arrow).mutate(); + iconId = largeIcons ? R.drawable.quantum_ic_call_missed_white_24 : R.drawable.ic_call_arrow; + missed = r.getDrawable(iconId).mutate(); missed.setColorFilter(r.getColor(R.color.missed_call), PorterDuff.Mode.MULTIPLY); - voicemail = r.getDrawable(R.drawable.quantum_ic_voicemail_white_18); + iconId = R.drawable.quantum_ic_voicemail_white_24; + voicemail = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); voicemail.setColorFilter( r.getColor(R.color.dialer_secondary_text_color), PorterDuff.Mode.MULTIPLY); - blocked = getScaledBitmap(context, R.drawable.ic_block_24dp); + iconId = R.drawable.quantum_ic_block_white_24; + blocked = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); blocked.setColorFilter(r.getColor(R.color.blocked_call), PorterDuff.Mode.MULTIPLY); - videoCall = getScaledBitmap(context, R.drawable.quantum_ic_videocam_white_24); + iconId = R.drawable.quantum_ic_videocam_white_24; + videoCall = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); videoCall.setColorFilter( r.getColor(R.color.dialer_secondary_text_color), PorterDuff.Mode.MULTIPLY); - hdCall = getScaledBitmap(context, R.drawable.quantum_ic_hd_white_24); + iconId = R.drawable.quantum_ic_hd_white_24; + hdCall = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); hdCall.setColorFilter( r.getColor(R.color.dialer_secondary_text_color), PorterDuff.Mode.MULTIPLY); - iconMargin = r.getDimensionPixelSize(R.dimen.call_log_icon_margin); + iconMargin = largeIcons ? 0 : r.getDimensionPixelSize(R.dimen.call_log_icon_margin); } // Gets the icon, scaled to the height of the call type icons. This helps display all the 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 6c85ef2ad..d4d615e79 100644 --- a/java/com/android/dialer/calllogutils/res/values-af/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-af/strings.xml @@ -35,8 +35,6 @@ "via %1$s" "op %1$s, via %2$s" "Stemboodskap" - - - - + "%s m. %s s." + "%s s." 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 725f3ecca..80a71c93f 100644 --- a/java/com/android/dialer/calllogutils/res/values-am/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-am/strings.xml @@ -35,8 +35,6 @@ "በ %1$s በኩል" "በ %1$s ላይ፣ በ %2$s በኩል" "የድምፅ መልእክት" - - - - + "%sደ %sሰ" + "%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 1093e3854..04cc6d9ac 100644 --- a/java/com/android/dialer/calllogutils/res/values-ar/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ar/strings.xml @@ -35,8 +35,6 @@ "من خلال %1$s" "على %1$s من خلال %2$s" "البريد الصوتي" - - - - + "%s د %s ث" + "%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 c47892692..76726120c 100644 --- a/java/com/android/dialer/calllogutils/res/values-az/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-az/strings.xml @@ -35,8 +35,6 @@ "%1$s vasitəsilə" "%2$s vasitəsilə %1$s hesabında" "Səsli e-məktub" - - - - + "%s dəq %s san" + "%ssan" 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 00ec0a7ba..fbb7bf24b 100644 --- a/java/com/android/dialer/calllogutils/res/values-be/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-be/strings.xml @@ -35,8 +35,6 @@ "праз %1$s" "на %1$s, праз %2$s" "Галасавая пошта" - - - - + "%s хв %s с" + "%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 afa60484c..4f21eb3f3 100644 --- a/java/com/android/dialer/calllogutils/res/values-bg/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-bg/strings.xml @@ -35,8 +35,6 @@ "през %1$s" "в/ъв %1$s, през %2$s" "Гласова поща" - - - - + "%s мин %s сек" + "%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 be386d6b2..28b40b448 100644 --- a/java/com/android/dialer/calllogutils/res/values-bn/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-bn/strings.xml @@ -35,8 +35,6 @@ "%1$s এর মাধ্যমে" "%1$s এ, %2$s এর মাধ্যমে" "ভয়েসমেল" - - - - + "%sমিনিট %sসেকেন্ড" + "%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 a6d8ec6b0..c6693d364 100644 --- a/java/com/android/dialer/calllogutils/res/values-bs/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-bs/strings.xml @@ -35,8 +35,6 @@ "preko %1$s" "na %1$s, preko %2$s" "Govorna pošta" - - - - + "%s min %s s" + "%s s" 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 ff620ea14..45b581423 100644 --- a/java/com/android/dialer/calllogutils/res/values-ca/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ca/strings.xml @@ -35,8 +35,6 @@ "al número %1$s" "a %1$s, al número %2$s" "Bústia de veu" - - - - + "%s min %s s" + "%s s" 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 4fd66dab5..f2de1f887 100644 --- a/java/com/android/dialer/calllogutils/res/values-cs/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-cs/strings.xml @@ -35,8 +35,6 @@ "z čísla %1$s" "na účet %1$s, z čísla %2$s" "Hlasová schránka" - - - - + "%s min %s s" + "%s s" 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 0dc317f91..09f5b3d77 100644 --- a/java/com/android/dialer/calllogutils/res/values-da/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-da/strings.xml @@ -35,8 +35,6 @@ "via %1$s" "til %1$s, via %2$s" "Telefonsvarer" - - - - + "%s min. %s sek." + "%s sek." 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 8b7edd81e..b71487432 100644 --- a/java/com/android/dialer/calllogutils/res/values-de/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-de/strings.xml @@ -35,8 +35,6 @@ "über %1$s" "mit %1$s, über %2$s" "Mailbox" - - - - + "%s min %s s" + "%s s" 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 58d146802..ab9b5e3ee 100644 --- a/java/com/android/dialer/calllogutils/res/values-el/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-el/strings.xml @@ -35,8 +35,6 @@ "μέσω %1$s" "στον λογαριασμό %1$s, μέσω %2$s" "Αυτόματος τηλεφωνητής" - - - - + "%sλ %sδ" + "%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 c47d8d8c6..c1105afcc 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 @@ -35,8 +35,6 @@ "via %1$s" "on %1$s, via %2$s" "Voicemail" - - - - + "%sm %ss" + "%ss" 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 c47d8d8c6..c1105afcc 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 @@ -35,8 +35,6 @@ "via %1$s" "on %1$s, via %2$s" "Voicemail" - - - - + "%sm %ss" + "%ss" 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 c47d8d8c6..c1105afcc 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 @@ -35,8 +35,6 @@ "via %1$s" "on %1$s, via %2$s" "Voicemail" - - - - + "%sm %ss" + "%ss" 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 59a2f087b..003cc5430 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 @@ -35,8 +35,6 @@ "por medio de %1$s" "en %1$s por medio de %2$s" "Buzón de voz" - - - - + "%s min. y %s s" + "%s s" 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 8243a49bc..9ed0b6472 100644 --- a/java/com/android/dialer/calllogutils/res/values-es/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-es/strings.xml @@ -35,8 +35,6 @@ "a través del %1$s" "en %1$s, a través del %2$s" "Buzón de voz" - - - - + "%s min %s s" + "%s s" 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 b92821e37..a6a8b9115 100644 --- a/java/com/android/dialer/calllogutils/res/values-et/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-et/strings.xml @@ -35,8 +35,6 @@ "numbri %1$s kaudu" "kontol %1$s, numbri %2$s kaudu" "Kõnepost" - - - - + "%s min %s s" + "%s s" 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 e80177743..8dfe88e09 100644 --- a/java/com/android/dialer/calllogutils/res/values-eu/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-eu/strings.xml @@ -35,8 +35,6 @@ "%1$s bidez" "%1$s kontuan, %2$s bidez" "Erantzungailua" - - - - + "%s min, %s s" + "%s s" 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 06f053492..adb3d9d21 100644 --- a/java/com/android/dialer/calllogutils/res/values-fa/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-fa/strings.xml @@ -35,8 +35,6 @@ "ازطریق %1$s" "در %1$s، ازطریق %2$s" "پست صوتی" - - - - + "%s دقیقه %s ثانیه" + "%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 8a19e89c6..2838e0d0e 100644 --- a/java/com/android/dialer/calllogutils/res/values-fi/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-fi/strings.xml @@ -35,8 +35,6 @@ "numerosta %1$s" "tililtä %1$s numerosta %2$s" "Vastaaja" - - - - + "%s min %s s" + "%s s" 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 58fc07f59..bf4ba171c 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 @@ -35,8 +35,6 @@ "au %1$s" "sur %1$s, au %2$s" "Messagerie vocale" - - - - + "%s min et %s s" + "%s s" 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 7050171b2..584c53ad4 100644 --- a/java/com/android/dialer/calllogutils/res/values-fr/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-fr/strings.xml @@ -35,8 +35,6 @@ "au %1$s" "sur %1$s, au %2$s" "Messagerie vocale" - - - - + "%s min et %s s" + "%s s" 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 afc2ec544..ace85e49b 100644 --- a/java/com/android/dialer/calllogutils/res/values-gl/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-gl/strings.xml @@ -35,8 +35,6 @@ "a través do %1$s" "en %1$s, a través do %2$s" "Correo de voz" - - - - + "%s min %s s" + "%s s" 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 4435d61aa..0e8e0212c 100644 --- a/java/com/android/dialer/calllogutils/res/values-gu/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-gu/strings.xml @@ -35,8 +35,6 @@ "%1$s મારફતે" "%1$s પર, %2$s મારફતે" "વૉઇસમેઇલ" - - - - + "%sમિ %sસે" + "%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 f8ddd23a7..59a6aff7b 100644 --- a/java/com/android/dialer/calllogutils/res/values-hi/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-hi/strings.xml @@ -35,8 +35,6 @@ "%1$s से" "%1$s पर, %2$s से" "वॉइसमेल" - - - - + "%s मि %s से" + "%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 9bb60d6e5..38843f15b 100644 --- a/java/com/android/dialer/calllogutils/res/values-hr/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-hr/strings.xml @@ -35,8 +35,6 @@ "putem broja %1$s" "na računu %1$s, putem broja %2$s" "Govorna pošta" - - - - + "%s min %s s" + "%s s" 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 65eb6bd17..e2849b1de 100644 --- a/java/com/android/dialer/calllogutils/res/values-hu/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-hu/strings.xml @@ -35,8 +35,6 @@ "szám: %1$s" "fiók: %1$s, szám: %2$s" "Hangposta" - - - - + "%s p %s mp" + "%s mp" 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 f65fc11cc..58d51a6be 100644 --- a/java/com/android/dialer/calllogutils/res/values-hy/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-hy/strings.xml @@ -35,8 +35,6 @@ "%1$s համարից" "%1$s-ին %2$s համարից" "Ձայնային փոստ" - - - - + "%s ր %s վ" + "%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 aaff08b49..faf93627c 100644 --- a/java/com/android/dialer/calllogutils/res/values-in/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-in/strings.xml @@ -35,8 +35,6 @@ "melalui %1$s" "di %1$s, melalui %2$s" "Pesan suara" - - - - + "%sm %sd" + "%sd" 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 6e15b1ae5..e7bbbe10e 100644 --- a/java/com/android/dialer/calllogutils/res/values-is/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-is/strings.xml @@ -35,8 +35,6 @@ "í gegnum %1$s" "á %1$s, í gegnum %2$s" "Talhólf" - - - - + "%s mín. og %s sek." + "%s sek." 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 8794911b7..04a0e1b39 100644 --- a/java/com/android/dialer/calllogutils/res/values-it/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-it/strings.xml @@ -35,8 +35,6 @@ "tramite %1$s" "su %1$s, tramite %2$s" "Messaggi vocali" - - - - + "%s m %s s" + "%s s" 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 10be3247f..1df6961c5 100644 --- a/java/com/android/dialer/calllogutils/res/values-iw/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-iw/strings.xml @@ -35,8 +35,6 @@ "דרך %1$s" "בחשבון %1$s, דרך %2$s" "דואר קולי" - - - - + "%s דקות ו-%s שניות" + "%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 75eda0ca2..4baeecc5a 100644 --- a/java/com/android/dialer/calllogutils/res/values-ja/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ja/strings.xml @@ -35,8 +35,6 @@ "%1$s で受信" "%1$s（%2$s）で受信" "ボイスメール" - - - - + "%s 分 %s 秒" + "%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 0e6fb128c..b1a4a4177 100644 --- a/java/com/android/dialer/calllogutils/res/values-ka/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ka/strings.xml @@ -35,8 +35,6 @@ "%1$s-ის მეშვეობით" "%1$s-ზე, %2$s-ის მეშვეობით" "ხმოვანი ფოსტა" - - - - + "%sწთ %sწმ" + "%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 02b938f05..efaef2323 100644 --- a/java/com/android/dialer/calllogutils/res/values-kk/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-kk/strings.xml @@ -35,8 +35,6 @@ "%1$s арқылы" "%1$s, %2$s арқылы" "Дауыстық хабар" - - - - + "%sм %sс" + "%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 d53f7d70f..b5e6c5d8e 100644 --- a/java/com/android/dialer/calllogutils/res/values-km/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-km/strings.xml @@ -35,8 +35,6 @@ "តាមរយៈ %1$s" "នៅ​លើ %1$s តាមរយៈ %2$s" "សារ​ជា​សំឡេង" - - - - + "%sm %ss" + "%ss" 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 60c29e809..44feee9e3 100644 --- a/java/com/android/dialer/calllogutils/res/values-kn/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-kn/strings.xml @@ -35,8 +35,6 @@ "%1$s ಮೂಲಕ" "%1$s ರಲ್ಲಿ, %2$s ಮೂಲಕ" "ಧ್ವನಿಮೇಲ್" - - - - + "%sನಿ %sಸೆ" + "%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 2a4ef32af..76ba89b8a 100644 --- a/java/com/android/dialer/calllogutils/res/values-ko/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ko/strings.xml @@ -35,8 +35,6 @@ "%1$s번으로 수신" "%1$s에서 %2$s번으로 수신" "음성사서함" - - - - + "%s분 %s초" + "%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 4ad92db5b..a91f0bd45 100644 --- a/java/com/android/dialer/calllogutils/res/values-ky/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ky/strings.xml @@ -35,8 +35,6 @@ "%1$s аркылуу" "%1$s боюнча %2$s аркылуу" "Үн почтасы" - - - - + "%sмүн. %sсек." + "%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 5e7a714fa..343fc60dd 100644 --- a/java/com/android/dialer/calllogutils/res/values-lo/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-lo/strings.xml @@ -35,8 +35,6 @@ "ຜ່ານ %1$s" "ຢູ່ %1$s, ຜ່ານ %2$s" "ຂໍ້ຄວາມສຽງ" - - - - + "%sນທ %sວິ" + "%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 8e4597317..779e95267 100644 --- a/java/com/android/dialer/calllogutils/res/values-lt/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-lt/strings.xml @@ -35,8 +35,6 @@ "numeriu %1$s" "%1$s, numeriu %2$s" "Balso paštas" - - - - + "%s min. %s sek." + "%s sek." 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 5e292e10e..d02d7ec3a 100644 --- a/java/com/android/dialer/calllogutils/res/values-lv/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-lv/strings.xml @@ -35,8 +35,6 @@ "izmantojot numuru %1$s" "kontā %1$s, izmantojot numuru %2$s" "Balss pasts" - - - - + "%s min %s s" + "%s s" 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 1ad4749a5..21872a817 100644 --- a/java/com/android/dialer/calllogutils/res/values-mk/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-mk/strings.xml @@ -35,8 +35,6 @@ "на %1$s" "на %1$s, на %2$s" "Говорна пошта" - - - - + "%s мин. %s сек." + "%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 f09aacd4c..f6507ae16 100644 --- a/java/com/android/dialer/calllogutils/res/values-ml/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ml/strings.xml @@ -35,8 +35,6 @@ "%1$s നമ്പർ വഴി" "%2$s നമ്പർ വഴി, %1$s അക്കൗണ്ടിൽ" "വോയ്‌സ്‌മെയിൽ" - - - - + "%sമിനിറ്റ് %sസെക്കന്‍ഡ്" + "%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 ccc473eb4..3f5bbd3ea 100644 --- a/java/com/android/dialer/calllogutils/res/values-mn/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-mn/strings.xml @@ -35,8 +35,6 @@ "%1$s-р" "%1$s дээр, %2$s-р" "Дуут шуудан" - - - - + "%sм %sс" + "%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 5d5d1bb6c..893851f69 100644 --- a/java/com/android/dialer/calllogutils/res/values-mr/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-mr/strings.xml @@ -35,8 +35,6 @@ "%1$s द्वारे" "%1$s वर, %2$s द्वारे" "व्हॉइसमेल" - - - - + "%sमि %sसे" + "%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 a2f003617..1f7a22127 100644 --- a/java/com/android/dialer/calllogutils/res/values-ms/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ms/strings.xml @@ -35,8 +35,6 @@ "melalui %1$s" "pada %1$s, melalui %2$s" "Mel suara" - - - - + "%sm %ss" + "%ss" 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 c2022327e..8b1337e01 100644 --- a/java/com/android/dialer/calllogutils/res/values-my/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-my/strings.xml @@ -35,8 +35,6 @@ "%1$s မှတစ်ဆင့်" "%1$s တွင်၊ %2$s မှတစ်ဆင့်" "အသံမေးလ်" - - - - + "%sမိနစ် %sစက္ကန့်" + "%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 e988e4f58..7d4622004 100644 --- a/java/com/android/dialer/calllogutils/res/values-nb/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-nb/strings.xml @@ -35,8 +35,6 @@ "via %1$s" "på %1$s via %2$s" "Talepost" - - - - + "%s m og %s s" + "%s s" 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 a9ee59b11..d498395f0 100644 --- a/java/com/android/dialer/calllogutils/res/values-ne/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ne/strings.xml @@ -35,8 +35,6 @@ "%1$s मार्फत" "%1$s मा, %2$s मार्फत" "भ्वाइस मेल" - - - - + "%sमिनेट %sसेकेन्ड" + "%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 6c51676cf..0fcc6ca7f 100644 --- a/java/com/android/dialer/calllogutils/res/values-nl/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-nl/strings.xml @@ -35,8 +35,6 @@ "via %1$s" "op %1$s, via %2$s" "Voicemail" - - - - + "%s m %s s" + "%s s" 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 e988e4f58..7d4622004 100644 --- a/java/com/android/dialer/calllogutils/res/values-no/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-no/strings.xml @@ -35,8 +35,6 @@ "via %1$s" "på %1$s via %2$s" "Talepost" - - - - + "%s m og %s s" + "%s s" 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 ecb1998fb..f4cde52ff 100644 --- a/java/com/android/dialer/calllogutils/res/values-pa/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-pa/strings.xml @@ -35,8 +35,6 @@ "%1$s ਰਾਹੀਂ" "%1$s \'ਤੇ, %2$s ਰਾਹੀਂ" "ਵੌਇਸਮੇਲ" - - - - + "%sਮਿੰ %sਸਕਿੰ" + "%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 7fcdd7511..f1396cd88 100644 --- a/java/com/android/dialer/calllogutils/res/values-pl/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-pl/strings.xml @@ -35,8 +35,6 @@ "przez %1$s" "na koncie %1$s, przez %2$s" "Poczta głosowa" - - - - + "%s min %s s" + "%s s" 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 127514b6d..1e8b733b9 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 @@ -35,8 +35,6 @@ "pelo número %1$s" "em %1$s, pelo número %2$s" "Correio de voz" - - - - + "%s min %s s" + "%s s" 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 45c5a6003..1a2fa4c01 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 @@ -35,8 +35,6 @@ "através do número %1$s" "em %1$s, através do número %2$s" "Correio de voz" - - - - + "%s min %s seg" + "%s seg" 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 127514b6d..1e8b733b9 100644 --- a/java/com/android/dialer/calllogutils/res/values-pt/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-pt/strings.xml @@ -35,8 +35,6 @@ "pelo número %1$s" "em %1$s, pelo número %2$s" "Correio de voz" - - - - + "%s min %s s" + "%s s" 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 59cb76725..84497540b 100644 --- a/java/com/android/dialer/calllogutils/res/values-ro/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ro/strings.xml @@ -35,8 +35,6 @@ "prin %1$s" "pe %1$s, prin %2$s" "Mesagerie vocală" - - - - + "%s min. %s sec." + "%s sec." 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 99a656803..8e6120ab1 100644 --- a/java/com/android/dialer/calllogutils/res/values-ru/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ru/strings.xml @@ -35,8 +35,6 @@ "Номер %1$s" "%1$s, номер %2$s" "Голосовая почта" - - - - + "%s мин. %s сек." + "%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 841f5caca..fa24c1c07 100644 --- a/java/com/android/dialer/calllogutils/res/values-si/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-si/strings.xml @@ -35,8 +35,6 @@ "%1$s හරහා" "%1$s මත, %2$s හරහා" "හඬ තැපෑල" - - - - + "මි%s ත%s" + "තත්%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 1e1b86811..ee32a0875 100644 --- a/java/com/android/dialer/calllogutils/res/values-sk/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sk/strings.xml @@ -35,8 +35,6 @@ "prostredníctvom čísla %1$s" "v účte %1$s, prostredníctvom čísla %2$s" "Hlasová schránka" - - - - + "%s min %s s" + "%s s" 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 945cecc9c..0cf0ab2ca 100644 --- a/java/com/android/dialer/calllogutils/res/values-sl/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sl/strings.xml @@ -35,8 +35,6 @@ "prek številke %1$s" "v računu %1$s, prek številke %2$s" "Odzivnik" - - - - + "%s min %s s" + "%s s" 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 229a3879f..b2a28357c 100644 --- a/java/com/android/dialer/calllogutils/res/values-sq/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sq/strings.xml @@ -35,8 +35,6 @@ "nëpërmjet %1$s" "në %1$s, nëpërmjet %2$s" "Posta zanore" - - - - + "%s minuta e %s sekonda" + "%s sekonda" 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 696f3d31c..49f7473d4 100644 --- a/java/com/android/dialer/calllogutils/res/values-sr/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sr/strings.xml @@ -35,8 +35,6 @@ "преко %1$s" "на %1$s, преко %2$s" "Говорна пошта" - - - - + "%s м %s с" + "%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 8fb59d115..eff7210ef 100644 --- a/java/com/android/dialer/calllogutils/res/values-sv/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sv/strings.xml @@ -35,8 +35,6 @@ "med %1$s" "på %1$s, med %2$s" "Röstbrevlåda" - - - - + "%s m %s s" + "%s s" 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 de161bcbc..7810fb14b 100644 --- a/java/com/android/dialer/calllogutils/res/values-sw/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sw/strings.xml @@ -35,8 +35,6 @@ "kupitia %1$s" "kwenye %1$s, kupitia %2$s" "Ujumbe wa sauti" - - - - + "Dakika %s sekunde %s" + "Sekunde %s" 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 6ff5c525f..b3e60bbc8 100644 --- a/java/com/android/dialer/calllogutils/res/values-ta/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ta/strings.xml @@ -35,8 +35,6 @@ "%1$s மூலம்" "%1$s இல் %2$s மூலம்" "குரலஞ்சல்" - - - - + "%sநி %sவி" + "%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 05f9addee..4d6553765 100644 --- a/java/com/android/dialer/calllogutils/res/values-te/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-te/strings.xml @@ -35,8 +35,6 @@ "%1$s ద్వారా" "%1$sలో, %2$s ద్వారా" "వాయిస్ మెయిల్" - - - - + "%sని %sసె" + "%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 35ec52d62..46d9ec028 100644 --- a/java/com/android/dialer/calllogutils/res/values-th/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-th/strings.xml @@ -35,8 +35,6 @@ "ผ่าน %1$s" "ใน %1$s ผ่าน %2$s" "ข้อความเสียง" - - - - + "%s นาที %s วินาที" + "%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 62cda0d19..b4f4045e3 100644 --- a/java/com/android/dialer/calllogutils/res/values-tl/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-tl/strings.xml @@ -35,8 +35,6 @@ "sa pamamagitan ng %1$s" "sa %1$s, sa pamamagitan ng %2$s" "Voicemail" - - - - + "%s (na) min. %s (na) segundo" + "%s (na) segundo" 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 490a8ed02..1a2e762f1 100644 --- a/java/com/android/dialer/calllogutils/res/values-tr/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-tr/strings.xml @@ -35,8 +35,6 @@ "%1$s kullanılarak" "%2$s kullanılarak %1$s hesabında" "Sesli mesaj" - - - - + "%s dk. %s sn." + "%s sn." 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 03d9fb732..5f3e0aecf 100644 --- a/java/com/android/dialer/calllogutils/res/values-uk/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-uk/strings.xml @@ -35,8 +35,6 @@ "на номер %1$s" "на %1$s на номер %2$s" "Голосова пошта" - - - - + "%s хв %s с" + "%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 914e7ac03..9872d4368 100644 --- a/java/com/android/dialer/calllogutils/res/values-ur/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ur/strings.xml @@ -35,8 +35,6 @@ "بذریعہ %1$s" "%1$s پر، بذریعہ %2$s" "صوتی میل" - - - - + "%sمنٹ %sسیکنڈ" + "%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 b41f62262..7917f4790 100644 --- a/java/com/android/dialer/calllogutils/res/values-uz/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-uz/strings.xml @@ -26,7 +26,7 @@ "Kiruvchi videochaqiruv boshqa qurilmaga o‘tkazildi" "Chiquvchi videochaqiruv" "Chiquvchi videochaqiruv boshqa qurilmaga o‘tkazildi" - "Javobsiz videochaqiruv" + "Javobsiz video chaqiruv" "Ovozli pochta" "Rad etilgan chaqiruv" "Bloklangan chaqiruv" @@ -35,8 +35,6 @@ "%1$s raqami orqali" "%1$s, %2$s raqami orqali" "Ovozli pochta" - - - - + "%s daq. %s son." + "%s son." 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 c20cd2710..b722dc234 100644 --- a/java/com/android/dialer/calllogutils/res/values-vi/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-vi/strings.xml @@ -35,8 +35,6 @@ "qua %1$s" "trên %1$s, qua %2$s" "Thư thoại" - - - - + "%s phút %s giây" + "%s giây" 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 89ae77fa7..6f20642e3 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 @@ -35,8 +35,6 @@ "通过 %1$s" "帐号：%1$s，通过 %2$s" "语音邮件" - - - - + "%s 分 %s 秒" + "%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 23a9d6735..83b68acfb 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 @@ -35,8 +35,6 @@ "透過 %1$s" "在 %1$s 上透過 %2$s" "留言" - - - - + "%s 分 %s 秒" + "%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 a67147047..1566f05d4 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 @@ -35,8 +35,6 @@ "透過 %1$s" "%1$s，透過 %2$s" "語音留言" - - - - + "%s 分鐘 %s 秒" + "%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 865cfce37..289ff34fe 100644 --- a/java/com/android/dialer/calllogutils/res/values-zu/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-zu/strings.xml @@ -35,8 +35,6 @@ "nge-%1$s" "ku-%1$s, nge-%2$s" "Ivoyisimeyili" - - - - + "%sm %ss" + "%ss" diff --git a/java/com/android/dialer/calllogutils/res/values/attrs.xml b/java/com/android/dialer/calllogutils/res/values/attrs.xml new file mode 100644 index 000000000..9c55e4c30 --- /dev/null +++ b/java/com/android/dialer/calllogutils/res/values/attrs.xml @@ -0,0 +1,24 @@ + + + + + + + + \ No newline at end of file -- cgit v1.2.3