diff options
Diffstat (limited to 'java/com/android/dialer')
133 files changed, 612 insertions, 478 deletions
diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java index 5241d9c80..f4c8c90f8 100644 --- a/java/com/android/dialer/app/calllog/CallLogAdapter.java +++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java @@ -63,6 +63,7 @@ import com.android.dialer.app.voicemail.VoicemailPlaybackPresenter.OnVoicemailDe import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler; import com.android.dialer.calldetails.CallDetailsEntries; import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry; +import com.android.dialer.callintent.CallIntentBuilder; import com.android.dialer.calllogutils.PhoneAccountUtils; import com.android.dialer.calllogutils.PhoneCallDetails; import com.android.dialer.common.Assert; @@ -293,6 +294,11 @@ public class CallLogAdapter extends GroupingListAdapter } }; + @VisibleForTesting + public View.OnClickListener getExpandCollapseListener() { + return mExpandCollapseListener; + } + /** The OnClickListener used to expand or collapse the action buttons of a call log entry. */ private final View.OnClickListener mExpandCollapseListener = new View.OnClickListener() { @@ -361,6 +367,17 @@ public class CallLogAdapter extends GroupingListAdapter } } expandViewHolderActions(viewHolder); + + if (viewHolder.videoCallButtonView.getVisibility() == View.VISIBLE + && LightbringerComponent.get(mActivity) + .getLightbringer() + .getPackageName() + .equals( + ((IntentProvider) viewHolder.videoCallButtonView.getTag()) + .getIntent(mActivity) + .getPackage())) { + CallIntentBuilder.increaseLightbringerCallButtonAppearInExpandedCallLogItemCount(); + } } } }; diff --git a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java index b8b029f7b..27aa82577 100644 --- a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java +++ b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java @@ -34,6 +34,8 @@ import android.support.v7.widget.CardView; import android.support.v7.widget.RecyclerView; import android.telecom.PhoneAccount; import android.telecom.PhoneAccountHandle; +import android.telecom.TelecomManager; +import android.telecom.VideoProfile; import android.telephony.PhoneNumberUtils; import android.text.BidiFormatter; import android.text.TextDirectionHeuristics; @@ -66,6 +68,7 @@ import com.android.dialer.blocking.FilteredNumbersUtil; import com.android.dialer.callcomposer.CallComposerActivity; import com.android.dialer.calldetails.CallDetailsActivity; import com.android.dialer.calldetails.CallDetailsEntries; +import com.android.dialer.callintent.CallIntentBuilder; import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; import com.android.dialer.compat.CompatUtils; @@ -85,6 +88,7 @@ import com.android.dialer.phonenumbercache.CachedNumberLookupService; import com.android.dialer.phonenumbercache.ContactInfo; import com.android.dialer.phonenumbercache.PhoneNumberCache; import com.android.dialer.phonenumberutil.PhoneNumberHelper; +import com.android.dialer.telecom.TelecomUtil; import com.android.dialer.util.CallUtil; import com.android.dialer.util.DialerUtils; import java.lang.annotation.Retention; @@ -117,6 +121,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder public final ImageView primaryActionButtonView; private final Context mContext; + @Nullable private final PhoneAccountHandle mDefaultPhoneAccountHandle; private final CallLogCache mCallLogCache; private final CallLogListItemHelper mCallLogListItemHelper; private final CachedNumberLookupService mCachedNumberLookupService; @@ -255,6 +260,10 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder mBlockReportListener = blockReportListener; mCachedNumberLookupService = PhoneNumberCache.get(mContext).getCachedNumberLookupService(); + // Cache this to avoid having to look it up each time we bind to a call log entry + mDefaultPhoneAccountHandle = + TelecomUtil.getDefaultOutgoingPhoneAccount(context, PhoneAccount.SCHEME_TEL); + this.rootView = rootView; this.quickContactView = dialerQuickContactView; this.primaryActionView = primaryActionView; @@ -336,11 +345,13 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder } public static CallLogListItemViewHolder createForTest(Context context) { - return createForTest(context, null); + return createForTest(context, null, null); } - static CallLogListItemViewHolder createForTest( - Context context, VoicemailPlaybackPresenter voicemailPlaybackPresenter) { + public static CallLogListItemViewHolder createForTest( + Context context, + View.OnClickListener expandCollapseListener, + VoicemailPlaybackPresenter voicemailPlaybackPresenter) { Resources resources = context.getResources(); CallLogCache callLogCache = CallLogCache.getCallLogCache(context); PhoneCallDetailsHelper phoneCallDetailsHelper = @@ -350,7 +361,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder new CallLogListItemViewHolder( context, null, - null /* expandCollapseListener */, + expandCollapseListener /* expandCollapseListener */, null, null, callLogCache, @@ -503,6 +514,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder boolean isVoicemailNumber = mCallLogCache.isVoicemailNumber(accountHandle, number); if (!isVoicemailNumber && showLightbringerPrimaryButton()) { + CallIntentBuilder.increaseLightbringerCallButtonAppearInCollapsedCallLogItemCount(); primaryActionButtonView.setTag(IntentProvider.getLightbringerIntentProvider(number)); primaryActionButtonView.setContentDescription( TextUtils.expandTemplate( @@ -594,7 +606,8 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder callButtonView.setVisibility(View.VISIBLE); } - if (hasPlacedCarrierVideoCall() || canSupportCarrierVideoCall()) { + if (CallUtil.isVideoEnabled(mContext) + && (hasPlacedCarrierVideoCall() || canSupportCarrierVideoCall())) { videoCallButtonView.setTag(IntentProvider.getReturnVideoCallIntentProvider(number)); videoCallButtonView.setVisibility(View.VISIBLE); } else if (showLightbringerPrimaryButton()) { @@ -709,10 +722,10 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder if (accountHandle == null) { return false; } - if (accountHandle.getComponentName().equals(getLightbringer().getPhoneAccountComponentName())) { + if (mDefaultPhoneAccountHandle == null) { return false; } - return true; + return accountHandle.getComponentName().equals(mDefaultPhoneAccountHandle.getComponentName()); } private boolean canSupportCarrierVideoCall() { @@ -878,12 +891,20 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder // intents need to be started using startActivityForResult instead of the usual startActivity String packageName = intent.getPackage(); if (packageName != null && packageName.equals(getLightbringer().getPackageName())) { + Logger.get(mContext) + .logImpression(DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FROM_CALL_LOG); startLightbringerActivity(intent); } else if (CallDetailsActivity.isLaunchIntent(intent)) { PerformanceReport.recordClick(UiAction.Type.OPEN_CALL_DETAIL); ((Activity) mContext) .startActivityForResult(intent, DialtactsActivity.ACTIVITY_REQUEST_CODE_CALL_DETAILS); } else { + if (Intent.ACTION_CALL.equals(intent.getAction()) + && intent.getIntExtra(TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE, -1) + == VideoProfile.STATE_BIDIRECTIONAL) { + Logger.get(mContext) + .logImpression(DialerImpression.Type.IMS_VIDEO_REQUESTED_FROM_CALL_LOG); + } DialerUtils.startActivityWithErrorToast(mContext, intent); } } diff --git a/java/com/android/dialer/app/calllog/IntentProvider.java b/java/com/android/dialer/app/calllog/IntentProvider.java index e1ec9f509..55fdbbace 100644 --- a/java/com/android/dialer/app/calllog/IntentProvider.java +++ b/java/com/android/dialer/app/calllog/IntentProvider.java @@ -30,8 +30,6 @@ import com.android.dialer.callintent.CallInitiationType; import com.android.dialer.callintent.CallIntentBuilder; import com.android.dialer.dialercontact.DialerContact; import com.android.dialer.lightbringer.LightbringerComponent; -import com.android.dialer.logging.DialerImpression; -import com.android.dialer.logging.Logger; import com.android.dialer.util.CallUtil; import com.android.dialer.util.IntentUtil; import java.util.ArrayList; @@ -70,7 +68,6 @@ public abstract class IntentProvider { return new IntentProvider() { @Override public Intent getIntent(Context context) { - Logger.get(context).logImpression(DialerImpression.Type.IMS_VIDEO_REQUESTED_FROM_CALL_LOG); return new CallIntentBuilder(number, CallInitiationType.Type.CALL_LOG) .setPhoneAccountHandle(accountHandle) .setIsVideoCall(true) @@ -83,8 +80,6 @@ public abstract class IntentProvider { return new IntentProvider() { @Override public Intent getIntent(Context context) { - Logger.get(context) - .logImpression(DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FROM_CALL_LOG); return LightbringerComponent.get(context).getLightbringer().getIntent(context, number); } }; diff --git a/java/com/android/dialer/app/calllog/calllogcache/CallLogCache.java b/java/com/android/dialer/app/calllog/calllogcache/CallLogCache.java index 6728dfb38..2e7c9339a 100644 --- a/java/com/android/dialer/app/calllog/calllogcache/CallLogCache.java +++ b/java/com/android/dialer/app/calllog/calllogcache/CallLogCache.java @@ -17,6 +17,7 @@ package com.android.dialer.app.calllog.calllogcache; import android.content.Context; +import android.support.annotation.Nullable; import android.telecom.PhoneAccountHandle; import com.android.dialer.app.calllog.CallLogAdapter; import com.android.dialer.util.CallUtil; @@ -57,20 +58,8 @@ public abstract class CallLogCache { * Returns true if the given number is the number of the configured voicemail. To be able to * mock-out this, it is not a static method. */ - public abstract boolean isVoicemailNumber(PhoneAccountHandle accountHandle, CharSequence number); - - /** - * Returns {@code true} when the current sim supports video calls, regardless of the value in a - * contact's {@link android.provider.ContactsContract.CommonDataKinds.Phone#CARRIER_PRESENCE} - * column. - */ - public boolean isVideoEnabled() { - if (!mHasCheckedForVideoAvailability) { - mVideoAvailability = CallUtil.getVideoCallingAvailability(mContext); - mHasCheckedForVideoAvailability = true; - } - return (mVideoAvailability & CallUtil.VIDEO_CALLING_ENABLED) != 0; - } + public abstract boolean isVoicemailNumber( + PhoneAccountHandle accountHandle, @Nullable CharSequence number); /** * Returns {@code true} when the current sim supports checking video calling capabilities via the diff --git a/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java b/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java index f85680649..2424b6dbd 100644 --- a/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java +++ b/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java @@ -17,7 +17,9 @@ package com.android.dialer.app.calllog.calllogcache; import android.content.Context; +import android.support.annotation.Nullable; import android.telecom.PhoneAccountHandle; +import android.text.TextUtils; import android.util.ArrayMap; import com.android.dialer.calllogutils.PhoneAccountUtils; import com.android.dialer.telecom.TelecomUtil; @@ -50,7 +52,11 @@ class CallLogCacheLollipopMr1 extends CallLogCache { } @Override - public boolean isVoicemailNumber(PhoneAccountHandle accountHandle, CharSequence number) { + public boolean isVoicemailNumber( + PhoneAccountHandle accountHandle, @Nullable CharSequence number) { + if (TextUtils.isEmpty(number)) { + return false; + } return TelecomUtil.isVoicemailNumber(mContext, accountHandle, number.toString()); } diff --git a/java/com/android/dialer/app/res/values-sq/strings.xml b/java/com/android/dialer/app/res/values-sq/strings.xml index ca3d52236..8f43ba72c 100644 --- a/java/com/android/dialer/app/res/values-sq/strings.xml +++ b/java/com/android/dialer/app/res/values-sq/strings.xml @@ -236,6 +236,6 @@ <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> është jashtë linje dhe nuk mund të kontaktohet"</string> <string name="about_phone_label" msgid="582991354677973731">"Rreth"</string> <string name="view_conversation" msgid="7895904782094119702">"Shiko"</string> - <string name="ec_data_deleted" msgid="4794880345545827107">"Telefonata u fshi. Shiko dhe fshi bashkëngjitjet e ndara gjatë kësaj telefonate te \"Mesazhet\"."</string> - <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Telefonatat u fshinë. Shiko dhe fshi bashkëngjitjet e ndara gjatë telefonatave te \"Mesazhet\"."</string> + <string name="ec_data_deleted" msgid="4794880345545827107">"Telefonata u fshi. Shiko dhe fshi bashkëngjitjet e ndara gjatë kësaj telefonate te Messages."</string> + <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Telefonatat u fshinë. Shiko dhe fshi bashkëngjitjet e ndara gjatë telefonatave te Messages."</string> </resources> diff --git a/java/com/android/dialer/app/res/values-ur/strings.xml b/java/com/android/dialer/app/res/values-ur/strings.xml index 2b6a3eb07..f713f4c56 100644 --- a/java/com/android/dialer/app/res/values-ur/strings.xml +++ b/java/com/android/dialer/app/res/values-ur/strings.xml @@ -236,6 +236,6 @@ <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> آف لائن ہے اور اس تک پہنچا نہیں جا سکتا"</string> <string name="about_phone_label" msgid="582991354677973731">"تفصیل"</string> <string name="view_conversation" msgid="7895904782094119702">"دیکھیں"</string> - <string name="ec_data_deleted" msgid="4794880345545827107">"کال حذف ہو گئی۔ اس کال کے دوران پیغامات کے اندر اشتراک کردہ منسلکہ جات ملاحظہ کریں اور حذف کریں۔"</string> - <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"کالیں حذف ہو گئیں۔ کالوں کے دوران پیغامات کے اندر اشتراک کردہ منسلکہ جات ملاحظہ کریں اور حذف کریں۔"</string> + <string name="ec_data_deleted" msgid="4794880345545827107">"کال حذف ہو گئی۔ اس کال کے دوران اشتراک کردہ منسلکہ جات کو \'پیغامات \' میں ملاحظہ کریں اور حذف کریں۔"</string> + <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"کالیں حذف ہو گئیں۔ کالوں کے دوران اشتراک کردہ منسلکہ جات کو \'پیغامات \' میں ملاحظہ کریں اور حذف کریں۔"</string> </resources> diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailErrorAlert.java b/java/com/android/dialer/app/voicemail/error/VoicemailErrorAlert.java index d045b1bd3..dbdf0f067 100644 --- a/java/com/android/dialer/app/voicemail/error/VoicemailErrorAlert.java +++ b/java/com/android/dialer/app/voicemail/error/VoicemailErrorAlert.java @@ -20,6 +20,7 @@ import android.content.Context; import android.support.annotation.VisibleForTesting; import android.text.util.Linkify; import android.view.View; +import android.widget.ImageView; import android.widget.TextView; import com.android.dialer.app.alert.AlertManager; import com.android.dialer.app.voicemail.error.VoicemailErrorMessage.Action; @@ -132,6 +133,13 @@ public class VoicemailErrorAlert { TextView secondaryButton = (TextView) view.findViewById(R.id.voicemail_tos_button_accept); secondaryButton.setText(secondaryAction.getText()); secondaryButton.setOnClickListener(secondaryAction.getListener()); + + if (message.getImageResourceId() != null) { + ImageView voicemailTosImage = (ImageView) view.findViewById(R.id.voicemail_image); + voicemailTosImage.setImageResource(message.getImageResourceId()); + voicemailTosImage.setVisibility(View.VISIBLE); + } + return view; } diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessage.java b/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessage.java index a0dd30f0b..92c787d2d 100644 --- a/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessage.java +++ b/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessage.java @@ -47,6 +47,7 @@ public class VoicemailErrorMessage { private final List<Action> actions; private boolean modal; + private Integer imageResourceId; /** Something the user can click on to resolve an error, such as retrying or calling voicemail */ public static class Action { @@ -100,6 +101,16 @@ public class VoicemailErrorMessage { return this; } + @Nullable + public Integer getImageResourceId() { + return imageResourceId; + } + + public VoicemailErrorMessage setImageResourceId(Integer imageResourceId) { + this.imageResourceId = imageResourceId; + return this; + } + public VoicemailErrorMessage(CharSequence title, CharSequence description, Action... actions) { this(title, description, Arrays.asList(actions)); } diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java b/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java index 3f0ed1f58..f2cdaf644 100644 --- a/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java +++ b/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java @@ -22,10 +22,13 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.graphics.Typeface; import android.preference.PreferenceManager; import android.support.annotation.Nullable; import android.telecom.PhoneAccountHandle; import android.telephony.TelephonyManager; +import android.text.SpannableString; +import android.text.style.StyleSpan; import android.view.View; import android.view.View.OnClickListener; import com.android.contacts.common.compat.TelephonyManagerCompat; @@ -114,7 +117,8 @@ public class VoicemailTosMessageCreator { } }, true /* raised */)) - .setModal(true); + .setModal(true) + .setImageResourceId(getTosImageId()); } private void showDeclineTosDialog(final PhoneAccountHandle handle) { @@ -274,17 +278,32 @@ public class VoicemailTosMessageCreator { } } - private String getTosTitle() { + private CharSequence getTosTitle() { return isVvm3() ? context.getString(R.string.verizon_terms_and_conditions_title) : context.getString(R.string.dialer_terms_and_conditions_title); } - private String getTosMessage() { - return isVvm3() - ? context.getString( - R.string.verizon_terms_and_conditions_message, getDialerTos(), getVvm3Tos()) - : context.getString(R.string.dialer_terms_and_conditions_message, getDialerTos()); + private CharSequence getTosMessage() { + if (isVvm3()) { + // For verizon the TOS consist of three pieces: google dialer TOS, Verizon TOS message and + // Verizon TOS details. + CharSequence vvm3Details = getVvm3Tos(); + CharSequence tos = + context.getString( + R.string.verizon_terms_and_conditions_message, getDialerTos(), vvm3Details); + // Make all text bold except the details. + SpannableString spannableTos = new SpannableString(tos); + spannableTos.setSpan(new StyleSpan(Typeface.BOLD), 0, tos.length() - vvm3Details.length(), 0); + return spannableTos; + } else { + // The TOS for everyone else there are no details, so just make everything bold. + CharSequence tos = + context.getString(R.string.dialer_terms_and_conditions_message, getDialerTos()); + SpannableString spannableTos = new SpannableString(tos); + spannableTos.setSpan(new StyleSpan(Typeface.BOLD), 0, tos.length(), 0); + return spannableTos; + } } private int getTosDeclinedDialogMessageId() { @@ -298,4 +317,8 @@ public class VoicemailTosMessageCreator { ? R.string.verizon_terms_and_conditions_decline_dialog_downgrade : R.string.dialer_terms_and_conditions_decline_dialog_downgrade; } + + private Integer getTosImageId() { + return isVvm3() ? null : R.drawable.voicemail_tos_image; + } } diff --git a/java/com/android/dialer/app/voicemail/error/res/drawable/shadow.xml b/java/com/android/dialer/app/voicemail/error/res/drawable/shadow.xml new file mode 100644 index 000000000..681c795f5 --- /dev/null +++ b/java/com/android/dialer/app/voicemail/error/res/drawable/shadow.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- 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. +--> + +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <solid android:color="#42000000" /> +</shape> diff --git a/java/com/android/dialer/app/voicemail/error/res/drawable/voicemail_tos_image.png b/java/com/android/dialer/app/voicemail/error/res/drawable/voicemail_tos_image.png Binary files differnew file mode 100644 index 000000000..2e076c69a --- /dev/null +++ b/java/com/android/dialer/app/voicemail/error/res/drawable/voicemail_tos_image.png diff --git a/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml b/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml index a082e8e67..ec8abed6d 100644 --- a/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml +++ b/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml @@ -23,13 +23,21 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:paddingStart="16dp" - android:paddingEnd="16dp" android:orientation="vertical"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" + android:paddingLeft="16dp" + android:paddingRight="16dp" android:orientation="vertical"> + <ImageView + android:id="@+id/voicemail_image" + android:layout_width="@dimen/voicemail_tos_image_size" + android:layout_height="@dimen/voicemail_tos_image_size" + android:layout_gravity="center" + android:paddingTop="24dp" + android:visibility="gone" + android:importantForAccessibility="no"/> <TextView android:id="@+id/tos_message_title" android:textStyle="bold" @@ -53,8 +61,9 @@ <View android:layout_width="match_parent" - android:layout_height="1dp" - android:background="#D2D2D2"/> + android:layout_height="0.5dp" + android:elevation="1dp" + android:background="@drawable/shadow"/> <LinearLayout android:id="@+id/voicemail_tos_button" @@ -62,10 +71,12 @@ android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="16dp" + android:paddingTop="20dp" + android:paddingBottom="20dp" android:orientation="horizontal"> <TextView android:id="@+id/voicemail_tos_button_decline" - style="@style/ErrorActionStyle" + style="@style/ErrorActionDeclineStyle" android:background="?android:attr/selectableItemBackground" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -76,7 +87,7 @@ android:layout_weight="1"/> <TextView android:id="@+id/voicemail_tos_button_accept" - style="@style/RaisedErrorActionStyle" + style="@style/ErrorActionStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/verizon_terms_and_conditions_accept_english"/> diff --git a/java/com/android/dialer/app/voicemail/error/res/values/dimens.xml b/java/com/android/dialer/app/voicemail/error/res/values/dimens.xml index 090311f15..dd815ca12 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values/dimens.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values/dimens.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + ~ 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 + --> + <resources> <dimen name="alert_icon_size">24dp</dimen> <dimen name="alert_start_padding">16dp</dimen> @@ -22,4 +38,6 @@ <dimen name="voicemail_promo_card_line_spacing">4dp</dimen> <dimen name="voicemail_promo_card_title_text_size">16sp</dimen> <dimen name="voicemail_promo_card_message_size">14sp</dimen> -</resources>
\ No newline at end of file + + <dimen name="voicemail_tos_image_size">200dp</dimen> +</resources> diff --git a/java/com/android/dialer/app/voicemail/error/res/values/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values/strings.xml index ad5240b9d..80349e168 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values/strings.xml @@ -174,16 +174,16 @@ Si no acepta todos estos términos y condiciones, no use el buzón de voz visual </string> <string translatable="false" name="dialer_terms_and_conditions_1.0_english"> - See and listen to your messages, without having to call voicemail.\n\nGet transcripts of your voicemail using Google’s transcription service. + See and listen to your messages, without having to call voicemail.\nGet transcripts of your voicemail using Google’s transcription service. </string> <string translatable="false" name="dialer_terms_and_conditions_1.0_spanish"> - ***TRANSLATE TO SPANISH***\nSee and listen to your messages, without having to call voicemail.\n\nGet transcripts of your voicemail using Google’s transcription service. + ***TRANSLATE TO SPANISH***\nSee and listen to your messages, without having to call voicemail.\nGet transcripts of your voicemail using Google’s transcription service. </string> - <string translatable="false" name="verizon_terms_and_conditions_accept_english">Accept</string> + <string translatable="false" name="verizon_terms_and_conditions_accept_english">Turn On</string> <string translatable="false" name="verizon_terms_and_conditions_accept_spanish">Aceptar</string> - <string translatable="false" name="verizon_terms_and_conditions_decline_english">Decline</string> + <string translatable="false" name="verizon_terms_and_conditions_decline_english">No Thanks</string> <string translatable="false" name="verizon_terms_and_conditions_decline_spanish">Rechazar</string> <string translatable="false" name="dialer_terms_and_conditions_accept_english">Turn On</string> diff --git a/java/com/android/dialer/app/voicemail/error/res/values/styles.xml b/java/com/android/dialer/app/voicemail/error/res/values/styles.xml index c4a8542f1..257e93d1b 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values/styles.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values/styles.xml @@ -1,6 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> -<resources> +<!-- + ~ 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 + --> +<resources> <style name="ErrorActionStyle"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">48dp</item> @@ -9,7 +24,23 @@ <item name="android:paddingEnd">8dp</item> <item name="android:layout_marginStart">8dp</item> <item name="android:layout_marginEnd">8dp</item> - <item name="android:textColor">@color/dialtacts_theme_color</item> + <item name="android:textColor">@color/dialer_theme_color</item> + <item name="android:fontFamily">"sans-serif-medium"</item> + <item name="android:focusable">true</item> + <item name="android:singleLine">true</item> + <item name="android:textAllCaps">true</item> + <item name="android:textSize">14sp</item> + </style> + + <style name="ErrorActionDeclineStyle"> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">48dp</item> + <item name="android:gravity">end|center_vertical</item> + <item name="android:paddingStart">8dp</item> + <item name="android:paddingEnd">8dp</item> + <item name="android:layout_marginStart">8dp</item> + <item name="android:layout_marginEnd">8dp</item> + <item name="android:textColor">@color/dialer_secondary_text_color</item> <item name="android:fontFamily">"sans-serif-medium"</item> <item name="android:focusable">true</item> <item name="android:singleLine">true</item> @@ -23,4 +54,4 @@ <item name="android:textSize">14sp</item> <item name="android:layout_height">@dimen/call_log_action_height</item> </style> -</resources>
\ No newline at end of file +</resources> diff --git a/java/com/android/dialer/blocking/res/values-hu/strings.xml b/java/com/android/dialer/blocking/res/values-hu/strings.xml index 10704546d..7981d6c14 100644 --- a/java/com/android/dialer/blocking/res/values-hu/strings.xml +++ b/java/com/android/dialer/blocking/res/values-hu/strings.xml @@ -33,7 +33,7 @@ <string name="block_number_undo" msgid="5158120911892491697">"VISSZAVONÁS"</string> <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Az importálás nem sikerült"</string> <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"A hívások tiltása funkció kikapcsolva 48 órára"</string> - <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Letiltva vészhívás miatt."</string> + <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Letiltva segélyhívás miatt."</string> <string name="block_report_number_alert_title" msgid="2740581989824959611">"Letiltja a következő számot: <xliff:g id="NUMBER">%1$s</xliff:g>?"</string> <string name="block_report_number_alert_details" msgid="2652479394593143562">"A jövőben nem fogad hívásokat erről a számról."</string> <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> A hívást spamként jelentjük be."</string> diff --git a/java/com/android/dialer/callcomposer/CallComposerActivity.java b/java/com/android/dialer/callcomposer/CallComposerActivity.java index 314752f93..df5cc29e0 100644 --- a/java/com/android/dialer/callcomposer/CallComposerActivity.java +++ b/java/com/android/dialer/callcomposer/CallComposerActivity.java @@ -64,8 +64,8 @@ import com.android.dialer.constants.Constants; import com.android.dialer.dialercontact.DialerContact; import com.android.dialer.enrichedcall.EnrichedCallComponent; import com.android.dialer.enrichedcall.EnrichedCallManager; -import com.android.dialer.enrichedcall.EnrichedCallManager.State; import com.android.dialer.enrichedcall.Session; +import com.android.dialer.enrichedcall.Session.State; import com.android.dialer.enrichedcall.extensions.StateExtension; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; @@ -255,25 +255,25 @@ public class CallComposerActivity extends AppCompatActivity StateExtension.toString(state)); switch (state) { - case EnrichedCallManager.STATE_STARTING: + case Session.STATE_STARTING: timeoutHandler.postDelayed(sessionStartedTimedOut, getSessionStartedTimeoutMillis()); if (sendAndCallReady) { showLoadingUi(); } break; - case EnrichedCallManager.STATE_STARTED: + case Session.STATE_STARTED: timeoutHandler.removeCallbacks(sessionStartedTimedOut); if (sendAndCallReady) { sendAndCall(); } break; - case EnrichedCallManager.STATE_START_FAILED: - case EnrichedCallManager.STATE_CLOSED: + case Session.STATE_START_FAILED: + case Session.STATE_CLOSED: setFailedResultAndFinish(); break; - case EnrichedCallManager.STATE_MESSAGE_FAILED: - case EnrichedCallManager.STATE_MESSAGE_SENT: - case EnrichedCallManager.STATE_NONE: + case Session.STATE_MESSAGE_FAILED: + case Session.STATE_MESSAGE_SENT: + case Session.STATE_NONE: default: break; } @@ -385,7 +385,7 @@ public class CallComposerActivity extends AppCompatActivity private boolean sessionReady() { Session session = getEnrichedCallManager().getSession(sessionId); - return session != null && session.getState() == EnrichedCallManager.STATE_STARTED; + return session != null && session.getState() == Session.STATE_STARTED; } private void placeRCSCall(MultimediaData.Builder builder) { diff --git a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml index 588cc1d42..48d6368c2 100644 --- a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml +++ b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml @@ -43,6 +43,8 @@ android:layout_marginTop="@dimen/call_composer_contact_container_margin_top" android:paddingTop="@dimen/call_composer_contact_container_padding_top" android:paddingBottom="@dimen/call_composer_contact_container_padding_bottom" + android:paddingStart="16dp" + android:paddingEnd="16dp" android:background="@color/dialer_theme_color"> <TextView @@ -50,6 +52,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" + android:maxLines="1" + android:ellipsize="end" android:textColor="@color/background_dialer_white" android:textSize="@dimen/call_composer_name_text_size"/> @@ -58,6 +62,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" + android:maxLines="1" + android:ellipsize="end" android:textColor="@color/background_dialer_white" android:textSize="@dimen/call_composer_number_text_size"/> </LinearLayout> diff --git a/java/com/android/dialer/callcomposer/res/values-af/strings.xml b/java/com/android/dialer/callcomposer/res/values-af/strings.xml index ef358651b..62a74579e 100644 --- a/java/com/android/dialer/callcomposer/res/values-af/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-af/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Neem \'n foto"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Kies \'n foto"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Stuur \'n boodskap"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Foto is via Boodskappe gestuur"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Boodskap is via Boodskappe gestuur"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-am/strings.xml b/java/com/android/dialer/callcomposer/res/values-am/strings.xml index 8224b1e3d..fe1c1e586 100644 --- a/java/com/android/dialer/callcomposer/res/values-am/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-am/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"ፎቶ ያንሱ"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"ፎቶ ይምረጡ"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"መልዕክት ይላኩ"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"ፎቶ በመልዕክቶች በኩል ተልኳል"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"መልዕክት በመልዕክቶች በኩል ተልኳል"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-ar/strings.xml b/java/com/android/dialer/callcomposer/res/values-ar/strings.xml index 4e27f21ba..b70f3ff32 100644 --- a/java/com/android/dialer/callcomposer/res/values-ar/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ar/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"التقاط صورة"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"اختيار صورة"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"إرسال رسالة"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"صورة مرسلة عبر Messages"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"رسالة مرسلة عبر Messages"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-az/strings.xml b/java/com/android/dialer/callcomposer/res/values-az/strings.xml index d861e660e..7495555af 100644 --- a/java/com/android/dialer/callcomposer/res/values-az/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-az/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Şəkil çəkin"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Foto seçin"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Mesaj göndərin"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Foto Mesajlaşma tətbiqi vasitəsilə göndərildi"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Mesaj Mesajlaşma tətbiqi vasitəsilə göndərildi"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml index 0a93b224c..88b801169 100644 --- a/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Slikajte"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Izaberite sliku"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Pošaljite poruku"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Slika je poslata preko Messages-a"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Poruka je poslata preko Messages-a"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-be/strings.xml b/java/com/android/dialer/callcomposer/res/values-be/strings.xml index ba55fc7b2..a741ccd4e 100644 --- a/java/com/android/dialer/callcomposer/res/values-be/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-be/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Зрабіць фота"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Выбраць фота"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Адправіць паведамленне"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Фота адпраўлена праз праграму \"Паведамленні\""</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Паведамленне адпраўлена праз праграму \"Паведамленні\""</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-bg/strings.xml b/java/com/android/dialer/callcomposer/res/values-bg/strings.xml index 7dad394c3..4348bc6cd 100644 --- a/java/com/android/dialer/callcomposer/res/values-bg/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-bg/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Правене на снимка"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Избиране на снимка"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Изпращане на съобщение"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Снимката е изпратена чрез Messages"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Съобщението е изпратено чрез Messages"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-bn/strings.xml b/java/com/android/dialer/callcomposer/res/values-bn/strings.xml index 607f195a1..f2f3f11c4 100644 --- a/java/com/android/dialer/callcomposer/res/values-bn/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-bn/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"একটি ছবি তুলুন"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"একটি ফটো বেছে নিন"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"একটি বার্তা পাঠান"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Messages এর সাহায্যে ফটো পাঠানো হয়েছে"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Messages-এর সাহায্যে বার্তা পাঠানো হয়েছে"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-bs/strings.xml b/java/com/android/dialer/callcomposer/res/values-bs/strings.xml index 99ca5db88..a5ecb0c87 100644 --- a/java/com/android/dialer/callcomposer/res/values-bs/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-bs/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Uslikaj"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Izaberi fotografiju"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Pošalji poruku"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Fotografija je poslana putem aplikacije Messages"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Poruka je poslana putem aplikacije Messages"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-ca/strings.xml b/java/com/android/dialer/callcomposer/res/values-ca/strings.xml index 7b553467e..1f3007d5d 100644 --- a/java/com/android/dialer/callcomposer/res/values-ca/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ca/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Fes una foto"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Tria una foto"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Envia un missatge"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada mitjançant Missatges"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Missatge enviat mitjançant Missatges"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-cs/strings.xml b/java/com/android/dialer/callcomposer/res/values-cs/strings.xml index f30bb3c78..590ab1c6a 100644 --- a/java/com/android/dialer/callcomposer/res/values-cs/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-cs/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Vyfotit"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Vybrat fotku"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Poslat zprávu"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Fotka poslaná v aplikaci Zprávy"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Zpráva poslaná v aplikaci Zprávy"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-da/strings.xml b/java/com/android/dialer/callcomposer/res/values-da/strings.xml index bae4495e9..179e0d02c 100644 --- a/java/com/android/dialer/callcomposer/res/values-da/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-da/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Tag et billede"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Vælg et billede"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Send en sms"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Fotoet blev sendt via Beskeder"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Beskeden blev sendt via Beskeder"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-de/strings.xml b/java/com/android/dialer/callcomposer/res/values-de/strings.xml index ac7ce4e10..d0c88a938 100644 --- a/java/com/android/dialer/callcomposer/res/values-de/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-de/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Bild aufnehmen"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Foto auswählen"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Nachricht senden"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Foto über Messages gesendet"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Nachricht über Messages gesendet."</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-el/strings.xml b/java/com/android/dialer/callcomposer/res/values-el/strings.xml index 1e7659bfd..bfa626bd7 100644 --- a/java/com/android/dialer/callcomposer/res/values-el/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-el/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Λήψη φωτογραφίας"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Επιλογή φωτογραφίας"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Αποστολή μηνύματος"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Η φωτογραφία στάλθηκε μέσω του Messages"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Το μήνυμα στάλθηκε μέσω του Messages"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml index 2b3f7a37d..5e2807b97 100644 --- a/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Take a picture"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Choose a photo"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Sending a message"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Photo sent via Messages"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Message sent via Messages"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml index 2b3f7a37d..5e2807b97 100644 --- a/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Take a picture"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Choose a photo"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Sending a message"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Photo sent via Messages"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Message sent via Messages"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml index 2b3f7a37d..5e2807b97 100644 --- a/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Take a picture"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Choose a photo"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Sending a message"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Photo sent via Messages"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Message sent via Messages"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml b/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml index 67bac9783..f1d470590 100644 --- a/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Tomar una foto"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Elegir una foto"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar un mensaje"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada por Mensajes"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Mensaje de texto enviado por Mensajes"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-es/strings.xml b/java/com/android/dialer/callcomposer/res/values-es/strings.xml index 4b87268d2..cba427be1 100644 --- a/java/com/android/dialer/callcomposer/res/values-es/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-es/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Hacer una foto"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Elegir una foto"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar un mensaje"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada a través de Mensajes"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Mensaje enviado a través de Mensajes"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-et/strings.xml b/java/com/android/dialer/callcomposer/res/values-et/strings.xml index 896525db3..d79ca9072 100644 --- a/java/com/android/dialer/callcomposer/res/values-et/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-et/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Pildistamine"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Foto valimine"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Sõnumi saatmine"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Foto saadeti rakenduse Messages kaudu"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Sõnum saadeti rakenduse Messages kaudu"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-eu/strings.xml b/java/com/android/dialer/callcomposer/res/values-eu/strings.xml index ce7e29617..32413f9d6 100644 --- a/java/com/android/dialer/callcomposer/res/values-eu/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-eu/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Atera argazki bat"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Aukeratu argazki bat"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Bidali mezu bat"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Mezuak aplikazioaren bidez bidali da argazkia"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Mezuak aplikazioaren bidez bidali da mezua"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-fa/strings.xml b/java/com/android/dialer/callcomposer/res/values-fa/strings.xml index 6f0c2e55b..a2604a9b6 100644 --- a/java/com/android/dialer/callcomposer/res/values-fa/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-fa/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"عکس گرفتن"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"انتخاب عکس"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"ارسال پیام"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"عکس ارسالشده ازطریق «پیامها»"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"پیام ارسالشده ازطریق «پیامها»"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-fi/strings.xml b/java/com/android/dialer/callcomposer/res/values-fi/strings.xml index ce0786c9b..482a36afc 100644 --- a/java/com/android/dialer/callcomposer/res/values-fi/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-fi/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Ota kuva"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Valitse kuva"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Lähetä viesti"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Kuva lähetettiin Messages-sovelluksen kautta"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Viesti lähetettiin Messages-sovelluksen kautta"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml b/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml index 0451dcfc1..be06baaf1 100644 --- a/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Prendre une photo"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Choisir une photo"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Envoyer un message"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Photo envoyée au moyen de l\'application Messages"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Message envoyé au moyen de l\'application Messages"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-fr/strings.xml b/java/com/android/dialer/callcomposer/res/values-fr/strings.xml index 50e61946c..f56ad7a00 100644 --- a/java/com/android/dialer/callcomposer/res/values-fr/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-fr/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Prendre une photo"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Choisir une photo"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Envoyer un message"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Photo envoyée via l\'application Messages"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Message envoyé via l\'application Messages"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-gl/strings.xml b/java/com/android/dialer/callcomposer/res/values-gl/strings.xml index 2ad2c9a60..f2a0f15be 100644 --- a/java/com/android/dialer/callcomposer/res/values-gl/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-gl/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Tira unha foto"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Escolle unha foto"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Envía unha mensaxe"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada a través de Mensaxes"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Mensaxe enviada a través de Mensaxes"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-gu/strings.xml b/java/com/android/dialer/callcomposer/res/values-gu/strings.xml index 8c9a521eb..771d14865 100644 --- a/java/com/android/dialer/callcomposer/res/values-gu/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-gu/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"એક ચિત્ર લો"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"ફોટો પસંદ કરો"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"એક સંદેશ મોકલો"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Messages મારફતે ફોટો મોકલ્યો"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Messages મારફતે સંદેશ મોકલ્યો"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-hi/strings.xml b/java/com/android/dialer/callcomposer/res/values-hi/strings.xml index 8d4f91e40..4de9a6d5d 100644 --- a/java/com/android/dialer/callcomposer/res/values-hi/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-hi/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"चित्र लें"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"एक फ़ोटो चुनें"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"संदेश भेजें"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"संदेश ऐप्लिकेशन के ज़रिए फ़ोटो भेजा गया"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"संदेश ऐप्लिकेशन के ज़रिए संदेश भेजा गया"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-hr/strings.xml b/java/com/android/dialer/callcomposer/res/values-hr/strings.xml index cc3219d9f..4bea73cba 100644 --- a/java/com/android/dialer/callcomposer/res/values-hr/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-hr/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Snimi fotografiju"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Odaberi fotografiju"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Pošalji poruku"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Fotografija poslana putem Poruka"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Poruka poslana putem Poruka"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-hu/strings.xml b/java/com/android/dialer/callcomposer/res/values-hu/strings.xml index b222c53a9..2a590e0bb 100644 --- a/java/com/android/dialer/callcomposer/res/values-hu/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-hu/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Kép készítése"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Fotó kiválasztása"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Üzenet küldése"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Fotó elküldve a Messages alkalmazásban"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Üzenet elküldve a Messages alkalmazásban"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-hy/strings.xml b/java/com/android/dialer/callcomposer/res/values-hy/strings.xml index 01635f65a..1b5523412 100644 --- a/java/com/android/dialer/callcomposer/res/values-hy/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-hy/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Լուսանկարել"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Ընտրել լուսանկար"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Ուղարկել հաղորդագրություն"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Լուսանկարն ուղարկվել է Messages-ի միջոցով"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Հաղորդագրությունն ուղարկվել է Messages-ի միջոցով"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-in/strings.xml b/java/com/android/dialer/callcomposer/res/values-in/strings.xml index 4c6d84495..7983c4de0 100644 --- a/java/com/android/dialer/callcomposer/res/values-in/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-in/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Jepret"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Pilih foto"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Mengirim pesan"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Foto dikirim lewat Message"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Pesan dikirim lewat Message"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-is/strings.xml b/java/com/android/dialer/callcomposer/res/values-is/strings.xml index d951edd48..3bf4a6b2d 100644 --- a/java/com/android/dialer/callcomposer/res/values-is/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-is/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Taka mynd"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Velja mynd"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Senda skilaboð"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Mynd send með Messages"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Skilaboð send með Messages"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-it/strings.xml b/java/com/android/dialer/callcomposer/res/values-it/strings.xml index 9d26b2ced..343dd84f0 100644 --- a/java/com/android/dialer/callcomposer/res/values-it/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-it/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Scatta una foto"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Scegli una foto"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Invia un messaggio"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Foto inviata tramite Messaggi"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Messaggio inviato tramite Messaggi"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-iw/strings.xml b/java/com/android/dialer/callcomposer/res/values-iw/strings.xml index 26e7daf81..24c6203cd 100644 --- a/java/com/android/dialer/callcomposer/res/values-iw/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-iw/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"צילום תמונה"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"בחירת תמונה"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"שליחת הודעה"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"התמונה נשלחה דרך אפליקציית Messages"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"ההודעה נשלחה דרך אפליקציית Messages"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-ja/strings.xml b/java/com/android/dialer/callcomposer/res/values-ja/strings.xml index 96eaea5ae..33f48c924 100644 --- a/java/com/android/dialer/callcomposer/res/values-ja/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ja/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"画像を撮影します"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"写真を選択します"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"メッセージを送信します"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Android メッセージで写真が送信されました"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Android メッセージでメッセージが送信されました"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-ka/strings.xml b/java/com/android/dialer/callcomposer/res/values-ka/strings.xml index 0cef94df9..65084f3d2 100644 --- a/java/com/android/dialer/callcomposer/res/values-ka/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ka/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"სურათის გადაღება"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"ფოტოს არჩევა"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"შეტყობინების გაგზავნა"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"ფოტო გაიგზავნა Messages აპიდან"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"შეტყობინება გაიგზავნა Messages აპიდან"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-kk/strings.xml b/java/com/android/dialer/callcomposer/res/values-kk/strings.xml index c95fb7b26..bf4173674 100644 --- a/java/com/android/dialer/callcomposer/res/values-kk/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-kk/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Суретке түсіру"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Суретті таңдау"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Хабар жіберу"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Сурет Messages арқылы жіберілді"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Хабар Messages арқылы жіберілді"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-km/strings.xml b/java/com/android/dialer/callcomposer/res/values-km/strings.xml index 66f82c581..10c8d52a1 100644 --- a/java/com/android/dialer/callcomposer/res/values-km/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-km/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"ថតរូប"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"ជ្រើសរើសរូបថត"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"ផ្ញើសារ"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"រូបថតដែលបានផ្ញើតាមរយៈ Messages"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"សារដែលបានផ្ញើតាមរយៈ Messages"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-kn/strings.xml b/java/com/android/dialer/callcomposer/res/values-kn/strings.xml index 7bb1e48ec..3776d9d1b 100644 --- a/java/com/android/dialer/callcomposer/res/values-kn/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-kn/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"ಚಿತ್ರ ತೆಗೆದುಕೊಳ್ಳಿ"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"ಒಂದು ಫೋಟೋ ಆಯ್ಕೆಮಾಡಿ"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"ಸಂದೇಶ ಕಳುಹಿಸಿ"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"ಸಂದೇಶಗಳ ಮೂಲಕ ಕಳುಹಿಸಲಾದ ಫೋಟೋ"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"ಸಂದೇಶಗಳ ಮೂಲಕ ಕಳುಹಿಸಲಾದ ಸಂದೇಶ"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-ko/strings.xml b/java/com/android/dialer/callcomposer/res/values-ko/strings.xml index 1052d551d..0e6820ed8 100644 --- a/java/com/android/dialer/callcomposer/res/values-ko/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ko/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"사진 촬영"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"사진 선택"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"메시지 보내기"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"메시지를 통해 전송된 사진"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"메시지를 통해 전송된 메시지"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-ky/strings.xml b/java/com/android/dialer/callcomposer/res/values-ky/strings.xml index 6e5889d69..f96ce4ddc 100644 --- a/java/com/android/dialer/callcomposer/res/values-ky/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ky/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Сүрөткө тартуу"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Сүрөттү тандоо"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Билдирүү жөнөтүү"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Сүрөт Android жазышуулары колдонмосу аркылуу жөнөтүлдү"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Билдирүү Android жазышуулары колдонмосу аркылуу жөнөтүлдү"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-lo/strings.xml b/java/com/android/dialer/callcomposer/res/values-lo/strings.xml index 87d72dbc6..d14f03d1c 100644 --- a/java/com/android/dialer/callcomposer/res/values-lo/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-lo/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"ຖ່າຍຮູບ"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"ເລືອກຮູບພາບ..."</string> <string name="description_call_composer_message" msgid="9132362446000908550">"ສົ່ງຂໍ້ຄວາມ"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"ສົ່ງຮູບຜ່ານ Messages ແລ້ວ"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"ສົ່ງຮູບຜ່ານ Messages ແລ້ວ"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-lt/strings.xml b/java/com/android/dialer/callcomposer/res/values-lt/strings.xml index 07fe444b0..4453bcd20 100644 --- a/java/com/android/dialer/callcomposer/res/values-lt/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-lt/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Fotografuoti"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Pasirinkti nuotrauką"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Siųsti pranešimą"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Nuotrauka išsiųsta naudojant „Messages“"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Pranešimas išsiųstas naudojant „Messages“"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-lv/strings.xml b/java/com/android/dialer/callcomposer/res/values-lv/strings.xml index 9a3efc7c4..80e5214d3 100644 --- a/java/com/android/dialer/callcomposer/res/values-lv/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-lv/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Uzņemt attēlu"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Izvēlēties fotoattēlu"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Sūtīt ziņojumu"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Fotoattēls nosūtīts, izmantojot lietotni Ziņojumi"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Ziņojums nosūtīts, izmantojot lietotni Ziņojumi"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-mk/strings.xml b/java/com/android/dialer/callcomposer/res/values-mk/strings.xml index 218c23d90..bd8f0c8d9 100644 --- a/java/com/android/dialer/callcomposer/res/values-mk/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-mk/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Фотографирајте"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Изберете фотографија"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Испратете порака"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Фотографијата е испратена преку Messages"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Пораката е испратена преку Messages"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-ml/strings.xml b/java/com/android/dialer/callcomposer/res/values-ml/strings.xml index 0e58cbbf0..e4931cbea 100644 --- a/java/com/android/dialer/callcomposer/res/values-ml/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ml/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"ഒരു ചിത്രമെടുക്കുക"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"ഒരു ഫോട്ടോ തിരഞ്ഞെടുക്കുക"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"ഒരു സന്ദേശം അയയ്ക്കുക"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"മെസേജ് വഴി ഫോട്ടോ അയച്ചു"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"മെസേജ് വഴി സന്ദേശം അയച്ചു"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-mn/strings.xml b/java/com/android/dialer/callcomposer/res/values-mn/strings.xml index 872874071..62a775074 100644 --- a/java/com/android/dialer/callcomposer/res/values-mn/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-mn/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Зураг авах"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Зураг сонгоно уу"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Зурвас илгээх"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Зургийг Зурвасаар дамжуулан илгээсэн"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Зурвасыг Зурвасаар дамжуулан илгээсэн"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-mr/strings.xml b/java/com/android/dialer/callcomposer/res/values-mr/strings.xml index 3ca51a2b2..e7a71901a 100644 --- a/java/com/android/dialer/callcomposer/res/values-mr/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-mr/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"एक फोटो घ्या"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"फोटो निवडा"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"एक संदेश पाठवा"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Messages द्वारे फोटो पाठविला"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Messages द्वारे संदेश पाठविला"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-ms/strings.xml b/java/com/android/dialer/callcomposer/res/values-ms/strings.xml index e722b88b2..39ed6fa6e 100644 --- a/java/com/android/dialer/callcomposer/res/values-ms/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ms/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Ambil gambar"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Pilih foto"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Hantar mesej"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Photo dihantar melalui Mesej"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Mesej dihantar melalui Mesej"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-my/strings.xml b/java/com/android/dialer/callcomposer/res/values-my/strings.xml index b49b1eaad..a20dabc83 100644 --- a/java/com/android/dialer/callcomposer/res/values-my/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-my/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"ဓာတ်ပုံတစ်ပုံ ရိုက်ရန်"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"ဓာတ်ပုံတစ်ပုံ ရွေးရန်"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"မက်ဆေ့ဂျ်ပို့ရန်"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"မက်ဆေ့ဂျ်များမှတစ်ဆင့် ဓာတ်ပုံပို့ပြီးပါပြီ"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"မက်ဆေ့ဂျ်များမှတစ်ဆင့် မက်ဆေ့ဂျ်ပို့ပြီးပါပြီ"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-nb/strings.xml b/java/com/android/dialer/callcomposer/res/values-nb/strings.xml index 07caf6ee0..cbb1acca2 100644 --- a/java/com/android/dialer/callcomposer/res/values-nb/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-nb/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Ta et bilde"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Velg et bilde"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Send en melding"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Bildet er sendt via Messages"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Meldingen er sendt via Messages"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-ne/strings.xml b/java/com/android/dialer/callcomposer/res/values-ne/strings.xml index 03eac6cba..f084dc9f6 100644 --- a/java/com/android/dialer/callcomposer/res/values-ne/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ne/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"तस्बिर खिच्नुहोस्"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"तस्बिर छनौट गर्नुहोस्"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"सन्देश पठाउनुहोस्"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Messages मार्फत पठाइएको तस्बिर"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Messages मार्फत पठाइएको सन्देश"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-nl/strings.xml b/java/com/android/dialer/callcomposer/res/values-nl/strings.xml index 7a73d93c1..5511427fa 100644 --- a/java/com/android/dialer/callcomposer/res/values-nl/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-nl/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Een foto nemen"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Een foto kiezen"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Een bericht verzenden"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Foto verzonden via Berichten"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Bericht verzonden via Berichten"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-no/strings.xml b/java/com/android/dialer/callcomposer/res/values-no/strings.xml index 07caf6ee0..cbb1acca2 100644 --- a/java/com/android/dialer/callcomposer/res/values-no/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-no/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Ta et bilde"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Velg et bilde"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Send en melding"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Bildet er sendt via Messages"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Meldingen er sendt via Messages"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-pa/strings.xml b/java/com/android/dialer/callcomposer/res/values-pa/strings.xml index 25de393e0..5c20adc7a 100644 --- a/java/com/android/dialer/callcomposer/res/values-pa/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-pa/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"ਇੱਕ ਤਸਵੀਰ ਖਿੱਚੋ"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"ਇੱਕ ਫ਼ੋਟੋ ਚੁਣੋ"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"ਇੱਕ ਸੁਨੇਹਾ ਭੇਜੋ"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"ਫ਼ੋਟੋ &quot;ਸੁਨੇਹੇ&quot; ਐਪ ਰਾਹੀਂ ਭੇਜੀ ਗਈ"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"ਸੁਨੇਹਾ &quot;ਸੁਨੇਹੇ&quot; ਐਪ ਰਾਹੀਂ ਭੇਜਿਆ ਗਿਆ"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-pl/strings.xml b/java/com/android/dialer/callcomposer/res/values-pl/strings.xml index b65ba236d..eea749604 100644 --- a/java/com/android/dialer/callcomposer/res/values-pl/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-pl/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Zrób zdjęcie"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Wybierz zdjęcie"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Wyślij wiadomość"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Zdjęcie zostało wysłane przez Wiadomości"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Tekst został wysłany przez Wiadomości"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml index 669e8505a..026cface7 100644 --- a/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Tirar uma foto"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Escolher uma foto"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar uma mensagem"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada pelo Mensagens"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Mensagem enviada pelo Mensagens"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml index 45411d389..1a35ce2e6 100644 --- a/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Tirar uma foto"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Selecionar foto"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar uma mensagem"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada através da aplicação Mensagens"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Mensagem enviada através da aplicação Mensagens"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-pt/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt/strings.xml index 669e8505a..026cface7 100644 --- a/java/com/android/dialer/callcomposer/res/values-pt/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-pt/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Tirar uma foto"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Escolher uma foto"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar uma mensagem"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada pelo Mensagens"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Mensagem enviada pelo Mensagens"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-ro/strings.xml b/java/com/android/dialer/callcomposer/res/values-ro/strings.xml index cd8359f53..ac55b8069 100644 --- a/java/com/android/dialer/callcomposer/res/values-ro/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ro/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Fotografiați"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Alegeți o fotografie"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Trimiteți un mesaj"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Fotografie trimisă prin Messages"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Mesaj trimis prin Messages"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-ru/strings.xml b/java/com/android/dialer/callcomposer/res/values-ru/strings.xml index 1119a0eb8..79d8136ff 100644 --- a/java/com/android/dialer/callcomposer/res/values-ru/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ru/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Сделать фото"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Выбрать фото"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Отправить сообщение"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Фото отправлено через Android Сообщения"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Сообщение отправлено через Android Сообщения"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-si/strings.xml b/java/com/android/dialer/callcomposer/res/values-si/strings.xml index dfae242f9..8c2b9536f 100644 --- a/java/com/android/dialer/callcomposer/res/values-si/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-si/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"පින්තුරයක් ගැනීම"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"ඡායාරූපයක් තේරීම"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"පණිවිඩයක් යැවීම"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Messages හරහා ඡායාරූපය යවන ලදී"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Messages හරහා පණිවිඩය යවන ලදී"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-sk/strings.xml b/java/com/android/dialer/callcomposer/res/values-sk/strings.xml index f54c73e25..ee062c475 100644 --- a/java/com/android/dialer/callcomposer/res/values-sk/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-sk/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Odfotiť"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Vybrať fotku"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Odoslať správu"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Fotka bola odoslaná prostredníctvom Správ"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Správa bola odoslaná prostredníctvom Správ"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-sl/strings.xml b/java/com/android/dialer/callcomposer/res/values-sl/strings.xml index 010ad07b5..9d57cfd0a 100644 --- a/java/com/android/dialer/callcomposer/res/values-sl/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-sl/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Posnemi fotografijo"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Izberi fotografijo"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Pošlji sporočilo"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Fotografija je bila poslana prek aplikacije Messages"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Sporočilo je bila poslano prek aplikacije Messages"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-sq/strings.xml b/java/com/android/dialer/callcomposer/res/values-sq/strings.xml index b106d5a1e..720994255 100644 --- a/java/com/android/dialer/callcomposer/res/values-sq/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-sq/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Bëj një fotografi"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Zgjidh një fotografi"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Dërgo një mesazh"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Fotografia u dërgua nëpërmjet \"Mesazheve\""</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Mesazhi u dërgua nëpërmjet \"Mesazheve\""</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-sr/strings.xml b/java/com/android/dialer/callcomposer/res/values-sr/strings.xml index 2b85628d9..1eafcb79b 100644 --- a/java/com/android/dialer/callcomposer/res/values-sr/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-sr/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Сликајте"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Изаберите слику"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Пошаљите поруку"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Слика је послата преко Messages-а"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Порука је послата преко Messages-а"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-sv/strings.xml b/java/com/android/dialer/callcomposer/res/values-sv/strings.xml index e60bbe946..787d8653a 100644 --- a/java/com/android/dialer/callcomposer/res/values-sv/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-sv/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Ta en bild"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Välj ett foto"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Skicka ett meddelande"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Fotot har skickats via Messages"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Meddelandet har skickats via Messages"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-sw/strings.xml b/java/com/android/dialer/callcomposer/res/values-sw/strings.xml index f67c8994e..d33ff3186 100644 --- a/java/com/android/dialer/callcomposer/res/values-sw/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-sw/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Piga picha"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Chagua picha"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Tuma ujumbe"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Picha imetumwa kupitia Programu ya Messages"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Ujumbe umetumwa kupitia Programu ya Messages"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-ta/strings.xml b/java/com/android/dialer/callcomposer/res/values-ta/strings.xml index ae59b3d30..37c0193d1 100644 --- a/java/com/android/dialer/callcomposer/res/values-ta/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ta/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"படமெடுக்கவும்"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"புகைப்படத்தைத் தேர்வு செய்யும்"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"செய்தியை அனுப்பும்"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"மெசேஜஸ் மூலம் படம் அனுப்பப்பட்டது"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"மெசேஜஸ் மூலம் செய்தி அனுப்பப்பட்டது"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-te/strings.xml b/java/com/android/dialer/callcomposer/res/values-te/strings.xml index 01d0910ea..548037034 100644 --- a/java/com/android/dialer/callcomposer/res/values-te/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-te/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"చిత్రాన్ని తీస్తుంది"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"ఫోటోను ఎంచుకోండి"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"సందేశాన్ని పంపుతుంది"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"సందేశాల అనువర్తనం ద్వారా ఫోటోను పంపాము"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"సందేశాల అనువర్తనం ద్వారా సందేశాన్ని పంపాము"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-th/strings.xml b/java/com/android/dialer/callcomposer/res/values-th/strings.xml index 53dbaea63..9d98d56b4 100644 --- a/java/com/android/dialer/callcomposer/res/values-th/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-th/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"ถ่ายภาพ"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"เลือกรูปภาพ"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"ส่งข้อความ"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"ส่งรูปภาพผ่าน Messages แล้ว"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"ส่งข้อความผ่าน Messages แล้ว"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-tl/strings.xml b/java/com/android/dialer/callcomposer/res/values-tl/strings.xml index 910d907a9..5bba94217 100644 --- a/java/com/android/dialer/callcomposer/res/values-tl/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-tl/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Kumuha ng larawan"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Pumili ng larawan"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Magpadala ng mensahe"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Larawang ipinadala sa pamamagitan ng Messages"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Mensaheng ipinadala sa pamamagitan ng Messages"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-tr/strings.xml b/java/com/android/dialer/callcomposer/res/values-tr/strings.xml index 51069ead3..cfb8bfb90 100644 --- a/java/com/android/dialer/callcomposer/res/values-tr/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-tr/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Resim çeker"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Fotoğraf seçilmesini sağlar"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Mesaj gönderir"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Fotoğraf, Mesajlar uygulaması üzerinden gönderildi"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Mesaj, Mesajlar uygulaması üzerinden gönderildi"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-uk/strings.xml b/java/com/android/dialer/callcomposer/res/values-uk/strings.xml index 57ee7224c..4cb1a2d6c 100644 --- a/java/com/android/dialer/callcomposer/res/values-uk/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-uk/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Зробити знімок"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Вибрати фотографію"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Надіслати повідомлення"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Фотографію надіслано через додаток Повідомлення"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Текст надіслано через додаток Повідомлення"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-ur/strings.xml b/java/com/android/dialer/callcomposer/res/values-ur/strings.xml index 28d79b82b..c665cfb37 100644 --- a/java/com/android/dialer/callcomposer/res/values-ur/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ur/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"تصویر لیں"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"ایک تصویر چنیں"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"پیغام بھیجیں"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"تصویر پیغامات کے ذریعے بھیجی گئی"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"پیغام پیغامات کے ذریعے بھیجا گیا"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-uz/strings.xml b/java/com/android/dialer/callcomposer/res/values-uz/strings.xml index a3c7346ba..0237ab9e3 100644 --- a/java/com/android/dialer/callcomposer/res/values-uz/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-uz/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Rasmga olish"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Rasm tanlash"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Xabar yuborish"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Rasm Android Xabarlar orqali yuborildi"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Xabar Android Xabarlar orqali yuborildi"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-vi/strings.xml b/java/com/android/dialer/callcomposer/res/values-vi/strings.xml index 7be47a00c..d617cfb58 100644 --- a/java/com/android/dialer/callcomposer/res/values-vi/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-vi/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Chụp ảnh"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Chọn ảnh"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Gửi tin nhắn"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Đã gửi ảnh qua Messages"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Đã gửi tin nhắn qua Messages"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml index 39ace9d71..97017d6f4 100644 --- a/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"拍照"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"选择一张照片"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"发送信息"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"已通过“信息”应用发送照片"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"已通过“信息”应用发送短信"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml index 87052ffb9..b191949fc 100644 --- a/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"拍照"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"選擇相片"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"傳送訊息"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"已透過「訊息」傳送相片"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"已透過「訊息」傳送訊息"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml index 51cc8f669..ef2cd9d16 100644 --- a/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"拍攝相片"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"選擇相片"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"傳送訊息"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"透過訊息應用程式傳送的相片"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"透過訊息應用程式傳送的訊息"</string> </resources> diff --git a/java/com/android/dialer/callcomposer/res/values-zu/strings.xml b/java/com/android/dialer/callcomposer/res/values-zu/strings.xml index 3e2db44d1..09845f65c 100644 --- a/java/com/android/dialer/callcomposer/res/values-zu/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-zu/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Thatha isithombe"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Khetha isithombe"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Thumela umlayezo"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Isithombe sithunyelwe ngemilayezo"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Umlayezo uthunyelwe ngemilayezo"</string> </resources> diff --git a/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java index bc989ea25..204e40721 100644 --- a/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java +++ b/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java @@ -36,7 +36,6 @@ import com.android.dialer.compat.AppCompatConstants; import com.android.dialer.enrichedcall.historyquery.proto.HistoryResult; import com.android.dialer.enrichedcall.historyquery.proto.HistoryResult.Type; import com.android.dialer.oem.MotorolaUtils; -import com.android.dialer.util.CallUtil; import com.android.dialer.util.DialerUtils; import com.android.dialer.util.IntentUtil; @@ -88,9 +87,7 @@ public class CallDetailsEntryViewHolder extends ViewHolder { CallTypeHelper callTypeHelper, boolean showMultimediaDivider) { int callType = entry.getCallType(); - boolean isVideoCall = - (entry.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO - && CallUtil.isVideoEnabled(context); + boolean isVideoCall = (entry.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO; boolean isPulledCall = (entry.getFeatures() & Calls.FEATURES_PULLED_EXTERNALLY) == Calls.FEATURES_PULLED_EXTERNALLY; @@ -98,7 +95,7 @@ public class CallDetailsEntryViewHolder extends ViewHolder { callTime.setTextColor(getColorForCallType(context, callType)); callTypeIcon.clear(); callTypeIcon.add(callType); - callTypeIcon.setShowVideo((entry.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO); + callTypeIcon.setShowVideo(isVideoCall); callTypeIcon.setShowHd(MotorolaUtils.shouldShowHdIconInCallLog(context, entry.getFeatures())); callTypeIcon.setShowWifi( MotorolaUtils.shouldShowWifiIconInCallLog(context, entry.getFeatures())); diff --git a/java/com/android/dialer/calldetails/res/values-uz/strings.xml b/java/com/android/dialer/calldetails/res/values-uz/strings.xml index 4f38cabd2..57f052648 100644 --- a/java/com/android/dialer/calldetails/res/values-uz/strings.xml +++ b/java/com/android/dialer/calldetails/res/values-uz/strings.xml @@ -20,7 +20,7 @@ <string name="call_details" msgid="5063658079729839605">"Chaqiruv tafsilotlari"</string> <string name="delete" msgid="2141020674108406737">"O‘chirib tashlash"</string> <string name="call_details_copy_number" msgid="4265479408878990796">"Raqamni nusxalash"</string> - <string name="call_details_edit_number" msgid="8718476514903513624">"Qo‘ng‘iroq qilishdan oldin raqamni tahrirlash"</string> + <string name="call_details_edit_number" msgid="8718476514903513624">"Chaqiruvdan oldin raqamni tahrirlash"</string> <string name="call_details_report_call_id" msgid="8857541295264421217">"Raqamdagi xatolik haqida xabar berish"</string> <string name="sent_a_photo" msgid="3978670717462979502">"Rasm yuborildi"</string> <string name="received_a_photo" msgid="3528953225576480505">"Rasm qabul qilindi"</string> diff --git a/java/com/android/dialer/callintent/CallIntentBuilder.java b/java/com/android/dialer/callintent/CallIntentBuilder.java index e5a0be848..e5449c804 100644 --- a/java/com/android/dialer/callintent/CallIntentBuilder.java +++ b/java/com/android/dialer/callintent/CallIntentBuilder.java @@ -22,6 +22,7 @@ import android.os.Bundle; import android.os.SystemClock; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.support.annotation.VisibleForTesting; import android.telecom.PhoneAccountHandle; import android.telecom.TelecomManager; import android.telecom.VideoProfile; @@ -38,25 +39,38 @@ public class CallIntentBuilder { private boolean isVideoCall; private String callSubject; + private static int lightbringerButtonAppearInExpandedCallLogItemCount = 0; + private static int lightbringerButtonAppearInCollapsedCallLogItemCount = 0; + private static int lightbringerButtonAppearInSearchCount = 0; + public CallIntentBuilder(@NonNull Uri uri, @NonNull CallSpecificAppData callSpecificAppData) { this.uri = Assert.isNotNull(uri); Assert.isNotNull(callSpecificAppData); Assert.checkArgument( callSpecificAppData.getCallInitiationType() != CallInitiationType.Type.UNKNOWN_INITIATION); + CallSpecificAppData.Builder builder = + CallSpecificAppData.newBuilder(callSpecificAppData) + .setLightbringerButtonAppearInExpandedCallLogItemCount( + lightbringerButtonAppearInExpandedCallLogItemCount) + .setLightbringerButtonAppearInCollapsedCallLogItemCount( + lightbringerButtonAppearInCollapsedCallLogItemCount) + .setLightbringerButtonAppearInSearchCount(lightbringerButtonAppearInSearchCount); + lightbringerButtonAppearInExpandedCallLogItemCount = 0; + lightbringerButtonAppearInCollapsedCallLogItemCount = 0; + lightbringerButtonAppearInSearchCount = 0; + if (PerformanceReport.isRecording()) { - this.callSpecificAppData = - CallSpecificAppData.newBuilder(callSpecificAppData) - .setTimeSinceAppLaunch(PerformanceReport.getTimeSinceAppLaunch()) - .setTimeSinceFirstClick(PerformanceReport.getTimeSinceFirstClick()) - .addAllUiActionsSinceAppLaunch(PerformanceReport.getActions()) - .addAllUiActionTimestampsSinceAppLaunch(PerformanceReport.getActionTimestamps()) - .setStartingTabIndex(PerformanceReport.getStartingTabIndex()) - .build(); + builder + .setTimeSinceAppLaunch(PerformanceReport.getTimeSinceAppLaunch()) + .setTimeSinceFirstClick(PerformanceReport.getTimeSinceFirstClick()) + .addAllUiActionsSinceAppLaunch(PerformanceReport.getActions()) + .addAllUiActionTimestampsSinceAppLaunch(PerformanceReport.getActionTimestamps()) + .build(); PerformanceReport.stopRecording(); - } else { - this.callSpecificAppData = callSpecificAppData; } + + this.callSpecificAppData = builder.build(); } public CallIntentBuilder(@NonNull Uri uri, CallInitiationType.Type callInitiationType) { @@ -119,4 +133,31 @@ public class CallIntentBuilder { CallSpecificAppData.newBuilder().setCallInitiationType(callInitiationType).build(); return callSpecificAppData; } + + public static void increaseLightbringerCallButtonAppearInExpandedCallLogItemCount() { + CallIntentBuilder.lightbringerButtonAppearInExpandedCallLogItemCount++; + } + + public static void increaseLightbringerCallButtonAppearInCollapsedCallLogItemCount() { + CallIntentBuilder.lightbringerButtonAppearInCollapsedCallLogItemCount++; + } + + public static void increaseLightbringerCallButtonAppearInSearchCount() { + CallIntentBuilder.lightbringerButtonAppearInSearchCount++; + } + + @VisibleForTesting + public static int getLightbringerButtonAppearInExpandedCallLogItemCount() { + return lightbringerButtonAppearInExpandedCallLogItemCount; + } + + @VisibleForTesting + public static int getLightbringerButtonAppearInCollapsedCallLogItemCount() { + return lightbringerButtonAppearInCollapsedCallLogItemCount; + } + + @VisibleForTesting + public static int getLightbringerButtonAppearInSearchCount() { + return lightbringerButtonAppearInSearchCount; + } } diff --git a/java/com/android/dialer/callintent/call_initiation_type.proto b/java/com/android/dialer/callintent/call_initiation_type.proto index e1385b7ef..318da9c86 100644 --- a/java/com/android/dialer/callintent/call_initiation_type.proto +++ b/java/com/android/dialer/callintent/call_initiation_type.proto @@ -57,5 +57,7 @@ message CallInitiationType { MISSED_CALL_NOTIFICATION = 15; CALL_SUBJECT_DIALOG = 16; + + IMS_VIDEO_BLOCKED_FALLBACK_TO_VOICE = 17; } } diff --git a/java/com/android/dialer/callintent/call_specific_app_data.proto b/java/com/android/dialer/callintent/call_specific_app_data.proto index 5d23794d5..82547fa03 100644 --- a/java/com/android/dialer/callintent/call_specific_app_data.proto +++ b/java/com/android/dialer/callintent/call_specific_app_data.proto @@ -14,7 +14,7 @@ import "java/com/android/dialer/logging/ui_action.proto"; // Miscellaneous data that's included in a new outgoing call initiated by // Dialer. The system will pass this data to the InCallUi which can use it // for logging or for something else. -// Next tag: 11 +// Next tag: 14 message CallSpecificAppData { optional CallInitiationType.Type call_initiation_type = 1; @@ -34,4 +34,11 @@ message CallSpecificAppData { repeated int64 ui_action_timestamps_since_app_launch = 9; optional int32 starting_tab_index = 10; + + // For recording the appearance of video call button + optional int32 lightbringer_button_appear_in_expanded_call_log_item_count = + 11; + optional int32 lightbringer_button_appear_in_collapsed_call_log_item_count = + 12; + optional int32 lightbringer_button_appear_in_search_count = 13; } 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 617d6d893..39afb6d1d 100644 --- a/java/com/android/dialer/calllogutils/res/values-ar/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ar/strings.xml @@ -34,8 +34,8 @@ <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"ث"</string> <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> - <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> - <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> + <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> + <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970"> <item quantity="zero">ثوان</item> <item quantity="two">ثانيتان</item> 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..0efe1e8ed 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 @@ <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"san"</string> <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> - <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\"<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\" <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string> - <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string> + <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> + <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970"> <item quantity="other">saniyə</item> <item quantity="one">saniyə</item> 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..21c6e0ead 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 @@ <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"sek."</string> <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> - <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\' <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\' <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> - <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\' <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> + <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> + <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970"> <item quantity="one">sekund</item> <item quantity="other">sekunder</item> 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..4d6f416d2 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 @@ <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string> <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> - <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\" <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string> - <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string> + <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> + <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970"> <item quantity="other"> Sekunden</item> <item quantity="one"> Sekunde</item> 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..7ab37c50f 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 @@ <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string> <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> eta <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> - <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' eta <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> + <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' \'eta\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970"> <item quantity="other">segundo</item> 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..b9a6241c3 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 @@ <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"से."</string> <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> - <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> - <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> + <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> + <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970"> <item quantity="one">सेकंड</item> <item quantity="other">सेकंड</item> 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..1ab041a00 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 @@ <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"שנ\'"</string> <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> ו-<xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> - <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' ו-<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> + <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970"> <item quantity="two">שניות</item> 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..76d389eed 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 @@ <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> - <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> + <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970"> <item quantity="other">секундалар</item> <item quantity="one">секунда</item> 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..9a7513bc0 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 @@ <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"से"</string> <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> - <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> - <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> + <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> + <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970"> <item quantity="one">सेकंद</item> <item quantity="other">सेकंद</item> 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..4ec963d4e 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 @@ <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"sek."</string> <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> - <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> - <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> + <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> + <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970"> <item quantity="other">sekunder</item> <item quantity="one">sekund</item> 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..5239928dd 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 @@ <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string> <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> - <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> - <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> + <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> + <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970"> <item quantity="other">seconden</item> <item quantity="one">seconde</item> 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..4ec963d4e 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 @@ <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"sek."</string> <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> - <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> - <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> + <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> + <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970"> <item quantity="other">sekunder</item> <item quantity="one">sekund</item> 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..ba526a868 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 @@ <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string> <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> - <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\" <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string> - <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string> + <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> + <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970"> <item quantity="one"> segundo</item> <item quantity="other"> segundos</item> 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..adb5dac7b 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,8 +34,8 @@ <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"seg"</string> <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>, <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> - <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\"<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\", <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string> - <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string> + <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\', <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> + <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970"> <item quantity="one">seconds</item> <item quantity="other">segundos</item> 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..ba526a868 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 @@ <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string> <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> - <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\" <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string> - <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string> + <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> + <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970"> <item quantity="one"> segundo</item> <item quantity="other"> segundos</item> 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..46217e7e8 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 @@ <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"sek"</string> <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> - <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> - <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> + <string name="call_duration_format_pattern" msgid="7566375153243313914">"\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\'<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>"</string> + <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>"</string> <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970"> <item quantity="other">Sekunde</item> <item quantity="one">Sekunde</item> 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..93cf690f5 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 @@ <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"sn."</string> <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string> - <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\" <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string> - <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string> + <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> + <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string> <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970"> <item quantity="other">saniye</item> <item quantity="one">saniye</item> diff --git a/java/com/android/dialer/constants/TrafficStatsTags.java b/java/com/android/dialer/constants/TrafficStatsTags.java index 4e6140431..13c3e2cd9 100644 --- a/java/com/android/dialer/constants/TrafficStatsTags.java +++ b/java/com/android/dialer/constants/TrafficStatsTags.java @@ -25,4 +25,5 @@ public class TrafficStatsTags { public static final int DOWNLOAD_LOCATION_MAP_TAG = 0xd000; public static final int REVERSE_GEOCODE_TAG = 0xd001; public static final int VISUAL_VOICEMAIL_TAG = 0xd002; + public static final int DIALER_VOIP_TAG = 0xd003; } diff --git a/java/com/android/dialer/enrichedcall/EnrichedCallManager.java b/java/com/android/dialer/enrichedcall/EnrichedCallManager.java index d341b43f9..f1057be1d 100644 --- a/java/com/android/dialer/enrichedcall/EnrichedCallManager.java +++ b/java/com/android/dialer/enrichedcall/EnrichedCallManager.java @@ -16,7 +16,6 @@ package com.android.dialer.enrichedcall; -import android.support.annotation.IntDef; import android.support.annotation.MainThread; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -25,8 +24,6 @@ import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry; import com.android.dialer.enrichedcall.historyquery.proto.HistoryResult; import com.android.dialer.enrichedcall.videoshare.VideoShareListener; import com.android.dialer.multimedia.MultimediaData; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; import java.util.List; import java.util.Map; @@ -81,27 +78,6 @@ public interface EnrichedCallManager { @MainThread void clearCachedData(); - /** Possible states for call composer sessions. */ - @Retention(RetentionPolicy.SOURCE) - @IntDef({ - STATE_NONE, - STATE_STARTING, - STATE_STARTED, - STATE_START_FAILED, - STATE_MESSAGE_SENT, - STATE_MESSAGE_FAILED, - STATE_CLOSED, - }) - @interface State {} - - int STATE_NONE = 0; - int STATE_STARTING = STATE_NONE + 1; - int STATE_STARTED = STATE_STARTING + 1; - int STATE_START_FAILED = STATE_STARTED + 1; - int STATE_MESSAGE_SENT = STATE_START_FAILED + 1; - int STATE_MESSAGE_FAILED = STATE_MESSAGE_SENT + 1; - int STATE_CLOSED = STATE_MESSAGE_FAILED + 1; - /** * Starts a call composer session with the given remote number. * @@ -119,7 +95,7 @@ public interface EnrichedCallManager { * @param sessionId the id for the session. See {@link #startCallComposerSession(String)} * @param data the {@link MultimediaData} * @throws IllegalArgumentException if there's no open session with the given number - * @throws IllegalStateException if the session isn't in the {@link #STATE_STARTED} state + * @throws IllegalStateException if the session isn't in the {@link Session#STATE_STARTED} state */ @MainThread void sendCallComposerData(long sessionId, @NonNull MultimediaData data); diff --git a/java/com/android/dialer/enrichedcall/Session.java b/java/com/android/dialer/enrichedcall/Session.java index b3f291438..06837e399 100644 --- a/java/com/android/dialer/enrichedcall/Session.java +++ b/java/com/android/dialer/enrichedcall/Session.java @@ -16,14 +16,37 @@ package com.android.dialer.enrichedcall; +import android.support.annotation.IntDef; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import com.android.dialer.enrichedcall.EnrichedCallManager.State; import com.android.dialer.multimedia.MultimediaData; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; /** Holds state information and data about enriched calling sessions. */ public interface Session { + /** Possible states for call composer sessions. */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({ + STATE_NONE, + STATE_STARTING, + STATE_STARTED, + STATE_START_FAILED, + STATE_MESSAGE_SENT, + STATE_MESSAGE_FAILED, + STATE_CLOSED, + }) + @interface State {} + + int STATE_NONE = 0; + int STATE_STARTING = STATE_NONE + 1; + int STATE_STARTED = STATE_STARTING + 1; + int STATE_START_FAILED = STATE_STARTED + 1; + int STATE_MESSAGE_SENT = STATE_START_FAILED + 1; + int STATE_MESSAGE_FAILED = STATE_MESSAGE_SENT + 1; + int STATE_CLOSED = STATE_MESSAGE_FAILED + 1; + /** Id used for sessions that fail to start. */ long NO_SESSION_ID = -1; diff --git a/java/com/android/dialer/enrichedcall/extensions/StateExtension.java b/java/com/android/dialer/enrichedcall/extensions/StateExtension.java index 8a4f6409d..5d90829c3 100644 --- a/java/com/android/dialer/enrichedcall/extensions/StateExtension.java +++ b/java/com/android/dialer/enrichedcall/extensions/StateExtension.java @@ -18,8 +18,8 @@ package com.android.dialer.enrichedcall.extensions; import android.support.annotation.NonNull; import com.android.dialer.common.Assert; -import com.android.dialer.enrichedcall.EnrichedCallManager; -import com.android.dialer.enrichedcall.EnrichedCallManager.State; +import com.android.dialer.enrichedcall.Session; +import com.android.dialer.enrichedcall.Session.State; /** Extends the {@link State} to include a toString method. */ public class StateExtension { @@ -27,25 +27,25 @@ public class StateExtension { /** Returns the string representation for the given {@link State}. */ @NonNull public static String toString(@State int callComposerState) { - if (callComposerState == EnrichedCallManager.STATE_NONE) { + if (callComposerState == Session.STATE_NONE) { return "STATE_NONE"; } - if (callComposerState == EnrichedCallManager.STATE_STARTING) { + if (callComposerState == Session.STATE_STARTING) { return "STATE_STARTING"; } - if (callComposerState == EnrichedCallManager.STATE_STARTED) { + if (callComposerState == Session.STATE_STARTED) { return "STATE_STARTED"; } - if (callComposerState == EnrichedCallManager.STATE_START_FAILED) { + if (callComposerState == Session.STATE_START_FAILED) { return "STATE_START_FAILED"; } - if (callComposerState == EnrichedCallManager.STATE_MESSAGE_SENT) { + if (callComposerState == Session.STATE_MESSAGE_SENT) { return "STATE_MESSAGE_SENT"; } - if (callComposerState == EnrichedCallManager.STATE_MESSAGE_FAILED) { + if (callComposerState == Session.STATE_MESSAGE_FAILED) { return "STATE_MESSAGE_FAILED"; } - if (callComposerState == EnrichedCallManager.STATE_CLOSED) { + if (callComposerState == Session.STATE_CLOSED) { return "STATE_CLOSED"; } Assert.checkArgument(false, "Unexpected callComposerState: %d", callComposerState); diff --git a/java/com/android/dialer/logging/dialer_impression.proto b/java/com/android/dialer/logging/dialer_impression.proto index 6db903724..2f89a3aed 100644 --- a/java/com/android/dialer/logging/dialer_impression.proto +++ b/java/com/android/dialer/logging/dialer_impression.proto @@ -6,11 +6,11 @@ option java_multiple_files = true; option optimize_for = LITE_RUNTIME; + message DialerImpression { // Event enums to be used for Impression Logging in Dialer. // It's perfectly acceptable for this enum to be large // Values should be from 1000 to 100000. - // Next Tag:1229 enum Type { UNKNOWN_AOSP_EVENT_TYPE = 1000; @@ -400,9 +400,10 @@ message DialerImpression { BUBBLE_END_CALL = 1195; LIGHTBRINGER_VIDEO_REQUESTED_FROM_SEARCH = 1196; - LIGHTBRINGER_VIDEO_REQUESTED_FROM_CALL_LOG = 1197; + LIGHTBRINGER_VIDEO_REQUESTED_FROM_CALL_LOG = + 1197; // Including call history IMS_VIDEO_REQUESTED_FROM_SEARCH = 1198; - IMS_VIDEO_REQUESTED_FROM_CALL_LOG = 1199; + IMS_VIDEO_REQUESTED_FROM_CALL_LOG = 1199; // Including call history // Multi select impressions MULTISELECT_LONG_PRESS_ENTER_MULTI_SELECT_MODE = 1200; @@ -442,5 +443,17 @@ message DialerImpression { // Impressions for dialer reporting caller id as inaccurate CALLER_ID_REPORTED = 1227; CALLER_ID_REPORT_FAILED = 1228; + + // Impressions for interactions with the voicemail transcription server + VVM_TRANSCRIPTION_REQUEST_SENT = 1229; + VVM_TRANSCRIPTION_REQUEST_RETRY = 1230; + VVM_TRANSCRIPTION_RESPONSE_SUCCESS = 1231; + VVM_TRANSCRIPTION_RESPONSE_EMPTY = 1232; + VVM_TRANSCRIPTION_RESPONSE_INVALID = 1233; + VVM_TRANSCRIPTION_RESPONSE_RECOVERABLE_ERROR = 1234; + VVM_TRANSCRIPTION_RESPONSE_FATAL_ERROR = 1235; + + // In in call UI + UPGRADE_TO_VIDEO_CALL_BUTTON_SHOWN = 1236; } } diff --git a/java/com/android/dialer/shortcuts/IconFactory.java b/java/com/android/dialer/shortcuts/IconFactory.java index a8c4ada4e..4ec964c7b 100644 --- a/java/com/android/dialer/shortcuts/IconFactory.java +++ b/java/com/android/dialer/shortcuts/IconFactory.java @@ -20,11 +20,16 @@ import android.content.Context; import android.content.pm.ShortcutInfo; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.graphics.drawable.AdaptiveIconDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.net.Uri; +import android.os.Build.VERSION; +import android.os.Build.VERSION_CODES; import android.provider.ContactsContract; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.annotation.RequiresApi; import android.support.annotation.WorkerThread; import android.support.v4.graphics.drawable.RoundedBitmapDrawable; import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory; @@ -83,6 +88,38 @@ class IconFactory { ContactsContract.Contacts.openContactPhotoInputStream( context.getContentResolver(), lookupUri, false /* preferHighres */); + return VERSION.SDK_INT >= VERSION_CODES.O + ? createAdaptiveIcon(displayName, lookupKey, inputStream) + : createFlatIcon(displayName, lookupKey, inputStream); + } + + @RequiresApi(VERSION_CODES.O) + private Icon createAdaptiveIcon( + @NonNull String displayName, @NonNull String lookupKey, @Nullable InputStream inputStream) { + if (inputStream == null) { + LetterTileDrawable letterTileDrawable = new LetterTileDrawable(context.getResources()); + // The adaptive icons clip the drawable to a safe area inside the drawable. Scale the letter + // so it fits inside the safe area. + letterTileDrawable.setScale(1f / (1f + AdaptiveIconDrawable.getExtraInsetFraction())); + letterTileDrawable.setCanonicalDialerLetterTileDetails( + displayName, + lookupKey, + LetterTileDrawable.SHAPE_RECTANGLE, + LetterTileDrawable.TYPE_DEFAULT); + + int iconSize = + context + .getResources() + .getDimensionPixelSize(R.dimen.launcher_shortcut_adaptive_icon_size); + return Icon.createWithAdaptiveBitmap( + DrawableConverter.drawableToBitmap(letterTileDrawable, iconSize, iconSize)); + } + Bitmap bitmap = BitmapFactory.decodeStream(inputStream); + return Icon.createWithAdaptiveBitmap(bitmap); + } + + private Icon createFlatIcon( + @NonNull String displayName, @NonNull String lookupKey, @Nullable InputStream inputStream) { Drawable drawable; if (inputStream == null) { // No photo for contact; use a letter tile. diff --git a/java/com/android/dialer/shortcuts/res/drawable-anydpi-v26/ic_shortcut_add_contact.xml b/java/com/android/dialer/shortcuts/res/drawable-anydpi-v26/ic_shortcut_add_contact.xml new file mode 100644 index 000000000..07ed17226 --- /dev/null +++ b/java/com/android/dialer/shortcuts/res/drawable-anydpi-v26/ic_shortcut_add_contact.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ 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 + --> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@color/shortcut_add_contact_background_color"/> + + <foreground android:drawable="@drawable/ic_add_contact_foreground"/> +</adaptive-icon> diff --git a/java/com/android/dialer/shortcuts/res/drawable/ic_add_contact_foreground.xml b/java/com/android/dialer/shortcuts/res/drawable/ic_add_contact_foreground.xml new file mode 100644 index 000000000..6bc172767 --- /dev/null +++ b/java/com/android/dialer/shortcuts/res/drawable/ic_add_contact_foreground.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ 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 + --> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:gravity="center" + android:src="@drawable/quantum_ic_person_add_white_24" + android:tint="@color/shortcut_add_contact_foreground_color"> + +</bitmap> diff --git a/java/com/android/dialer/shortcuts/res/values/dimens.xml b/java/com/android/dialer/shortcuts/res/values/dimens.xml index 232125653..369d38c15 100644 --- a/java/com/android/dialer/shortcuts/res/values/dimens.xml +++ b/java/com/android/dialer/shortcuts/res/values/dimens.xml @@ -16,4 +16,5 @@ --> <resources> <dimen name="launcher_shortcut_icon_size">48dp</dimen> + <dimen name="launcher_shortcut_adaptive_icon_size">108dp</dimen> </resources> diff --git a/java/com/android/dialer/simulator/impl/SimulatorContacts.java b/java/com/android/dialer/simulator/impl/SimulatorContacts.java index e77788f02..5bd28986c 100644 --- a/java/com/android/dialer/simulator/impl/SimulatorContacts.java +++ b/java/com/android/dialer/simulator/impl/SimulatorContacts.java @@ -37,7 +37,7 @@ import java.util.ArrayList; import java.util.List; /** Populates the device database with contacts. */ -final class SimulatorContacts { +public final class SimulatorContacts { // Phone numbers from https://www.google.com/about/company/facts/locations/ private static final Contact[] SIMPLE_CONTACTS = { // US, contact with e164 number. @@ -114,7 +114,7 @@ final class SimulatorContacts { }; @WorkerThread - static void populateContacts(@NonNull Context context) { + public static void populateContacts(@NonNull Context context) { Assert.isWorkerThread(); ArrayList<ContentProviderOperation> operations = new ArrayList<>(); for (Contact contact : SIMPLE_CONTACTS) { |
