diff options
Diffstat (limited to 'java/com/android/dialer/app')
113 files changed, 701 insertions, 234 deletions
diff --git a/java/com/android/dialer/app/AndroidManifest.xml b/java/com/android/dialer/app/AndroidManifest.xml index 5b7e75751..de4b48c51 100644 --- a/java/com/android/dialer/app/AndroidManifest.xml +++ b/java/com/android/dialer/app/AndroidManifest.xml @@ -55,7 +55,7 @@ <uses-sdk android:minSdkVersion="23" - android:targetSdkVersion="25"/> + android:targetSdkVersion="26"/> <application android:theme="@style/Theme.AppCompat"> diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java index 139f27af8..3318c506d 100644 --- a/java/com/android/dialer/app/DialtactsActivity.java +++ b/java/com/android/dialer/app/DialtactsActivity.java @@ -18,6 +18,7 @@ package com.android.dialer.app; import android.app.Fragment; import android.app.FragmentTransaction; +import android.app.KeyguardManager; import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; @@ -161,6 +162,7 @@ public class DialtactsActivity extends TransactionSafeActivity private static final int ACTIVITY_REQUEST_CODE_VOICE_SEARCH = 1; public static final int ACTIVITY_REQUEST_CODE_CALL_COMPOSE = 2; + public static final int ACTIVITY_REQUEST_CODE_LIGHTBRINGER = 3; private static final int FAB_SCALE_IN_DELAY_MS = 300; @@ -379,12 +381,8 @@ public class DialtactsActivity extends TransactionSafeActivity mSearchView.addTextChangedListener(mPhoneSearchQueryTextListener); mVoiceSearchButton = searchEditTextLayout.findViewById(R.id.voice_search_button); searchEditTextLayout - .findViewById(R.id.search_magnifying_glass) + .findViewById(R.id.search_box_collapsed) .setOnClickListener(mSearchViewOnClickListener); - searchEditTextLayout - .findViewById(R.id.search_box_start_search) - .setOnClickListener(mSearchViewOnClickListener); - searchEditTextLayout.setOnClickListener(mSearchViewOnClickListener); searchEditTextLayout.setCallback( new SearchEditTextLayout.Callback() { @Override @@ -505,8 +503,6 @@ public class DialtactsActivity extends TransactionSafeActivity mVoiceSearchQuery = null; } - mFirstLaunch = false; - if (mIsRestarting) { // This is only called when the activity goes from resumed -> paused -> resumed, so it // will not cause an extra view to be sent out on rotation @@ -522,33 +518,39 @@ public class DialtactsActivity extends TransactionSafeActivity } mFloatingActionButtonController.align(getFabAlignment(), false /* animate */); - if (Calls.CONTENT_TYPE.equals(getIntent().getType())) { - // Externally specified extras take precedence to EXTRA_SHOW_TAB, which is only - // used internally. - final Bundle extras = getIntent().getExtras(); - if (extras != null && extras.getInt(Calls.EXTRA_CALL_TYPE_FILTER) == Calls.VOICEMAIL_TYPE) { - mListsFragment.showTab(DialtactsPagerAdapter.TAB_INDEX_VOICEMAIL); - Logger.get(this).logImpression(DialerImpression.Type.VVM_NOTIFICATION_CLICKED); - } else { - mListsFragment.showTab(DialtactsPagerAdapter.TAB_INDEX_HISTORY); + if (mFirstLaunch) { + // Only process the Intent the first time onResume() is called after receiving it + if (Calls.CONTENT_TYPE.equals(getIntent().getType())) { + // Externally specified extras take precedence to EXTRA_SHOW_TAB, which is only + // used internally. + final Bundle extras = getIntent().getExtras(); + if (extras != null && extras.getInt(Calls.EXTRA_CALL_TYPE_FILTER) == Calls.VOICEMAIL_TYPE) { + mListsFragment.showTab(DialtactsPagerAdapter.TAB_INDEX_VOICEMAIL); + Logger.get(this).logImpression(DialerImpression.Type.VVM_NOTIFICATION_CLICKED); + } else { + mListsFragment.showTab(DialtactsPagerAdapter.TAB_INDEX_HISTORY); + } + } else if (getIntent().hasExtra(EXTRA_SHOW_TAB)) { + int index = + getIntent().getIntExtra(EXTRA_SHOW_TAB, DialtactsPagerAdapter.TAB_INDEX_SPEED_DIAL); + if (index < mListsFragment.getTabCount()) { + // Hide dialpad since this is an explicit intent to show a specific tab, which is coming + // from missed call or voicemail notification. + hideDialpadFragment(false, false); + exitSearchUi(); + mListsFragment.showTab(index); + } } - } else if (getIntent().hasExtra(EXTRA_SHOW_TAB)) { - int index = - getIntent().getIntExtra(EXTRA_SHOW_TAB, DialtactsPagerAdapter.TAB_INDEX_SPEED_DIAL); - if (index < mListsFragment.getTabCount()) { - // Hide dialpad since this is an explicit intent to show a specific tab, which is coming - // from missed call or voicemail notification. - hideDialpadFragment(false, false); - exitSearchUi(); - mListsFragment.showTab(index); + + if (getIntent().getBooleanExtra(EXTRA_CLEAR_NEW_VOICEMAILS, false)) { + CallLogNotificationsService.markNewVoicemailsAsOld(this, null); } } - if (getIntent().getBooleanExtra(EXTRA_CLEAR_NEW_VOICEMAILS, false)) { - CallLogNotificationsService.markNewVoicemailsAsOld(this, null); - } + mFirstLaunch = false; setSearchBoxHint(); + timeTabSelected = SystemClock.elapsedRealtime(); mP13nLogger.reset(); mP13nRanker.refresh( @@ -586,7 +588,10 @@ public class DialtactsActivity extends TransactionSafeActivity SystemClock.elapsedRealtime() - timeTabSelected >= HISTORY_TAB_SEEN_TIMEOUT; boolean isOnHistoryTab = mListsFragment.getCurrentTabIndex() == DialtactsPagerAdapter.TAB_INDEX_HISTORY; - if (isOnHistoryTab && timeoutElapsed && !isChangingConfigurations()) { + if (isOnHistoryTab + && timeoutElapsed + && !isChangingConfigurations() + && !getSystemService(KeyguardManager.class).isKeyguardLocked()) { mListsFragment.markMissedCallsAsReadAndRemoveNotifications(); } } @@ -857,7 +862,10 @@ public class DialtactsActivity extends TransactionSafeActivity /** Finishes hiding the dialpad fragment after any animations are completed. */ private void commitDialpadFragmentHide() { - if (!mStateSaved && mDialpadFragment != null && !mDialpadFragment.isHidden()) { + if (!mStateSaved + && mDialpadFragment != null + && !mDialpadFragment.isHidden() + && !isDestroyed()) { final FragmentTransaction ft = getFragmentManager().beginTransaction(); ft.hide(mDialpadFragment); ft.commit(); @@ -1006,6 +1014,7 @@ public class DialtactsActivity extends TransactionSafeActivity @Override public void onNewIntent(Intent newIntent) { setIntent(newIntent); + mFirstLaunch = true; mStateSaved = false; displayFragment(newIntent); diff --git a/java/com/android/dialer/app/calllog/BlockReportSpamListener.java b/java/com/android/dialer/app/calllog/BlockReportSpamListener.java index 740d6b361..28082df2b 100644 --- a/java/com/android/dialer/app/calllog/BlockReportSpamListener.java +++ b/java/com/android/dialer/app/calllog/BlockReportSpamListener.java @@ -20,6 +20,7 @@ import android.app.FragmentManager; import android.content.ContentValues; import android.content.Context; import android.net.Uri; +import android.support.annotation.NonNull; import android.support.v7.widget.RecyclerView; import com.android.dialer.blocking.BlockReportSpamDialogs; import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler; @@ -55,7 +56,7 @@ public class BlockReportSpamListener implements CallLogListItemViewHolder.OnClic final String number, final String countryIso, final int callType, - final ContactSource.Type contactSourceType) { + @NonNull final ContactSource.Type contactSourceType) { BlockReportSpamDialogs.BlockReportSpamDialogFragment.newInstance( displayNumber, Spam.get(mContext).isDialogReportSpamCheckedByDefault(), @@ -99,7 +100,7 @@ public class BlockReportSpamListener implements CallLogListItemViewHolder.OnClic final String number, final String countryIso, final int callType, - final ContactSource.Type contactSourceType) { + @NonNull final ContactSource.Type contactSourceType) { BlockReportSpamDialogs.BlockDialogFragment.newInstance( displayNumber, Spam.get(mContext).isSpamEnabled(), diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java index d4872d5b3..b433e6529 100644 --- a/java/com/android/dialer/app/calllog/CallLogAdapter.java +++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java @@ -77,6 +77,7 @@ import com.android.dialer.enrichedcall.historyquery.proto.HistoryResult; import com.android.dialer.lightbringer.Lightbringer; import com.android.dialer.lightbringer.LightbringerComponent; import com.android.dialer.lightbringer.LightbringerListener; +import com.android.dialer.logging.ContactSource; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; import com.android.dialer.phonenumbercache.CallLogQuery; @@ -177,13 +178,14 @@ public class CallLogAdapter extends GroupingListAdapter } }; + // Todo (uabdullah): Use plurals http://b/37751831 private void showDeleteSelectedItemsDialog() { AlertDialog.Builder builder = new AlertDialog.Builder(mActivity); Assert.checkArgument(selectedItems.size() > 0); String voicemailString = selectedItems.size() == 1 ? mActivity.getResources().getString(R.string.voicemailMultiSelectVoicemail) - : mActivity.getResources().getString(R.string.voicemailMultiSelectVoicemail); + : mActivity.getResources().getString(R.string.voicemailMultiSelectVoicemails); String deleteVoicemailTitle = mActivity .getResources() @@ -228,14 +230,15 @@ public class CallLogAdapter extends GroupingListAdapter if (ConfigProviderBindings.get(v.getContext()) .getBoolean("enable_call_log_multiselect", true) && mVoicemailPlaybackPresenter != null) { - if (v.getId() == R.id.primary_action_view) { + if (v.getId() == R.id.primary_action_view || v.getId() == R.id.quick_contact_photo) { if (mActionMode == null) { mActionMode = v.startActionMode(mActionModeCallback); } CallLogListItemViewHolder viewHolder = (CallLogListItemViewHolder) v.getTag(); viewHolder.quickContactView.setVisibility(View.GONE); viewHolder.checkBoxView.setVisibility(View.VISIBLE); - return false; + mExpandCollapseListener.onClick(v); + return true; } } return true; @@ -522,6 +525,7 @@ public class CallLogAdapter extends GroupingListAdapter viewHolder.callLogEntryView.setTag(viewHolder); viewHolder.primaryActionView.setTag(viewHolder); + viewHolder.quickContactView.setTag(viewHolder); return viewHolder; } @@ -630,7 +634,7 @@ public class CallLogAdapter extends GroupingListAdapter @Override protected Boolean doInBackground(Void... params) { views.blockId = - mFilteredNumberAsyncQueryHandler.getBlockedIdSynchronousForCalllogOnly( + mFilteredNumberAsyncQueryHandler.getBlockedIdSynchronous( views.number, views.countryIso); details.isBlocked = views.blockId != null; if (isCancelled()) { @@ -872,14 +876,25 @@ public class CallLogAdapter extends GroupingListAdapter } views.info = info; - views.numberType = - (String) - Phone.getTypeLabel(mActivity.getResources(), details.numberType, details.numberLabel); + views.numberType = getNumberType(mActivity.getResources(), details); mCallLogListItemHelper.updatePhoneCallDetails(details); return true; } + private static String getNumberType(Resources res, PhoneCallDetails details) { + // Label doesn't make much sense if the information is coming from CNAP or Cequint Caller ID. + if (details.sourceType == ContactSource.Type.SOURCE_TYPE_CNAP + || details.sourceType == ContactSource.Type.SOURCE_TYPE_CEQUINT_CALLER_ID) { + return ""; + } + // Returns empty label instead of "custom" if the custom label is empty. + if (details.numberType == Phone.TYPE_CUSTOM && TextUtils.isEmpty(details.numberLabel)) { + return ""; + } + return (String) Phone.getTypeLabel(res, details.numberType, details.numberLabel); + } + /** * Render item view given position. This is running on UI thread so DO NOT put any expensive * operation into it. diff --git a/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java b/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java index 2aedb6f17..a58357448 100644 --- a/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java +++ b/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java @@ -83,12 +83,7 @@ public class CallLogAsyncTaskUtil { new AsyncTask<Void, Void, Void>() { @Override public Void doInBackground(Void... params) { - ContentValues values = new ContentValues(); - values.put(Voicemails.DELETED, "1"); - context.getContentResolver().update(voicemailUri, values, null, null); - // TODO(b/35440541): check which source package is changed. Don't need - // to upload changes on foreign voicemails, they will get a PROVIDER_CHANGED - uploadVoicemailLocalChangesToServer(context); + deleteVoicemailSynchronous(context, voicemailUri); return null; } @@ -101,6 +96,15 @@ public class CallLogAsyncTaskUtil { }); } + public static void deleteVoicemailSynchronous(Context context, Uri voicemailUri) { + ContentValues values = new ContentValues(); + values.put(Voicemails.DELETED, "1"); + context.getContentResolver().update(voicemailUri, values, null, null); + // TODO(b/35440541): check which source package is changed. Don't need + // to upload changes on foreign voicemails, they will get a PROVIDER_CHANGED + uploadVoicemailLocalChangesToServer(context); + } + public static void markCallAsRead(@NonNull final Context context, @NonNull final long[] callIds) { if (!PermissionsUtil.hasPhonePermissions(context)) { return; diff --git a/java/com/android/dialer/app/calllog/CallLogFragment.java b/java/com/android/dialer/app/calllog/CallLogFragment.java index fcc34ebef..874aeeac8 100644 --- a/java/com/android/dialer/app/calllog/CallLogFragment.java +++ b/java/com/android/dialer/app/calllog/CallLogFragment.java @@ -41,7 +41,6 @@ import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.android.contacts.common.GeoUtil; import com.android.dialer.app.Bindings; import com.android.dialer.app.R; import com.android.dialer.app.calllog.calllogcache.CallLogCache; @@ -56,6 +55,7 @@ import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler; import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; import com.android.dialer.database.CallLogQueryHandler; +import com.android.dialer.location.GeoUtil; import com.android.dialer.phonenumbercache.ContactInfoHelper; import com.android.dialer.util.PermissionsUtil; @@ -376,6 +376,7 @@ public class CallLogFragment extends Fragment super.onStop(); mAdapter.onStop(); + mContactInfoCache.stop(); } @Override @@ -398,8 +399,6 @@ public class CallLogFragment extends Fragment outState.putBoolean(KEY_HAS_READ_CALL_LOG_PERMISSION, mHasReadCallLogPermission); outState.putBoolean(KEY_REFRESH_DATA_REQUIRED, mRefreshDataRequired); - mContactInfoCache.stop(); - mAdapter.onSaveInstanceState(outState); } diff --git a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java index b57f9b04a..278caba92 100644 --- a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java +++ b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java @@ -17,6 +17,7 @@ package com.android.dialer.app.calllog; import android.app.Activity; +import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.content.res.Resources; @@ -26,6 +27,7 @@ import android.provider.CallLog; import android.provider.CallLog.Calls; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; import android.support.v7.widget.CardView; import android.support.v7.widget.RecyclerView; @@ -43,6 +45,7 @@ import android.widget.ImageButton; import android.widget.ImageView; import android.widget.QuickContactBadge; import android.widget.TextView; +import android.widget.Toast; import com.android.contacts.common.ClipboardUtils; import com.android.contacts.common.ContactPhotoManager; import com.android.contacts.common.compat.PhoneNumberUtilsCompat; @@ -182,7 +185,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder * The name or number associated with the call. Cached here for use when setting content * descriptions on buttons in the actions ViewStub when it is inflated. */ - public CharSequence nameOrNumber; + @Nullable public CharSequence nameOrNumber; /** * The call type or Location associated with the call. Cached here for use when setting text for a * voicemail log's call button @@ -257,6 +260,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder primaryActionView.setOnClickListener(mExpandCollapseListener); if (mVoicemailPlaybackPresenter != null) { primaryActionView.setOnLongClickListener(longPressListener); + quickContactView.setOnLongClickListener(longPressListener); } else { primaryActionView.setOnCreateContextMenuListener(this); } @@ -788,17 +792,38 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder mVoicemailPlaybackPresenter.shareVoicemail(); } else { logCallLogAction(view.getId()); + final IntentProvider intentProvider = (IntentProvider) view.getTag(); - if (intentProvider != null) { - final Intent intent = intentProvider.getIntent(mContext); - // See IntentProvider.getCallDetailIntentProvider() for why this may be null. - if (intent != null) { - DialerUtils.startActivityWithErrorToast(mContext, intent); - } + if (intentProvider == null) { + return; + } + + final Intent intent = intentProvider.getIntent(mContext); + // See IntentProvider.getCallDetailIntentProvider() for why this may be null. + if (intent == null) { + return; + } + + // We check to see if we are starting a Lightbringer intent. The reason is Lightbringer + // intents need to be started using startActivityForResult instead of the usual startActivity + String packageName = intent.getPackage(); + if (packageName != null && packageName.equals(getLightbringer().getPackageName(mContext))) { + startLightbringerActivity(intent); + } else { + DialerUtils.startActivityWithErrorToast(mContext, intent); } } } + private void startLightbringerActivity(Intent intent) { + try { + Activity activity = (Activity) mContext; + activity.startActivityForResult(intent, DialtactsActivity.ACTIVITY_REQUEST_CODE_LIGHTBRINGER); + } catch (ActivityNotFoundException e) { + Toast.makeText(mContext, R.string.activity_not_available, Toast.LENGTH_SHORT).show(); + } + } + private CallComposerContact buildContact() { CallComposerContact.Builder contact = CallComposerContact.newBuilder(); contact.setPhotoId(info.photoId); @@ -808,7 +833,9 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder if (info.lookupUri != null) { contact.setContactUri(info.lookupUri.toString()); } - contact.setNameOrNumber((String) nameOrNumber); + if (nameOrNumber != null) { + contact.setNameOrNumber((String) nameOrNumber); + } contact.setContactType(getContactType()); contact.setNumber(number); /* second line of contact view. */ diff --git a/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java b/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java index 79a32afe3..4127d1f0b 100644 --- a/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java +++ b/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java @@ -32,10 +32,10 @@ import android.support.annotation.WorkerThread; import android.support.v4.os.UserManagerCompat; import android.telephony.PhoneNumberUtils; import android.text.TextUtils; -import com.android.contacts.common.GeoUtil; import com.android.dialer.app.R; import com.android.dialer.calllogutils.PhoneNumberDisplayUtil; import com.android.dialer.common.LogUtil; +import com.android.dialer.location.GeoUtil; import com.android.dialer.notification.GroupedNotificationUtil; import com.android.dialer.phonenumbercache.ContactInfo; import com.android.dialer.phonenumbercache.ContactInfoHelper; diff --git a/java/com/android/dialer/app/calllog/DefaultVoicemailNotifier.java b/java/com/android/dialer/app/calllog/DefaultVoicemailNotifier.java index 0007d1863..d67f12266 100644 --- a/java/com/android/dialer/app/calllog/DefaultVoicemailNotifier.java +++ b/java/com/android/dialer/app/calllog/DefaultVoicemailNotifier.java @@ -31,6 +31,7 @@ import android.os.PersistableBundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; +import android.support.annotation.WorkerThread; import android.support.v4.os.BuildCompat; import android.support.v4.util.Pair; import android.telecom.PhoneAccount; @@ -48,6 +49,7 @@ import com.android.dialer.app.R; import com.android.dialer.app.calllog.CallLogNotificationsQueryHelper.NewCall; import com.android.dialer.app.contactinfo.ContactPhotoLoader; import com.android.dialer.app.list.DialtactsPagerAdapter; +import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler; import com.android.dialer.blocking.FilteredNumbersUtil; import com.android.dialer.calllogutils.PhoneAccountUtils; import com.android.dialer.common.Assert; @@ -76,17 +78,24 @@ public class DefaultVoicemailNotifier { private final Context context; private final CallLogNotificationsQueryHelper queryHelper; + private final FilteredNumberAsyncQueryHandler filteredNumberAsyncQueryHandler; @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) - DefaultVoicemailNotifier(Context context, CallLogNotificationsQueryHelper queryHelper) { + DefaultVoicemailNotifier( + Context context, + CallLogNotificationsQueryHelper queryHelper, + FilteredNumberAsyncQueryHandler filteredNumberAsyncQueryHandler) { this.context = context; this.queryHelper = queryHelper; + this.filteredNumberAsyncQueryHandler = filteredNumberAsyncQueryHandler; } /** Returns an instance of {@link DefaultVoicemailNotifier}. */ public static DefaultVoicemailNotifier getInstance(Context context) { return new DefaultVoicemailNotifier( - context, CallLogNotificationsQueryHelper.getInstance(context)); + context, + CallLogNotificationsQueryHelper.getInstance(context), + new FilteredNumberAsyncQueryHandler(context)); } /** @@ -97,7 +106,9 @@ public class DefaultVoicemailNotifier { * * <p>It is not safe to call this method from the main thread. */ + @WorkerThread public void updateNotification() { + Assert.isWorkerThread(); // Lookup the list of new voicemails to include in the notification. final List<NewCall> newCalls = queryHelper.getNewVoicemails(); @@ -121,13 +132,15 @@ public class DefaultVoicemailNotifier { NewCall newCall = itr.next(); // Skip notifying for numbers which are blocked. - if (FilteredNumbersUtil.shouldBlockVoicemail( - context, newCall.number, newCall.countryIso, newCall.dateMs)) { + if (!FilteredNumbersUtil.hasRecentEmergencyCall(context) + && filteredNumberAsyncQueryHandler.getBlockedIdSynchronous( + newCall.number, newCall.countryIso) + != null) { itr.remove(); if (newCall.voicemailUri != null) { // Delete the voicemail. - context.getContentResolver().delete(newCall.voicemailUri, null, null); + CallLogAsyncTaskUtil.deleteVoicemailSynchronous(context, newCall.voicemailUri); } continue; } diff --git a/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java b/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java index 7c25e7d39..1440218fb 100644 --- a/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java +++ b/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java @@ -46,22 +46,18 @@ public class VisualVoicemailCallLogFragment extends CallLogFragment { } @Override - public void onCreate(Bundle state) { - super.onCreate(state); - mVoicemailPlaybackPresenter = VoicemailPlaybackPresenter.getInstance(getActivity(), state); - getActivity() - .getContentResolver() - .registerContentObserver( - VoicemailContract.Status.CONTENT_URI, true, mVoicemailStatusObserver); - } - - @Override protected VoicemailPlaybackPresenter getVoicemailPlaybackPresenter() { return mVoicemailPlaybackPresenter; } @Override public void onActivityCreated(Bundle savedInstanceState) { + mVoicemailPlaybackPresenter = + VoicemailPlaybackPresenter.getInstance(getActivity(), savedInstanceState); + getActivity() + .getContentResolver() + .registerContentObserver( + VoicemailContract.Status.CONTENT_URI, true, mVoicemailStatusObserver); super.onActivityCreated(savedInstanceState); mVoicemailErrorManager = new VoicemailErrorManager(getContext(), getAdapter().getAlertManager(), mModalAlertManager); @@ -132,9 +128,6 @@ public class VisualVoicemailCallLogFragment extends CallLogFragment { public void onNotVisible() { LogUtil.enterBlock("VisualVoicemailCallLogFragment.onPageUnselected"); super.onNotVisible(); - if (getAdapter() != null && getAdapter().mActionMode != null) { - getAdapter().mActionMode.finish(); - } if (getActivity() != null) { getActivity().setVolumeControlStream(AudioManager.USE_DEFAULT_STREAM_TYPE); } diff --git a/java/com/android/dialer/app/contactinfo/ContactInfoCache.java b/java/com/android/dialer/app/contactinfo/ContactInfoCache.java index 7a5db19f2..e561b5607 100644 --- a/java/com/android/dialer/app/contactinfo/ContactInfoCache.java +++ b/java/com/android/dialer/app/contactinfo/ContactInfoCache.java @@ -28,6 +28,7 @@ import com.android.dialer.phonenumbercache.ContactInfo; import com.android.dialer.phonenumbercache.ContactInfoHelper; import com.android.dialer.util.ExpirableCache; import java.lang.ref.WeakReference; +import java.util.Objects; import java.util.concurrent.BlockingQueue; import java.util.concurrent.PriorityBlockingQueue; @@ -77,6 +78,8 @@ public class ContactInfoCache { break; case START_THREAD: reference.startRequestProcessing(); + break; + default: // fall out } } } @@ -125,7 +128,7 @@ public class ContactInfoCache { enqueueRequest(number, countryIso, callLogContactInfo, /* immediate */ false, requestType); } - if (info == ContactInfo.EMPTY) { + if (Objects.equals(info, ContactInfo.EMPTY)) { // Use the cached contact info from the call log. info = callLogContactInfo; } @@ -153,11 +156,15 @@ public class ContactInfoCache { ContactInfo info; if (request.isLocalRequest()) { info = mContactInfoHelper.lookupNumber(request.number, request.countryIso); - // TODO: Maybe skip look up if it's already available in cached number lookup service. - long start = SystemClock.elapsedRealtime(); - mContactInfoHelper.updateFromCequintCallerId(info, request.number); - long time = SystemClock.elapsedRealtime() - start; - LogUtil.d("ContactInfoCache.queryContactInfo", "Cequint Caller Id look up takes %d ms", time); + if (!info.contactExists) { + // TODO: Maybe skip look up if it's already available in cached number lookup + // service. + long start = SystemClock.elapsedRealtime(); + mContactInfoHelper.updateFromCequintCallerId(info, request.number); + long time = SystemClock.elapsedRealtime() - start; + LogUtil.d( + "ContactInfoCache.queryContactInfo", "Cequint Caller Id look up takes %d ms", time); + } if (request.type == ContactInfoRequest.TYPE_LOCAL_AND_REMOTE) { if (!mContactInfoHelper.hasName(info)) { enqueueRequest( @@ -192,7 +199,8 @@ public class ContactInfoCache { // Exception: Photo uris for contacts from remote sources are not cached in the call log // cache, so we have to force a redraw for these contacts regardless. boolean updated = - (existingInfo != ContactInfo.EMPTY || isRemoteSource) && !info.equals(existingInfo); + (!Objects.equals(existingInfo, ContactInfo.EMPTY) || isRemoteSource) + && !info.equals(existingInfo); // Store the data in the cache so that the UI thread can use to display it. Store it // even if it has not changed so that it is marked as not expired. diff --git a/java/com/android/dialer/app/contactinfo/ContactPhotoLoader.java b/java/com/android/dialer/app/contactinfo/ContactPhotoLoader.java index 71e4a16ad..4c8e32a41 100644 --- a/java/com/android/dialer/app/contactinfo/ContactPhotoLoader.java +++ b/java/com/android/dialer/app/contactinfo/ContactPhotoLoader.java @@ -25,11 +25,11 @@ import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; import android.support.v4.graphics.drawable.RoundedBitmapDrawable; import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory; -import com.android.contacts.common.GeoUtil; import com.android.contacts.common.lettertiles.LetterTileDrawable; import com.android.dialer.app.R; import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; +import com.android.dialer.location.GeoUtil; import com.android.dialer.phonenumbercache.ContactInfo; import com.android.dialer.phonenumbercache.ContactInfoHelper; import java.io.IOException; diff --git a/java/com/android/dialer/app/dialpad/DialpadFragment.java b/java/com/android/dialer/app/dialpad/DialpadFragment.java index 271f62199..a0c348424 100644 --- a/java/com/android/dialer/app/dialpad/DialpadFragment.java +++ b/java/com/android/dialer/app/dialpad/DialpadFragment.java @@ -69,7 +69,6 @@ import android.widget.ListView; import android.widget.PopupMenu; import android.widget.RelativeLayout; import android.widget.TextView; -import com.android.contacts.common.GeoUtil; import com.android.contacts.common.dialog.CallSubjectDialog; import com.android.contacts.common.util.StopWatch; import com.android.contacts.common.widget.FloatingActionButtonController; @@ -84,6 +83,7 @@ import com.android.dialer.calllogutils.PhoneAccountUtils; import com.android.dialer.common.LogUtil; import com.android.dialer.dialpadview.DialpadKeyButton; import com.android.dialer.dialpadview.DialpadView; +import com.android.dialer.location.GeoUtil; import com.android.dialer.proguard.UsedByReflection; import com.android.dialer.telecom.TelecomUtil; import com.android.dialer.util.CallUtil; @@ -1189,7 +1189,6 @@ public class DialpadFragment extends Fragment // Just call 'scaleIn()' method if the mFloatingActionButtonController was not already // previously visible. mFloatingActionButtonController.scaleIn(0); - mFloatingActionButtonController.setVisible(true); } mDialpadChooser.setVisibility(View.GONE); } @@ -1410,10 +1409,10 @@ public class DialpadFragment extends Fragment public void onHiddenChanged(boolean hidden) { super.onHiddenChanged(hidden); final DialtactsActivity activity = (DialtactsActivity) getActivity(); - final DialpadView dialpadView = (DialpadView) getView().findViewById(R.id.dialpad_view); - if (activity == null) { + if (activity == null || getView() == null) { return; } + final DialpadView dialpadView = (DialpadView) getView().findViewById(R.id.dialpad_view); if (!hidden && !isDialpadChooserVisible()) { if (mAnimate) { dialpadView.animateShow(); diff --git a/java/com/android/dialer/app/dialpad/SmartDialCursorLoader.java b/java/com/android/dialer/app/dialpad/SmartDialCursorLoader.java index f3a93f916..2e3b0cf92 100644 --- a/java/com/android/dialer/app/dialpad/SmartDialCursorLoader.java +++ b/java/com/android/dialer/app/dialpad/SmartDialCursorLoader.java @@ -17,11 +17,14 @@ package com.android.dialer.app.dialpad; import android.content.AsyncTaskLoader; +import android.content.BroadcastReceiver; import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; import android.database.Cursor; import android.database.MatrixCursor; -import android.util.Log; import com.android.contacts.common.list.PhoneNumberListAdapter.PhoneQuery; +import com.android.dialer.common.LogUtil; import com.android.dialer.database.Database; import com.android.dialer.database.DialerDatabaseHelper; import com.android.dialer.database.DialerDatabaseHelper.ContactNumber; @@ -43,7 +46,7 @@ public class SmartDialCursorLoader extends AsyncTaskLoader<Cursor> { private String mQuery; private SmartDialNameMatcher mNameMatcher; - private ForceLoadContentObserver mObserver; + private BroadcastReceiver mSmartDialUpdatedReceiver; private boolean mShowEmptyListForNullQuery = true; @@ -59,7 +62,7 @@ public class SmartDialCursorLoader extends AsyncTaskLoader<Cursor> { */ public void configureQuery(String query) { if (DEBUG) { - Log.v(TAG, "Configure new query to be " + query); + LogUtil.v(TAG, "Configure new query to be " + query); } mQuery = SmartDialNameMatcher.normalizeNumber(query, SmartDialPrefix.getMap()); @@ -76,7 +79,7 @@ public class SmartDialCursorLoader extends AsyncTaskLoader<Cursor> { @Override public Cursor loadInBackground() { if (DEBUG) { - Log.v(TAG, "Load in background " + mQuery); + LogUtil.v(TAG, "Load in background " + mQuery); } if (!PermissionsUtil.hasContactsPermissions(mContext)) { @@ -90,7 +93,7 @@ public class SmartDialCursorLoader extends AsyncTaskLoader<Cursor> { dialerDatabaseHelper.getLooseMatches(mQuery, mNameMatcher); if (DEBUG) { - Log.v(TAG, "Loaded matches " + String.valueOf(allMatches.size())); + LogUtil.v(TAG, "Loaded matches " + allMatches.size()); } /** Constructs a cursor for the returned array of results. */ @@ -121,11 +124,17 @@ public class SmartDialCursorLoader extends AsyncTaskLoader<Cursor> { Cursor oldCursor = mCursor; mCursor = cursor; - if (mObserver == null) { - mObserver = new ForceLoadContentObserver(); - mContext - .getContentResolver() - .registerContentObserver(DialerDatabaseHelper.SMART_DIAL_UPDATED_URI, true, mObserver); + if (mSmartDialUpdatedReceiver == null) { + mSmartDialUpdatedReceiver = + new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + onContentChanged(); + } + }; + mContext.registerReceiver( + mSmartDialUpdatedReceiver, + new IntentFilter(DialerDatabaseHelper.ACTION_SMART_DIAL_UPDATED)); } if (isStarted()) { @@ -162,9 +171,9 @@ public class SmartDialCursorLoader extends AsyncTaskLoader<Cursor> { /** Ensure the loader has been stopped. */ onStopLoading(); - if (mObserver != null) { - mContext.getContentResolver().unregisterContentObserver(mObserver); - mObserver = null; + if (mSmartDialUpdatedReceiver != null) { + mContext.unregisterReceiver(mSmartDialUpdatedReceiver); + mSmartDialUpdatedReceiver = null; } /** Release all previously saved query results. */ @@ -178,9 +187,9 @@ public class SmartDialCursorLoader extends AsyncTaskLoader<Cursor> { public void onCanceled(Cursor cursor) { super.onCanceled(cursor); - if (mObserver != null) { - mContext.getContentResolver().unregisterContentObserver(mObserver); - mObserver = null; + if (mSmartDialUpdatedReceiver != null) { + mContext.unregisterReceiver(mSmartDialUpdatedReceiver); + mSmartDialUpdatedReceiver = null; } /** The load has been canceled, so we should release the resources associated with 'data'. */ diff --git a/java/com/android/dialer/app/filterednumber/BlockedNumbersAdapter.java b/java/com/android/dialer/app/filterednumber/BlockedNumbersAdapter.java index ac4903c31..dbd4e868c 100644 --- a/java/com/android/dialer/app/filterednumber/BlockedNumbersAdapter.java +++ b/java/com/android/dialer/app/filterednumber/BlockedNumbersAdapter.java @@ -21,10 +21,10 @@ import android.database.Cursor; import android.telephony.PhoneNumberUtils; import android.view.View; import com.android.contacts.common.ContactPhotoManager; -import com.android.contacts.common.GeoUtil; import com.android.dialer.app.R; import com.android.dialer.blocking.BlockNumberDialogFragment; import com.android.dialer.database.FilteredNumberContract.FilteredNumberColumns; +import com.android.dialer.location.GeoUtil; import com.android.dialer.logging.InteractionEvent; import com.android.dialer.logging.Logger; import com.android.dialer.phonenumbercache.ContactInfoHelper; diff --git a/java/com/android/dialer/app/filterednumber/ViewNumbersToImportAdapter.java b/java/com/android/dialer/app/filterednumber/ViewNumbersToImportAdapter.java index 5228a1d79..313efb4d7 100644 --- a/java/com/android/dialer/app/filterednumber/ViewNumbersToImportAdapter.java +++ b/java/com/android/dialer/app/filterednumber/ViewNumbersToImportAdapter.java @@ -20,9 +20,9 @@ import android.content.Context; import android.database.Cursor; import android.view.View; import com.android.contacts.common.ContactPhotoManager; -import com.android.contacts.common.GeoUtil; import com.android.dialer.app.R; import com.android.dialer.blocking.FilteredNumbersUtil; +import com.android.dialer.location.GeoUtil; import com.android.dialer.phonenumbercache.ContactInfoHelper; public class ViewNumbersToImportAdapter extends NumbersAdapter { diff --git a/java/com/android/dialer/app/list/BlockedListSearchAdapter.java b/java/com/android/dialer/app/list/BlockedListSearchAdapter.java index a90ce7a0d..96d02d7bf 100644 --- a/java/com/android/dialer/app/list/BlockedListSearchAdapter.java +++ b/java/com/android/dialer/app/list/BlockedListSearchAdapter.java @@ -19,10 +19,10 @@ import android.content.Context; import android.content.res.Resources; import android.database.Cursor; import android.view.View; -import com.android.contacts.common.GeoUtil; import com.android.contacts.common.list.ContactListItemView; import com.android.dialer.app.R; import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler; +import com.android.dialer.location.GeoUtil; /** List adapter to display search results for adding a blocked number. */ public class BlockedListSearchAdapter extends RegularSearchListAdapter { diff --git a/java/com/android/dialer/app/list/BlockedListSearchFragment.java b/java/com/android/dialer/app/list/BlockedListSearchFragment.java index 0f96e2d6e..8d42221c0 100644 --- a/java/com/android/dialer/app/list/BlockedListSearchFragment.java +++ b/java/com/android/dialer/app/list/BlockedListSearchFragment.java @@ -28,7 +28,6 @@ import android.view.View; import android.widget.AdapterView; import android.widget.EditText; import android.widget.Toast; -import com.android.contacts.common.GeoUtil; import com.android.contacts.common.list.ContactEntryListAdapter; import com.android.contacts.common.util.ContactDisplayUtils; import com.android.dialer.app.R; @@ -37,6 +36,7 @@ import com.android.dialer.blocking.BlockNumberDialogFragment; import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler; import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler.OnCheckBlockedListener; import com.android.dialer.common.LogUtil; +import com.android.dialer.location.GeoUtil; import com.android.dialer.logging.InteractionEvent; import com.android.dialer.logging.Logger; diff --git a/java/com/android/dialer/app/list/DialerPhoneNumberListAdapter.java b/java/com/android/dialer/app/list/DialerPhoneNumberListAdapter.java index 542501cfd..537f488d5 100644 --- a/java/com/android/dialer/app/list/DialerPhoneNumberListAdapter.java +++ b/java/com/android/dialer/app/list/DialerPhoneNumberListAdapter.java @@ -24,11 +24,11 @@ import android.text.BidiFormatter; import android.text.TextDirectionHeuristics; import android.view.View; import android.view.ViewGroup; -import com.android.contacts.common.GeoUtil; import com.android.contacts.common.list.ContactListItemView; import com.android.contacts.common.list.PhoneNumberListAdapter; import com.android.contacts.common.util.ContactDisplayUtils; import com.android.dialer.app.R; +import com.android.dialer.location.GeoUtil; import com.android.dialer.util.CallUtil; /** @@ -47,11 +47,13 @@ public class DialerPhoneNumberListAdapter extends PhoneNumberListAdapter { public static final int SHORTCUT_MAKE_VIDEO_CALL = 4; public static final int SHORTCUT_BLOCK_NUMBER = 5; public static final int SHORTCUT_COUNT = 6; + private final boolean[] mShortcutEnabled = new boolean[SHORTCUT_COUNT]; private final BidiFormatter mBidiFormatter = BidiFormatter.getInstance(); + private final boolean mVideoCallingEnabled; + private final String mCountryIso; + private String mFormattedQueryString; - private String mCountryIso; - private boolean mVideoCallingEnabled = false; public DialerPhoneNumberListAdapter(Context context) { super(context); @@ -108,7 +110,8 @@ public class DialerPhoneNumberListAdapter extends PhoneNumberListAdapter { return convertView; } else { final ContactListItemView v = - new ContactListItemView(getContext(), null, mVideoCallingEnabled); + new ContactListItemView( + getContext(), null, mVideoCallingEnabled, isCallAndShareEnabled()); assignShortcutToView(v, shortcutType); return v; } @@ -123,6 +126,7 @@ public class DialerPhoneNumberListAdapter extends PhoneNumberListAdapter { final ContactListItemView view = super.newView(context, partition, cursor, position, parent); view.setSupportVideoCallIcon(mVideoCallingEnabled); + view.setSupportCallAndShareIcon(isCallAndShareEnabled()); return view; } diff --git a/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml b/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml index 7e450c4cd..ca93da0de 100644 --- a/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml +++ b/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml @@ -112,6 +112,11 @@ android:resource="@layout/keyguard_preview"/> </activity> + <activity-alias + android:exported="true" + android:name="com.android.dialer.DialtactsActivity" + android:targetActivity="com.android.dialer.app.DialtactsActivity"/> + </application> </manifest> diff --git a/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml b/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml index 862882a62..d3a553130 100644 --- a/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml +++ b/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml @@ -135,7 +135,7 @@ <ImageView style="@style/CallLogActionIconStyle" - android:src="@drawable/ic_phone_attach"/> + android:src="@drawable/ic_call_and_share"/> <TextView style="@style/CallLogActionTextStyle" diff --git a/java/com/android/dialer/app/res/layout/phone_favorite_tile_view.xml b/java/com/android/dialer/app/res/layout/phone_favorite_tile_view.xml index 43594f649..d2712e9fe 100644 --- a/java/com/android/dialer/app/res/layout/phone_favorite_tile_view.xml +++ b/java/com/android/dialer/app/res/layout/phone_favorite_tile_view.xml @@ -14,115 +14,118 @@ limitations under the License. --> <view - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/contact_tile" - class="com.android.dialer.app.list.PhoneFavoriteSquareTileView" - android:paddingBottom="@dimen/contact_tile_divider_width" - android:paddingEnd="@dimen/contact_tile_divider_width"> + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/contact_tile" + class="com.android.dialer.app.list.PhoneFavoriteSquareTileView" + android:paddingBottom="@dimen/contact_tile_divider_width" + android:paddingEnd="@dimen/contact_tile_divider_width"> <RelativeLayout - android:id="@+id/contact_favorite_card" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:focusable="true" - android:nextFocusRight="@+id/contact_tile_secondary_button"> - - <com.android.contacts.common.widget.LayoutSuppressingImageView - android:id="@+id/contact_tile_image" + android:id="@+id/contact_favorite_card" android:layout_width="match_parent" android:layout_height="match_parent" - android:scaleType="centerCrop"/> + android:focusable="true" + android:nextFocusRight="@+id/contact_tile_secondary_button"> + + <com.android.contacts.common.widget.LayoutSuppressingImageView + android:id="@+id/contact_tile_image" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:scaleType="centerCrop"/> <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - <View android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="6"/> + android:layout_height="match_parent" + android:orientation="vertical"> <View - android:id="@+id/shadow_overlay" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="4" - android:background="@drawable/shadow_contact_photo"/> + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="6"/> + <View + android:id="@+id/shadow_overlay" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="4" + android:background="@drawable/shadow_contact_photo"/> </LinearLayout> <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:paddingBottom="@dimen/contact_tile_text_bottom_padding" - android:paddingStart="@dimen/contact_tile_text_side_padding" - android:paddingEnd="@dimen/contact_tile_text_side_padding" - android:orientation="vertical"> - - <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:gravity="center_vertical" - android:orientation="horizontal"> + android:layout_alignParentBottom="true" + android:paddingBottom="@dimen/contact_tile_text_bottom_padding" + android:paddingStart="@dimen/contact_tile_text_side_padding" + android:paddingEnd="@dimen/contact_tile_text_side_padding" + android:orientation="vertical"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:orientation="horizontal"> <TextView - android:id="@+id/contact_tile_name" - android:layout_width="0dp" + android:id="@+id/contact_tile_name" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:ellipsize="marquee" + android:fadingEdge="horizontal" + android:fadingEdgeLength="3dip" + android:fontFamily="sans-serif-medium" + android:singleLine="true" + android:textAlignment="viewStart" + android:textColor="@color/contact_tile_name_color" + android:textSize="15sp"/> + <ImageView + android:id="@+id/contact_star_icon" + android:layout_width="@dimen/favorites_star_icon_size" + android:layout_height="@dimen/favorites_star_icon_size" + android:layout_marginStart="3dp" + android:src="@drawable/ic_star" + android:visibility="gone"/> + </LinearLayout> + <TextView + android:id="@+id/contact_tile_phone_type" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" android:ellipsize="marquee" android:fadingEdge="horizontal" android:fadingEdgeLength="3dip" - android:fontFamily="sans-serif-medium" + android:fontFamily="sans-serif" + android:gravity="center_vertical" android:singleLine="true" android:textAlignment="viewStart" android:textColor="@color/contact_tile_name_color" - android:textSize="15sp"/> - <ImageView - android:id="@+id/contact_star_icon" - android:layout_width="@dimen/favorites_star_icon_size" - android:layout_height="@dimen/favorites_star_icon_size" - android:layout_marginStart="3dp" - android:src="@drawable/ic_star" - android:visibility="gone"/> - </LinearLayout> - <TextView - android:id="@+id/contact_tile_phone_type" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:ellipsize="marquee" - android:fadingEdge="horizontal" - android:fadingEdgeLength="3dip" - android:fontFamily="sans-serif" - android:gravity="center_vertical" - android:singleLine="true" - android:textAlignment="viewStart" - android:textColor="@color/contact_tile_name_color" - android:textSize="11sp"/> + android:textSize="11sp"/> </LinearLayout> <View - android:id="@+id/contact_tile_push_state" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@drawable/item_background_material_dark" - android:importantForAccessibility="no"/> + android:id="@+id/contact_tile_push_state" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@drawable/item_background_material_dark" + android:importantForAccessibility="no"/> + + <!-- Wrap the ImageButton in a layout with a transparent background so the ripple has something to draw on --> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@android:color/transparent"> + <ImageButton + android:id="@id/contact_tile_secondary_button" + android:layout_width="@dimen/contact_tile_info_button_height_and_width" + android:layout_height="@dimen/contact_tile_info_button_height_and_width" + android:layout_gravity="top|end" + android:paddingTop="8dp" + android:paddingBottom="4dp" + android:paddingStart="4dp" + android:paddingEnd="4dp" + android:background="@drawable/item_background_material_borderless_dark" + android:contentDescription="@string/description_view_contact_detail" + android:scaleType="center" + android:src="@drawable/quantum_ic_more_vert_white_24"/> - <ImageButton - android:id="@id/contact_tile_secondary_button" - android:layout_width="@dimen/contact_tile_info_button_height_and_width" - android:layout_height="@dimen/contact_tile_info_button_height_and_width" - android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:paddingTop="8dp" - android:paddingBottom="4dp" - android:paddingStart="4dp" - android:paddingEnd="4dp" - android:paddingLeft="4dp" - android:paddingRight="9dp" - android:background="@drawable/item_background_material_dark" - android:contentDescription="@string/description_view_contact_detail" - android:scaleType="center" - android:src="@drawable/quantum_ic_more_vert_white_24"/> + </FrameLayout> </RelativeLayout> </view> diff --git a/java/com/android/dialer/app/res/layout/search_edittext.xml b/java/com/android/dialer/app/res/layout/search_edittext.xml index 903fbcae9..c02512d80 100644 --- a/java/com/android/dialer/app/res/layout/search_edittext.xml +++ b/java/com/android/dialer/app/res/layout/search_edittext.xml @@ -10,12 +10,14 @@ android:layout_marginRight="@dimen/search_margin_horizontal" android:background="@drawable/rounded_corner" android:elevation="@dimen/search_box_elevation" + android:theme="@style/DialtactsSearchBarThemeOverlay" android:orientation="horizontal"> <LinearLayout android:id="@+id/search_box_collapsed" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="?android:selectableItemBackground" android:paddingStart="@dimen/search_box_left_padding" android:gravity="center_vertical" android:orientation="horizontal"> diff --git a/java/com/android/dialer/app/res/values-af/strings.xml b/java/com/android/dialer/app/res/values-af/strings.xml index 0245a2d1d..2cd688023 100644 --- a/java/com/android/dialer/app/res/values-af/strings.xml +++ b/java/com/android/dialer/app/res/values-af/strings.xml @@ -199,6 +199,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Oproepe"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Oproepblokkering"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Stemboodskap"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Oproepblokkering is tydelik af"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Oproepblokkering is gedeaktiveer omdat jy die afgelope 48 uur nooddienste van hierdie foon af gekontak het. Dit sal outomaties heraktiveer word sodra die 48-uurtydperk verstryk."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Voer nommers in"</string> diff --git a/java/com/android/dialer/app/res/values-am/strings.xml b/java/com/android/dialer/app/res/values-am/strings.xml index befa4c45c..760099d26 100644 --- a/java/com/android/dialer/app/res/values-am/strings.xml +++ b/java/com/android/dialer/app/res/values-am/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"ጥሪዎች"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ጥሪን ማገድ"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"የድምፅ መልእክት"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ጥሪን ማገድ ለጊዜው ተሰናክሏል"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ባለፉት 48 ሰዓቶች ውስጥ ከዚህ ስልክ ሆነው የአስቸኳይ አደጋ አገልግሎቶችን ስላነጋገሩ ጥሪን ማገድ ተሰናክሏል። አንዴ የ48 ሰዓቱ ጊዜ ካለፈ በኋላ በራስ-ሰር ዳግም ይነቃል።"</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"ቁጥሮችን አስመጣ"</string> diff --git a/java/com/android/dialer/app/res/values-ar/strings.xml b/java/com/android/dialer/app/res/values-ar/strings.xml index 961e4833e..6e387b490 100644 --- a/java/com/android/dialer/app/res/values-ar/strings.xml +++ b/java/com/android/dialer/app/res/values-ar/strings.xml @@ -207,6 +207,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"المكالمات"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"حظر المكالمات"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"البريد الصوتي"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"حظر المكالمات معطّل مؤقتًا"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"تم تعطيل حظر المكالمات لأنك اتصلت بخدمات الطوارئ خلال 48 ساعة ماضية. وستتم إعادة تمكينه تلقائيًا بعد انتهاء هذه الفترة التي تبلغ 48 ساعة."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"استيراد الأرقام"</string> diff --git a/java/com/android/dialer/app/res/values-az/strings.xml b/java/com/android/dialer/app/res/values-az/strings.xml index 78440fd24..9522764aa 100644 --- a/java/com/android/dialer/app/res/values-az/strings.xml +++ b/java/com/android/dialer/app/res/values-az/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Zənglər"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Zəng blok edilir"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Səsli e-məktub"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Çağrının blok edilməsi müvəqqəti olaraq deaktiv edilib"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Son 48 saat ərzində bu telefondan təcili yardım xidmətləri ilə əlaqə saxladığınız üçün Çağrı Bloklanması deaktiv edildi. 48 saatlıq müddət başa çatdıqda avtomatik olaraq yenidən aktiv ediləcək."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Nömrələri import edin"</string> diff --git a/java/com/android/dialer/app/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/app/res/values-b+sr+Latn/strings.xml index ddb311266..c046d94aa 100644 --- a/java/com/android/dialer/app/res/values-b+sr+Latn/strings.xml +++ b/java/com/android/dialer/app/res/values-b+sr+Latn/strings.xml @@ -202,6 +202,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Pozivi"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blokiranje poziva"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Govorna pošta"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokiranje poziva je privremeno isključeno"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blokiranje poziva je onemogućeno zato što ste kontaktirali službe za pomoć u hitnim slučajevima sa ovog telefona u poslednjih 48 sati. Automatski će biti ponovo omogućeno kada istekne period od 48 sati."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Uvezi brojeve"</string> diff --git a/java/com/android/dialer/app/res/values-be/strings.xml b/java/com/android/dialer/app/res/values-be/strings.xml index 54d7d8384..552e6ac17 100644 --- a/java/com/android/dialer/app/res/values-be/strings.xml +++ b/java/com/android/dialer/app/res/values-be/strings.xml @@ -204,6 +204,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Выклікі"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Блакіраванне выклікаў"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Галасавая пошта"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Блакіроўка выклікаў часова адключана"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Блакіроўка выклікаў будзе адключана, таму што вы выклікалі экстранныя службы з гэтага тэлефона на працягу апошніх 48 гадзін. Яна будзе аўтаматычна адноўлена пасля заканчэння перыяду ў 48 гадзін."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Імпартаваць нумары"</string> diff --git a/java/com/android/dialer/app/res/values-bg/strings.xml b/java/com/android/dialer/app/res/values-bg/strings.xml index 0fb06c165..277cb63a7 100644 --- a/java/com/android/dialer/app/res/values-bg/strings.xml +++ b/java/com/android/dialer/app/res/values-bg/strings.xml @@ -199,6 +199,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Обаждания"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Блокиране на обажданията"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Гласова поща"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Блокир. на обажданията е временно изкл."</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Блокирането на обажданията е деактивирано, защото в рамките на последните 48 часа сте се свързали със спешните служби от този телефон. То автоматично ще бъде активирано отново, когато периодът от 48 часа изтече."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Импортиране на номерата"</string> diff --git a/java/com/android/dialer/app/res/values-bn/strings.xml b/java/com/android/dialer/app/res/values-bn/strings.xml index 45787cc0f..0a5569234 100644 --- a/java/com/android/dialer/app/res/values-bn/strings.xml +++ b/java/com/android/dialer/app/res/values-bn/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"কল"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"কল অবরোধ করা"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"ভয়েসমেল"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"কল অবরোধ সাময়িকভাবে বন্ধ রয়েছে"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"কল অবরোধ অক্ষম করা হয়েছে কারণ আপনি গত ২৮ ঘন্টার মধ্যে এই ফোন থেকে জরুরি পরিষেবায় যোগাযোগ করেছেন। ২৮ ঘন্টার সময়সীমা পেরিয়ে গেলেই এটি স্বয়ংক্রিয়ভাবে আবার সক্ষম হবে।"</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"নম্বরগুলি আমদানি করুন"</string> diff --git a/java/com/android/dialer/app/res/values-bs/strings.xml b/java/com/android/dialer/app/res/values-bs/strings.xml index 8c19cb719..834d29609 100644 --- a/java/com/android/dialer/app/res/values-bs/strings.xml +++ b/java/com/android/dialer/app/res/values-bs/strings.xml @@ -202,6 +202,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Pozivi"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blokiranje poziva"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Govorna pošta"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokiranje poziva je privremeno isključeno"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blokiranje poziva je onemogućeno jer ste kontaktirali hitnu službu s ovog telefona u proteklih 48 sati. Automatski će se ponovo omogućiti kada istekne 48 sati."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Uvezi brojeve"</string> diff --git a/java/com/android/dialer/app/res/values-ca/strings.xml b/java/com/android/dialer/app/res/values-ca/strings.xml index a333e5389..6afd86b6b 100644 --- a/java/com/android/dialer/app/res/values-ca/strings.xml +++ b/java/com/android/dialer/app/res/values-ca/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Trucades"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bloqueig de trucades"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Bústia de veu"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Bloqueig de trucades desactivat tempor."</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"El bloqueig de trucades s\'ha desactivat perquè has contactat amb els serveis d\'emergència des d\'aquest telèfon durant les últimes 48 hores. Es tornarà a activar automàticament una vegada transcorregut el període de 48 hores."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importa els números"</string> diff --git a/java/com/android/dialer/app/res/values-cs/strings.xml b/java/com/android/dialer/app/res/values-cs/strings.xml index cc71441da..97f43319c 100644 --- a/java/com/android/dialer/app/res/values-cs/strings.xml +++ b/java/com/android/dialer/app/res/values-cs/strings.xml @@ -204,6 +204,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Volání"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blokování hovorů"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Hlasová schránka"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokování hovorů je dočasně vypnuto"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Protože jste z tohoto telefonu během posledních 48 hodin volali na tísňovou linku, bylo blokování hovorů vypnuto. Po uplynutí 48 hodin se automaticky znovu zapne."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importovat čísla"</string> diff --git a/java/com/android/dialer/app/res/values-da/strings.xml b/java/com/android/dialer/app/res/values-da/strings.xml index 5315bee5e..7f162b9db 100644 --- a/java/com/android/dialer/app/res/values-da/strings.xml +++ b/java/com/android/dialer/app/res/values-da/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Opkald"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Opkaldsblokering"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Telefonsvarer"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Opkaldsblokering er midlertidigt slået fra"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Opkaldsblokering er blevet deaktiveret, da du inden for de sidste 48 timer har kontaktet en alarmcentral. Blokeringen aktiveres automatisk igen, når perioden på 48 timer er udløbet."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importér numre"</string> diff --git a/java/com/android/dialer/app/res/values-de/strings.xml b/java/com/android/dialer/app/res/values-de/strings.xml index a50a8cd93..eaa798694 100644 --- a/java/com/android/dialer/app/res/values-de/strings.xml +++ b/java/com/android/dialer/app/res/values-de/strings.xml @@ -202,6 +202,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Anrufe"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Anrufblockierung"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Mailbox"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Anrufblockierung vorübergehend aus"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Die Anrufblockierung wurde deaktiviert, weil du innerhalb der letzten 48 Stunden mit diesem Telefon den Notruf gewählt hast. Nach Ablauf dieser 48-Stunden-Frist wird die Blockierung automatisch wieder aktiviert."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Nummern importieren"</string> diff --git a/java/com/android/dialer/app/res/values-el/strings.xml b/java/com/android/dialer/app/res/values-el/strings.xml index 9978eac96..6996817d8 100644 --- a/java/com/android/dialer/app/res/values-el/strings.xml +++ b/java/com/android/dialer/app/res/values-el/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Κλήσεις"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Φραγή κλήσεων"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Αυτόματος τηλεφωνητής"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Προσωρινά απενεργοποιημένη φραγή κλήσεων"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Η φραγή κλήσεων έχει απενεργοποιηθεί προσωρινά επειδή επικοινωνήσατε με τις υπηρεσίες έκτακτης ανάγκης από αυτό το τηλέφωνο μέσα στις τελευταίες 48 ώρες. Θα ενεργοποιηθεί ξανά αυτόματα μόλις λήξει η περίοδος των 48 ωρών."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Εισαγωγή αριθμών"</string> diff --git a/java/com/android/dialer/app/res/values-en-rAU/strings.xml b/java/com/android/dialer/app/res/values-en-rAU/strings.xml index 6525bb672..967c74158 100644 --- a/java/com/android/dialer/app/res/values-en-rAU/strings.xml +++ b/java/com/android/dialer/app/res/values-en-rAU/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Calls"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Call blocking"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Voicemail"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Call blocking temporarily off"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Call blocking has been disabled because you contacted emergency services from this phone within the last 48 hours. It will be automatically re-enabled once the 48 hour period expires."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Import numbers"</string> diff --git a/java/com/android/dialer/app/res/values-en-rGB/strings.xml b/java/com/android/dialer/app/res/values-en-rGB/strings.xml index 6525bb672..967c74158 100644 --- a/java/com/android/dialer/app/res/values-en-rGB/strings.xml +++ b/java/com/android/dialer/app/res/values-en-rGB/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Calls"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Call blocking"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Voicemail"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Call blocking temporarily off"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Call blocking has been disabled because you contacted emergency services from this phone within the last 48 hours. It will be automatically re-enabled once the 48 hour period expires."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Import numbers"</string> diff --git a/java/com/android/dialer/app/res/values-en-rIN/strings.xml b/java/com/android/dialer/app/res/values-en-rIN/strings.xml index 6525bb672..967c74158 100644 --- a/java/com/android/dialer/app/res/values-en-rIN/strings.xml +++ b/java/com/android/dialer/app/res/values-en-rIN/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Calls"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Call blocking"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Voicemail"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Call blocking temporarily off"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Call blocking has been disabled because you contacted emergency services from this phone within the last 48 hours. It will be automatically re-enabled once the 48 hour period expires."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Import numbers"</string> diff --git a/java/com/android/dialer/app/res/values-es-rUS/strings.xml b/java/com/android/dialer/app/res/values-es-rUS/strings.xml index d86c50b46..4a39f3418 100644 --- a/java/com/android/dialer/app/res/values-es-rUS/strings.xml +++ b/java/com/android/dialer/app/res/values-es-rUS/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Llamadas"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bloqueo de llamadas"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Buzón de voz"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Bloqueo de llamadas desactivado temporalmente"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Se inhabilitó el bloqueo de llamadas porque te comunicaste con servicios de emergencia en las últimas 48 horas desde este teléfono. Se volverá a habilitar de forma automática una vez que venza el período de 48 horas."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importar números"</string> diff --git a/java/com/android/dialer/app/res/values-es/strings.xml b/java/com/android/dialer/app/res/values-es/strings.xml index 3c68a3b99..f3ebe5d9b 100644 --- a/java/com/android/dialer/app/res/values-es/strings.xml +++ b/java/com/android/dialer/app/res/values-es/strings.xml @@ -199,6 +199,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Llamadas"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bloqueo de llamadas"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Buzón de voz"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Bloqueo de llamadas desactivado temporalmente"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Se ha inhabilitado el bloqueo de llamadas porque te has puesto en contacto con los servicios de emergencia desde este teléfono en las últimas 48 horas. Se volverá a habilitar automáticamente cuando finalice este periodo de tiempo."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importar números"</string> diff --git a/java/com/android/dialer/app/res/values-et/strings.xml b/java/com/android/dialer/app/res/values-et/strings.xml index 071f4eab4..e880e3d5e 100644 --- a/java/com/android/dialer/app/res/values-et/strings.xml +++ b/java/com/android/dialer/app/res/values-et/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Kõned"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Kõnede blokeerimine"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Kõnepost"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Kõnede blokeerimine on ajutiselt väljas"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Kõnede blokeerimine on keelatud, kuna võtsite sellelt telefonilt viimase 48 tunni jooksul ühendust hädaabiteenustega. See lubatakse 48 tunni möödumisel automaatselt uuesti."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Impordi numbrid"</string> diff --git a/java/com/android/dialer/app/res/values-eu/strings.xml b/java/com/android/dialer/app/res/values-eu/strings.xml index 236850ab3..079e5c75b 100644 --- a/java/com/android/dialer/app/res/values-eu/strings.xml +++ b/java/com/android/dialer/app/res/values-eu/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Deiak"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Deien blokeoa"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Erantzungailua"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Deien blokeoa aldi baterako desgaituta"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Deiak blokeatzeko aukera desgaitu egin da, azken 48 orduetan larrialdi-zerbitzuekin harremanetan jarri zarelako telefono honetatik. Berriro gaituko da 48 orduko epea igaro ondoren."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Inportatu zenbakiak"</string> diff --git a/java/com/android/dialer/app/res/values-fa/strings.xml b/java/com/android/dialer/app/res/values-fa/strings.xml index d76253f79..67f58a04e 100644 --- a/java/com/android/dialer/app/res/values-fa/strings.xml +++ b/java/com/android/dialer/app/res/values-fa/strings.xml @@ -202,6 +202,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"تماسها"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"مسدود کردن تماس"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"پست صوتی"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"انسداد تماس موقتاً خاموش است"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"چون در ۴۸ ساعت گذشته با این تلفن با سرویسهای اضطراری تماس گرفتید، انسداد تماس غیرفعال شده است. پس از گذشت ۴۸ ساعت، این قابلیت دوباره فعال میشود."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"وارد کردن شمارهها"</string> diff --git a/java/com/android/dialer/app/res/values-fi/strings.xml b/java/com/android/dialer/app/res/values-fi/strings.xml index e247e4845..417305b69 100644 --- a/java/com/android/dialer/app/res/values-fi/strings.xml +++ b/java/com/android/dialer/app/res/values-fi/strings.xml @@ -199,6 +199,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Puhelut"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Puhelujen esto"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Vastaaja"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Puheluesto väliaikaisesti pois käytöstä"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Puheluiden estäminen on poistettu käytöstä, koska olet ottanut yhteyttä hätäpalveluihin tästä puhelimesta viimeisen 48 tunnin aikana. Esto otetaan automaattisesti uudelleen käyttöön, kun puhelusta on kulunut 48 tuntia."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Tuo numerot"</string> diff --git a/java/com/android/dialer/app/res/values-fr-rCA/strings.xml b/java/com/android/dialer/app/res/values-fr-rCA/strings.xml index 33eae2b43..0429a767f 100644 --- a/java/com/android/dialer/app/res/values-fr-rCA/strings.xml +++ b/java/com/android/dialer/app/res/values-fr-rCA/strings.xml @@ -199,6 +199,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Appels"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blocage des appels"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Messagerie vocale"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blocage appels désactivé temporairement"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Le blocage des appels a été désactivé, car vous avez communiqué avec les services d\'urgence à partir de ce téléphone au cours des dernières 48 heures. Le blocage sera réactivé automatiquement après 48 heures."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importer les numéros"</string> diff --git a/java/com/android/dialer/app/res/values-fr/strings.xml b/java/com/android/dialer/app/res/values-fr/strings.xml index e9bb8dd78..933acc130 100644 --- a/java/com/android/dialer/app/res/values-fr/strings.xml +++ b/java/com/android/dialer/app/res/values-fr/strings.xml @@ -199,6 +199,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Appels"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blocage des appels"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Messagerie vocale"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blocage appels désactivé temporairement"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Le blocage des appels a été désactivé, car vous avez contacté les services d\'urgence à l\'aide de ce téléphone au cours des dernières 48 heures. Le blocage sera réactivé automatiquement après 48 heures."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importer les numéros"</string> diff --git a/java/com/android/dialer/app/res/values-gl/strings.xml b/java/com/android/dialer/app/res/values-gl/strings.xml index 41eacac16..df162bffd 100644 --- a/java/com/android/dialer/app/res/values-gl/strings.xml +++ b/java/com/android/dialer/app/res/values-gl/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Chamadas"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bloqueo de chamadas"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Correo de voz"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"O bloqueo de chamadas desactivouse temporalmente"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"O bloqueo de chamadas desactivouse porque contactaches cos servizos de emerxencias desde este teléfono nas últimas 48 horas. Volverase activar automaticamente unha vez que pase o período de 48 horas."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importar números"</string> diff --git a/java/com/android/dialer/app/res/values-gu/strings.xml b/java/com/android/dialer/app/res/values-gu/strings.xml index 1b7b28a11..ad5cd0776 100644 --- a/java/com/android/dialer/app/res/values-gu/strings.xml +++ b/java/com/android/dialer/app/res/values-gu/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"કૉલ્સ"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"કૉલ અવરોધ"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"વૉઇસમેઇલ"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"કૉલ અવરોધિત કરવાનું અસ્થાયીરૂપે બંધ છે"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"કૉલ અવરોધિત કરવાનું અક્ષમ કરવામાં આવ્યું છે કારણ કે તમે આ ફોનમાંથી છેલ્લા 48 કલાકમાં કટોકટીની સેવાઓનો સંપર્ક કર્યો હતો. એકવાર 48 કલાકનો સમયગાળો સમાપ્ત થાય, પછી તે આપમેળે ફરીથી સક્ષમ કરવામાં આવશે."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"નંબર્સ આયાત કરો"</string> diff --git a/java/com/android/dialer/app/res/values-hi/strings.xml b/java/com/android/dialer/app/res/values-hi/strings.xml index cc8b287dc..320baa559 100644 --- a/java/com/android/dialer/app/res/values-hi/strings.xml +++ b/java/com/android/dialer/app/res/values-hi/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"कॉल"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"कॉल अवरुद्ध करें"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"वॉइसमेल"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"कॉल अवरुद्ध करना अस्थायी रूप से बंद है"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"कॉल अवरुद्ध किए जाने को अक्षम कर दिया गया है क्योंकि पिछले 48 घंटों में आपने इस फ़ोन से आपातकालीन सेवाओं से संपर्क किया है. 48 घंटे की अवधि बीत जाने पर यह अपने आप फिर से सक्षम हो जाएगी."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"नंबर आयात करें"</string> diff --git a/java/com/android/dialer/app/res/values-hr/strings.xml b/java/com/android/dialer/app/res/values-hr/strings.xml index 4b12e83d7..ee2df5495 100644 --- a/java/com/android/dialer/app/res/values-hr/strings.xml +++ b/java/com/android/dialer/app/res/values-hr/strings.xml @@ -204,6 +204,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Pozivi"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blokiranje poziva"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Govorna pošta"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokiranje poziva privremeno isključeno"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blokiranje poziva onemogućeno je jer ste kontaktirali hitne službe s ovog telefona u posljednjih 48 sati. Automatski će se ponovo omogućiti kada prođe 48 sati."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Uvoz brojeva"</string> diff --git a/java/com/android/dialer/app/res/values-hu/strings.xml b/java/com/android/dialer/app/res/values-hu/strings.xml index 7b529c205..9660b0c47 100644 --- a/java/com/android/dialer/app/res/values-hu/strings.xml +++ b/java/com/android/dialer/app/res/values-hu/strings.xml @@ -202,6 +202,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Hívások"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Hívásletiltás"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Hangposta"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Hívástiltás átmenetileg felfüggesztve"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Felfüggesztettük a hívások tiltását, mert az elmúlt 48 órában tárcsázta a segélyhívót erről a telefonról. A funkciót automatikusan újból engedélyezzük 48 óra elteltével."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Számok importálása"</string> diff --git a/java/com/android/dialer/app/res/values-hy/strings.xml b/java/com/android/dialer/app/res/values-hy/strings.xml index b7b9cd34f..58a8e9a35 100644 --- a/java/com/android/dialer/app/res/values-hy/strings.xml +++ b/java/com/android/dialer/app/res/values-hy/strings.xml @@ -199,6 +199,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Զանգեր"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Զանգերի արգելափակում"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Ձայնային փոստ"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Զանգերի արգելափակումը կասեցվել է"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Զանգերի արգելափակումը կասեցվել է, քանի որ վերջին 48 ժամվա ընթացքում դուք այս հեռախոսից զանգել եք արտակարգ իրավիճակների ծառայություններին: 48 ժամ տևողությամբ ժամանակահատվածի ավարտից հետո այն ավտոմատ կերպով կվերամիացվի:"</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Ներմուծել համարները"</string> diff --git a/java/com/android/dialer/app/res/values-in/strings.xml b/java/com/android/dialer/app/res/values-in/strings.xml index 75b1edbe2..3b9fcbeca 100644 --- a/java/com/android/dialer/app/res/values-in/strings.xml +++ b/java/com/android/dialer/app/res/values-in/strings.xml @@ -202,6 +202,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Panggilan telepon"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Pemblokiran panggilan telepon"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Pesan Suara"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokir panggilan dinonaktifkan sementara"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Pemblokiran panggilan telepon telah dinonaktifkan karena Anda menghubungi layanan darurat dari telepon ini dalam 48 jam terakhir. Akan diaktifkan kembali secara otomatis setelah masa 48 jam berakhir."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Impor nomor"</string> diff --git a/java/com/android/dialer/app/res/values-is/strings.xml b/java/com/android/dialer/app/res/values-is/strings.xml index b905ba886..e08471203 100644 --- a/java/com/android/dialer/app/res/values-is/strings.xml +++ b/java/com/android/dialer/app/res/values-is/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Símtöl"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Lokað fyrir símtöl"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Talhólf"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Tímabundið slökkt á lokun fyrir símtöl"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Lokun fyrir símtöl hefur verið gerð óvirk vegna þess að þú hafðir samband við neyðarþjónustu úr þessum síma á undanförnum tveimur sólarhringum. Lokunin verður aftur virk að þessum tveimur sólarhringum liðnum."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Flytja inn númer"</string> diff --git a/java/com/android/dialer/app/res/values-it/strings.xml b/java/com/android/dialer/app/res/values-it/strings.xml index 322386fb9..341d49771 100644 --- a/java/com/android/dialer/app/res/values-it/strings.xml +++ b/java/com/android/dialer/app/res/values-it/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Chiamate"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blocco delle chiamate"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Messaggi vocali"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blocco chiamate temporaneam. disattivato"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Il blocco chiamate è stato disattivato perché hai contattato servizi di emergenza da questo telefono nelle ultime 48 ore. Verrà riattivato automaticamente una volta trascorso il periodo di 48 ore."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importa numeri"</string> diff --git a/java/com/android/dialer/app/res/values-iw/strings.xml b/java/com/android/dialer/app/res/values-iw/strings.xml index d3966b446..9b61af74b 100644 --- a/java/com/android/dialer/app/res/values-iw/strings.xml +++ b/java/com/android/dialer/app/res/values-iw/strings.xml @@ -203,6 +203,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"שיחות"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"חסימת שיחות"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"דואר קולי"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"חסימת השיחות מושבתת באופן זמני"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"חסימת השיחות הושבתה מפני שיצרת קשר מטלפון זה עם שירותי חירום במהלך 48 השעות האחרונות. הפונקציה תופעל מחדש באופן אוטומטי בתום 48 השעות."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"יבא מספרים"</string> diff --git a/java/com/android/dialer/app/res/values-ja/strings.xml b/java/com/android/dialer/app/res/values-ja/strings.xml index 147f572f7..22cfd4831 100644 --- a/java/com/android/dialer/app/res/values-ja/strings.xml +++ b/java/com/android/dialer/app/res/values-ja/strings.xml @@ -199,6 +199,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"通話"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"着信のブロック"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"ボイスメール"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"着信のブロックは一時的にOFFです"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"このスマートフォンから緊急通報番号への発信が過去48時間以内に行われているため、着信のブロックは無効になっています。48時間経過すると、着信のブロックは自動的に有効になります。"</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"番号をインポート"</string> diff --git a/java/com/android/dialer/app/res/values-ka/strings.xml b/java/com/android/dialer/app/res/values-ka/strings.xml index 4d573831e..06bc726a6 100644 --- a/java/com/android/dialer/app/res/values-ka/strings.xml +++ b/java/com/android/dialer/app/res/values-ka/strings.xml @@ -202,6 +202,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"ზარები"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ზარების დაბლოკვა"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"ხმოვანი ფოსტა"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ზარების დაბლოკვა დროებით გამოირთო"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ზარების დაბლოკვა გაითიშა, რადგან ბოლო 48 საათში ამ ტელეფონიდან საგანგებო სამსახურებს დაუკავშირდით. 48 საათის გასვლის შემდეგ ის ავტომატურად ჩაირთვება."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"ნომრების იმპორტი"</string> diff --git a/java/com/android/dialer/app/res/values-kk/strings.xml b/java/com/android/dialer/app/res/values-kk/strings.xml index 62397bbb9..409217a77 100644 --- a/java/com/android/dialer/app/res/values-kk/strings.xml +++ b/java/com/android/dialer/app/res/values-kk/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Қоңыраулар"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Қоңырауларға тыйым салу"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Дауыстық хабар"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Қоңырауларға тыйым салу уақытша өшірулі"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Қоңырауларға тыйым салу өшірілді, өйткені сіз соңғы 48 сағат ішінде осы телефоннан төтенше қызметтерге хабарластыңыз. Ол 48 сағаттық кезең өткеннен кейін автоматты түрде қайта қосылады."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Нөмірлерді импорттау"</string> diff --git a/java/com/android/dialer/app/res/values-km/strings.xml b/java/com/android/dialer/app/res/values-km/strings.xml index 27dbf97c9..7ebe85d5b 100644 --- a/java/com/android/dialer/app/res/values-km/strings.xml +++ b/java/com/android/dialer/app/res/values-km/strings.xml @@ -199,6 +199,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"ការហៅ"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ការរារាំងការហៅ"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"សារជាសំឡេង"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ការរារាំងការហៅត្រូវបានបិទជាបណ្តោះអាសន្ន"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ការរារាំងការហៅត្រូវបានបិទដំណើរការ ដោយសារតែអ្នកបានទាក់ទងទៅសេវាអាសន្នចេញពីទូរស័ព្ទនេះក្នុងចន្លោះពេល 48 ម៉ោងកន្លងមកនេះ។ វានឹងបើកដំណើរការឡើងវិញ បន្ទាប់ពីរយៈពេល 48 ម៉ោងផុតកំណត់។"</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"នាំចូលលេខ"</string> diff --git a/java/com/android/dialer/app/res/values-kn/strings.xml b/java/com/android/dialer/app/res/values-kn/strings.xml index 19e11e90f..3e70c8819 100644 --- a/java/com/android/dialer/app/res/values-kn/strings.xml +++ b/java/com/android/dialer/app/res/values-kn/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"ಕರೆಗಳು"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ಕರೆ ನಿರ್ಬಂಧಿಸುವಿಕೆ"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"ಧ್ವನಿಮೇಲ್"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ಕರೆ ನಿರ್ಬಂಧಿಸುವಿಕೆ ತಾತ್ಕಾಲಿಕ ಆಫ್ ಮಾಡಲಾಗಿದೆ"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ನೀವು ಕಳೆದ 48 ಗಂಟೆಗಳಲ್ಲಿ ಈ ಫೋನ್ನಿಂದ ತುರ್ತು ಸೇವೆಗಳಿಗೆ ಸಂಪರ್ಕಿಸಿರುವ ಕಾರಣದಿಂದ ಕರೆ ನಿರ್ಬಂಧಿಸುವಿಕೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ. ಒಮ್ಮೆ 48 ಗಂಟೆಗಳ ಅವಧಿಯು ಮುಕ್ತಾಯಗೊಂಡ ನಂತರ ಅದನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಮರುಸಕ್ರಿಯಗೊಳಿಸಲಾಗುವುದು."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"ಸಂಖ್ಯೆಗಳನ್ನು ಆಮದು ಮಾಡಿ"</string> diff --git a/java/com/android/dialer/app/res/values-ko/strings.xml b/java/com/android/dialer/app/res/values-ko/strings.xml index d28760c6f..0f6abdf59 100644 --- a/java/com/android/dialer/app/res/values-ko/strings.xml +++ b/java/com/android/dialer/app/res/values-ko/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"통화"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"통화 차단"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"음성사서함"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"통화 차단 기능이 일시적으로 중지됨"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"지난 48시간 이내에 이 휴대전화를 사용해 응급 서비스에 연락했으므로 통화 차단 기능이 중지되었습니다. 48시간이 지나면 통화 차단 기능이 자동으로 다시 사용 설정됩니다."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"번호 가져오기"</string> diff --git a/java/com/android/dialer/app/res/values-ky/strings.xml b/java/com/android/dialer/app/res/values-ky/strings.xml index 85789978d..4a2ccf3f7 100644 --- a/java/com/android/dialer/app/res/values-ky/strings.xml +++ b/java/com/android/dialer/app/res/values-ky/strings.xml @@ -202,6 +202,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Чалуулар"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Чалууларды бөгөттөө"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Үн почтасы"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Чалууну бөгөттөө убактылуу өчүрүлгөн"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Акыркы 48 саат ичинде бул телефондон өзгөчө кырдаал кызматына байланышкандыктан чалууну бөгөттөө өчүрүлдү. 48 сааттык мөөнөтү аяктагандан кийин ал автоматтык түрдө кайра иштетилет."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Номерлерди импорттоо"</string> diff --git a/java/com/android/dialer/app/res/values-lo/strings.xml b/java/com/android/dialer/app/res/values-lo/strings.xml index a433847f9..315534639 100644 --- a/java/com/android/dialer/app/res/values-lo/strings.xml +++ b/java/com/android/dialer/app/res/values-lo/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"ການໂທ"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ການບລັອກສາຍໂທ"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"ຂໍ້ຄວາມສຽງ"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ການບລັອກສາຍໂທປິດຊົ່ວຄາວ"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ການບລັອກສາຍໂທຖືກປິດໃຊ້ງານແລ້ວ ເພາະວ່າທ່ານໄດ້ຕິດຕໍ່ຫາຝ່າຍບໍລິການສຸກເສີນຈາກໂທລະສັບນີ້ພາຍໃນ 48 ຊົ່ວໂມງສຸດທ້າຍ. ມັນຈະຖືກເປີດໃຊ້ງານອີກໂດຍອັດຕະໂນມັດ ເມື່ອໝົດໄລຍະ 48 ຊົ່ວໂມງໄປແລ້ວ."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"ນຳຕົວເລກເຂົ້າ"</string> diff --git a/java/com/android/dialer/app/res/values-lt/strings.xml b/java/com/android/dialer/app/res/values-lt/strings.xml index c4feacf32..6ac7e4d2b 100644 --- a/java/com/android/dialer/app/res/values-lt/strings.xml +++ b/java/com/android/dialer/app/res/values-lt/strings.xml @@ -204,6 +204,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Skambučiai"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Skambučių blokavimas"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Balso paštas"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Skamb. blokavimo funkcija laikinai išj."</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Skambučių blokavimo funkcija buvo išjungta, nes iš šio telefono buvote susisiekę su pagalbos tarnybomis per pastarąsias 48 val. Ši funkcija bus automatiškai įgalinta iš naujo, kai 48 val. laikotarpis pasibaigs."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importuoti numerius"</string> diff --git a/java/com/android/dialer/app/res/values-lv/strings.xml b/java/com/android/dialer/app/res/values-lv/strings.xml index 440e2d4d1..df51e60a4 100644 --- a/java/com/android/dialer/app/res/values-lv/strings.xml +++ b/java/com/android/dialer/app/res/values-lv/strings.xml @@ -202,6 +202,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Zvani"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Zvanu bloķēšana"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Balss pasts"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Zvanu bloķēšana ir īslaicīgi izslēgta"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Zvanu bloķēšana ir atspējota, jo pēdējo 48 stundu laikā jūs sazinājāties ar ārkārtas palīdzības dienestiem, izmantojot šo tālruni. Zvanu bloķēšana tiks automātiski iespējota, tiklīdz beigsies 48 stundu periods."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importēt numurus"</string> diff --git a/java/com/android/dialer/app/res/values-mk/strings.xml b/java/com/android/dialer/app/res/values-mk/strings.xml index c179bb631..1086e34fb 100644 --- a/java/com/android/dialer/app/res/values-mk/strings.xml +++ b/java/com/android/dialer/app/res/values-mk/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Повици"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Блокирање повик"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Говорна пошта"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Блокирањето повик е привремено исклучено"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Блокирањето повици е исклучено бидејќи ја контактиравте службата за итни случаи од телефонов во изминатите 48 часа. Повторно ќе се овозможи автоматски откако ќе истече периодот од 48 часа."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Увези броеви"</string> diff --git a/java/com/android/dialer/app/res/values-ml/strings.xml b/java/com/android/dialer/app/res/values-ml/strings.xml index a642334b5..7a43a2dfd 100644 --- a/java/com/android/dialer/app/res/values-ml/strings.xml +++ b/java/com/android/dialer/app/res/values-ml/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"കോളുകൾ"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"കോൾ ബ്ലോക്കുചെയ്യൽ"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"വോയ്സ് മെയില്"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"കോൾ ബ്ലോക്കുചെയ്യൽ താൽക്കാലികമായി ഓഫാണ്"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"കഴിഞ്ഞ 48 മണിക്കൂറിനുള്ളിൽ നിങ്ങൾ ഈ ഫോണിൽ നിന്ന് അടിയന്തിര സേവനങ്ങളുമായി ബന്ധപ്പെട്ടതിനാൽ കോൾ ബ്ലോക്കുചെയ്യൽ പ്രവർത്തനരഹിതമാക്കി. 48 മണിക്കൂർ സമയപരിധി കഴിഞ്ഞയുടൻ ഇത് സ്വയമേവ പ്രവർത്തനക്ഷമമാക്കപ്പെടും."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"നമ്പറുകൾ ഇമ്പോർട്ടുചെയ്യുക"</string> diff --git a/java/com/android/dialer/app/res/values-mn/strings.xml b/java/com/android/dialer/app/res/values-mn/strings.xml index 12f0d41cc..0dda88e18 100644 --- a/java/com/android/dialer/app/res/values-mn/strings.xml +++ b/java/com/android/dialer/app/res/values-mn/strings.xml @@ -199,6 +199,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Дуудлага"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Дуудлага блоклох"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Дуут шуудан"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Дуудлага блоклох тохиргоог түр хугацаагаар унтраасан"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Та сүүлийн 48 цагийн дотор энэ утсаар тусламжийн дуудлага хийсэн тул дуудлага блоклох тохиргоог идэвхгүй болгосон. Энэ тохиргоо нь 48 цагийн хугацаа дуусахад автоматаар идэвхэжнэ."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Импортын тоо"</string> diff --git a/java/com/android/dialer/app/res/values-mr/strings.xml b/java/com/android/dialer/app/res/values-mr/strings.xml index feda81603..505dae72c 100644 --- a/java/com/android/dialer/app/res/values-mr/strings.xml +++ b/java/com/android/dialer/app/res/values-mr/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"कॉल"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"कॉल अवरोधित करणे"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"व्हॉइसमेल"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"कॉल अवरोधित करणे तात्पुरते बंद"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"आपण मागील 48 तासात या फोनवरून आणीबाणी सेवांशी संपर्क साधला असल्याने कॉल अवरोधित करणे अक्षम केले गेले आहे. एकदा 48 तासांचा कालावधी कालबाह्य झाला की ते स्वयंचलितपणे पुन्हा सक्षम केले जाईल."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"नंबर अायात करा"</string> diff --git a/java/com/android/dialer/app/res/values-ms/strings.xml b/java/com/android/dialer/app/res/values-ms/strings.xml index f4c9ac29f..74d9b051a 100644 --- a/java/com/android/dialer/app/res/values-ms/strings.xml +++ b/java/com/android/dialer/app/res/values-ms/strings.xml @@ -202,6 +202,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Panggilan"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Sekatan panggilan"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Mel suara"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Sekatan panggilan dimatikan sementara"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Sekatan panggilan telah dilumpuhkan kerana anda menghubungi perkhidmatan kecemasan daripada telefon ini dalam masa 48 jam yang lalu. Ciri ini akan didayakan semula secara automatik apabila tempoh 48 jam berakhir."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Import nombor"</string> diff --git a/java/com/android/dialer/app/res/values-my/strings.xml b/java/com/android/dialer/app/res/values-my/strings.xml index 16b286fd4..88f5bd394 100644 --- a/java/com/android/dialer/app/res/values-my/strings.xml +++ b/java/com/android/dialer/app/res/values-my/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"ခေါ်ဆိုမှုများ"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ခေါ်ဆိုမှု ပိတ်ဆို့ခြင်း"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"အသံမေးလ်"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ခေါ်ဆိုမှုပိတ်ဆို့ခြင်း ယာယီပိတ်ထားသည်"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"သင်သည် လွန်ခဲ့သည့် ၄၈ နာရီအတွင်း ဤဖုန်းဖြင့် အရေးပေါ်ဌာနကိုဖုန်း ခေါ်ဆိုခဲ့သောကြောင့် ခေါ်ဆိုမှုပိတ်ဆို့ခြင်းကို ဖြုတ်ထားသည်။ ၄၈ နာရီကျော်လွန်သည်နှင့် ၎င်းကိုအလိုအလျောက် ပြန်ဖွင့်ပေးပါမည်။"</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"နံပါတ်များ သွင်းရန်"</string> diff --git a/java/com/android/dialer/app/res/values-nb/strings.xml b/java/com/android/dialer/app/res/values-nb/strings.xml index 4d97dc23a..7a8528e2e 100644 --- a/java/com/android/dialer/app/res/values-nb/strings.xml +++ b/java/com/android/dialer/app/res/values-nb/strings.xml @@ -199,6 +199,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Anrop"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Anropsblokkering"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Talepost"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokkering av anrop er midlertidig slått av"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blokkering av anrop er slått av fordi du kontaktet nødtjenester fra denne telefonen i løpet av de siste 48 timene. Funksjonen blir automatisk slått på igjen når perioden på 48 timer er utløpt."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importér numre"</string> diff --git a/java/com/android/dialer/app/res/values-ne/strings.xml b/java/com/android/dialer/app/res/values-ne/strings.xml index 169c0111a..8595062d3 100644 --- a/java/com/android/dialer/app/res/values-ne/strings.xml +++ b/java/com/android/dialer/app/res/values-ne/strings.xml @@ -199,6 +199,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"कलहरू"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"कल रोक्दै"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"भ्वाइस मेल"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"कल अवरुद्ध अस्थायी रुपमा निष्क्रिय"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"कल अवरुद्ध अस्थायी रुपमा असक्षम गरिएको छ किनभने तपाईँले अन्तिम ४८ घन्टा भित्र यस फोनबाट आपत्कालीन सेवाहरू सम्पर्क गर्नुभयो। एकपटक ४८ घन्टा अवधि समाप्त भएपछि यो स्वचालित रूपले पुनः सक्रिय हुनेछ।"</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"नम्बरहरू आयात गर्नुहोस्"</string> diff --git a/java/com/android/dialer/app/res/values-nl/strings.xml b/java/com/android/dialer/app/res/values-nl/strings.xml index 3eddbb7e2..54d784b91 100644 --- a/java/com/android/dialer/app/res/values-nl/strings.xml +++ b/java/com/android/dialer/app/res/values-nl/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Oproepen"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Oproepen blokkeren"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Voicemail"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Oproepblokkering tijdelijk uitgeschakeld"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Oproepblokkering is uitgeschakeld omdat je in de afgelopen 48 uur contact met de noodhulpdiensten hebt opgenomen via deze telefoon. De functie wordt automatisch weer ingeschakeld nadat de periode van 48 uur is verstreken."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Nummers importeren"</string> diff --git a/java/com/android/dialer/app/res/values-no/strings.xml b/java/com/android/dialer/app/res/values-no/strings.xml index 4d97dc23a..7a8528e2e 100644 --- a/java/com/android/dialer/app/res/values-no/strings.xml +++ b/java/com/android/dialer/app/res/values-no/strings.xml @@ -199,6 +199,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Anrop"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Anropsblokkering"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Talepost"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokkering av anrop er midlertidig slått av"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blokkering av anrop er slått av fordi du kontaktet nødtjenester fra denne telefonen i løpet av de siste 48 timene. Funksjonen blir automatisk slått på igjen når perioden på 48 timer er utløpt."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importér numre"</string> diff --git a/java/com/android/dialer/app/res/values-pa/strings.xml b/java/com/android/dialer/app/res/values-pa/strings.xml index c8a39f6ae..880eecccd 100644 --- a/java/com/android/dialer/app/res/values-pa/strings.xml +++ b/java/com/android/dialer/app/res/values-pa/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"ਕਾਲਾਂ"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ਕਾਲ ਬਲੌਕ ਕਰਨਾ"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"ਵੌਇਸਮੇਲ"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ਕਾਲ ਬਲੌਕਿੰਗ ਆਰਜ਼ੀ ਤੌਰ ਤੇ ਬੰਦ ਹੈ"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ਕਾਲ ਬਲੌਕਿੰਗ ਅਸਮਰੱਥ ਕਰ ਦਿੱਤੀ ਗਈ ਹੈ ਕਿਉਂਕਿ ਤੁਸੀਂ ਇਸ ਫੋਨ ਦੁਆਰਾ ਪਿਛਲੇ 48 ਘੰਟਿਆਂ ਤੋਂ ਐਮਰਜੈਂਸੀ ਸੇਵਾਵਾਂ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ ਹੋਇਆ ਹੈ। ਇਹ 48 ਘੰਟਿਆਂ ਦਾ ਸਮਾਂ ਪੂਰਾ ਹੋਣ ਤੇੋਂ ਬਾਅਦ ਆਟੋਮੈਟਿਕਲੀ ਮੁੜ-ਸਮਰੱਥ ਹੋ ਜਾਵੇਗੀ।"</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"ਆਯਾਤ ਨੰਬਰ"</string> diff --git a/java/com/android/dialer/app/res/values-pl/strings.xml b/java/com/android/dialer/app/res/values-pl/strings.xml index 452854064..b36d09628 100644 --- a/java/com/android/dialer/app/res/values-pl/strings.xml +++ b/java/com/android/dialer/app/res/values-pl/strings.xml @@ -204,6 +204,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Połączenia"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blokowanie połączeń"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Poczta głosowa"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokada połączeń tymczasowo wyłączona"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blokada połączeń została wyłączona, ponieważ w ciągu ostatnich 48 godzin dzwoniono z tego telefonu na numer alarmowy. Blokada zostanie automatycznie przywrócona po upływie 48 godzin."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Zaimportuj numery"</string> diff --git a/java/com/android/dialer/app/res/values-pt-rBR/strings.xml b/java/com/android/dialer/app/res/values-pt-rBR/strings.xml index 845442a71..9e0eab854 100644 --- a/java/com/android/dialer/app/res/values-pt-rBR/strings.xml +++ b/java/com/android/dialer/app/res/values-pt-rBR/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Chamadas"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bloqueio de chamadas"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Correio de voz"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Bloqueio de chamadas temporiamente desativado"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"O bloqueio de chamadas foi desativado porque você entrou em contato com serviços de emergência usando este telefone nas últimas 48 horas. Ele será reativado automaticamente depois de um período de 48 horas."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importar números"</string> diff --git a/java/com/android/dialer/app/res/values-pt-rPT/strings.xml b/java/com/android/dialer/app/res/values-pt-rPT/strings.xml index 95451bc9d..669d66065 100644 --- a/java/com/android/dialer/app/res/values-pt-rPT/strings.xml +++ b/java/com/android/dialer/app/res/values-pt-rPT/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Chamadas"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bloqueio de chamadas"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Correio de voz"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Bloqueio de chamadas tempor. desativado"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"O bloqueio de chamadas foi desativado porque contactou os serviços de emergência a partir deste telemóvel nas últimas 48 horas. O bloqueio será automaticamente reativado assim que expirar o período de 48 horas."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importar números"</string> diff --git a/java/com/android/dialer/app/res/values-pt/strings.xml b/java/com/android/dialer/app/res/values-pt/strings.xml index 845442a71..9e0eab854 100644 --- a/java/com/android/dialer/app/res/values-pt/strings.xml +++ b/java/com/android/dialer/app/res/values-pt/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Chamadas"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bloqueio de chamadas"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Correio de voz"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Bloqueio de chamadas temporiamente desativado"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"O bloqueio de chamadas foi desativado porque você entrou em contato com serviços de emergência usando este telefone nas últimas 48 horas. Ele será reativado automaticamente depois de um período de 48 horas."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importar números"</string> diff --git a/java/com/android/dialer/app/res/values-ro/strings.xml b/java/com/android/dialer/app/res/values-ro/strings.xml index 36987fe3e..007199d3a 100644 --- a/java/com/android/dialer/app/res/values-ro/strings.xml +++ b/java/com/android/dialer/app/res/values-ro/strings.xml @@ -202,6 +202,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Apeluri"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blocarea apelurilor"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Mesagerie vocală"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blocarea apelurilor e dezactivată temporar"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blocarea apelurilor a fost dezactivată, deoarece ați contactat serviciile de urgență de pe acest telefon în ultimele 48 de ore. Funcția va fi reactivată automat după ce perioada de 48 de ore va expira."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importați numere"</string> diff --git a/java/com/android/dialer/app/res/values-ru/strings.xml b/java/com/android/dialer/app/res/values-ru/strings.xml index 69031b14f..6744592e8 100644 --- a/java/com/android/dialer/app/res/values-ru/strings.xml +++ b/java/com/android/dialer/app/res/values-ru/strings.xml @@ -204,6 +204,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Вызовы"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Блокировка вызовов"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Голосовая почта"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Блокировка вызовов временно отключена"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Блокировка вызовов отключена, поскольку вы недавно набирали номер экстренной службы. Когда с момента звонка пройдет 48 часов, эта функция включится автоматически."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Импортировать номера"</string> diff --git a/java/com/android/dialer/app/res/values-si/strings.xml b/java/com/android/dialer/app/res/values-si/strings.xml index 45ee7d961..4340c0edf 100644 --- a/java/com/android/dialer/app/res/values-si/strings.xml +++ b/java/com/android/dialer/app/res/values-si/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"ඇමතුම්"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ඇමතුම් අවහිර කිරීම"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"හඬ තැපෑල"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ඇමතුම් අවහිර කිරීම තාවකාලිකව අක්රියයි"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ඔබ පසුගිය පැය 48 ඇතුළත මෙම දුරකථනයෙන් හදිසි අවස්ථා සේවා ඇමතූ බැව්න් ඇමතුම් අවහිර කිරීම අබල කර ඇත. පැය 48ක කාල සීමාව ඉකුත් වූ විට එය ස්වයංක්රියව යළි සබල කෙරේ."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"අංක ආයාත කරන්න"</string> diff --git a/java/com/android/dialer/app/res/values-sk/strings.xml b/java/com/android/dialer/app/res/values-sk/strings.xml index 9774a4180..25b8d74c5 100644 --- a/java/com/android/dialer/app/res/values-sk/strings.xml +++ b/java/com/android/dialer/app/res/values-sk/strings.xml @@ -204,6 +204,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Hovory"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blokovanie hovorov"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Hlasová schránka"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokovanie hovorov je dočasne vypnuté"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Pretože ste z tohto telefónu počas posledných 48 hodín volali na tiesňovú linku, blokovanie hovorov bolo vypnuté. Po uplynutí 48 hodín sa automaticky znova zapne."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importovať čísla"</string> diff --git a/java/com/android/dialer/app/res/values-sl/strings.xml b/java/com/android/dialer/app/res/values-sl/strings.xml index 80898e58d..d5a22d5be 100644 --- a/java/com/android/dialer/app/res/values-sl/strings.xml +++ b/java/com/android/dialer/app/res/values-sl/strings.xml @@ -204,6 +204,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Klici"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blokiranje klicev"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Odzivnik"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokiranje klicev je začasno izklopljeno"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blokiranje klicev je onemogočeno, ker ste se v zadnjih 48 urah s tem telefonom obrnili na nujno pomoč. Ko 48-urno obdobje poteče, bo blokiranje klicev samodejno znova omogočeno."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Uvoz številk"</string> 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 ea757a873..cfa84436f 100644 --- a/java/com/android/dialer/app/res/values-sq/strings.xml +++ b/java/com/android/dialer/app/res/values-sq/strings.xml @@ -202,6 +202,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Telefonatat"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bllokimi i telefonatave"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Posta zanore"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Bllokimi i telefonatave është përkohësisht joaktiv"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Bllokimi i telefonatave është çaktivizuar sepse kontaktove me shërbimet e urgjencës nga ky telefon brenda 48 orëve të fundit. Ai do të riaktivizohet automatikisht pas skadimit të periudhës prej 48 orë."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importo numrat"</string> diff --git a/java/com/android/dialer/app/res/values-sr/strings.xml b/java/com/android/dialer/app/res/values-sr/strings.xml index 610f230f7..d8222da95 100644 --- a/java/com/android/dialer/app/res/values-sr/strings.xml +++ b/java/com/android/dialer/app/res/values-sr/strings.xml @@ -202,6 +202,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Позиви"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Блокирање позива"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Говорна пошта"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Блокирање позива је привремено искључено"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Блокирање позива је онемогућено зато што сте контактирали службе за помоћ у хитним случајевима са овог телефона у последњих 48 сати. Аутоматски ће бити поново омогућено када истекне период од 48 сати."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Увези бројеве"</string> diff --git a/java/com/android/dialer/app/res/values-sv/strings.xml b/java/com/android/dialer/app/res/values-sv/strings.xml index c29568ba3..47b215136 100644 --- a/java/com/android/dialer/app/res/values-sv/strings.xml +++ b/java/com/android/dialer/app/res/values-sv/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Samtal"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Samtalsblockering"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Röstbrevlåda"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blockeringen har inaktiverats tillfälligt"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Samtalsblockering har inaktiverats eftersom du ringde ett larmnummer från den här mobilen under de senaste 48 timmarna. Blockeringen aktiveras igen när 48 timmar har gått."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importera nummer"</string> diff --git a/java/com/android/dialer/app/res/values-sw/strings.xml b/java/com/android/dialer/app/res/values-sw/strings.xml index 11f5664d0..1516b9a9c 100644 --- a/java/com/android/dialer/app/res/values-sw/strings.xml +++ b/java/com/android/dialer/app/res/values-sw/strings.xml @@ -202,6 +202,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Simu zilizopigwa"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Kuzuia simu"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Ujumbe wa sauti"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Kuzuia simu kumezimwa kwa muda"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Kipengele cha kuzuia simu kimezimwa kwa sababu uliwasiliana na huduma za dharura kwenye simu hii ndani ya saa 48 zilizopita. Kipengele hiki kitawashwa kiotomatiki baada ya kipindi cha saa 48 kumalizika."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Leta nambari"</string> diff --git a/java/com/android/dialer/app/res/values-ta/strings.xml b/java/com/android/dialer/app/res/values-ta/strings.xml index 795a4e7cb..5a80a2b4a 100644 --- a/java/com/android/dialer/app/res/values-ta/strings.xml +++ b/java/com/android/dialer/app/res/values-ta/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"அழைப்புகள்"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"அழைப்புத் தடுப்பு"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"குரலஞ்சல்"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"அழைப்புத் தடுப்பு அம்சம் தற்காலிகமாக முடக்கப்பட்டுள்ளது"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"கடந்த 48 மணிநேரத்தில், இந்த ஃபோனிலிருந்து அவசர அழைப்பு எண்ணைத் தொடர்புகொண்டதால் அழைப்புத் தடுப்பு அம்சம் முடக்கப்பட்டுள்ளது. 48 மணிநேரம் கழித்து, இந்த அம்சம் தானாகவே மீண்டும் இயக்கப்படும்."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"எண்களை இறக்கு"</string> diff --git a/java/com/android/dialer/app/res/values-te/strings.xml b/java/com/android/dialer/app/res/values-te/strings.xml index 531e20618..aea962527 100644 --- a/java/com/android/dialer/app/res/values-te/strings.xml +++ b/java/com/android/dialer/app/res/values-te/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"కాల్లు"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"కాల్ బ్లాక్ చేయడం"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"వాయిస్ మెయిల్"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"కాల్ బ్లాకింగ్ తాత్కాలికంగా ఆఫ్ అయ్యింది"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"మీరు గత 48 గంటల వ్యవధిలో ఈ ఫోన్ నుండి అత్యవసర సేవలను సంప్రదించినందున కాల్ బ్లాకింగ్ నిలిపివేయబడింది. 48 గంటల వ్యవధి ముగిసిన తర్వాత ఇది స్వయంచాలకంగా పునఃప్రారంభించబడుతుంది."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"నంబర్లను దిగుమతి చేయి"</string> diff --git a/java/com/android/dialer/app/res/values-th/strings.xml b/java/com/android/dialer/app/res/values-th/strings.xml index 0433a6eb4..cecf217a1 100644 --- a/java/com/android/dialer/app/res/values-th/strings.xml +++ b/java/com/android/dialer/app/res/values-th/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"การโทร"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"การบล็อกสายเรียกเข้า"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"ข้อความเสียง"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"การบล็อกสายเรียกเข้าปิดชั่วคราว"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ระบบปิดใช้การบล็อกสายเรียกเข้าเนื่องจากคุณติดต่อบริการฉุกเฉินจากโทรศัพท์เครื่องนี้ภายใน 48 ชั่วโมงที่ผ่านมา ระบบจะเปิดใช้คุณลักษณะนี้อีกครั้งโดยอัตโนมัติเมื่อครบ 48 ชั่วโมง"</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"นำเข้าหมายเลข"</string> diff --git a/java/com/android/dialer/app/res/values-tl/strings.xml b/java/com/android/dialer/app/res/values-tl/strings.xml index 6eb1723ff..d7408cb01 100644 --- a/java/com/android/dialer/app/res/values-tl/strings.xml +++ b/java/com/android/dialer/app/res/values-tl/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Mga Tawag"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Pagba-block ng tawag"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Voicemail"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Pansamantalang na-off ang call blocking"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Na-disable ang pagba-block ng tawag dahil nakipag-ugnayan ka sa mga pang-emergency na serbisyo mula sa teleponong ito sa nakalipas na 48 oras. Awtomatiko itong muling i-enable kapag nag-expire na ang 48 oras."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"I-import ang mga numero"</string> diff --git a/java/com/android/dialer/app/res/values-tr/strings.xml b/java/com/android/dialer/app/res/values-tr/strings.xml index 751286b30..3c92206df 100644 --- a/java/com/android/dialer/app/res/values-tr/strings.xml +++ b/java/com/android/dialer/app/res/values-tr/strings.xml @@ -202,6 +202,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Çağrılar"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Çağrı engelleme"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Sesli mesaj"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Çağrı engelleme geçici olarak kapalı"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Son 48 saat içinde bu telefondan acil servislerle iletişimde bulunduğunuz için çağrı engelleme modu devre dışı bırakıldı. 48 saatlik süre dolduktan sonra çağrı engelleme modu otomatik olarak tekrar etkinleştirilecektir."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Numaraları içe aktar"</string> diff --git a/java/com/android/dialer/app/res/values-uk/strings.xml b/java/com/android/dialer/app/res/values-uk/strings.xml index 0da2ea9f2..5a1dfcc59 100644 --- a/java/com/android/dialer/app/res/values-uk/strings.xml +++ b/java/com/android/dialer/app/res/values-uk/strings.xml @@ -204,6 +204,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Дзвінки"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Блокування викликів"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Голосова пошта"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Блокування дзвінків тимчасово вимкнено"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Блокування дзвінків вимкнено, оскільки ви зверталися з цього телефона в екстрені служби протягом останніх 48 годин. Ця функція автоматично ввімкнеться, коли мине 48 годин."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Імпортувати номери"</string> 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 748e2f210..eec7db062 100644 --- a/java/com/android/dialer/app/res/values-ur/strings.xml +++ b/java/com/android/dialer/app/res/values-ur/strings.xml @@ -202,6 +202,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"کالز"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"کال مسدود کرنا"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"صوتی میل"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"کال مسدود کرنا عارضی طور پر آف ہے"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"کال مسدود کرنا غیر فعال کر دیا گیا ہے کیونکہ آپ نے پچھلے 48 گھنٹوں میں اس فون سے ہنگامی سروسز کے ساتھ رابطہ کیا تھا۔ جب 48 گھنٹے کا دورانیہ ختم ہوگا تو یہ خودکار طور پر دوبارہ فعال ہو جائے گا۔"</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"نمبرز درآمد کریں"</string> diff --git a/java/com/android/dialer/app/res/values-uz/strings.xml b/java/com/android/dialer/app/res/values-uz/strings.xml index a13da4389..2a2b7afba 100644 --- a/java/com/android/dialer/app/res/values-uz/strings.xml +++ b/java/com/android/dialer/app/res/values-uz/strings.xml @@ -202,6 +202,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Chaqiruvlar"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Qo‘ng‘iroqlarni bloklash"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Ovozli pochta"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Qo‘ng‘iroqlarni bloklash o‘chirilgan"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Oxirgi 48 soat ichida ushbu telefon orqali favqulodda xizmatlar bilan bog‘lanilganligi uchun qo‘ng‘iroqlarni bloklash o‘chirib qo‘yildi. 48 soatlik muddat tugagandan so‘ng bu avtomatik qayta yoqiladi."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Raqamlarni import qilish"</string> diff --git a/java/com/android/dialer/app/res/values-vi/strings.xml b/java/com/android/dialer/app/res/values-vi/strings.xml index a95e0683c..9def34a1e 100644 --- a/java/com/android/dialer/app/res/values-vi/strings.xml +++ b/java/com/android/dialer/app/res/values-vi/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Cuộc gọi"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Chặn cuộc gọi"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Thư thoại"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Tạm thời tắt chặn cuộc gọi"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Tính năng chặn cuộc gọi đã bị tắt vì bạn đã liên hệ với dịch vụ khẩn cấp từ điện thoại này trong vòng 48 giờ qua. Tính năng này sẽ được bật lại tự động sau khi khoảng thời gian 48 giờ kết thúc."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Nhập số"</string> diff --git a/java/com/android/dialer/app/res/values-zh-rCN/strings.xml b/java/com/android/dialer/app/res/values-zh-rCN/strings.xml index 6a12a0711..c1b802979 100644 --- a/java/com/android/dialer/app/res/values-zh-rCN/strings.xml +++ b/java/com/android/dialer/app/res/values-zh-rCN/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"通话"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"来电屏蔽"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"语音邮件"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"来电拦截功能已暂时关闭"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"来电拦截功能已停用,因为您在过去 48 小时内使用该手机拨打了紧急服务电话。系统会在 48 小时的期限结束后自动重新启用该功能。"</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"导入号码"</string> diff --git a/java/com/android/dialer/app/res/values-zh-rHK/strings.xml b/java/com/android/dialer/app/res/values-zh-rHK/strings.xml index 12e50fb09..95b72f2b5 100644 --- a/java/com/android/dialer/app/res/values-zh-rHK/strings.xml +++ b/java/com/android/dialer/app/res/values-zh-rHK/strings.xml @@ -199,6 +199,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"通話"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"來電封鎖"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"留言"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"暫時關閉來電封鎖功能"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"您在過去 48 小時內曾經使用此手機聯絡緊急服務,因此來電封鎖功能已停用。系統會在 48 小時期限結束後自動重新啟用功能。"</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"匯入號碼"</string> diff --git a/java/com/android/dialer/app/res/values-zh-rTW/strings.xml b/java/com/android/dialer/app/res/values-zh-rTW/strings.xml index 83d093e55..c846980c1 100644 --- a/java/com/android/dialer/app/res/values-zh-rTW/strings.xml +++ b/java/com/android/dialer/app/res/values-zh-rTW/strings.xml @@ -202,6 +202,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"通話"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"來電封鎖"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"語音留言"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"來電封鎖功能已暫時關閉"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"由於您曾在過去 48 小時內使用這支手機撥打緊急服務電話,因此來電封鎖功能已停用。此功能停用達 48 小時後,將由系統自動重新啟用。"</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"匯入電話號碼"</string> diff --git a/java/com/android/dialer/app/res/values-zu/strings.xml b/java/com/android/dialer/app/res/values-zu/strings.xml index 840d16877..07aa68d24 100644 --- a/java/com/android/dialer/app/res/values-zu/strings.xml +++ b/java/com/android/dialer/app/res/values-zu/strings.xml @@ -200,6 +200,8 @@ <string name="call_settings_label" msgid="7824611757200960807">"Amakholi"</string> <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Ukuvimbela ikholi"</string> <string name="voicemail_settings_label" msgid="4594299554519920570">"Ivoyisimeyili"</string> + <!-- no translation found for voicemail_settings_select_sim_title (129296966967476845) --> + <skip /> <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Ukuvimbela ikholi kuvalwe isikhashana"</string> <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Ukuvimbela ikholi kukhutshaziwe ngoba uxhumane nabosizo oluphuthumayo kusukela kule foni phakathi kwamahora angu-48 wokugcina. Kuzophinda kunikwe amandla ngokuzenzakalela uma sokuphele isikhathi samahora angu-48."</string> <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Ngenisa izinombolo"</string> diff --git a/java/com/android/dialer/app/res/values/strings.xml b/java/com/android/dialer/app/res/values/strings.xml index a4e443dca..174bbe17a 100644 --- a/java/com/android/dialer/app/res/values/strings.xml +++ b/java/com/android/dialer/app/res/values/strings.xml @@ -764,6 +764,9 @@ <!-- Label for the voicemail settings section [CHAR LIMIT=30] --> <string name="voicemail_settings_label">Voicemail</string> + <!-- Title for the preference screen to select which SIM to change voicemail settings for [CHAR LIMIT=30] --> + <string name="voicemail_settings_select_sim_title">Select SIM for voicemail settings</string> + <!-- Label for a section describing that call blocking is temporarily disabled because an emergency call was made. [CHAR LIMIT=50] --> <string name="blocked_numbers_disabled_emergency_header_label"> diff --git a/java/com/android/dialer/app/res/values/styles.xml b/java/com/android/dialer/app/res/values/styles.xml index 3b2df96f2..7adf7ca2c 100644 --- a/java/com/android/dialer/app/res/values/styles.xml +++ b/java/com/android/dialer/app/res/values/styles.xml @@ -142,6 +142,8 @@ <item name="contentInsetEnd">0dp</item> </style> + <style name="DialtactsSearchBarThemeOverlay" parent="ThemeOverlay.AppCompat.Light"/> + <!-- Text in the action bar at the top of the screen --> <style name="DialtactsActionBarTitleText" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title"> diff --git a/java/com/android/dialer/app/settings/DialerSettingsActivity.java b/java/com/android/dialer/app/settings/DialerSettingsActivity.java index ff3841aa1..fae5ff3ee 100644 --- a/java/com/android/dialer/app/settings/DialerSettingsActivity.java +++ b/java/com/android/dialer/app/settings/DialerSettingsActivity.java @@ -24,6 +24,7 @@ import android.os.Bundle; import android.os.UserManager; import android.preference.PreferenceManager; import android.provider.Settings; +import android.support.annotation.Nullable; import android.telecom.PhoneAccount; import android.telecom.PhoneAccountHandle; import android.telecom.TelecomManager; @@ -151,21 +152,57 @@ public class DialerSettingsActivity extends AppCompatPreferenceActivity { return; } - PhoneAccountHandle phoneAccountHandle = - getSystemService(TelecomManager.class) - .getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_TEL); - if (phoneAccountHandle == null) { - LogUtil.e("DialerSettingsActivity.addVoicemailSettings", "phoneAccountHandle is null"); - return; - } LogUtil.i("DialerSettingsActivity.addVoicemailSettings", "adding voicemail settings"); Header voicemailSettings = new Header(); voicemailSettings.titleRes = R.string.voicemail_settings_label; - voicemailSettings.fragment = voicemailSettingsFragment; - Bundle bundle = new Bundle(); - bundle.putParcelable(VoicemailClient.PARAM_PHONE_ACCOUNT_HANDLE, phoneAccountHandle); - voicemailSettings.fragmentArguments = bundle; - target.add(voicemailSettings); + PhoneAccountHandle soleAccount = getSoleSimAccount(); + if (soleAccount == null) { + LogUtil.i( + "DialerSettingsActivity.addVoicemailSettings", "showing multi-SIM voicemail settings"); + voicemailSettings.fragment = PhoneAccountSelectionFragment.class.getName(); + Bundle bundle = new Bundle(); + bundle.putString( + PhoneAccountSelectionFragment.PARAM_TARGET_FRAGMENT, voicemailSettingsFragment); + bundle.putString( + PhoneAccountSelectionFragment.PARAM_PHONE_ACCOUNT_HANDLE_KEY, + VoicemailClient.PARAM_PHONE_ACCOUNT_HANDLE); + bundle.putBundle(PhoneAccountSelectionFragment.PARAM_ARGUMENTS, new Bundle()); + bundle.putInt( + PhoneAccountSelectionFragment.PARAM_TARGET_TITLE_RES, R.string.voicemail_settings_label); + voicemailSettings.fragmentArguments = bundle; + target.add(voicemailSettings); + } else { + LogUtil.i( + "DialerSettingsActivity.addVoicemailSettings", "showing single-SIM voicemail settings"); + voicemailSettings.fragment = voicemailSettingsFragment; + Bundle bundle = new Bundle(); + bundle.putParcelable(VoicemailClient.PARAM_PHONE_ACCOUNT_HANDLE, soleAccount); + voicemailSettings.fragmentArguments = bundle; + target.add(voicemailSettings); + } + } + + /** + * @return the only SIM phone account, or {@code null} if there are none or more than one. Note: + * having a empty SIM slot still count as a PhoneAccountHandle that is "invalid", and + * voicemail settings should still be available for it. + */ + @Nullable + private PhoneAccountHandle getSoleSimAccount() { + TelecomManager telecomManager = getSystemService(TelecomManager.class); + PhoneAccountHandle result = null; + for (PhoneAccountHandle phoneAccountHandle : telecomManager.getCallCapablePhoneAccounts()) { + PhoneAccount phoneAccount = telecomManager.getPhoneAccount(phoneAccountHandle); + if (phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) { + LogUtil.i( + "DialerSettingsActivity.getSoleSimAccount", phoneAccountHandle + " is a SIM account"); + if (result != null) { + return null; + } + result = phoneAccountHandle; + } + } + return result; } /** diff --git a/java/com/android/dialer/app/settings/PhoneAccountSelectionFragment.java b/java/com/android/dialer/app/settings/PhoneAccountSelectionFragment.java new file mode 100644 index 000000000..8fd276724 --- /dev/null +++ b/java/com/android/dialer/app/settings/PhoneAccountSelectionFragment.java @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.dialer.app.settings; + +import android.app.Fragment; +import android.content.Context; +import android.graphics.drawable.Icon; +import android.os.Bundle; +import android.preference.Preference; +import android.preference.PreferenceActivity; +import android.preference.PreferenceFragment; +import android.preference.PreferenceScreen; +import android.support.annotation.VisibleForTesting; +import android.telecom.PhoneAccount; +import android.telecom.PhoneAccountHandle; +import android.telecom.TelecomManager; +import java.util.List; + +/** + * Preference screen that lists SIM phone accounts to select from, and forwards the selected account + * to {@link #PARAM_TARGET_FRAGMENT}. Can only be used in a {@link PreferenceActivity} + */ +public class PhoneAccountSelectionFragment extends PreferenceFragment { + + /** The {@link PreferenceFragment} to launch after the account is selected. */ + public static final String PARAM_TARGET_FRAGMENT = "target_fragment"; + + /** + * The arguments bundle to pass to the {@link #PARAM_TARGET_FRAGMENT} + * + * @see Fragment#getArguments() + */ + public static final String PARAM_ARGUMENTS = "arguments"; + + /** + * The key to insert the selected {@link PhoneAccountHandle} to bundle in {@link #PARAM_ARGUMENTS} + */ + public static final String PARAM_PHONE_ACCOUNT_HANDLE_KEY = "phone_account_handle_key"; + + /** + * The title of the {@link #PARAM_TARGET_FRAGMENT} once it is launched with {@link + * PreferenceActivity#startWithFragment(String, Bundle, Fragment, int)}, as a string resource ID. + */ + public static final String PARAM_TARGET_TITLE_RES = "target_title_res"; + + private String targetFragment; + private Bundle arguments; + private String phoneAccountHandleKey; + private int titleRes; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + targetFragment = getArguments().getString(PARAM_TARGET_FRAGMENT); + arguments = new Bundle(); + arguments.putAll(getArguments().getBundle(PARAM_ARGUMENTS)); + phoneAccountHandleKey = getArguments().getString(PARAM_PHONE_ACCOUNT_HANDLE_KEY); + titleRes = getArguments().getInt(PARAM_TARGET_TITLE_RES, 0); + } + + final class AccountPreference extends Preference { + private final PhoneAccountHandle phoneAccountHandle; + + public AccountPreference( + Context context, PhoneAccountHandle phoneAccountHandle, PhoneAccount phoneAccount) { + super(context); + this.phoneAccountHandle = phoneAccountHandle; + setTitle(phoneAccount.getLabel()); + setSummary(phoneAccount.getShortDescription()); + Icon icon = phoneAccount.getIcon(); + if (icon != null) { + setIcon(icon.loadDrawable(context)); + } + } + + @VisibleForTesting + void click() { + onClick(); + } + + @Override + protected void onClick() { + super.onClick(); + PreferenceActivity preferenceActivity = (PreferenceActivity) getActivity(); + arguments.putParcelable(phoneAccountHandleKey, phoneAccountHandle); + preferenceActivity.startWithFragment(targetFragment, arguments, null, 0, titleRes, 0); + } + } + + @Override + public void onResume() { + super.onResume(); + setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getContext())); + PreferenceScreen screen = getPreferenceScreen(); + + TelecomManager telecomManager = getContext().getSystemService(TelecomManager.class); + + List<PhoneAccountHandle> accountHandles = telecomManager.getCallCapablePhoneAccounts(); + + Context context = getActivity(); + for (PhoneAccountHandle handle : accountHandles) { + PhoneAccount account = telecomManager.getPhoneAccount(handle); + if (account != null) { + final boolean isSimAccount = + 0 != (account.getCapabilities() & PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION); + if (isSimAccount) { + screen.addPreference(new AccountPreference(context, handle, account)); + } + } + } + } +} diff --git a/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java b/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java index 078a40a82..a7ef4f43a 100644 --- a/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java +++ b/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java @@ -22,14 +22,15 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.os.Build.VERSION_CODES; +import android.preference.PreferenceManager; import android.support.v4.os.BuildCompat; -import android.telecom.PhoneAccount; +import android.support.v4.os.UserManagerCompat; import android.telecom.PhoneAccountHandle; -import android.telecom.TelecomManager; import android.telephony.TelephonyManager; import com.android.dialer.app.calllog.DefaultVoicemailNotifier; import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; +import com.android.dialer.common.PerAccountSharedPreferences; import com.android.voicemail.VoicemailComponent; /** @@ -40,6 +41,8 @@ import com.android.voicemail.VoicemailComponent; @TargetApi(VERSION_CODES.O) public class LegacyVoicemailNotificationReceiver extends BroadcastReceiver { + private static final String LEGACY_VOICEMAIL_COUNT = "legacy_voicemail_count"; + @Override public void onReceive(Context context, Intent intent) { LogUtil.i( @@ -47,31 +50,47 @@ public class LegacyVoicemailNotificationReceiver extends BroadcastReceiver { Assert.checkArgument(BuildCompat.isAtLeastO()); PhoneAccountHandle phoneAccountHandle = - intent.getParcelableExtra(TelephonyManager.EXTRA_PHONE_ACCOUNT_HANDLE); - if (phoneAccountHandle == null) { - // TODO: assert instead after API has landed. - phoneAccountHandle = - context - .getSystemService(TelecomManager.class) - .getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_VOICEMAIL); - } - if (VoicemailComponent.get(context) - .getVoicemailClient() - .isActivated(context, phoneAccountHandle)) { + Assert.isNotNull(intent.getParcelableExtra(TelephonyManager.EXTRA_PHONE_ACCOUNT_HANDLE)); + + // Carrier might not send voicemail count. Missing extra means there are unknown numbers of + // voicemails (One or more). Treat it as 1 so the generic version will be shown. ("Voicemail" + // instead of "X voicemails") + int count = intent.getIntExtra(TelephonyManager.EXTRA_NOTIFICATION_COUNT, 1); + + // Need credential encrypted storage to access preferences. + if (UserManagerCompat.isUserUnlocked(context)) { + PerAccountSharedPreferences preferences = + new PerAccountSharedPreferences( + context, phoneAccountHandle, PreferenceManager.getDefaultSharedPreferences(context)); + // Carriers may send multiple notifications for the same voicemail. + if (count != 0 && count == preferences.getInt(LEGACY_VOICEMAIL_COUNT, -1)) { + LogUtil.i( + "LegacyVoicemailNotificationReceiver.onReceive", + "voicemail count hasn't changed, ignoring"); + return; + } + preferences.edit().putInt(LEGACY_VOICEMAIL_COUNT, count).apply(); + } else { LogUtil.i( "LegacyVoicemailNotificationReceiver.onReceive", - "visual voicemail is activated, ignoring notification"); - return; + "User locked, bypassing voicemail count check"); } - // Missing extra means there are unknown numbers of voicemails. - int count = intent.getIntExtra(TelephonyManager.EXTRA_NOTIFICATION_COUNT, 1); if (count == 0) { LogUtil.i("LegacyVoicemailNotificationReceiver.onReceive", "clearing notification"); DefaultVoicemailNotifier.getInstance(context).cancelLegacyNotification(); return; } + if (VoicemailComponent.get(context) + .getVoicemailClient() + .isActivated(context, phoneAccountHandle)) { + LogUtil.i( + "LegacyVoicemailNotificationReceiver.onReceive", + "visual voicemail is activated, ignoring notification"); + return; + } + String voicemailNumber = intent.getStringExtra(TelephonyManager.EXTRA_VOICEMAIL_NUMBER); PendingIntent callVoicemailIntent = intent.getParcelableExtra(TelephonyManager.EXTRA_CALL_VOICEMAIL_INTENT); diff --git a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java index 5ac487b2d..524873f6d 100644 --- a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java +++ b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java @@ -847,6 +847,9 @@ public class VoicemailPlaybackPresenter } private void showShareVoicemailButton(boolean show) { + if (mContext == null) { + return; + } if (isShareVoicemailAllowed(mContext) && shareVoicemailButtonView != null) { if (show) { Logger.get(mContext).logImpression(DialerImpression.Type.VVM_SHARE_VISIBLE); diff --git a/java/com/android/dialer/app/widget/ActionBarController.java b/java/com/android/dialer/app/widget/ActionBarController.java index d0eb326ab..c1b4cc2b4 100644 --- a/java/com/android/dialer/app/widget/ActionBarController.java +++ b/java/com/android/dialer/app/widget/ActionBarController.java @@ -49,6 +49,20 @@ public class ActionBarController { } }; + private final AnimationCallback mFadeInCallback = + new AnimationCallback() { + @Override + public void onAnimationEnd() { + slideActionBar(false /* slideUp */, false /* animate */); + } + + @Override + public void onAnimationCancel() { + slideActionBar(false /* slideUp */, false /* animate */); + } + }; + private ValueAnimator mAnimator; + public ActionBarController(ActivityUi activityUi, SearchEditTextLayout searchBox) { mActivityUi = activityUi; mSearchBox = searchBox; @@ -107,7 +121,7 @@ public class ActionBarController { } slideActionBar(false /* slideUp */, true /* animate */); } else { - mSearchBox.fadeIn(); + mSearchBox.fadeIn(mFadeInCallback); } } } @@ -129,14 +143,18 @@ public class ActionBarController { public void slideActionBar(boolean slideUp, boolean animate) { LogUtil.d("ActionBarController.slidingActionBar", "up: %b, animate: %b", slideUp, animate); + if (mAnimator != null && mAnimator.isRunning()) { + mAnimator.cancel(); + mAnimator.removeAllUpdateListeners(); + } if (animate) { - ValueAnimator animator = slideUp ? ValueAnimator.ofFloat(0, 1) : ValueAnimator.ofFloat(1, 0); - animator.addUpdateListener( + mAnimator = slideUp ? ValueAnimator.ofFloat(0, 1) : ValueAnimator.ofFloat(1, 0); + mAnimator.addUpdateListener( animation -> { final float value = (float) animation.getAnimatedValue(); setHideOffset((int) (mActivityUi.getActionBarHeight() * value)); }); - animator.start(); + mAnimator.start(); } else { setHideOffset(slideUp ? mActivityUi.getActionBarHeight() : 0); } @@ -147,8 +165,7 @@ public class ActionBarController { mSearchBox.animate().alpha(alphaValue).start(); } - public void setHideOffset(int offset) { - mIsActionBarSlidUp = offset >= mActivityUi.getActionBarHeight(); + private void setHideOffset(int offset) { mActivityUi.setActionBarHideOffset(offset); } diff --git a/java/com/android/dialer/app/widget/SearchEditTextLayout.java b/java/com/android/dialer/app/widget/SearchEditTextLayout.java index be850f9a0..f83c48288 100644 --- a/java/com/android/dialer/app/widget/SearchEditTextLayout.java +++ b/java/com/android/dialer/app/widget/SearchEditTextLayout.java @@ -95,11 +95,11 @@ public class SearchEditTextLayout extends FrameLayout { // Convert a long click into a click to expand the search box, and then long click on the // search view. This accelerates the long-press scenario for copy/paste. - mCollapsedSearchBox.setOnLongClickListener( + mCollapsed.setOnLongClickListener( new OnLongClickListener() { @Override public boolean onLongClick(View view) { - mCollapsedSearchBox.performClick(); + mCollapsed.performClick(); mSearchView.performLongClick(); return false; } @@ -188,6 +188,11 @@ public class SearchEditTextLayout extends FrameLayout { mIsFadedOut = false; } + public void fadeIn(AnimUtils.AnimationCallback callback) { + AnimUtils.fadeIn(this, ANIMATION_DURATION, AnimUtils.NO_DELAY, callback); + mIsFadedOut = false; + } + public void setVisible(boolean visible) { if (visible) { setAlpha(1); |