query(int type) {
if (!PermissionsUtil.hasPermission(mContext, Manifest.permission.READ_CALL_LOG)) {
- LogUtil.w(TAG, "No READ_CALL_LOG permission, returning null for calls lookup.");
+ LogUtil.w(
+ "CallLogNotificationsQueryHelper.DefaultNewCallsQuery.query",
+ "no READ_CALL_LOG permission, returning null for calls lookup.");
return null;
}
final String selection = String.format("%s = 1 AND %s = ?", Calls.NEW, Calls.TYPE);
@@ -302,7 +316,9 @@ public class CallLogNotificationsQueryHelper {
}
return newCalls;
} catch (RuntimeException e) {
- LogUtil.w(TAG, "Exception when querying Contacts Provider for calls lookup");
+ LogUtil.w(
+ "CallLogNotificationsQueryHelper.DefaultNewCallsQuery.query",
+ "exception when querying Contacts Provider for calls lookup");
return null;
}
}
diff --git a/java/com/android/dialer/app/calllog/CallLogNotificationsService.java b/java/com/android/dialer/app/calllog/CallLogNotificationsService.java
index 7dfd2cb69967548463423dd2999220f28baf9741..be1ebfb6ddc4e64f3cfdd09758808177df12fb33 100644
--- a/java/com/android/dialer/app/calllog/CallLogNotificationsService.java
+++ b/java/com/android/dialer/app/calllog/CallLogNotificationsService.java
@@ -17,12 +17,13 @@
package com.android.dialer.app.calllog;
import android.app.IntentService;
+import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
-import android.os.Handler;
-import android.os.Looper;
+import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
import com.android.dialer.common.LogUtil;
import com.android.dialer.telecom.TelecomUtil;
import com.android.dialer.util.PermissionsUtil;
@@ -43,16 +44,20 @@ import com.android.dialer.util.PermissionsUtil;
*/
public class CallLogNotificationsService extends IntentService {
- /** Action to mark all the new voicemails as old. */
- public static final String ACTION_MARK_NEW_VOICEMAILS_AS_OLD =
- "com.android.dialer.calllog.ACTION_MARK_NEW_VOICEMAILS_AS_OLD";
+ private static final String ACTION_MARK_ALL_NEW_VOICEMAILS_AS_OLD =
+ "com.android.dialer.calllog.ACTION_MARK_ALL_NEW_VOICEMAILS_AS_OLD";
- /** Action to mark all the new missed calls as old. */
- public static final String ACTION_MARK_NEW_MISSED_CALLS_AS_OLD =
- "com.android.dialer.calllog.ACTION_MARK_NEW_MISSED_CALLS_AS_OLD";
+ private static final String ACTION_MARK_SINGLE_NEW_VOICEMAIL_AS_OLD =
+ "com.android.dialer.calllog.ACTION_MARK_SINGLE_NEW_VOICEMAIL_AS_OLD ";
- /** Action to update missed call notifications with a post call note. */
- public static final String ACTION_INCOMING_POST_CALL =
+ @VisibleForTesting
+ static final String ACTION_CANCEL_ALL_MISSED_CALLS =
+ "com.android.dialer.calllog.ACTION_CANCEL_ALL_MISSED_CALLS";
+
+ private static final String ACTION_CANCEL_SINGLE_MISSED_CALL =
+ "com.android.dialer.calllog.ACTION_CANCEL_SINGLE_MISSED_CALL";
+
+ private static final String ACTION_INCOMING_POST_CALL =
"com.android.dialer.calllog.INCOMING_POST_CALL";
/** Action to call back a missed call. */
@@ -64,7 +69,7 @@ public class CallLogNotificationsService extends IntentService {
*
* It must be a {@link String}
*/
- public static final String EXTRA_POST_CALL_NOTE = "POST_CALL_NOTE";
+ private static final String EXTRA_POST_CALL_NOTE = "POST_CALL_NOTE";
/**
* Extra to be included with {@link #ACTION_INCOMING_POST_CALL} to represent the phone number the
@@ -72,10 +77,9 @@ public class CallLogNotificationsService extends IntentService {
*
*
It must be a {@link String}
*/
- public static final String EXTRA_POST_CALL_NUMBER = "POST_CALL_NUMBER";
+ private static final String EXTRA_POST_CALL_NUMBER = "POST_CALL_NUMBER";
public static final int UNKNOWN_MISSED_CALL_COUNT = -1;
- private VoicemailQueryHandler mVoicemailQueryHandler;
public CallLogNotificationsService() {
super("CallLogNotificationsService");
@@ -89,52 +93,95 @@ public class CallLogNotificationsService extends IntentService {
context.startService(serviceIntent);
}
- public static void markNewVoicemailsAsOld(Context context, @Nullable Uri voicemailUri) {
+ public static void markAllNewVoicemailsAsOld(Context context) {
+ LogUtil.enterBlock("CallLogNotificationsService.markAllNewVoicemailsAsOld");
Intent serviceIntent = new Intent(context, CallLogNotificationsService.class);
- serviceIntent.setAction(CallLogNotificationsService.ACTION_MARK_NEW_VOICEMAILS_AS_OLD);
+ serviceIntent.setAction(CallLogNotificationsService.ACTION_MARK_ALL_NEW_VOICEMAILS_AS_OLD);
+ context.startService(serviceIntent);
+ }
+
+ public static void markSingleNewVoicemailAsOld(Context context, @Nullable Uri voicemailUri) {
+ LogUtil.enterBlock("CallLogNotificationsService.markSingleNewVoicemailAsOld");
+ Intent serviceIntent = new Intent(context, CallLogNotificationsService.class);
+ serviceIntent.setAction(CallLogNotificationsService.ACTION_MARK_SINGLE_NEW_VOICEMAIL_AS_OLD);
serviceIntent.setData(voicemailUri);
context.startService(serviceIntent);
}
- public static void markNewMissedCallsAsOld(Context context, @Nullable Uri callUri) {
+ public static PendingIntent createMarkAllNewVoicemailsAsOldIntent(@NonNull Context context) {
+ Intent intent = new Intent(context, CallLogNotificationsService.class);
+ intent.setAction(CallLogNotificationsService.ACTION_MARK_ALL_NEW_VOICEMAILS_AS_OLD);
+ return PendingIntent.getService(context, 0, intent, 0);
+ }
+
+ public static PendingIntent createMarkSingleNewVoicemailAsOldIntent(
+ @NonNull Context context, @Nullable Uri voicemailUri) {
+ Intent intent = new Intent(context, CallLogNotificationsService.class);
+ intent.setAction(CallLogNotificationsService.ACTION_MARK_SINGLE_NEW_VOICEMAIL_AS_OLD);
+ intent.setData(voicemailUri);
+ return PendingIntent.getService(context, 0, intent, 0);
+ }
+
+ public static void cancelAllMissedCalls(@NonNull Context context) {
+ LogUtil.enterBlock("CallLogNotificationsService.cancelAllMissedCalls");
Intent serviceIntent = new Intent(context, CallLogNotificationsService.class);
- serviceIntent.setAction(ACTION_MARK_NEW_MISSED_CALLS_AS_OLD);
- serviceIntent.setData(callUri);
+ serviceIntent.setAction(ACTION_CANCEL_ALL_MISSED_CALLS);
context.startService(serviceIntent);
}
+ public static PendingIntent createCancelAllMissedCallsPendingIntent(@NonNull Context context) {
+ Intent intent = new Intent(context, CallLogNotificationsService.class);
+ intent.setAction(ACTION_CANCEL_ALL_MISSED_CALLS);
+ return PendingIntent.getService(context, 0, intent, 0);
+ }
+
+ public static PendingIntent createCancelSingleMissedCallPendingIntent(
+ @NonNull Context context, @Nullable Uri callUri) {
+ Intent intent = new Intent(context, CallLogNotificationsService.class);
+ intent.setAction(ACTION_CANCEL_SINGLE_MISSED_CALL);
+ intent.setData(callUri);
+ return PendingIntent.getService(context, 0, intent, 0);
+ }
+
@Override
protected void onHandleIntent(Intent intent) {
if (intent == null) {
- LogUtil.d("CallLogNotificationsService.onHandleIntent", "could not handle null intent");
+ LogUtil.e("CallLogNotificationsService.onHandleIntent", "could not handle null intent");
return;
}
- if (!PermissionsUtil.hasPermission(this, android.Manifest.permission.READ_CALL_LOG)) {
+ if (!PermissionsUtil.hasPermission(this, android.Manifest.permission.READ_CALL_LOG)
+ || !PermissionsUtil.hasPermission(this, android.Manifest.permission.WRITE_CALL_LOG)) {
+ LogUtil.e("CallLogNotificationsService.onHandleIntent", "no READ_CALL_LOG permission");
return;
}
String action = intent.getAction();
+ LogUtil.i("CallLogNotificationsService.onHandleIntent", "action: " + action);
switch (action) {
- case ACTION_MARK_NEW_VOICEMAILS_AS_OLD:
- // VoicemailQueryHandler cannot be created on the IntentService worker thread. The completed
- // callback might happen when the thread is dead.
- Handler handler = new Handler(Looper.getMainLooper());
- handler.post(
- () -> {
- if (mVoicemailQueryHandler == null) {
- mVoicemailQueryHandler = new VoicemailQueryHandler(this, getContentResolver());
- }
- mVoicemailQueryHandler.markNewVoicemailsAsOld(intent.getData());
- });
+ case ACTION_MARK_ALL_NEW_VOICEMAILS_AS_OLD:
+ VoicemailQueryHandler.markAllNewVoicemailsAsRead(this);
+ VisualVoicemailNotifier.cancelAllVoicemailNotifications(this);
+ break;
+ case ACTION_MARK_SINGLE_NEW_VOICEMAIL_AS_OLD:
+ Uri voicemailUri = intent.getData();
+ VoicemailQueryHandler.markSingleNewVoicemailAsRead(this, voicemailUri);
+ VisualVoicemailNotifier.cancelSingleVoicemailNotification(this, voicemailUri);
break;
case ACTION_INCOMING_POST_CALL:
String note = intent.getStringExtra(EXTRA_POST_CALL_NOTE);
String phoneNumber = intent.getStringExtra(EXTRA_POST_CALL_NUMBER);
MissedCallNotifier.getIstance(this).insertPostCallNotification(phoneNumber, note);
break;
- case ACTION_MARK_NEW_MISSED_CALLS_AS_OLD:
- CallLogNotificationsQueryHelper.removeMissedCallNotifications(this, intent.getData());
+ case ACTION_CANCEL_ALL_MISSED_CALLS:
+ CallLogNotificationsQueryHelper.markAllMissedCallsInCallLogAsRead(this);
+ MissedCallNotifier.cancelAllMissedCallNotifications(this);
+ TelecomUtil.cancelMissedCallsNotification(this);
+ break;
+ case ACTION_CANCEL_SINGLE_MISSED_CALL:
+ Uri callUri = intent.getData();
+ CallLogNotificationsQueryHelper.markSingleMissedCallInCallLogAsRead(this, callUri);
+ MissedCallNotifier.cancelSingleMissedCallNotification(this, callUri);
TelecomUtil.cancelMissedCallsNotification(this);
break;
case ACTION_CALL_BACK_FROM_MISSED_CALL_NOTIFICATION:
@@ -145,7 +192,7 @@ public class CallLogNotificationsService extends IntentService {
intent.getData());
break;
default:
- LogUtil.d("CallLogNotificationsService.onHandleIntent", "could not handle: " + intent);
+ LogUtil.e("CallLogNotificationsService.onHandleIntent", "no handler for action: " + action);
break;
}
}
diff --git a/java/com/android/dialer/app/calllog/CallLogReceiver.java b/java/com/android/dialer/app/calllog/CallLogReceiver.java
index 172d001006b7a68135c72eeb1030f91b1be41f24..ce3132d126f384d6113b1c1e6f6b35537e603c4b 100644
--- a/java/com/android/dialer/app/calllog/CallLogReceiver.java
+++ b/java/com/android/dialer/app/calllog/CallLogReceiver.java
@@ -39,10 +39,10 @@ public class CallLogReceiver extends BroadcastReceiver {
if (VoicemailContract.ACTION_NEW_VOICEMAIL.equals(intent.getAction())) {
checkVoicemailStatus(context);
PendingResult pendingResult = goAsync();
- DefaultVoicemailNotifier.updateVoicemailNotifications(context, pendingResult::finish);
+ VisualVoicemailUpdateTask.scheduleTask(context, pendingResult::finish);
} else if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
PendingResult pendingResult = goAsync();
- DefaultVoicemailNotifier.updateVoicemailNotifications(context, pendingResult::finish);
+ VisualVoicemailUpdateTask.scheduleTask(context, pendingResult::finish);
} else {
LogUtil.w("CallLogReceiver.onReceive", "could not handle: " + intent);
}
diff --git a/java/com/android/dialer/app/calllog/ClearCallLogDialog.java b/java/com/android/dialer/app/calllog/ClearCallLogDialog.java
index a01b895274d7187c0a43b1605d3eadd593101b94..155a9161870ff9e028c7b1c890b81efddb0bb079 100644
--- a/java/com/android/dialer/app/calllog/ClearCallLogDialog.java
+++ b/java/com/android/dialer/app/calllog/ClearCallLogDialog.java
@@ -54,7 +54,7 @@ public class ClearCallLogDialog extends DialogFragment {
ProgressDialog.show(
getActivity(), getString(R.string.clearCallLogProgress_title), "", true, false);
progressDialog.setOwnerActivity(getActivity());
- CallLogNotificationsService.markNewMissedCallsAsOld(getContext(), null);
+ CallLogNotificationsService.cancelAllMissedCalls(getContext());
final AsyncTask task =
new AsyncTask() {
@Override
diff --git a/java/com/android/dialer/app/calllog/DefaultVoicemailNotifier.java b/java/com/android/dialer/app/calllog/DefaultVoicemailNotifier.java
deleted file mode 100644
index 1f45f70863df361097a69f4f3bd9bd0598e7f1f6..0000000000000000000000000000000000000000
--- a/java/com/android/dialer/app/calllog/DefaultVoicemailNotifier.java
+++ /dev/null
@@ -1,451 +0,0 @@
-/*
- * Copyright (C) 2011 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.calllog;
-
-import android.annotation.TargetApi;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
-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;
-import android.telecom.PhoneAccountHandle;
-import android.telecom.TelecomManager;
-import android.telephony.CarrierConfigManager;
-import android.telephony.PhoneNumberUtils;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import android.util.ArrayMap;
-import com.android.contacts.common.compat.TelephonyManagerCompat;
-import com.android.contacts.common.util.ContactDisplayUtils;
-import com.android.dialer.app.DialtactsActivity;
-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;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.common.concurrent.DialerExecutor.Worker;
-import com.android.dialer.common.concurrent.DialerExecutors;
-import com.android.dialer.logging.DialerImpression;
-import com.android.dialer.logging.Logger;
-import com.android.dialer.notification.NotificationChannelManager;
-import com.android.dialer.notification.NotificationChannelManager.Channel;
-import com.android.dialer.phonenumbercache.ContactInfo;
-import com.android.dialer.telecom.TelecomUtil;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/** Shows a voicemail notification in the status bar. */
-public class DefaultVoicemailNotifier implements Worker {
-
- public static final String TAG = "VoicemailNotifier";
-
- /** The tag used to identify notifications from this class. */
- static final String VISUAL_VOICEMAIL_NOTIFICATION_TAG = "DefaultVoicemailNotifier";
- /** The identifier of the notification of new voicemails. */
- private static final int VISUAL_VOICEMAIL_NOTIFICATION_ID = R.id.notification_visual_voicemail;
-
- private static final int LEGACY_VOICEMAIL_NOTIFICATION_ID = R.id.notification_legacy_voicemail;
- private static final String LEGACY_VOICEMAIL_NOTIFICATION_TAG = "legacy_voicemail";
-
- private final Context context;
- private final CallLogNotificationsQueryHelper queryHelper;
- private final FilteredNumberAsyncQueryHandler filteredNumberAsyncQueryHandler;
-
- @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
- DefaultVoicemailNotifier(
- Context context,
- CallLogNotificationsQueryHelper queryHelper,
- FilteredNumberAsyncQueryHandler filteredNumberAsyncQueryHandler) {
- this.context = context;
- this.queryHelper = queryHelper;
- this.filteredNumberAsyncQueryHandler = filteredNumberAsyncQueryHandler;
- }
-
- public DefaultVoicemailNotifier(Context context) {
- this(
- context,
- CallLogNotificationsQueryHelper.getInstance(context),
- new FilteredNumberAsyncQueryHandler(context));
- }
-
- @Nullable
- @Override
- public Void doInBackground(@Nullable Void input) throws Throwable {
- updateNotification();
- return null;
- }
-
- /**
- * Updates the notification and notifies of the call with the given URI.
- *
- * Clears the notification if there are no new voicemails, and notifies if the given URI
- * corresponds to a new voicemail.
- *
- *
It is not safe to call this method from the main thread.
- */
- @VisibleForTesting
- @WorkerThread
- void updateNotification() {
- Assert.isWorkerThread();
- // Lookup the list of new voicemails to include in the notification.
- final List newCalls = queryHelper.getNewVoicemails();
-
- if (newCalls == null) {
- // Query failed, just return.
- return;
- }
-
- Resources resources = context.getResources();
-
- // This represents a list of names to include in the notification.
- String callers = null;
-
- // Maps each number into a name: if a number is in the map, it has already left a more
- // recent voicemail.
- final Map contactInfos = new ArrayMap<>();
-
- // Iterate over the new voicemails to determine all the information above.
- Iterator itr = newCalls.iterator();
- while (itr.hasNext()) {
- NewCall newCall = itr.next();
-
- // Skip notifying for numbers which are blocked.
- if (!FilteredNumbersUtil.hasRecentEmergencyCall(context)
- && filteredNumberAsyncQueryHandler.getBlockedIdSynchronous(
- newCall.number, newCall.countryIso)
- != null) {
- itr.remove();
-
- if (newCall.voicemailUri != null) {
- // Delete the voicemail.
- CallLogAsyncTaskUtil.deleteVoicemailSynchronous(context, newCall.voicemailUri);
- }
- continue;
- }
-
- // Check if we already know the name associated with this number.
- ContactInfo contactInfo = contactInfos.get(newCall.number);
- if (contactInfo == null) {
- contactInfo =
- queryHelper.getContactInfo(
- newCall.number, newCall.numberPresentation, newCall.countryIso);
- contactInfos.put(newCall.number, contactInfo);
- // This is a new caller. Add it to the back of the list of callers.
- if (TextUtils.isEmpty(callers)) {
- callers = contactInfo.name;
- } else {
- callers =
- resources.getString(
- R.string.notification_voicemail_callers_list, callers, contactInfo.name);
- }
- }
- }
-
- if (newCalls.isEmpty()) {
- // No voicemails to notify about
- return;
- }
-
- Notification.Builder groupSummary =
- createNotificationBuilder()
- .setContentTitle(
- resources.getQuantityString(
- R.plurals.notification_voicemail_title, newCalls.size(), newCalls.size()))
- .setContentText(callers)
- .setDeleteIntent(createMarkNewVoicemailsAsOldIntent(null))
- .setGroupSummary(true)
- .setContentIntent(newVoicemailIntent(null));
-
- if (BuildCompat.isAtLeastO()) {
- groupSummary.setGroupAlertBehavior(Notification.GROUP_ALERT_CHILDREN);
- }
-
- NotificationChannelManager.applyChannel(
- groupSummary,
- context,
- Channel.VOICEMAIL,
- PhoneAccountHandles.getAccount(context, newCalls.get(0)));
-
- LogUtil.i(TAG, "Creating visual voicemail notification");
- getNotificationManager()
- .notify(
- VISUAL_VOICEMAIL_NOTIFICATION_TAG,
- VISUAL_VOICEMAIL_NOTIFICATION_ID,
- groupSummary.build());
-
- for (NewCall voicemail : newCalls) {
- getNotificationManager()
- .notify(
- voicemail.callsUri.toString(),
- VISUAL_VOICEMAIL_NOTIFICATION_ID,
- createNotificationForVoicemail(voicemail, contactInfos));
- }
- }
-
- /**
- * Replicates how packages/services/Telephony/NotificationMgr.java handles legacy voicemail
- * notification. The notification will not be stackable because no information is available for
- * individual voicemails.
- */
- @TargetApi(VERSION_CODES.O)
- public void notifyLegacyVoicemail(
- @NonNull PhoneAccountHandle phoneAccountHandle,
- int count,
- String voicemailNumber,
- PendingIntent callVoicemailIntent,
- PendingIntent voicemailSettingIntent,
- boolean isRefresh) {
- Assert.isNotNull(phoneAccountHandle);
- Assert.checkArgument(BuildCompat.isAtLeastO());
- TelephonyManager telephonyManager =
- context
- .getSystemService(TelephonyManager.class)
- .createForPhoneAccountHandle(phoneAccountHandle);
- if (telephonyManager == null) {
- LogUtil.e(TAG, "invalid PhoneAccountHandle, ignoring");
- return;
- }
- LogUtil.i(TAG, "Creating legacy voicemail notification");
-
- PersistableBundle carrierConfig = telephonyManager.getCarrierConfig();
-
- String notificationTitle =
- context
- .getResources()
- .getQuantityString(R.plurals.notification_voicemail_title, count, count);
-
- TelecomManager telecomManager = context.getSystemService(TelecomManager.class);
- PhoneAccount phoneAccount = telecomManager.getPhoneAccount(phoneAccountHandle);
-
- String notificationText;
- PendingIntent pendingIntent;
-
- if (voicemailSettingIntent != null) {
- // If the voicemail number if unknown, instead of calling voicemail, take the user
- // to the voicemail settings.
- notificationText = context.getString(R.string.notification_voicemail_no_vm_number);
- pendingIntent = voicemailSettingIntent;
- } else {
- if (PhoneAccountUtils.getSubscriptionPhoneAccounts(context).size() > 1) {
- notificationText = phoneAccount.getShortDescription().toString();
- } else {
- notificationText =
- String.format(
- context.getString(R.string.notification_voicemail_text_format),
- PhoneNumberUtils.formatNumber(voicemailNumber));
- }
- pendingIntent = callVoicemailIntent;
- }
- Notification.Builder builder = new Notification.Builder(context);
- builder
- .setSmallIcon(android.R.drawable.stat_notify_voicemail)
- .setColor(context.getColor(R.color.dialer_theme_color))
- .setWhen(System.currentTimeMillis())
- .setContentTitle(notificationTitle)
- .setContentText(notificationText)
- .setContentIntent(pendingIntent)
- .setSound(telephonyManager.getVoicemailRingtoneUri(phoneAccountHandle))
- .setOngoing(
- carrierConfig.getBoolean(
- CarrierConfigManager.KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL))
- .setOnlyAlertOnce(isRefresh);
-
- if (telephonyManager.isVoicemailVibrationEnabled(phoneAccountHandle)) {
- builder.setDefaults(Notification.DEFAULT_VIBRATE);
- }
-
- NotificationChannelManager.applyChannel(
- builder, context, Channel.VOICEMAIL, phoneAccountHandle);
- Notification notification = builder.build();
- getNotificationManager()
- .notify(LEGACY_VOICEMAIL_NOTIFICATION_TAG, LEGACY_VOICEMAIL_NOTIFICATION_ID, notification);
- }
-
- public void cancelLegacyNotification() {
- LogUtil.i(TAG, "Clearing legacy voicemail notification");
- getNotificationManager()
- .cancel(LEGACY_VOICEMAIL_NOTIFICATION_TAG, LEGACY_VOICEMAIL_NOTIFICATION_ID);
- }
-
- /**
- * Determines which ringtone Uri and Notification defaults to use when updating the notification
- * for the given call.
- */
- private Pair getNotificationInfo(@Nullable NewCall callToNotify) {
- LogUtil.v(TAG, "getNotificationInfo");
- if (callToNotify == null) {
- LogUtil.i(TAG, "callToNotify == null");
- return new Pair<>(null, 0);
- }
- PhoneAccountHandle accountHandle = PhoneAccountHandles.getAccount(context, callToNotify);
- if (accountHandle == null) {
- LogUtil.i(TAG, "No default phone account found, using default notification ringtone");
- return new Pair<>(null, Notification.DEFAULT_ALL);
- }
- return new Pair<>(
- TelephonyManagerCompat.getVoicemailRingtoneUri(getTelephonyManager(), accountHandle),
- getNotificationDefaults(accountHandle));
- }
-
- private int getNotificationDefaults(PhoneAccountHandle accountHandle) {
- if (VERSION.SDK_INT >= VERSION_CODES.N) {
- return TelephonyManagerCompat.isVoicemailVibrationEnabled(
- getTelephonyManager(), accountHandle)
- ? Notification.DEFAULT_VIBRATE
- : 0;
- }
- return Notification.DEFAULT_ALL;
- }
-
- /** Creates a pending intent that marks all new voicemails as old. */
- private PendingIntent createMarkNewVoicemailsAsOldIntent(@Nullable Uri voicemailUri) {
- Intent intent = new Intent(context, CallLogNotificationsService.class);
- intent.setAction(CallLogNotificationsService.ACTION_MARK_NEW_VOICEMAILS_AS_OLD);
- intent.setData(voicemailUri);
- return PendingIntent.getService(context, 0, intent, 0);
- }
-
- private NotificationManager getNotificationManager() {
- return (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
- }
-
- private TelephonyManager getTelephonyManager() {
- return (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
- }
-
- private Notification createNotificationForVoicemail(
- @NonNull NewCall voicemail, @NonNull Map contactInfos) {
- Pair notificationInfo = getNotificationInfo(voicemail);
- ContactInfo contactInfo = contactInfos.get(voicemail.number);
-
- Notification.Builder notificationBuilder =
- createNotificationBuilder()
- .setContentTitle(
- context
- .getResources()
- .getQuantityString(R.plurals.notification_voicemail_title, 1, 1))
- .setContentText(
- ContactDisplayUtils.getTtsSpannedPhoneNumber(
- context.getResources(),
- R.string.notification_new_voicemail_ticker,
- contactInfo.name))
- .setWhen(voicemail.dateMs)
- .setSound(notificationInfo.first)
- .setDefaults(notificationInfo.second);
-
- if (voicemail.voicemailUri != null) {
- notificationBuilder.setDeleteIntent(
- createMarkNewVoicemailsAsOldIntent(voicemail.voicemailUri));
- }
-
- NotificationChannelManager.applyChannel(
- notificationBuilder,
- context,
- Channel.VOICEMAIL,
- PhoneAccountHandles.getAccount(context, voicemail));
-
- ContactPhotoLoader loader = new ContactPhotoLoader(context, contactInfo);
- Bitmap photoIcon = loader.loadPhotoIcon();
- if (photoIcon != null) {
- notificationBuilder.setLargeIcon(photoIcon);
- }
- if (!TextUtils.isEmpty(voicemail.transcription)) {
- Logger.get(context)
- .logImpression(DialerImpression.Type.VVM_NOTIFICATION_CREATED_WITH_TRANSCRIPTION);
- notificationBuilder.setStyle(
- new Notification.BigTextStyle().bigText(voicemail.transcription));
- }
- notificationBuilder.setContentIntent(newVoicemailIntent(voicemail));
- Logger.get(context).logImpression(DialerImpression.Type.VVM_NOTIFICATION_CREATED);
- return notificationBuilder.build();
- }
-
- private Notification.Builder createNotificationBuilder() {
- return new Notification.Builder(context)
- .setSmallIcon(android.R.drawable.stat_notify_voicemail)
- .setColor(context.getColor(R.color.dialer_theme_color))
- .setGroup(VISUAL_VOICEMAIL_NOTIFICATION_TAG)
- .setOnlyAlertOnce(true)
- .setAutoCancel(true);
- }
-
- private PendingIntent newVoicemailIntent(@Nullable NewCall voicemail) {
- Intent intent =
- DialtactsActivity.getShowTabIntent(context, DialtactsPagerAdapter.TAB_INDEX_VOICEMAIL);
- // TODO (b/35486204): scroll to this voicemail
- if (voicemail != null) {
- intent.setData(voicemail.voicemailUri);
- }
- intent.putExtra(DialtactsActivity.EXTRA_CLEAR_NEW_VOICEMAILS, true);
- return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
- }
-
- /**
- * Updates the voicemail notifications displayed.
- *
- * @param runnable Called when the async update task completes no matter if it succeeds or fails.
- * May be null.
- */
- static void updateVoicemailNotifications(Context context, Runnable runnable) {
- if (!TelecomUtil.isDefaultDialer(context)) {
- LogUtil.i(
- "DefaultVoicemailNotifier.updateVoicemailNotifications",
- "not default dialer, not scheduling update to voicemail notifications");
- return;
- }
-
- DialerExecutors.createNonUiTaskBuilder(new DefaultVoicemailNotifier(context))
- .onSuccess(
- output -> {
- LogUtil.i(
- "DefaultVoicemailNotifier.updateVoicemailNotifications",
- "update voicemail notifications successful");
- if (runnable != null) {
- runnable.run();
- }
- })
- .onFailure(
- throwable -> {
- LogUtil.i(
- "DefaultVoicemailNotifier.updateVoicemailNotifications",
- "update voicemail notifications failed");
- if (runnable != null) {
- runnable.run();
- }
- })
- .build()
- .executeParallel(null);
- }
-}
diff --git a/java/com/android/dialer/app/calllog/DialerQuickContactBadge.java b/java/com/android/dialer/app/calllog/DialerQuickContactBadge.java
new file mode 100644
index 0000000000000000000000000000000000000000..a3aac41fafa2b7210e4e363396a5ca99aab76007
--- /dev/null
+++ b/java/com/android/dialer/app/calllog/DialerQuickContactBadge.java
@@ -0,0 +1,63 @@
+/*
+ * 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.calllog;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.QuickContactBadge;
+import com.android.dialer.app.calllog.CallLogAdapter.OnActionModeStateChangedListener;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+
+/** Allows us to click the contact badge for non multi select mode. */
+class DialerQuickContactBadge extends QuickContactBadge {
+
+ private View.OnClickListener mExtraOnClickListener;
+ private OnActionModeStateChangedListener onActionModeStateChangeListener;
+
+ public DialerQuickContactBadge(Context context) {
+ super(context);
+ }
+
+ public DialerQuickContactBadge(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ public DialerQuickContactBadge(Context context, AttributeSet attrs, int defStyle) {
+ super(context, attrs, defStyle);
+ }
+
+ @Override
+ public void onClick(View v) {
+ if (mExtraOnClickListener != null
+ && onActionModeStateChangeListener.isActionModeStateEnabled()) {
+ Logger.get(v.getContext())
+ .logImpression(DialerImpression.Type.MULTISELECT_SINGLE_PRESS_TAP_VIA_CONTACT_BADGE);
+ mExtraOnClickListener.onClick(v);
+ } else {
+ super.onClick(v);
+ }
+ }
+
+ public void setMulitSelectListeners(
+ View.OnClickListener extraOnClickListener,
+ OnActionModeStateChangedListener actionModeStateChangeListener) {
+ mExtraOnClickListener = extraOnClickListener;
+ onActionModeStateChangeListener = actionModeStateChangeListener;
+ }
+}
diff --git a/java/com/android/dialer/app/calllog/IntentProvider.java b/java/com/android/dialer/app/calllog/IntentProvider.java
index 9c3c18b602f82dd86b0913c1471b32f4c3a7fd83..e1ec9f5095076a35b4b40ef5eae6d2d56af4d209 100644
--- a/java/com/android/dialer/app/calllog/IntentProvider.java
+++ b/java/com/android/dialer/app/calllog/IntentProvider.java
@@ -117,11 +117,12 @@ public abstract class IntentProvider {
* @return The call details intent provider.
*/
public static IntentProvider getCallDetailIntentProvider(
- CallDetailsEntries callDetailsEntries, DialerContact contact) {
+ CallDetailsEntries callDetailsEntries, DialerContact contact, boolean canReportCallerId) {
return new IntentProvider() {
@Override
public Intent getIntent(Context context) {
- return CallDetailsActivity.newInstance(context, callDetailsEntries, contact);
+ return CallDetailsActivity.newInstance(
+ context, callDetailsEntries, contact, canReportCallerId);
}
};
}
diff --git a/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java b/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java
new file mode 100644
index 0000000000000000000000000000000000000000..428c71677cf91ad942cbbcca23959e303128d0d6
--- /dev/null
+++ b/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java
@@ -0,0 +1,156 @@
+/*
+ * 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.calllog;
+
+import android.annotation.TargetApi;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.os.Build.VERSION_CODES;
+import android.support.annotation.NonNull;
+import android.support.v4.os.BuildCompat;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.telephony.CarrierConfigManager;
+import android.telephony.PhoneNumberUtils;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import com.android.dialer.app.R;
+import com.android.dialer.calllogutils.PhoneAccountUtils;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.notification.NotificationChannelManager;
+
+/** Shows a notification in the status bar for legacy vociemail. */
+@TargetApi(VERSION_CODES.O)
+public final class LegacyVoicemailNotifier {
+ private static final String NOTIFICATION_TAG = "LegacyVoicemail";
+ private static final int NOTIFICATION_ID = 1;
+
+ /**
+ * Replicates how packages/services/Telephony/NotificationMgr.java handles legacy voicemail
+ * notification. The notification will not be stackable because no information is available for
+ * individual voicemails.
+ */
+ public static void showNotification(
+ @NonNull Context context,
+ @NonNull PhoneAccountHandle handle,
+ int count,
+ String voicemailNumber,
+ PendingIntent callVoicemailIntent,
+ PendingIntent voicemailSettingsIntent,
+ boolean isRefresh) {
+ LogUtil.enterBlock("LegacyVoicemailNotifier.showNotification");
+ Assert.isNotNull(handle);
+ Assert.checkArgument(BuildCompat.isAtLeastO());
+
+ TelephonyManager pinnedTelephonyManager =
+ context.getSystemService(TelephonyManager.class).createForPhoneAccountHandle(handle);
+ if (pinnedTelephonyManager == null) {
+ LogUtil.e("LegacyVoicemailNotifier.showNotification", "invalid PhoneAccountHandle");
+ return;
+ }
+
+ Notification notification =
+ createNotification(
+ context,
+ pinnedTelephonyManager,
+ handle,
+ count,
+ voicemailNumber,
+ callVoicemailIntent,
+ voicemailSettingsIntent,
+ isRefresh);
+ context
+ .getSystemService(NotificationManager.class)
+ .notify(NOTIFICATION_TAG, NOTIFICATION_ID, notification);
+ }
+
+ @NonNull
+ private static Notification createNotification(
+ @NonNull Context context,
+ @NonNull TelephonyManager pinnedTelephonyManager,
+ @NonNull PhoneAccountHandle handle,
+ int count,
+ String voicemailNumber,
+ PendingIntent callVoicemailIntent,
+ PendingIntent voicemailSettingsIntent,
+ boolean isRefresh) {
+ String notificationTitle =
+ context
+ .getResources()
+ .getQuantityString(R.plurals.notification_voicemail_title, count, count);
+ boolean isOngoing =
+ pinnedTelephonyManager
+ .getCarrierConfig()
+ .getBoolean(CarrierConfigManager.KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL);
+
+ String contentText;
+ PendingIntent contentIntent;
+ if (!TextUtils.isEmpty(voicemailNumber) && callVoicemailIntent != null) {
+ contentText = getNotificationText(context, handle, voicemailNumber);
+ contentIntent = callVoicemailIntent;
+ } else {
+ contentText = context.getString(R.string.notification_voicemail_no_vm_number);
+ contentIntent = voicemailSettingsIntent;
+ }
+
+ Notification.Builder builder =
+ new Notification.Builder(context)
+ .setSmallIcon(android.R.drawable.stat_notify_voicemail)
+ .setColor(context.getColor(R.color.dialer_theme_color))
+ .setWhen(System.currentTimeMillis())
+ .setContentTitle(notificationTitle)
+ .setContentText(contentText)
+ .setContentIntent(contentIntent)
+ .setSound(pinnedTelephonyManager.getVoicemailRingtoneUri(handle))
+ .setOngoing(isOngoing)
+ .setOnlyAlertOnce(isRefresh)
+ .setChannelId(NotificationChannelManager.getVoicemailChannelId(context, handle));
+
+ if (pinnedTelephonyManager.isVoicemailVibrationEnabled(handle)) {
+ builder.setDefaults(Notification.DEFAULT_VIBRATE);
+ }
+
+ return builder.build();
+ }
+
+ @NonNull
+ private static String getNotificationText(
+ @NonNull Context context, PhoneAccountHandle handle, String voicemailNumber) {
+ if (PhoneAccountUtils.getSubscriptionPhoneAccounts(context).size() > 1) {
+ TelecomManager telecomManager = context.getSystemService(TelecomManager.class);
+ PhoneAccount phoneAccount = telecomManager.getPhoneAccount(handle);
+ return phoneAccount.getShortDescription().toString();
+ } else {
+ return String.format(
+ context.getString(R.string.notification_voicemail_text_format),
+ PhoneNumberUtils.formatNumber(voicemailNumber));
+ }
+ }
+
+ public static void cancelNotification(@NonNull Context context) {
+ LogUtil.enterBlock("LegacyVoicemailNotifier.cancelNotification");
+ Assert.checkArgument(BuildCompat.isAtLeastO());
+ NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+ notificationManager.cancel(NOTIFICATION_TAG, NOTIFICATION_ID);
+ }
+
+ private LegacyVoicemailNotifier() {}
+}
diff --git a/java/com/android/dialer/app/calllog/MissedCallNotifier.java b/java/com/android/dialer/app/calllog/MissedCallNotifier.java
index dd13298bc3ff5cfcd3f7566aa6da60b3e5c4ddff..e0e3fdf3f61e6b97d1a5d49879c37da5a5d8acd7 100644
--- a/java/com/android/dialer/app/calllog/MissedCallNotifier.java
+++ b/java/com/android/dialer/app/calllog/MissedCallNotifier.java
@@ -30,11 +30,13 @@ 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.os.UserManagerCompat;
import android.support.v4.util.Pair;
import android.text.BidiFormatter;
import android.text.TextDirectionHeuristics;
import android.text.TextUtils;
+import android.util.ArraySet;
import com.android.contacts.common.ContactsUtils;
import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
import com.android.dialer.app.DialtactsActivity;
@@ -46,23 +48,20 @@ import com.android.dialer.callintent.CallInitiationType;
import com.android.dialer.callintent.CallIntentBuilder;
import com.android.dialer.common.LogUtil;
import com.android.dialer.common.concurrent.DialerExecutor.Worker;
-import com.android.dialer.notification.NotificationChannelManager;
-import com.android.dialer.notification.NotificationChannelManager.Channel;
+import com.android.dialer.notification.NotificationChannelId;
import com.android.dialer.phonenumbercache.ContactInfo;
import com.android.dialer.phonenumberutil.PhoneNumberHelper;
import com.android.dialer.util.DialerUtils;
import com.android.dialer.util.IntentUtil;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
/** Creates a notification for calls that the user missed (neither answered nor rejected). */
public class MissedCallNotifier implements Worker, Void> {
- /** The tag used to identify notifications from this class. */
- static final String NOTIFICATION_TAG = "MissedCallNotifier";
- /** The identifier of the notification of new missed calls. */
- private static final int NOTIFICATION_ID = R.id.notification_missed_call;
+ static final String NOTIFICATION_TAG_PREFIX = "MissedCall_";
+ static final String NOTIFICATION_GROUP = "MissedCall";
+ private static final int NOTIFICATION_ID = 1;
private final Context context;
private final CallLogNotificationsQueryHelper callLogNotificationsQueryHelper;
@@ -104,7 +103,8 @@ public class MissedCallNotifier implements Worker, Void> {
if ((newCalls != null && newCalls.isEmpty()) || count == 0) {
// No calls to notify about: clear the notification.
- CallLogNotificationsQueryHelper.removeMissedCallNotifications(context, null);
+ CallLogNotificationsQueryHelper.markAllMissedCallsInCallLogAsRead(context);
+ cancelAllMissedCallNotifications(context);
return;
}
@@ -146,7 +146,7 @@ public class MissedCallNotifier implements Worker, Void> {
null,
System.currentTimeMillis());
- //TODO: look up caller ID that is not in contacts.
+ // TODO: look up caller ID that is not in contacts.
ContactInfo contactInfo =
callLogNotificationsQueryHelper.getContactInfo(
call.number, call.numberPresentation, call.countryIso);
@@ -181,36 +181,39 @@ public class MissedCallNotifier implements Worker, Void> {
publicSummaryBuilder
.setContentTitle(context.getText(titleResId))
.setContentIntent(createCallLogPendingIntent())
- .setDeleteIntent(createClearMissedCallsPendingIntent(null));
+ .setDeleteIntent(
+ CallLogNotificationsService.createCancelAllMissedCallsPendingIntent(context));
// Create the notification summary suitable for display when sensitive information is showing.
groupSummary
.setContentTitle(context.getText(titleResId))
.setContentText(expandedText)
.setContentIntent(createCallLogPendingIntent())
- .setDeleteIntent(createClearMissedCallsPendingIntent(null))
+ .setDeleteIntent(
+ CallLogNotificationsService.createCancelAllMissedCallsPendingIntent(context))
.setGroupSummary(useCallList)
.setOnlyAlertOnce(useCallList)
.setPublicVersion(publicSummaryBuilder.build());
-
- NotificationChannelManager.applyChannel(groupSummary, context, Channel.MISSED_CALL, null);
+ if (BuildCompat.isAtLeastO()) {
+ groupSummary.setChannelId(NotificationChannelId.MISSED_CALL);
+ }
Notification notification = groupSummary.build();
configureLedOnNotification(notification);
LogUtil.i("MissedCallNotifier.updateMissedCallNotification", "adding missed call notification");
- getNotificationMgr().notify(NOTIFICATION_TAG, NOTIFICATION_ID, notification);
+ getNotificationMgr().notify(getNotificationTagForGroupSummary(), NOTIFICATION_ID, notification);
if (useCallList) {
// Do not repost active notifications to prevent erasing post call notes.
NotificationManager manager = getNotificationMgr();
- Set activeTags = new HashSet<>();
+ Set activeTags = new ArraySet<>();
for (StatusBarNotification activeNotification : manager.getActiveNotifications()) {
activeTags.add(activeNotification.getTag());
}
for (NewCall call : newCalls) {
- String callTag = call.callsUri.toString();
+ String callTag = getNotificationTagForCall(call);
if (!activeTags.contains(callTag)) {
manager.notify(callTag, NOTIFICATION_ID, getNotificationForCall(call, null));
}
@@ -218,6 +221,59 @@ public class MissedCallNotifier implements Worker, Void> {
}
}
+ public static void cancelAllMissedCallNotifications(@NonNull Context context) {
+ NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+ for (StatusBarNotification notification : notificationManager.getActiveNotifications()) {
+ String tag = notification.getTag();
+ if (tag != null && tag.startsWith(NOTIFICATION_TAG_PREFIX)) {
+ notificationManager.cancel(tag, notification.getId());
+ }
+ }
+ }
+
+ public static void cancelSingleMissedCallNotification(
+ @NonNull Context context, @Nullable Uri callUri) {
+ if (callUri == null) {
+ LogUtil.e(
+ "MissedCallNotifier.cancelSingleMissedCallNotification",
+ "unable to cancel notification, uri is null");
+ return;
+ }
+ NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+ String callTag = getNotificationTagForCallUri(callUri);
+ String summaryTag = getNotificationTagForGroupSummary();
+ int notificationCount = 0;
+
+ for (StatusBarNotification notification : notificationManager.getActiveNotifications()) {
+ String currentTag = notification.getTag();
+ if (currentTag == null) {
+ continue;
+ }
+ if (currentTag.equals(callTag)) {
+ notificationManager.cancel(notification.getTag(), notification.getId());
+ } else if (currentTag.startsWith(NOTIFICATION_TAG_PREFIX) && !currentTag.equals(summaryTag)) {
+ notificationCount++;
+ }
+ }
+
+ if (notificationCount == 0) {
+ // There are no more missed call notifications. Remove the summary notification too.
+ notificationManager.cancel(summaryTag, NOTIFICATION_ID);
+ }
+ }
+
+ private static String getNotificationTagForGroupSummary() {
+ return NOTIFICATION_TAG_PREFIX + "GroupSummary";
+ }
+
+ private static String getNotificationTagForCall(@NonNull NewCall call) {
+ return getNotificationTagForCallUri(call.callsUri);
+ }
+
+ private static String getNotificationTagForCallUri(@NonNull Uri callUri) {
+ return NOTIFICATION_TAG_PREFIX + callUri;
+ }
+
public void insertPostCallNotification(@NonNull String number, @NonNull String note) {
List newCalls = callLogNotificationsQueryHelper.getNewMissedCalls();
if (newCalls != null && !newCalls.isEmpty()) {
@@ -226,7 +282,9 @@ public class MissedCallNotifier implements Worker, Void> {
// Update the first notification that matches our post call note sender.
getNotificationMgr()
.notify(
- call.callsUri.toString(), NOTIFICATION_ID, getNotificationForCall(call, note));
+ getNotificationTagForCall(call),
+ NOTIFICATION_ID,
+ getNotificationForCall(call, note));
break;
}
}
@@ -308,7 +366,7 @@ public class MissedCallNotifier implements Worker, Void> {
private Notification.Builder createNotificationBuilder() {
return new Notification.Builder(context)
- .setGroup(NOTIFICATION_TAG)
+ .setGroup(NOTIFICATION_GROUP)
.setSmallIcon(android.R.drawable.stat_notify_missed_call)
.setColor(context.getResources().getColor(R.color.dialer_theme_color, null))
.setAutoCancel(true)
@@ -321,10 +379,14 @@ public class MissedCallNotifier implements Worker, Void> {
Builder builder =
createNotificationBuilder()
.setWhen(call.dateMs)
- .setDeleteIntent(createClearMissedCallsPendingIntent(call.callsUri))
+ .setDeleteIntent(
+ CallLogNotificationsService.createCancelSingleMissedCallPendingIntent(
+ context, call.callsUri))
.setContentIntent(createCallLogPendingIntent(call.callsUri));
+ if (BuildCompat.isAtLeastO()) {
+ builder.setChannelId(NotificationChannelId.MISSED_CALL);
+ }
- NotificationChannelManager.applyChannel(builder, context, Channel.MISSED_CALL, null);
return builder;
}
@@ -332,7 +394,8 @@ public class MissedCallNotifier implements Worker, Void> {
@WorkerThread
public void callBackFromMissedCall(String number, Uri callUri) {
closeSystemDialogs(context);
- CallLogNotificationsQueryHelper.removeMissedCallNotifications(context, callUri);
+ CallLogNotificationsQueryHelper.markSingleMissedCallInCallLogAsRead(context, callUri);
+ cancelSingleMissedCallNotification(context, callUri);
DialerUtils.startActivityWithErrorToast(
context,
new CallIntentBuilder(number, CallInitiationType.Type.MISSED_CALL_NOTIFICATION)
@@ -343,7 +406,8 @@ public class MissedCallNotifier implements Worker, Void> {
/** Trigger an intent to send an sms from a missed call number. */
public void sendSmsFromMissedCall(String number, Uri callUri) {
closeSystemDialogs(context);
- CallLogNotificationsQueryHelper.removeMissedCallNotifications(context, callUri);
+ CallLogNotificationsQueryHelper.markSingleMissedCallInCallLogAsRead(context, callUri);
+ cancelSingleMissedCallNotification(context, callUri);
DialerUtils.startActivityWithErrorToast(
context, IntentUtil.getSendSmsIntent(number).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
}
@@ -371,14 +435,6 @@ public class MissedCallNotifier implements Worker, Void> {
return PendingIntent.getActivity(context, 0, contentIntent, PendingIntent.FLAG_UPDATE_CURRENT);
}
- /** Creates a pending intent that marks all new missed calls as old. */
- private PendingIntent createClearMissedCallsPendingIntent(@Nullable Uri callUri) {
- Intent intent = new Intent(context, CallLogNotificationsService.class);
- intent.setAction(CallLogNotificationsService.ACTION_MARK_NEW_MISSED_CALLS_AS_OLD);
- intent.setData(callUri);
- return PendingIntent.getService(context, 0, intent, 0);
- }
-
private PendingIntent createCallBackPendingIntent(String number, @NonNull Uri callUri) {
Intent intent = new Intent(context, CallLogNotificationsService.class);
intent.setAction(CallLogNotificationsService.ACTION_CALL_BACK_FROM_MISSED_CALL_NOTIFICATION);
diff --git a/java/com/android/dialer/app/calllog/PhoneAccountHandles.java b/java/com/android/dialer/app/calllog/PhoneAccountHandles.java
deleted file mode 100644
index acffffb1dc620877d470c4b141a5425d2d29b4a2..0000000000000000000000000000000000000000
--- a/java/com/android/dialer/app/calllog/PhoneAccountHandles.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.dialer.app.calllog;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.telecom.PhoneAccount;
-import android.telecom.PhoneAccountHandle;
-import com.android.dialer.app.calllog.CallLogNotificationsQueryHelper.NewCall;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.telecom.TelecomUtil;
-import java.util.List;
-
-/** Methods to help extract {@link PhoneAccount} information from database and Telecomm sources. */
-class PhoneAccountHandles {
-
- @Nullable
- public static PhoneAccountHandle getAccount(@NonNull Context context, @Nullable NewCall call) {
- PhoneAccountHandle handle;
- if (call == null || call.accountComponentName == null || call.accountId == null) {
- LogUtil.v(
- "PhoneAccountUtils.getAccount",
- "accountComponentName == null || callToNotify.accountId == null");
- handle = TelecomUtil.getDefaultOutgoingPhoneAccount(context, PhoneAccount.SCHEME_TEL);
- if (handle == null) {
- List callCapablePhoneAccounts =
- TelecomUtil.getCallCapablePhoneAccounts(context);
- if (!callCapablePhoneAccounts.isEmpty()) {
- return callCapablePhoneAccounts.get(0);
- }
- return null;
- }
- } else {
- handle =
- new PhoneAccountHandle(
- ComponentName.unflattenFromString(call.accountComponentName), call.accountId);
- }
- if (handle.getComponentName() != null) {
- LogUtil.v(
- "PhoneAccountUtils.getAccount",
- "PhoneAccountHandle.ComponentInfo:" + handle.getComponentName());
- } else {
- LogUtil.i("PhoneAccountUtils.getAccount", "PhoneAccountHandle.ComponentInfo: null");
- }
- return handle;
- }
-}
diff --git a/java/com/android/dialer/app/calllog/VisualVoicemailNotifier.java b/java/com/android/dialer/app/calllog/VisualVoicemailNotifier.java
new file mode 100644
index 0000000000000000000000000000000000000000..99fe466d8c5cf6cbf98a1410fb40b4a6cb8d6fe2
--- /dev/null
+++ b/java/com/android/dialer/app/calllog/VisualVoicemailNotifier.java
@@ -0,0 +1,291 @@
+/*
+ * 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.calllog;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.service.notification.StatusBarNotification;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.os.BuildCompat;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import com.android.contacts.common.util.ContactDisplayUtils;
+import com.android.dialer.app.DialtactsActivity;
+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.common.LogUtil;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+import com.android.dialer.notification.NotificationChannelManager;
+import com.android.dialer.phonenumbercache.ContactInfo;
+import com.android.dialer.telecom.TelecomUtil;
+import java.util.List;
+import java.util.Map;
+
+/** Shows a notification in the status bar for visual voicemail. */
+final class VisualVoicemailNotifier {
+ private static final String NOTIFICATION_TAG_PREFIX = "VisualVoicemail_";
+ private static final String NOTIFICATION_GROUP = "VisualVoicemail";
+ private static final int NOTIFICATION_ID = 1;
+
+ public static void showNotifications(
+ @NonNull Context context,
+ @NonNull List newCalls,
+ @NonNull Map contactInfos,
+ @Nullable String callers) {
+ LogUtil.enterBlock("VisualVoicemailNotifier.showNotifications");
+ PendingIntent deleteIntent =
+ CallLogNotificationsService.createMarkAllNewVoicemailsAsOldIntent(context);
+ String contentTitle =
+ context
+ .getResources()
+ .getQuantityString(
+ R.plurals.notification_voicemail_title, newCalls.size(), newCalls.size());
+ Notification.Builder groupSummary =
+ createNotificationBuilder(context)
+ .setContentTitle(contentTitle)
+ .setContentText(callers)
+ .setDeleteIntent(deleteIntent)
+ .setGroupSummary(true)
+ .setContentIntent(newVoicemailIntent(context, null));
+
+ if (BuildCompat.isAtLeastO()) {
+ groupSummary.setGroupAlertBehavior(Notification.GROUP_ALERT_CHILDREN);
+ PhoneAccountHandle handle = getAccountForCall(context, newCalls.get(0));
+ groupSummary.setChannelId(NotificationChannelManager.getVoicemailChannelId(context, handle));
+ }
+
+ NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+ notificationManager.notify(
+ getNotificationTagForGroupSummary(), NOTIFICATION_ID, groupSummary.build());
+
+ for (NewCall voicemail : newCalls) {
+ notificationManager.notify(
+ getNotificationTagForVoicemail(voicemail),
+ NOTIFICATION_ID,
+ createNotificationForVoicemail(context, voicemail, contactInfos));
+ }
+ }
+
+ public static void cancelAllVoicemailNotifications(@NonNull Context context) {
+ LogUtil.enterBlock("VisualVoicemailNotifier.cancelAllVoicemailNotifications");
+ NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+ for (StatusBarNotification notification : notificationManager.getActiveNotifications()) {
+ String tag = notification.getTag();
+ if (tag != null && tag.startsWith(NOTIFICATION_TAG_PREFIX)) {
+ notificationManager.cancel(tag, notification.getId());
+ }
+ }
+ }
+
+ public static void cancelSingleVoicemailNotification(
+ @NonNull Context context, @Nullable Uri voicemailUri) {
+ LogUtil.enterBlock("VisualVoicemailNotifier.cancelSingleVoicemailNotification");
+ if (voicemailUri == null) {
+ LogUtil.e("VisualVoicemailNotifier.cancelSingleVoicemailNotification", "uri is null");
+ return;
+ }
+ NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+ String voicemailTag = getNotificationTagForUri(voicemailUri);
+ String summaryTag = getNotificationTagForGroupSummary();
+ int notificationCount = 0;
+
+ for (StatusBarNotification notification : notificationManager.getActiveNotifications()) {
+ String currentTag = notification.getTag();
+ if (currentTag == null) {
+ continue;
+ }
+ if (currentTag.equals(voicemailTag)) {
+ notificationManager.cancel(notification.getTag(), notification.getId());
+ } else if (currentTag.startsWith(NOTIFICATION_TAG_PREFIX) && !currentTag.equals(summaryTag)) {
+ notificationCount++;
+ }
+ }
+
+ if (notificationCount == 0) {
+ // There are no more visual voicemail notifications. Remove the summary notification too.
+ notificationManager.cancel(summaryTag, NOTIFICATION_ID);
+ }
+ }
+
+ private static String getNotificationTagForVoicemail(@NonNull NewCall voicemail) {
+ return getNotificationTagForUri(voicemail.voicemailUri);
+ }
+
+ private static String getNotificationTagForUri(@NonNull Uri voicemailUri) {
+ return NOTIFICATION_TAG_PREFIX + voicemailUri;
+ }
+
+ private static String getNotificationTagForGroupSummary() {
+ return NOTIFICATION_TAG_PREFIX + "GroupSummary";
+ }
+
+ private static Notification.Builder createNotificationBuilder(@NonNull Context context) {
+ return new Notification.Builder(context)
+ .setSmallIcon(android.R.drawable.stat_notify_voicemail)
+ .setColor(context.getColor(R.color.dialer_theme_color))
+ .setGroup(NOTIFICATION_GROUP)
+ .setOnlyAlertOnce(true)
+ .setAutoCancel(true);
+ }
+
+ private static Notification createNotificationForVoicemail(
+ @NonNull Context context,
+ @NonNull NewCall voicemail,
+ @NonNull Map contactInfos) {
+ PhoneAccountHandle handle = getAccountForCall(context, voicemail);
+ ContactInfo contactInfo = contactInfos.get(voicemail.number);
+
+ Notification.Builder builder =
+ createNotificationBuilder(context)
+ .setContentTitle(
+ context
+ .getResources()
+ .getQuantityString(R.plurals.notification_voicemail_title, 1, 1))
+ .setContentText(
+ ContactDisplayUtils.getTtsSpannedPhoneNumber(
+ context.getResources(),
+ R.string.notification_new_voicemail_ticker,
+ contactInfo.name))
+ .setWhen(voicemail.dateMs)
+ .setSound(getVoicemailRingtoneUri(context, handle))
+ .setDefaults(getNotificationDefaultFlags(context, handle));
+
+ if (voicemail.voicemailUri != null) {
+ builder.setDeleteIntent(
+ CallLogNotificationsService.createMarkSingleNewVoicemailAsOldIntent(
+ context, voicemail.voicemailUri));
+ }
+
+ if (BuildCompat.isAtLeastO()) {
+ builder.setChannelId(NotificationChannelManager.getVoicemailChannelId(context, handle));
+ }
+
+ ContactPhotoLoader loader = new ContactPhotoLoader(context, contactInfo);
+ Bitmap photoIcon = loader.loadPhotoIcon();
+ if (photoIcon != null) {
+ builder.setLargeIcon(photoIcon);
+ }
+ if (!TextUtils.isEmpty(voicemail.transcription)) {
+ Logger.get(context)
+ .logImpression(DialerImpression.Type.VVM_NOTIFICATION_CREATED_WITH_TRANSCRIPTION);
+ builder.setStyle(new Notification.BigTextStyle().bigText(voicemail.transcription));
+ }
+ builder.setContentIntent(newVoicemailIntent(context, voicemail));
+ Logger.get(context).logImpression(DialerImpression.Type.VVM_NOTIFICATION_CREATED);
+ return builder.build();
+ }
+
+ @Nullable
+ private static Uri getVoicemailRingtoneUri(
+ @NonNull Context context, @Nullable PhoneAccountHandle handle) {
+ if (VERSION.SDK_INT < VERSION_CODES.N) {
+ return null;
+ }
+ if (handle == null) {
+ LogUtil.i("VisualVoicemailNotifier.getVoicemailRingtoneUri", "null handle, getting fallback");
+ handle = getFallbackAccount(context);
+ if (handle == null) {
+ LogUtil.i(
+ "VisualVoicemailNotifier.getVoicemailRingtoneUri",
+ "no fallback handle, using null (default) ringtone");
+ return null;
+ }
+ }
+ return context.getSystemService(TelephonyManager.class).getVoicemailRingtoneUri(handle);
+ }
+
+ private static int getNotificationDefaultFlags(
+ @NonNull Context context, @Nullable PhoneAccountHandle handle) {
+ if (VERSION.SDK_INT < VERSION_CODES.N) {
+ return Notification.DEFAULT_ALL;
+ }
+ if (handle == null) {
+ LogUtil.i(
+ "VisualVoicemailNotifier.getNotificationDefaultFlags", "null handle, getting fallback");
+ handle = getFallbackAccount(context);
+ if (handle == null) {
+ LogUtil.i(
+ "VisualVoicemailNotifier.getNotificationDefaultFlags",
+ "no fallback handle, using default vibration");
+ return Notification.DEFAULT_ALL;
+ }
+ }
+ if (context.getSystemService(TelephonyManager.class).isVoicemailVibrationEnabled(handle)) {
+ return Notification.DEFAULT_VIBRATE;
+ }
+ return 0;
+ }
+
+ private static PendingIntent newVoicemailIntent(
+ @NonNull Context context, @Nullable NewCall voicemail) {
+ Intent intent =
+ DialtactsActivity.getShowTabIntent(context, DialtactsPagerAdapter.TAB_INDEX_VOICEMAIL);
+ // TODO (b/35486204): scroll to this voicemail
+ if (voicemail != null) {
+ intent.setData(voicemail.voicemailUri);
+ }
+ intent.putExtra(DialtactsActivity.EXTRA_CLEAR_NEW_VOICEMAILS, true);
+ return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+ }
+
+ /**
+ * Gets a phone account for the given call entry. This could be null if SIM associated with the
+ * entry is no longer in the device or for other reasons (for example, modem reboot).
+ */
+ @Nullable
+ public static PhoneAccountHandle getAccountForCall(
+ @NonNull Context context, @Nullable NewCall call) {
+ if (call == null || call.accountComponentName == null || call.accountId == null) {
+ return null;
+ }
+ return new PhoneAccountHandle(
+ ComponentName.unflattenFromString(call.accountComponentName), call.accountId);
+ }
+
+ /**
+ * Gets any available phone account that can be used to get sound settings for voicemail. This is
+ * only called if the phone account for the voicemail entry can't be found.
+ */
+ @Nullable
+ public static PhoneAccountHandle getFallbackAccount(@NonNull Context context) {
+ PhoneAccountHandle handle =
+ TelecomUtil.getDefaultOutgoingPhoneAccount(context, PhoneAccount.SCHEME_TEL);
+ if (handle == null) {
+ List handles = TelecomUtil.getCallCapablePhoneAccounts(context);
+ if (!handles.isEmpty()) {
+ handle = handles.get(0);
+ }
+ }
+ return handle;
+ }
+
+ private VisualVoicemailNotifier() {}
+}
diff --git a/java/com/android/dialer/app/calllog/VisualVoicemailUpdateTask.java b/java/com/android/dialer/app/calllog/VisualVoicemailUpdateTask.java
new file mode 100644
index 0000000000000000000000000000000000000000..d6601be36d7539cb0eae94455256c3f600096b5d
--- /dev/null
+++ b/java/com/android/dialer/app/calllog/VisualVoicemailUpdateTask.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2011 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.calllog;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.WorkerThread;
+import android.text.TextUtils;
+import android.util.ArrayMap;
+import com.android.dialer.app.R;
+import com.android.dialer.app.calllog.CallLogNotificationsQueryHelper.NewCall;
+import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
+import com.android.dialer.blocking.FilteredNumbersUtil;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import com.android.dialer.common.concurrent.DialerExecutors;
+import com.android.dialer.phonenumbercache.ContactInfo;
+import com.android.dialer.telecom.TelecomUtil;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/** Updates voicemail notifications in the background. */
+class VisualVoicemailUpdateTask implements Worker {
+ @Nullable
+ @Override
+ public Void doInBackground(@NonNull Input input) throws Throwable {
+ updateNotification(input.context, input.queryHelper, input.queryHandler);
+ return null;
+ }
+
+ /**
+ * Updates the notification and notifies of the call with the given URI.
+ *
+ * Clears the notification if there are no new voicemails, and notifies if the given URI
+ * corresponds to a new voicemail.
+ */
+ @WorkerThread
+ private static void updateNotification(
+ Context context,
+ CallLogNotificationsQueryHelper queryHelper,
+ FilteredNumberAsyncQueryHandler queryHandler) {
+ Assert.isWorkerThread();
+
+ List newCalls = queryHelper.getNewVoicemails();
+ if (newCalls == null) {
+ return;
+ }
+ newCalls = filterBlockedNumbers(context, queryHandler, newCalls);
+ if (newCalls.isEmpty()) {
+ return;
+ }
+
+ // This represents a list of names to include in the notification.
+ String callers = null;
+
+ // Maps each number into a name: if a number is in the map, it has already left a more
+ // recent voicemail.
+ Map contactInfos = new ArrayMap<>();
+ for (NewCall newCall : newCalls) {
+ if (!contactInfos.containsKey(newCall.number)) {
+ ContactInfo contactInfo =
+ queryHelper.getContactInfo(
+ newCall.number, newCall.numberPresentation, newCall.countryIso);
+ contactInfos.put(newCall.number, contactInfo);
+
+ // This is a new caller. Add it to the back of the list of callers.
+ if (TextUtils.isEmpty(callers)) {
+ callers = contactInfo.name;
+ } else {
+ callers =
+ context.getString(
+ R.string.notification_voicemail_callers_list, callers, contactInfo.name);
+ }
+ }
+ }
+ VisualVoicemailNotifier.showNotifications(context, newCalls, contactInfos, callers);
+ }
+
+ @WorkerThread
+ private static List filterBlockedNumbers(
+ Context context, FilteredNumberAsyncQueryHandler queryHandler, List newCalls) {
+ Assert.isWorkerThread();
+ if (FilteredNumbersUtil.hasRecentEmergencyCall(context)) {
+ LogUtil.i(
+ "VisualVoicemailUpdateTask.filterBlockedNumbers",
+ "not filtering due to recent emergency call");
+ return newCalls;
+ }
+
+ List result = new ArrayList<>();
+ for (NewCall newCall : newCalls) {
+ if (queryHandler.getBlockedIdSynchronous(newCall.number, newCall.countryIso) != null) {
+ LogUtil.i(
+ "VisualVoicemailUpdateTask.filterBlockedNumbers",
+ "found voicemail from blocked number, deleting");
+ if (newCall.voicemailUri != null) {
+ // Delete the voicemail.
+ CallLogAsyncTaskUtil.deleteVoicemailSynchronous(context, newCall.voicemailUri);
+ }
+ } else {
+ result.add(newCall);
+ }
+ }
+ return result;
+ }
+
+ /** Updates the voicemail notifications displayed. */
+ static void scheduleTask(@NonNull Context context, @NonNull Runnable callback) {
+ Assert.isNotNull(context);
+ Assert.isNotNull(callback);
+ if (!TelecomUtil.isDefaultDialer(context)) {
+ LogUtil.i("VisualVoicemailUpdateTask.scheduleTask", "not default dialer, not running");
+ callback.run();
+ return;
+ }
+
+ Input input =
+ new Input(
+ context,
+ CallLogNotificationsQueryHelper.getInstance(context),
+ new FilteredNumberAsyncQueryHandler(context));
+ DialerExecutors.createNonUiTaskBuilder(new VisualVoicemailUpdateTask())
+ .onSuccess(
+ output -> {
+ LogUtil.i("VisualVoicemailUpdateTask.scheduleTask", "update successful");
+ callback.run();
+ })
+ .onFailure(
+ throwable -> {
+ LogUtil.i("VisualVoicemailUpdateTask.scheduleTask", "update failed: " + throwable);
+ callback.run();
+ })
+ .build()
+ .executeParallel(input);
+ }
+
+ static class Input {
+ @NonNull final Context context;
+ @NonNull final CallLogNotificationsQueryHelper queryHelper;
+ @NonNull final FilteredNumberAsyncQueryHandler queryHandler;
+
+ Input(
+ Context context,
+ CallLogNotificationsQueryHelper queryHelper,
+ FilteredNumberAsyncQueryHandler queryHandler) {
+ this.context = context;
+ this.queryHelper = queryHelper;
+ this.queryHandler = queryHandler;
+ }
+ }
+}
diff --git a/java/com/android/dialer/app/calllog/VoicemailQueryHandler.java b/java/com/android/dialer/app/calllog/VoicemailQueryHandler.java
index 777f4c79f6721037a85019c3cfd0476957be526b..2fbebdd302ddff31dec38fcb77994d109ead1cd3 100644
--- a/java/com/android/dialer/app/calllog/VoicemailQueryHandler.java
+++ b/java/com/android/dialer/app/calllog/VoicemailQueryHandler.java
@@ -15,7 +15,6 @@
*/
package com.android.dialer.app.calllog;
-import android.app.NotificationManager;
import android.content.AsyncQueryHandler;
import android.content.ContentResolver;
import android.content.ContentValues;
@@ -23,30 +22,49 @@ import android.content.Context;
import android.net.Uri;
import android.provider.CallLog.Calls;
import android.support.annotation.MainThread;
+import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
-import com.android.dialer.app.R;
+import android.support.annotation.WorkerThread;
import com.android.dialer.common.Assert;
-import com.android.dialer.notification.GroupedNotificationUtil;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.ThreadUtil;
/** Handles asynchronous queries to the call log for voicemail. */
public class VoicemailQueryHandler extends AsyncQueryHandler {
- private static final String TAG = "VoicemailQueryHandler";
-
/** The token for the query to mark all new voicemails as old. */
private static final int UPDATE_MARK_VOICEMAILS_AS_OLD_TOKEN = 50;
- private Context mContext;
-
@MainThread
- public VoicemailQueryHandler(Context context, ContentResolver contentResolver) {
+ private VoicemailQueryHandler(ContentResolver contentResolver) {
super(contentResolver);
Assert.isMainThread();
- mContext = context;
+ }
+
+ @WorkerThread
+ public static void markAllNewVoicemailsAsRead(final @NonNull Context context) {
+ ThreadUtil.postOnUiThread(
+ () -> {
+ new VoicemailQueryHandler(context.getContentResolver()).markNewVoicemailsAsOld(null);
+ });
+ }
+
+ @WorkerThread
+ public static void markSingleNewVoicemailAsRead(
+ final @NonNull Context context, final Uri voicemailUri) {
+ if (voicemailUri == null) {
+ LogUtil.e("VoicemailQueryHandler.markSingleNewVoicemailAsRead", "voicemail URI is null");
+ return;
+ }
+ ThreadUtil.postOnUiThread(
+ () -> {
+ new VoicemailQueryHandler(context.getContentResolver())
+ .markNewVoicemailsAsOld(voicemailUri);
+ });
}
/** Updates all new voicemails to mark them as old. */
- public void markNewVoicemailsAsOld(@Nullable Uri voicemailUri) {
+ private void markNewVoicemailsAsOld(@Nullable Uri voicemailUri) {
// Mark all "new" voicemails as not new anymore.
StringBuilder where = new StringBuilder();
where.append(Calls.NEW);
@@ -70,11 +88,5 @@ public class VoicemailQueryHandler extends AsyncQueryHandler {
voicemailUri == null
? new String[] {Integer.toString(Calls.VOICEMAIL_TYPE)}
: new String[] {Integer.toString(Calls.VOICEMAIL_TYPE), voicemailUri.toString()});
-
- GroupedNotificationUtil.removeNotification(
- mContext.getSystemService(NotificationManager.class),
- voicemailUri != null ? voicemailUri.toString() : null,
- R.id.notification_visual_voicemail,
- DefaultVoicemailNotifier.VISUAL_VOICEMAIL_NOTIFICATION_TAG);
}
}
diff --git a/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java b/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java
index 0399987806b1bf7f384f987c1e99390dbc0200cb..f85680649c8d95294a27068d52b7396cfc61c130 100644
--- a/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java
+++ b/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java
@@ -17,15 +17,11 @@
package com.android.dialer.app.calllog.calllogcache;
import android.content.Context;
-import android.support.annotation.VisibleForTesting;
import android.telecom.PhoneAccountHandle;
-import android.text.TextUtils;
import android.util.ArrayMap;
-import android.util.Pair;
import com.android.dialer.calllogutils.PhoneAccountUtils;
-import com.android.dialer.phonenumberutil.PhoneNumberHelper;
+import com.android.dialer.telecom.TelecomUtil;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
/**
* This is the CallLogCache for versions of dialer Lollipop Mr1 and above with support for multi-SIM
@@ -36,15 +32,6 @@ import java.util.concurrent.ConcurrentHashMap;
*/
class CallLogCacheLollipopMr1 extends CallLogCache {
- /*
- * Maps from a phone-account/number pair to a boolean because multiple numbers could return true
- * for the voicemail number if those numbers are not pre-normalized. Access must be synchronzied
- * as it's used in the background thread in CallLogAdapter. {@see CallLogAdapter#loadData}
- */
- @VisibleForTesting
- final Map, Boolean> mVoicemailQueryCache =
- new ConcurrentHashMap<>();
-
private final Map mPhoneAccountLabelCache = new ArrayMap<>();
private final Map mPhoneAccountColorCache = new ArrayMap<>();
private final Map mPhoneAccountCallWithNoteCache = new ArrayMap<>();
@@ -55,7 +42,6 @@ class CallLogCacheLollipopMr1 extends CallLogCache {
@Override
public void reset() {
- mVoicemailQueryCache.clear();
mPhoneAccountLabelCache.clear();
mPhoneAccountColorCache.clear();
mPhoneAccountCallWithNoteCache.clear();
@@ -65,19 +51,7 @@ class CallLogCacheLollipopMr1 extends CallLogCache {
@Override
public boolean isVoicemailNumber(PhoneAccountHandle accountHandle, CharSequence number) {
- if (TextUtils.isEmpty(number)) {
- return false;
- }
-
- Pair key = new Pair<>(accountHandle, number);
- Boolean value = mVoicemailQueryCache.get(key);
- if (value != null) {
- return value;
- }
- boolean isVoicemail =
- PhoneNumberHelper.isVoicemailNumber(mContext, accountHandle, number.toString());
- mVoicemailQueryCache.put(key, isVoicemail);
- return isVoicemail;
+ return TelecomUtil.isVoicemailNumber(mContext, accountHandle, number.toString());
}
@Override
diff --git a/java/com/android/dialer/app/contactinfo/ContactInfoCache.java b/java/com/android/dialer/app/contactinfo/ContactInfoCache.java
index 32bbf06b521ee9f5867c8f2a46962ed91124e1a3..82fc229af93d090c633e4fa4b4c6d5fc89fc82fb 100644
--- a/java/com/android/dialer/app/contactinfo/ContactInfoCache.java
+++ b/java/com/android/dialer/app/contactinfo/ContactInfoCache.java
@@ -162,7 +162,7 @@ public class ContactInfoCache {
ContactInfo info;
if (request.isLocalRequest()) {
info = mContactInfoHelper.lookupNumber(request.number, request.countryIso);
- if (!info.contactExists) {
+ if (info != null && !info.contactExists) {
// TODO: Maybe skip look up if it's already available in cached number lookup
// service.
long start = SystemClock.elapsedRealtime();
diff --git a/java/com/android/dialer/app/dialpad/DialpadFragment.java b/java/com/android/dialer/app/dialpad/DialpadFragment.java
index c0b26c91ae0dc19f203716ce7a0ccce4b31e60b7..d33943773e1aacc3d1ef2275c2c50122ec771f83 100644
--- a/java/com/android/dialer/app/dialpad/DialpadFragment.java
+++ b/java/com/android/dialer/app/dialpad/DialpadFragment.java
@@ -85,7 +85,9 @@ 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.logging.UiAction;
import com.android.dialer.oem.MotorolaUtils;
+import com.android.dialer.performancereport.PerformanceReport;
import com.android.dialer.proguard.UsedByReflection;
import com.android.dialer.telecom.TelecomUtil;
import com.android.dialer.util.CallUtil;
@@ -1015,6 +1017,8 @@ public class DialpadFragment extends Fragment
*/
private void handleDialButtonPressed() {
if (isDigitsEmpty()) { // No number entered.
+ // No real call made, so treat it as a click
+ PerformanceReport.recordClick(UiAction.Type.PRESS_CALL_BUTTON_WITHOUT_CALLING);
handleDialButtonClickWithEmptyDigits();
} else {
final String number = mDigits.getText().toString();
@@ -1025,6 +1029,7 @@ public class DialpadFragment extends Fragment
if (number != null
&& !TextUtils.isEmpty(mProhibitedPhoneNumberRegexp)
&& number.matches(mProhibitedPhoneNumberRegexp)) {
+ PerformanceReport.recordClick(UiAction.Type.PRESS_CALL_BUTTON_WITHOUT_CALLING);
LogUtil.i(
"DialpadFragment.handleDialButtonPressed",
"The phone number is prohibited explicitly by a rule.");
@@ -1061,6 +1066,10 @@ public class DialpadFragment extends Fragment
startActivity(newFlashIntent());
} else {
if (!TextUtils.isEmpty(mLastNumberDialed)) {
+ // Dialpad will be filled with last called number,
+ // but we don't want to record it as user action
+ PerformanceReport.setIgnoreActionOnce(UiAction.Type.TEXT_CHANGE_WITH_INPUT);
+
// Recall the last number dialed.
mDigits.setText(mLastNumberDialed);
diff --git a/java/com/android/dialer/app/legacybindings/DialerLegacyBindings.java b/java/com/android/dialer/app/legacybindings/DialerLegacyBindings.java
index c208fd57d40d7427e230e454efb4e87a97656734..a483af9e913331ce50ad7951a276cbf776578ef4 100644
--- a/java/com/android/dialer/app/legacybindings/DialerLegacyBindings.java
+++ b/java/com/android/dialer/app/legacybindings/DialerLegacyBindings.java
@@ -41,6 +41,7 @@ public interface DialerLegacyBindings {
ViewGroup alertContainer,
CallLogAdapter.CallFetcher callFetcher,
CallLogAdapter.MultiSelectRemoveView multiSelectRemoveView,
+ CallLogAdapter.OnActionModeStateChangedListener actionModeStateChangedListener,
CallLogCache callLogCache,
ContactInfoCache contactInfoCache,
VoicemailPlaybackPresenter voicemailPlaybackPresenter,
diff --git a/java/com/android/dialer/app/legacybindings/DialerLegacyBindingsStub.java b/java/com/android/dialer/app/legacybindings/DialerLegacyBindingsStub.java
index 19fa1a70c6598b6225a78eef94f73a5c6eaad671..488fbad68bb3959d88d84b163127fcc7219ccedf 100644
--- a/java/com/android/dialer/app/legacybindings/DialerLegacyBindingsStub.java
+++ b/java/com/android/dialer/app/legacybindings/DialerLegacyBindingsStub.java
@@ -35,6 +35,7 @@ public class DialerLegacyBindingsStub implements DialerLegacyBindings {
ViewGroup alertContainer,
CallLogAdapter.CallFetcher callFetcher,
CallLogAdapter.MultiSelectRemoveView multiSelectRemoveView,
+ CallLogAdapter.OnActionModeStateChangedListener actionModeStateChangedListener,
CallLogCache callLogCache,
ContactInfoCache contactInfoCache,
VoicemailPlaybackPresenter voicemailPlaybackPresenter,
@@ -45,6 +46,7 @@ public class DialerLegacyBindingsStub implements DialerLegacyBindings {
alertContainer,
callFetcher,
multiSelectRemoveView,
+ actionModeStateChangedListener,
callLogCache,
contactInfoCache,
voicemailPlaybackPresenter,
diff --git a/java/com/android/dialer/app/list/AllContactsFragment.java b/java/com/android/dialer/app/list/AllContactsFragment.java
index f5fdb9e2dcb620d892c497d0dc4a905b9736c95f..32a99e79594a30a2e98c96411fca6d891e7777ea 100644
--- a/java/com/android/dialer/app/list/AllContactsFragment.java
+++ b/java/com/android/dialer/app/list/AllContactsFragment.java
@@ -38,6 +38,7 @@ import com.android.contacts.common.list.ContactEntryListFragment;
import com.android.contacts.common.list.ContactListFilter;
import com.android.contacts.common.list.DefaultContactListAdapter;
import com.android.dialer.app.R;
+import com.android.dialer.common.LogUtil;
import com.android.dialer.compat.CompatUtils;
import com.android.dialer.logging.InteractionEvent;
import com.android.dialer.logging.Logger;
@@ -46,6 +47,7 @@ import com.android.dialer.util.IntentUtil;
import com.android.dialer.util.PermissionsUtil;
import com.android.dialer.widget.EmptyContentView;
import com.android.dialer.widget.EmptyContentView.OnEmptyViewActionButtonClickedListener;
+import java.util.Arrays;
/** Fragments to show all contacts with phone numbers. */
public class AllContactsFragment extends ContactEntryListFragment
@@ -173,9 +175,15 @@ public class AllContactsFragment extends ContactEntryListFragment 0) {
+ LogUtil.i(
+ "AllContactsFragment.onEmptyViewActionButtonClicked",
+ "Requesting permissions: " + Arrays.toString(deniedPermissions));
FragmentCompat.requestPermissions(
- this, new String[] {READ_CONTACTS}, READ_CONTACTS_PERMISSION_REQUEST_CODE);
+ this, deniedPermissions, READ_CONTACTS_PERMISSION_REQUEST_CODE);
} else {
// Add new contact
DialerUtils.startActivityWithErrorToast(
diff --git a/java/com/android/dialer/app/list/DialerPhoneNumberListAdapter.java b/java/com/android/dialer/app/list/DialerPhoneNumberListAdapter.java
index 04927cf7a596ad25968b3bd37a1502b9aec11fef..fc0bd3ccff278c305ae71aa37204955d9aece8c0 100644
--- a/java/com/android/dialer/app/list/DialerPhoneNumberListAdapter.java
+++ b/java/com/android/dialer/app/list/DialerPhoneNumberListAdapter.java
@@ -20,6 +20,7 @@ import android.content.Context;
import android.content.res.Resources;
import android.database.Cursor;
import android.graphics.drawable.Drawable;
+import android.support.v4.content.ContextCompat;
import android.telephony.PhoneNumberUtils;
import android.text.BidiFormatter;
import android.text.TextDirectionHeuristics;
@@ -177,33 +178,33 @@ public class DialerPhoneNumberListAdapter extends PhoneNumberListAdapter {
resources,
R.string.search_shortcut_call_number,
mBidiFormatter.unicodeWrap(number, TextDirectionHeuristics.LTR));
- drawable = getContext().getResources().getDrawable(R.drawable.quantum_ic_call_vd_theme_24);
+ drawable = ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_call_vd_theme_24);
break;
case SHORTCUT_CREATE_NEW_CONTACT:
text = resources.getString(R.string.search_shortcut_create_new_contact);
drawable =
- getContext().getResources().getDrawable(R.drawable.quantum_ic_person_add_vd_theme_24);
+ ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_person_add_vd_theme_24);
drawable.setAutoMirrored(true);
break;
case SHORTCUT_ADD_TO_EXISTING_CONTACT:
text = resources.getString(R.string.search_shortcut_add_to_contact);
drawable =
- getContext().getResources().getDrawable(R.drawable.quantum_ic_person_add_vd_theme_24);
+ ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_person_add_vd_theme_24);
break;
case SHORTCUT_SEND_SMS_MESSAGE:
text = resources.getString(R.string.search_shortcut_send_sms_message);
drawable =
- getContext().getResources().getDrawable(R.drawable.quantum_ic_message_vd_theme_24);
+ ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_message_vd_theme_24);
break;
case SHORTCUT_MAKE_VIDEO_CALL:
text = resources.getString(R.string.search_shortcut_make_video_call);
drawable =
- getContext().getResources().getDrawable(R.drawable.quantum_ic_videocam_vd_theme_24);
+ ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_videocam_vd_theme_24);
break;
case SHORTCUT_BLOCK_NUMBER:
text = resources.getString(R.string.search_shortcut_block_number);
drawable =
- getContext().getResources().getDrawable(R.drawable.ic_not_interested_googblue_24dp);
+ ContextCompat.getDrawable(getContext(), R.drawable.ic_not_interested_googblue_24dp);
break;
default:
throw new IllegalArgumentException("Invalid shortcut type");
diff --git a/java/com/android/dialer/app/list/DialtactsPagerAdapter.java b/java/com/android/dialer/app/list/DialtactsPagerAdapter.java
index dba3d3a93a4a454da82ae72f89f906ae4afa7e0f..822aa789fa91140fa381b40c0b25811aed40b655 100644
--- a/java/com/android/dialer/app/list/DialtactsPagerAdapter.java
+++ b/java/com/android/dialer/app/list/DialtactsPagerAdapter.java
@@ -28,8 +28,8 @@ import com.android.dialer.calllog.CallLogComponent;
import com.android.dialer.calllog.CallLogFramework;
import com.android.dialer.calllog.ui.NewCallLogFragment;
import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
import com.android.dialer.contactsfragment.ContactsFragment;
import com.android.dialer.database.CallLogQueryHandler;
import com.android.dialer.speeddial.SpeedDialFragment;
@@ -78,7 +78,7 @@ public class DialtactsPagerAdapter extends FragmentPagerAdapter {
CallLogFramework callLogFramework = CallLogComponent.get(context).callLogFramework();
useNewCallLogTab = callLogFramework.isNewCallLogEnabled(context);
useNewContactsTab =
- ConfigProviderBindings.get(context).getBoolean("enable_new_contacts_tab", false);
+ ConfigProviderBindings.get(context).getBoolean("enable_new_contacts_tab", true);
this.tabTitles = tabTitles;
hasActiveVoicemailProvider = hasVoicemailProvider;
fragments.addAll(Collections.nCopies(TAB_COUNT_WITH_VOICEMAIL, null));
diff --git a/java/com/android/dialer/app/list/ListsFragment.java b/java/com/android/dialer/app/list/ListsFragment.java
index 32501d556206d1be1a4c44c8cdb1c5814fe219dc..3f03db1e850e478f0ba5ee8d1a484b2c9e7f39e9 100644
--- a/java/com/android/dialer/app/list/ListsFragment.java
+++ b/java/com/android/dialer/app/list/ListsFragment.java
@@ -34,15 +34,11 @@ import android.provider.VoicemailContract;
import android.support.v4.view.ViewPager.OnPageChangeListener;
import android.view.LayoutInflater;
import android.view.View;
-import android.view.View.OnClickListener;
import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
import com.android.contacts.common.list.ViewPagerTabs;
import com.android.dialer.app.R;
import com.android.dialer.app.calllog.CallLogFragment;
import com.android.dialer.app.calllog.CallLogNotificationsService;
-import com.android.dialer.app.calllog.VisualVoicemailCallLogFragment;
import com.android.dialer.app.voicemail.error.VoicemailStatusCorruptionHandler;
import com.android.dialer.app.voicemail.error.VoicemailStatusCorruptionHandler.Source;
import com.android.dialer.common.LogUtil;
@@ -51,6 +47,8 @@ import com.android.dialer.database.CallLogQueryHandler.Listener;
import com.android.dialer.logging.DialerImpression;
import com.android.dialer.logging.Logger;
import com.android.dialer.logging.ScreenEvent;
+import com.android.dialer.logging.UiAction;
+import com.android.dialer.performancereport.PerformanceReport;
import com.android.dialer.speeddial.SpeedDialFragment;
import com.android.dialer.util.PermissionsUtil;
import com.android.dialer.voicemailstatus.VisualVoicemailEnabledChecker;
@@ -64,22 +62,18 @@ import java.util.ArrayList;
* Contacts list. This will also eventually contain the logic that allows sliding the ViewPager
* containing the lists up above the search bar and pin it against the top of the screen.
*/
-public class ListsFragment extends Fragment
- implements OnPageChangeListener, Listener, OnClickListener {
+public class ListsFragment extends Fragment implements OnPageChangeListener, Listener {
private static final String TAG = "ListsFragment";
+
private DialerViewPager mViewPager;
private ViewPagerTabs mViewPagerTabs;
private DialtactsPagerAdapter mAdapter;
private RemoveView mRemoveView;
private View mRemoveViewContent;
- private View mMultiSelectSelectAllViewContent;
- private TextView mSelectUnselectAllViewText;
- private ImageView mSelectUnselectAllIcon;
private Fragment mCurrentPage;
private SharedPreferences mPrefs;
private boolean mHasFetchedVoicemailStatus;
- private boolean selectAllMode;
private boolean mShowVoicemailTabAfterVoicemailStatusIsFetched;
private VoicemailStatusHelper mVoicemailStatusHelper;
private final ArrayList mOnPageChangeListeners = new ArrayList<>();
@@ -89,6 +83,8 @@ public class ListsFragment extends Fragment
private boolean mPaused;
private CallLogQueryHandler mCallLogQueryHandler;
+ private UiAction.Type[] actionTypeList;
+
private final ContentObserver mVoicemailStatusObserver =
new ContentObserver(new Handler()) {
@Override
@@ -159,6 +155,12 @@ public class ListsFragment extends Fragment
Trace.endSection();
Trace.beginSection(TAG + " setup views");
+ actionTypeList = new UiAction.Type[TAB_COUNT_WITH_VOICEMAIL];
+ actionTypeList[TAB_INDEX_SPEED_DIAL] = UiAction.Type.CHANGE_TAB_TO_FAVORITE;
+ actionTypeList[TAB_INDEX_HISTORY] = UiAction.Type.CHANGE_TAB_TO_CALL_LOG;
+ actionTypeList[TAB_INDEX_ALL_CONTACTS] = UiAction.Type.CHANGE_TAB_TO_CONTACTS;
+ actionTypeList[TAB_INDEX_VOICEMAIL] = UiAction.Type.CHANGE_TAB_TO_VOICEMAIL;
+
String[] tabTitles = new String[TAB_COUNT_WITH_VOICEMAIL];
tabTitles[TAB_INDEX_SPEED_DIAL] = getResources().getString(R.string.tab_speed_dial);
tabTitles[TAB_INDEX_HISTORY] = getResources().getString(R.string.tab_history);
@@ -190,13 +192,6 @@ public class ListsFragment extends Fragment
addOnPageChangeListener(mViewPagerTabs);
mRemoveView = (RemoveView) parentView.findViewById(R.id.remove_view);
mRemoveViewContent = parentView.findViewById(R.id.remove_view_content);
- mMultiSelectSelectAllViewContent =
- parentView.findViewById(R.id.multi_select_select_all_view_content);
- mSelectUnselectAllViewText = (TextView) parentView.findViewById(R.id.select_all_view_text);
- mSelectUnselectAllIcon = (ImageView) parentView.findViewById(R.id.select_all_view_icon);
- mMultiSelectSelectAllViewContent.setOnClickListener(null);
- mSelectUnselectAllIcon.setOnClickListener(this);
- mSelectUnselectAllViewText.setOnClickListener(this);
if (PermissionsUtil.hasReadVoicemailPermissions(getContext())
&& PermissionsUtil.hasAddVoicemailPermissions(getContext())) {
@@ -227,8 +222,8 @@ public class ListsFragment extends Fragment
/**
* Shows the tab with the specified index. If the voicemail tab index is specified, but the
- * voicemail status hasn't been fetched, it will try to show the tab after the voicemail status
- * has been fetched.
+ * voicemail status hasn't been fetched, it will show the speed dial tab and try to show the
+ * voicemail tab after the voicemail status has been fetched.
*/
public void showTab(int index) {
if (index == TAB_INDEX_VOICEMAIL) {
@@ -255,6 +250,8 @@ public class ListsFragment extends Fragment
@Override
public void onPageSelected(int position) {
+ PerformanceReport.recordClick(actionTypeList[position]);
+
LogUtil.i("ListsFragment.onPageSelected", "position: %d", position);
mTabIndex = mAdapter.getRtlPosition(position);
@@ -389,7 +386,7 @@ public class ListsFragment extends Fragment
public void markMissedCallsAsReadAndRemoveNotifications() {
if (mCallLogQueryHandler != null) {
mCallLogQueryHandler.markMissedCallsAsRead();
- CallLogNotificationsService.markNewMissedCallsAsOld(getContext(), null);
+ CallLogNotificationsService.cancelAllMissedCalls(getContext());
}
}
@@ -400,9 +397,7 @@ public class ListsFragment extends Fragment
}
public void showMultiSelectRemoveView(boolean show) {
- mMultiSelectSelectAllViewContent.setVisibility(show ? View.VISIBLE : View.GONE);
- mMultiSelectSelectAllViewContent.setAlpha(show ? 0 : 1);
- mMultiSelectSelectAllViewContent.animate().alpha(show ? 1 : 0).start();
+ mViewPagerTabs.setVisibility(show ? View.GONE : View.VISIBLE);
mViewPager.setEnableSwipingPages(!show);
}
@@ -445,28 +440,4 @@ public class ListsFragment extends Fragment
}
Logger.get(getActivity()).logScreenView(screenType, getActivity());
}
-
- @Override
- public void onClick(View v) {
- updateSelectAllIcon();
- selectAllMode = !selectAllMode;
- }
-
- public void setSelectAllModeToFalse() {
- selectAllMode = false;
- mSelectUnselectAllIcon.setImageDrawable(
- getContext().getDrawable(R.drawable.ic_empty_check_mark_white_24dp));
- }
-
- private void updateSelectAllIcon() {
- if (selectAllMode) {
- mSelectUnselectAllIcon.setImageDrawable(
- getContext().getDrawable(R.drawable.ic_empty_check_mark_white_24dp));
- ((VisualVoicemailCallLogFragment) mCurrentPage).getAdapter().onAllDeselected();
- } else {
- mSelectUnselectAllIcon.setImageDrawable(
- getContext().getDrawable(R.drawable.ic_check_mark_blue_24dp));
- ((VisualVoicemailCallLogFragment) mCurrentPage).getAdapter().onAllSelected();
- }
- }
}
diff --git a/java/com/android/dialer/app/list/OldSpeedDialFragment.java b/java/com/android/dialer/app/list/OldSpeedDialFragment.java
index 1ddc0f4e1d50ab0ffc01d3cbb8f2187e40429f30..05d017b2869c20629e4bd703c30f61ae24fd7285 100644
--- a/java/com/android/dialer/app/list/OldSpeedDialFragment.java
+++ b/java/com/android/dialer/app/list/OldSpeedDialFragment.java
@@ -56,6 +56,7 @@ import com.android.dialer.util.PermissionsUtil;
import com.android.dialer.util.ViewUtil;
import com.android.dialer.widget.EmptyContentView;
import java.util.ArrayList;
+import java.util.Arrays;
/** This fragment displays the user's favorite/frequent contacts in a grid. */
public class OldSpeedDialFragment extends Fragment
@@ -403,9 +404,15 @@ public class OldSpeedDialFragment extends Fragment
return;
}
- if (!PermissionsUtil.hasPermission(activity, READ_CONTACTS)) {
+ String[] deniedPermissions =
+ PermissionsUtil.getPermissionsCurrentlyDenied(
+ getContext(), PermissionsUtil.allContactsGroupPermissionsUsedInDialer);
+ if (deniedPermissions.length > 0) {
+ LogUtil.i(
+ "OldSpeedDialFragment.onEmptyViewActionButtonClicked",
+ "Requesting permissions: " + Arrays.toString(deniedPermissions));
FragmentCompat.requestPermissions(
- this, new String[] {READ_CONTACTS}, READ_CONTACTS_PERMISSION_REQUEST_CODE);
+ this, deniedPermissions, READ_CONTACTS_PERMISSION_REQUEST_CODE);
} else {
// Switch tabs
((HostInterface) activity).showAllContactsTab();
diff --git a/java/com/android/dialer/app/list/PhoneFavoriteTileView.java b/java/com/android/dialer/app/list/PhoneFavoriteTileView.java
index 835b448bdb71bc343a6bb2426e1f72b051c9a90d..eb4f8e967221efaaa795282631b9eb8666c6a01e 100644
--- a/java/com/android/dialer/app/list/PhoneFavoriteTileView.java
+++ b/java/com/android/dialer/app/list/PhoneFavoriteTileView.java
@@ -138,6 +138,8 @@ public abstract class PhoneFavoriteTileView extends ContactTileView {
}
if (TextUtils.isEmpty(mPhoneNumberString)) {
+ // Don't set performance report now, since user may spend some time on picking a number
+
// Copy "superclass" implementation
Logger.get(getContext())
.logInteraction(InteractionEvent.Type.SPEED_DIAL_CLICK_CONTACT_WITH_AMBIGUOUS_NUMBER);
diff --git a/java/com/android/dialer/app/list/PhoneFavoritesTileAdapter.java b/java/com/android/dialer/app/list/PhoneFavoritesTileAdapter.java
index ce859826143d30b5def5a25e3bccdafdd9fc3ba5..876fbf146aa674843b3124dfb17fe87656434623 100644
--- a/java/com/android/dialer/app/list/PhoneFavoritesTileAdapter.java
+++ b/java/com/android/dialer/app/list/PhoneFavoritesTileAdapter.java
@@ -200,7 +200,7 @@ public class PhoneFavoritesTileAdapter extends BaseAdapter implements OnDragDrop
int multipleNumbersContactsCount = 0;
int contactsWithPhotoCount = 0;
int contactsWithNameCount = 0;
- int duoReachableContactsCount = 0;
+ int lightbringerReachableContactsCount = 0;
// The cursor should not be closed since this is invoked from a CursorLoader.
if (cursor.moveToFirst()) {
@@ -308,7 +308,7 @@ public class PhoneFavoritesTileAdapter extends BaseAdapter implements OnDragDrop
if (contact.phoneNumber == null) {
multipleNumbersContactsCount++;
} else if (lightbringer.isReachable(mContext, contact.phoneNumber)) {
- duoReachableContactsCount++;
+ lightbringerReachableContactsCount++;
}
}
@@ -320,7 +320,7 @@ public class PhoneFavoritesTileAdapter extends BaseAdapter implements OnDragDrop
multipleNumbersContactsCount,
contactsWithPhotoCount,
contactsWithNameCount,
- duoReachableContactsCount);
+ lightbringerReachableContactsCount);
// Logs for manual testing
LogUtil.v("PhoneFavoritesTileAdapter.saveCursorToCache", "counter: %d", counter);
LogUtil.v(
diff --git a/java/com/android/dialer/app/list/RegularSearchFragment.java b/java/com/android/dialer/app/list/RegularSearchFragment.java
index 4f032032f1e7520acc7636452e1b4c24d0b91c05..728948bfc03800aaa3ef1ee290236628a2ac3af8 100644
--- a/java/com/android/dialer/app/list/RegularSearchFragment.java
+++ b/java/com/android/dialer/app/list/RegularSearchFragment.java
@@ -26,11 +26,13 @@ import com.android.contacts.common.list.ContactEntryListAdapter;
import com.android.contacts.common.list.PinnedHeaderListView;
import com.android.dialer.app.R;
import com.android.dialer.callintent.CallInitiationType;
+import com.android.dialer.common.LogUtil;
import com.android.dialer.phonenumbercache.CachedNumberLookupService;
import com.android.dialer.phonenumbercache.PhoneNumberCache;
import com.android.dialer.util.PermissionsUtil;
import com.android.dialer.widget.EmptyContentView;
import com.android.dialer.widget.EmptyContentView.OnEmptyViewActionButtonClickedListener;
+import java.util.Arrays;
public class RegularSearchFragment extends SearchFragment
implements OnEmptyViewActionButtonClickedListener,
@@ -114,8 +116,15 @@ public class RegularSearchFragment extends SearchFragment
}
if (READ_CONTACTS.equals(mPermissionToRequest)) {
- FragmentCompat.requestPermissions(
- this, new String[] {mPermissionToRequest}, PERMISSION_REQUEST_CODE);
+ String[] deniedPermissions =
+ PermissionsUtil.getPermissionsCurrentlyDenied(
+ getContext(), PermissionsUtil.allContactsGroupPermissionsUsedInDialer);
+ if (deniedPermissions.length > 0) {
+ LogUtil.i(
+ "RegularSearchFragment.onEmptyViewActionButtonClicked",
+ "Requesting permissions: " + Arrays.toString(deniedPermissions));
+ FragmentCompat.requestPermissions(this, deniedPermissions, PERMISSION_REQUEST_CODE);
+ }
}
}
diff --git a/java/com/android/dialer/app/list/SearchFragment.java b/java/com/android/dialer/app/list/SearchFragment.java
index 7f2d17650d654468bb7eb6b87205bce48173f560..00a2708a1ef85585399471959fd70c989822547b 100644
--- a/java/com/android/dialer/app/list/SearchFragment.java
+++ b/java/com/android/dialer/app/list/SearchFragment.java
@@ -42,6 +42,8 @@ import com.android.dialer.app.dialpad.DialpadFragment.ErrorDialogFragment;
import com.android.dialer.app.widget.DialpadSearchEmptyContentView;
import com.android.dialer.callintent.CallSpecificAppData;
import com.android.dialer.common.LogUtil;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
import com.android.dialer.util.DialerUtils;
import com.android.dialer.util.IntentUtil;
import com.android.dialer.util.PermissionsUtil;
@@ -96,9 +98,6 @@ public class SearchFragment extends PhoneNumberPickerFragment {
public void onStart() {
LogUtil.d("SearchFragment.onStart", "");
super.onStart();
- if (isSearchMode()) {
- getAdapter().setHasHeader(0, false);
- }
mActivity = (HostInterface) getActivity();
@@ -170,16 +169,6 @@ public class SearchFragment extends PhoneNumberPickerFragment {
return animator;
}
- @Override
- protected void setSearchMode(boolean flag) {
- super.setSearchMode(flag);
- // This hides the "All contacts with phone numbers" header in the search fragment
- final ContactEntryListAdapter adapter = getAdapter();
- if (adapter != null) {
- adapter.setHasHeader(0, false);
- }
- }
-
public void setAddToContactNumber(String addToContactNumber) {
mAddToContactNumber = addToContactNumber;
}
@@ -247,6 +236,10 @@ public class SearchFragment extends PhoneNumberPickerFragment {
}
break;
case DialerPhoneNumberListAdapter.SHORTCUT_CREATE_NEW_CONTACT:
+ if (this instanceof SmartDialSearchFragment) {
+ Logger.get(getContext())
+ .logImpression(DialerImpression.Type.CREATE_NEW_CONTACT_FROM_DIALPAD);
+ }
number =
TextUtils.isEmpty(mAddToContactNumber)
? adapter.getFormattedQueryString()
@@ -255,6 +248,10 @@ public class SearchFragment extends PhoneNumberPickerFragment {
DialerUtils.startActivityWithErrorToast(getActivity(), intent);
break;
case DialerPhoneNumberListAdapter.SHORTCUT_ADD_TO_EXISTING_CONTACT:
+ if (this instanceof SmartDialSearchFragment) {
+ Logger.get(getContext())
+ .logImpression(DialerImpression.Type.ADD_TO_A_CONTACT_FROM_DIALPAD);
+ }
number =
TextUtils.isEmpty(mAddToContactNumber)
? adapter.getFormattedQueryString()
diff --git a/java/com/android/dialer/app/list/SmartDialSearchFragment.java b/java/com/android/dialer/app/list/SmartDialSearchFragment.java
index fc21c8bc3f8be21d51061916bea92f94b5ca7733..2ebc06bc3f505a5309faaa5558134bb567a557f3 100644
--- a/java/com/android/dialer/app/list/SmartDialSearchFragment.java
+++ b/java/com/android/dialer/app/list/SmartDialSearchFragment.java
@@ -34,6 +34,7 @@ import com.android.dialer.common.LogUtil;
import com.android.dialer.database.DialerDatabaseHelper;
import com.android.dialer.util.PermissionsUtil;
import com.android.dialer.widget.EmptyContentView;
+import java.util.Arrays;
/** Implements a fragment to load and display SmartDial search results. */
public class SmartDialSearchFragment extends SearchFragment
@@ -79,6 +80,11 @@ public class SmartDialSearchFragment extends SearchFragment
}
}
+ @Override
+ public boolean getShowEmptyListForNullQuery() {
+ return true;
+ }
+
@Override
protected void setupEmptyView() {
if (mEmptyView != null && getActivity() != null) {
@@ -123,8 +129,16 @@ public class SmartDialSearchFragment extends SearchFragment
return;
}
- FragmentCompat.requestPermissions(
- this, new String[] {CALL_PHONE}, CALL_PHONE_PERMISSION_REQUEST_CODE);
+ String[] deniedPermissions =
+ PermissionsUtil.getPermissionsCurrentlyDenied(
+ getContext(), PermissionsUtil.allPhoneGroupPermissionsUsedInDialer);
+ if (deniedPermissions.length > 0) {
+ LogUtil.i(
+ "SmartDialSearchFragment.onEmptyViewActionButtonClicked",
+ "Requesting permissions: " + Arrays.toString(deniedPermissions));
+ FragmentCompat.requestPermissions(
+ this, deniedPermissions, CALL_PHONE_PERMISSION_REQUEST_CODE);
+ }
}
@Override
diff --git a/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml b/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml
index 7c6df944882d69d7cbfac562604a7607bb6edb3d..0729d7293140eaeb6ec3228ecab115cf82d9d6cf 100644
--- a/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml
+++ b/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml
@@ -41,6 +41,7 @@
android:resizeableActivity="true"
android:theme="@style/DialtactsActivityTheme"
android:windowSoftInputMode="stateAlwaysHidden|adjustNothing">
+
@@ -106,6 +107,7 @@
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/com/android/dialer/app/res/menu/dialtacts_options.xml b/java/com/android/dialer/app/res/menu/dialtacts_options.xml
index 25a3e181133722d40ad8f5ad2b55bb73d3cce49b..b50e6ad5ffbc807c6a7dd096c3cd38deb08bbed1 100644
--- a/java/com/android/dialer/app/res/menu/dialtacts_options.xml
+++ b/java/com/android/dialer/app/res/menu/dialtacts_options.xml
@@ -28,5 +28,8 @@
- ""Vee hierdie stemboodskappe uit? ""
+ - ""Vee hierdie stemboodskap uit? ""
+
@string/call_log_header_today
"%1$s om %2$s"
"%1$02d:%2$02d"
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 7f4a622d70dc258f0751e5b95f0ac04d9e68a932..08b52a6ee9f93ad68ad88a630b54ad2e0a5115a9 100644
--- a/java/com/android/dialer/app/res/values-am/strings.xml
+++ b/java/com/android/dialer/app/res/values-am/strings.xml
@@ -80,6 +80,7 @@
"መጠበቅ አክል"
"ቅንብሮች"
"ማስመሰያ"
+ "አዲስ የዩአይ አቋራጭ ፍጠር"
"ሁሉም እውቅያዎች"
"የድምፅ ቁልፍ ሰሌዳን ንካ"
"በመካሄድ ላይ ወዳለው ጥሪ ተመለስ"
@@ -104,12 +105,14 @@
"%s ሰከንድ"
"%s ደቂቃ %s ሴከ"
"የጅምላ እርምጃ ሁነታ ይቅር"
- "የድምፅ መልዕክት"
- "የድምፅ መልዕክቶች"
- "አዎ"
- "አይ"
+ "ሰርዝ"
+ "ይቅር"
"የተመረጠው %1$s ይሰረዝ?"
"%1$s ተመርጠዋል"
+
+ - ""እነዚህ የድምፅ መልዕክቶች ይሰረዙ? ""
+ - ""እነዚህ የድምፅ መልዕክቶች ይሰረዙ? ""
+
@string/call_log_header_today
"%1$s %2$s ላይ"
"%1$02d:%2$02d"
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 3687d0bcb50406798a4bd06472ecba9c0b10819d..fe84a66abe131e83cc0c563f135c885401750116 100644
--- a/java/com/android/dialer/app/res/values-ar/strings.xml
+++ b/java/com/android/dialer/app/res/values-ar/strings.xml
@@ -84,6 +84,7 @@
"إضافة انتظار"
"الإعدادات"
"المحاكي"
+ "إنشاء اختصار للواجهة الجديدة"
"جميع جهات الاتصال"
"استخدام لوحة مفاتيح نغمات باللمس"
"عودة إلى المكالمة الجارية"
@@ -108,12 +109,18 @@
"%s ثانية"
"%s دقيقة %s ثانية"
"إلغاء وضع الإجراءات المجمَّع"
- "البريد الصوتي"
- "رسائل البريد الصوتي"
- "نعم"
- "لا"
+ "حذف"
+ "إلغاء"
"حذف رسائل %1$s المحددة؟"
"تم تحديد %1$s"
+
+ - ""حذف رسائل البريد الصوتي هذه؟ ""
+ - ""حذف رسالتي البريد الصوتي هاتين؟ ""
+ - ""حذف رسائل البريد الصوتي هذه؟ ""
+ - ""حذف رسائل البريد الصوتي هذه؟ ""
+ - ""حذف رسائل البريد الصوتي هذه؟ ""
+ - ""حذف رسالة البريد الصوتي هذه؟ ""
+
@string/call_log_header_today
"%1$s في %2$s"
"%1$02d:%2$02d"
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 b6681c9e2ab5047b9924ebc3232e97f4700b0a97..f2b0cf35d669bdd8461dd0ede14ea5d7a6b4fd90 100644
--- a/java/com/android/dialer/app/res/values-az/strings.xml
+++ b/java/com/android/dialer/app/res/values-az/strings.xml
@@ -80,6 +80,7 @@
"Gözləmə əlavə edin"
"Ayarlar"
"Stimulyator"
+ "Yeni İİ Qısayolu yaradın"
"Bütün kontaktlar"
"Toxunma ton klaviaturasını istifadə edin"
"Davam edən zəngə qayıdın"
@@ -104,12 +105,14 @@
"%s san"
"%s dəq %s san"
"Qrup əməliyyatları rejimini ləğv edin"
- "səsli e-məktub"
- "səsli e-məktublar"
- "Bəli"
- "Xeyr"
+ "Silin"
+ "Ləğv edin"
"Seçilmiş %1$s silinsin?"
"%1$s seçilib"
+
+ - ""Bu səsli e-məktub silinsin? ""
+ - ""Bu səsli e-məktub silinsin? ""
+
@string/call_log_header_today
"%1$s tarixində %2$s"
"%1$02d:%2$02d"
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 40c0886c8e7c47a18d2f37f7a8909b3635a616fd..b011f7866c80b7951f0f0fc42fe425f014b94f1f 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
@@ -81,6 +81,7 @@
"Dodaj čekanje"
"Podešavanja"
"Simulator"
+ "Napravite prečicu za novi UI"
"Svi kontakti"
"Upotrebite brojčanik za tonsko biranje"
"Vrati se na poziv koji je u toku"
@@ -105,12 +106,15 @@
"%s sek"
"%s min %s sek"
"Otkažite režim grupnih radnji"
- "govornu poruku"
- "govorne poruke"
- "Da"
- "Ne"
+ "Izbriši"
+ "Otkaži"
"Želite li da izbrišete izabranu(e) %1$s?"
"Izabranih: %1$s"
+
+ - ""Želite li da izbrišete ove govorne poruke? ""
+ - ""Želite li da izbrišete ove govorne poruke? ""
+ - ""Želite li da izbrišete ove govorne poruke? ""
+
@string/call_log_header_today
"%1$s u %2$s"
"%1$02d:%2$02d"
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 f2ad3342b9f6bfca92c3ca4ef77242ae9f6e2abe..f9b083747e0f84a8f394c2ea0c98ad9ce40851b0 100644
--- a/java/com/android/dialer/app/res/values-be/strings.xml
+++ b/java/com/android/dialer/app/res/values-be/strings.xml
@@ -82,6 +82,7 @@
"Дадаць чаканне"
"Налады"
"Сродак мадэліравання"
+ "Ярлык новага карыст. інтэрфейсу"
"Усе кантакты"
"Выкарыстанне тонавай клавіятуры"
"Звярнуцца да бягучага выкліку"
@@ -106,12 +107,16 @@
"%s с"
"%s хв %s с"
"Скасаваць рэжым пакетных дзеянняў"
- "галасавая пошта"
- "галасавая пошта"
- "Так"
- "Не"
+ "Выдаліць"
+ "Скасаваць"
"Выдаліць вылучанае: %1$s?"
"Выбрана: %1$s"
+
+ - ""Выдаліць гэтыя паведамленні галасавой пошты? ""
+ - ""Выдаліць гэтыя паведамленні галасавой пошты? ""
+ - ""Выдаліць гэтыя паведамленні галасавой пошты? ""
+ - ""Выдаліць гэтыя паведамленні галасавой пошты? ""
+
@string/call_log_header_today
"%1$s у %2$s"
"%1$02d:%2$02d"
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 8083f48281a15e9ebe10acf5903d72f20e184db9..8b1105cb3015c5a38f5de030250f60fda9f7691c 100644
--- a/java/com/android/dialer/app/res/values-bg/strings.xml
+++ b/java/com/android/dialer/app/res/values-bg/strings.xml
@@ -80,6 +80,7 @@
"Добавяне на изчакване"
"Настройки"
"Симулатор"
+ "Пряк път към новия ПИ"
"Всички контакти"
"Използване на тонова клавиатура"
"Назад към текущото обаждане"
@@ -104,12 +105,14 @@
"%s сек"
"%s мин %s сек"
"Анулиране на режима на групови действия"
- "гласово съобщение"
- "гласови съобщения"
- "Да"
- "Не"
+ "Изтриване"
+ "Отказ"
"Избрахте %1$s – да се изтрие ли избраното?"
"Избрахте %1$s"
+
+ - ""Да се изтрият ли тези гласови съобщения? ""
+ - ""Да се изтрие ли това гласово съобщение? ""
+
@string/call_log_header_today
"%1$s в %2$s"
"%1$02d:%2$02d"
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 4d2d7cc1e4bb679b91544012d3597fb0b5cdeb8c..2ec362685b382559c778ade62968f940f15c2e42 100644
--- a/java/com/android/dialer/app/res/values-bn/strings.xml
+++ b/java/com/android/dialer/app/res/values-bn/strings.xml
@@ -80,6 +80,7 @@
"অপেক্ষা যোগ করুন"
"সেটিংস"
"সিমুলেটার"
+ "নতুন UI শর্টকাট তৈরি করুন"
"সকল পরিচিতি"
"স্পর্শ স্বর কীপ্যাড ব্যবহার করুন"
"প্রগতিতে থাকা কলে প্রত্যাবর্তন"
@@ -104,12 +105,14 @@
"%s সেকেন্ড"
"%s মিনিট %s সেকেন্ড"
"ব্যাচ অ্যাকশন মোড বাতিল করুন"
- "ভয়েসমেল"
- "ভয়েসমেলগুলি"
- "হ্যাঁ"
- "না"
+ "মুছুন"
+ "বাতিল করুন"
"নির্বাচিত %1$s মুছে ফেলতে চান?"
"%1$sটি নির্বাচিত"
+
+ - ""এই ভয়েসমেলগুলি মুছবেন? ""
+ - ""এই ভয়েসমেলগুলি মুছবেন? ""
+
@string/call_log_header_today
"%1$s তারিখে %2$s\'টায়"
"%1$02d:%2$02d"
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 d8347723dc3d192ca18290ca7d7896f04501170b..087db1274603b36d1bb8b785857ca82b4ecf3e66 100644
--- a/java/com/android/dialer/app/res/values-bs/strings.xml
+++ b/java/com/android/dialer/app/res/values-bs/strings.xml
@@ -81,6 +81,7 @@
"Dodaj čekanje"
"Postavke"
"Simulator"
+ "Kreiraj prečicu za novi UI"
"Svi kontakti"
"Koristi tastaturu za tonsko biranje"
"Povratak na poziv u toku"
@@ -105,12 +106,15 @@
"%s sek."
"%s min. %s sek."
"Otkaži način rada za grupnu radnju"
- "poruka govorne pošte"
- "poruke govorne pošte"
- "Da"
- "Ne"
+ "Izbriši"
+ "Otkaži"
"Izbrisati izabranu/e %1$s?"
"Odabrano %1$s"
+
+ - ""Izbrisati ove govorne poruke? ""
+ - ""Izbrisati ove govorne poruke? ""
+ - ""Izbrisati ove govorne poruke? ""
+
@string/call_log_header_today
"%1$s u %2$s"
"%1$02d:%2$02d"
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 7b12e0dbd3ae707b5255feb1276c65023f24db48..71385805a397e7a25e8eab0c53c8043925bed28e 100644
--- a/java/com/android/dialer/app/res/values-ca/strings.xml
+++ b/java/com/android/dialer/app/res/values-ca/strings.xml
@@ -80,6 +80,7 @@
"Afegeix espera"
"Configuració"
"Simulador"
+ "Crea drecera per a la nova IU"
"Tots els contactes"
"Utilitza el teclat de tons"
"Torna a la trucada en curs"
@@ -104,18 +105,20 @@
"%s s"
"%s min %s s"
"Cancel·la el mode d\'accions en lot"
- "missatge de veu"
- "missatges de veu"
- "Sí"
- "No"
+ "Suprimeix"
+ "Cancel·la"
"Vols suprimir l\'element o elements seleccionats (%1$s)?"
"%1$s seleccionades"
+
+ - ""Vols suprimir aquests missatges de veu? ""
+ - ""Vols suprimir aquest missatge de veu? ""
+
@string/call_log_header_today
"%1$s a les %2$s"
"%1$02d:%2$02d"
"%1$s • %2$s"
"No es pot trucar a aquest número."
- "Per configurar els missatges de veu, vés a Menú > Configuració."
+ "Per configurar els missatges de veu, ves a Menú > Configuració."
"Per trucar a la bústia de veu, primer has de desactivar el mode d\'avió."
"S\'està carregant…"
"IMEI"
@@ -229,7 +232,7 @@
"Bloqueja el número"
"No és una trucada brossa"
"Desbloqueja el número"
- "Contingut brossa"
+ "Trucada brossa"
"%1$s no té connexió i no s\'hi pot contactar"
"Informació"
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 bbcb35847ef1ec0b684b151e0d75bc40cc3fe859..dbff467c08c85262df61f37c0b33ba1dc326ce20 100644
--- a/java/com/android/dialer/app/res/values-cs/strings.xml
+++ b/java/com/android/dialer/app/res/values-cs/strings.xml
@@ -82,6 +82,7 @@
"Přidat čekání"
"Nastavení"
"Simulátor"
+ "Vytv. zkratku na nové rozhraní"
"Všechny kontakty"
"Použít dotykovou tónovou klávesnici"
"Návrat k probíhajícímu hovoru"
@@ -106,12 +107,16 @@
"%s s"
"%s min %s s"
"Zrušit režim hromadných akcí"
- "vybranou hlasovou zprávu"
- "vybrané hlasové zprávy"
- "Ano"
- "Ne"
+ "Smazat"
+ "Zrušit"
"Smazat %1$s?"
"Vybráno: %1$s"
+
+ - ""Smazat tyto hlasové zprávy? ""
+ - ""Smazat tyto hlasové zprávy? ""
+ - ""Smazat tyto hlasové zprávy? ""
+ - ""Smazat tuto hlasovou zprávu? ""
+
@string/call_log_header_today
"%1$s v %2$s"
"%1$02d:%2$02d"
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 31cf8e33d1b9ffb0838f190dbe91bf53e8721597..72f5a283559a94eea2440361ef3d92f5e8ca7f5c 100644
--- a/java/com/android/dialer/app/res/values-da/strings.xml
+++ b/java/com/android/dialer/app/res/values-da/strings.xml
@@ -80,6 +80,7 @@
"Tilføj ventetid"
"Indstillinger"
"Simulator"
+ "Opret ny brugerfladegenvej"
"Alle kontakter"
"Brug numerisk tastatur"
"Vend tilbage til igangværende opkald"
@@ -88,7 +89,7 @@
"Massehandlingstilstanden startes"
"Massehandlingstilstanden blev afsluttet"
"Vælg %1$s"
- "Fravælg %1$s"
+ "Fravalgt %1$s"
"Afspil telefonsvarerbesked"
"Vis kontaktpersonen %1$s"
"Ring til %1$s"
@@ -104,12 +105,14 @@
"%s sek."
"%s min. %s sek."
"Annuller massehandlingstilstand"
- "talebesked"
- "talebeskeder"
- "Ja"
- "Nej"
+ "Slet"
+ "Annuller"
"Vil du slette de valgte %1$s?"
"%1$s er valgt"
+
+ - ""Vil du slette denne talebesked? ""
+ - ""Vil du slette disse talebeskeder? ""
+
@string/call_log_header_today
"%1$s kl. %2$s"
"%1$02d:%2$02d"
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 c1f644119de6027a9b818e40a0f46e954a58df2b..a7efd53a352fc2b99b0754dc8b8a294cde960605 100644
--- a/java/com/android/dialer/app/res/values-de/strings.xml
+++ b/java/com/android/dialer/app/res/values-de/strings.xml
@@ -80,6 +80,7 @@
"Warten hinzufügen"
"Einstellungen"
"Simulator"
+ "Verknüpfung für neue Benutzeroberfläche erstellen"
"Alle Kontakte"
"Telefontastatur verwenden"
"Zurück zum aktuellen Anruf"
@@ -104,12 +105,14 @@
"%s s"
"%s min %s s"
"Modus für Batch-Aktionen abbrechen"
- "Mailboxnachricht"
- "Mailboxnachrichten"
- "Ja"
- "Nein"
+ "Löschen"
+ "Abbrechen"
"Ausgewählte %1$s löschen?"
"%1$s ausgewählt"
+
+ - ""Diese Mailboxnachrichten löschen? ""
+ - ""Diese Mailboxnachricht löschen? ""
+
@string/call_log_header_today
"%1$s um %2$s"
"%1$02d:%2$02d"
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 c4ba02d0f1d9fb73f9c4e44504d926e38cb95298..7080e5e50d5f68a324a46d5d6471ffdc649dca22 100644
--- a/java/com/android/dialer/app/res/values-el/strings.xml
+++ b/java/com/android/dialer/app/res/values-el/strings.xml
@@ -80,6 +80,7 @@
"Προσθήκη αναμονής"
"Ρυθμίσεις"
"Προσομοιωτής"
+ "Δημ. νέας συντόμ. διεπαφής"
"Όλες οι επαφές"
"Χρησιμοποιήστε το πληκτρολόγιο αφής ηχητικών τόνων"
"Επιστροφή στην κλήση που βρίσκεται σε εξέλιξη"
@@ -104,12 +105,14 @@
"%s δευτερόλεπτα"
"%s λεπτά %s δευτερόλεπτα"
"Ακύρωση λειτουργίας μαζικών ενεργειών"
- "φωνητικού μηνύματος αυτόματου τηλεφωνητή"
- "φωνητικών μηνυμάτων αυτόματου τηλεφωνητή"
- "Ναι"
- "Όχι"
+ "Διαγραφή"
+ "Ακύρωση"
"Διαγραφή επιλεγμ. %1$s;"
"Έχουν επιλεγεί %1$s"
+
+ - ""Διαγραφή αυτών των μηνυμάτων αυτόματου τηλεφωνητή; ""
+ - ""Διαγραφή αυτού του μηνύματος αυτόματου τηλεφωνητή; ""
+
@string/call_log_header_today
"%1$s στις %2$s"
"%1$02d:%2$02d"
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 cb7e912c7bc119c938f1c9d0a2551a107ae1d00b..999f7dab01b5a41f74ac67a194a2b617ed733bd7 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
@@ -80,6 +80,7 @@
"Add wait"
"Settings"
"Simulator"
+ "Create new UI shortcut"
"All contacts"
"Use touch tone keypad"
"Return to call in progress"
@@ -104,12 +105,14 @@
"%s sec"
"%s min %s sec"
"Cancel batch actions mode"
- "voicemail"
- "voicemails"
- "Yes"
- "No"
+ "Delete"
+ "Cancel"
"Delete selected %1$s?"
"%1$s selected"
+
+ - ""Delete these voicemails? ""
+ - ""Delete this voicemail? ""
+
@string/call_log_header_today
"%1$s at %2$s"
"%1$02d:%2$02d"
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 cb7e912c7bc119c938f1c9d0a2551a107ae1d00b..999f7dab01b5a41f74ac67a194a2b617ed733bd7 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
@@ -80,6 +80,7 @@
"Add wait"
"Settings"
"Simulator"
+ "Create new UI shortcut"
"All contacts"
"Use touch tone keypad"
"Return to call in progress"
@@ -104,12 +105,14 @@
"%s sec"
"%s min %s sec"
"Cancel batch actions mode"
- "voicemail"
- "voicemails"
- "Yes"
- "No"
+ "Delete"
+ "Cancel"
"Delete selected %1$s?"
"%1$s selected"
+
+ - ""Delete these voicemails? ""
+ - ""Delete this voicemail? ""
+
@string/call_log_header_today
"%1$s at %2$s"
"%1$02d:%2$02d"
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 cb7e912c7bc119c938f1c9d0a2551a107ae1d00b..999f7dab01b5a41f74ac67a194a2b617ed733bd7 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
@@ -80,6 +80,7 @@
"Add wait"
"Settings"
"Simulator"
+ "Create new UI shortcut"
"All contacts"
"Use touch tone keypad"
"Return to call in progress"
@@ -104,12 +105,14 @@
"%s sec"
"%s min %s sec"
"Cancel batch actions mode"
- "voicemail"
- "voicemails"
- "Yes"
- "No"
+ "Delete"
+ "Cancel"
"Delete selected %1$s?"
"%1$s selected"
+
+ - ""Delete these voicemails? ""
+ - ""Delete this voicemail? ""
+
@string/call_log_header_today
"%1$s at %2$s"
"%1$02d:%2$02d"
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 79d607fc781aad12568058676f3c76ff53df0115..701d74ebca44873cf46bc24e3791425f70cd8d4a 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
@@ -80,6 +80,7 @@
"Agregar espera"
"Configuración"
"Simulador"
+ "Crear acceso a la nueva IU"
"Todos los contactos"
"Usar teclado numérico"
"Regresar a la llamada en curso"
@@ -104,12 +105,14 @@
"%s s"
"%s min %s s"
"Cancelar el modo de acción masiva"
- "el mensaje de voz"
- "los mensajes de voz"
- "Sí"
- "No"
+ "Borrar"
+ "Cancelar"
"¿Deseas borrar %1$s que seleccionaste?"
"%1$s seleccionada(s)"
+
+ - ""¿Deseas borrar estos mensajes de voz? ""
+ - ""¿Deseas borrar este mensaje de voz? ""
+
@string/call_log_header_today
"El %1$s a la hora %2$s"
"%1$02d:%2$02d"
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 170edc8ca604e64374a76c1bafdb190aab021b9e..8cf47f554474071b148baf57e47e0a71809b430e 100644
--- a/java/com/android/dialer/app/res/values-es/strings.xml
+++ b/java/com/android/dialer/app/res/values-es/strings.xml
@@ -80,6 +80,7 @@
"Añadir espera"
"Ajustes"
"Simulador"
+ "Crear acceso a la interfaz"
"Todos los contactos"
"Usar teclado táctil"
"Volver a la llamada"
@@ -104,12 +105,14 @@
"%s s"
"%s min y %s s"
"Cancelar el modo de acciones en lote"
- "mensaje de voz"
- "mensajes de voz"
- "Sí"
- "No"
+ "Eliminar"
+ "Cancelar"
"¿Eliminar la selección de %1$s?"
"Se han seleccionado %1$s"
+
+ - ""¿Eliminar estos mensajes de voz? ""
+ - ""¿Eliminar este mensaje de voz? ""
+
@string/call_log_header_today
"%1$s a las %2$s"
"%1$02d:%2$02d"
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 e32b10403892da5e2a0eeec470b608c1321b105f..da043bf3cdc6f4303fda98f70c0d42a5cf5c4728 100644
--- a/java/com/android/dialer/app/res/values-et/strings.xml
+++ b/java/com/android/dialer/app/res/values-et/strings.xml
@@ -80,6 +80,7 @@
"Lisa ootamine"
"Seaded"
"Simulaator"
+ "Loo uue kasutajaliid. otsetee"
"Kõik kontaktid"
"Kasuta puutetooniga klahvistikku"
"Tagasi käimasolevale kõnele"
@@ -104,12 +105,14 @@
"%s s"
"%s min %s s"
"Mitme toimigu režiimi tühistamine"
- "kõnepostisõnum"
- "kõnepostisõnumid"
- "Jah"
- "Ei"
+ "Kustuta"
+ "Tühista"
"Kas kustutada valitud kõnepostisõnumid %1$s?"
"%1$s on valitud"
+
+ - ""Kas kustutada need kõnepostisõnumid? ""
+ - ""Kas kustutada see kõnepostisõnum? ""
+
@string/call_log_header_today
"%1$s kell %2$s"
"%1$02d:%2$02d"
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 57ef67d883759d5de3aa919b704624d8f4940552..071c6f3f06f59860bdc7192161d0fbc80bec5537 100644
--- a/java/com/android/dialer/app/res/values-eu/strings.xml
+++ b/java/com/android/dialer/app/res/values-eu/strings.xml
@@ -80,6 +80,7 @@
"Gehitu itxaronaldia"
"Ezarpenak"
"Simulagailua"
+ "Sortu interfazerako esteka"
"Kontaktu guztiak"
"Erabili ukipen-tonuak dituen teklatua"
"Itzuli abian den deira"
@@ -104,12 +105,14 @@
"%s s"
"%s min %s s"
"Utzi bertan behera ekintzak multzoka gauzatzeko modua"
- "ahots-mezua"
- "ahots-mezuak"
- "Bai"
- "Ez"
+ "Ezabatu"
+ "Utzi"
"Hautatutako %1$s ezabatu?"
"%1$s hautatu dira"
+
+ - ""Ahots-mezu hauek ezabatu nahi dituzu? ""
+ - ""Ahots-mezu hau ezabatu nahi duzu? ""
+
@string/call_log_header_today
"%1$s (%2$s)"
"%1$02d:%2$02d"
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 eadb0dcb7aa9e42c61ff3f0676241af82b75a8bb..6c588747e6e82362572aab7e2ed00a000d7710ba 100644
--- a/java/com/android/dialer/app/res/values-fa/strings.xml
+++ b/java/com/android/dialer/app/res/values-fa/strings.xml
@@ -80,6 +80,7 @@
"افزودن انتظار"
"تنظیمات"
"شبیهساز"
+ "ایجاد میانبر رابط کاربری جدید"
"همه مخاطبین"
"استفاده از صفحهکلید لمسی"
"برگشت به تماس درحال انجام"
@@ -104,12 +105,14 @@
"%s ثانیه"
"%s دقیقه %s ثانیه"
"لغو حالت اقدام دستهای"
- "پست صوتی"
- "پستهای صوتی"
- "بله"
- "نه"
+ "حذف"
+ "لغو"
"%1$s انتخابشده حذف شود؟"
"%1$s مورد انتخاب شد"
+
+ - ""این پستهای صوتی حذف شوند؟ ""
+ - ""این پستهای صوتی حذف شوند؟ ""
+
@string/call_log_header_today
"%1$s ساعت %2$s"
"%1$02d:%2$02d"
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 9510959088519fb672e8c25b563ec7b103bf237d..55865d44a48d58e29c1c87f06f0112c0a15c4c58 100644
--- a/java/com/android/dialer/app/res/values-fi/strings.xml
+++ b/java/com/android/dialer/app/res/values-fi/strings.xml
@@ -80,6 +80,7 @@
"Lisää tauko"
"Asetukset"
"Simulaattori"
+ "Luo uusi UI-pikakuvake"
"Kaikki yhteystiedot"
"Käytä näppäimistöä"
"Palaa käynnissä olevaan puheluun"
@@ -104,12 +105,14 @@
"%s s"
"%s min %s s"
"Peruuta joukkotoimintotila."
- "vastaajaviesti"
- "vastaajaviestit"
- "Kyllä"
- "Ei"
+ "Poista"
+ "Peruuta"
"Poistetaanko %1$s?"
"%1$s valittu"
+
+ - ""Poistetaanko nämä vastaajaviestit? ""
+ - ""Poistetaanko tämä vastaajaviesti? ""
+
@string/call_log_header_today
"%1$s klo %2$s"
"%1$02d.%2$02d"
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 6aa285c501d452e1229b8d96780dfc4c3413d6a0..f10b121d5561ea4a6cee0901e4fc394e31cff7da 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
@@ -80,6 +80,7 @@
"Ajouter Attendre"
"Paramètres"
"Simulateur"
+ "Créer un raccourci vers l\'IU"
"Tous les contacts"
"Utiliser le clavier DTMF"
"Reprendre l\'appel en cours"
@@ -104,12 +105,14 @@
"%s s"
"%s min et %s sec"
"Annuler le mode d\'action par lots"
- "message vocal"
- "messages vocaux"
- "Oui"
- "Non"
+ "Supprimer"
+ "Annuler"
"Supprimer la sélection (%1$s)?"
"%1$s sélection(s)"
+
+ - ""Supprimer ce message vocal? ""
+ - ""Supprimer ces messages vocaux? ""
+
@string/call_log_header_today
"%1$s à %2$s"
"%1$02d:%2$02d"
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 f539d2e550afc57386980a5c430d50743f961f02..2ce930af5b1f1834634459728d191709d82afb0d 100644
--- a/java/com/android/dialer/app/res/values-fr/strings.xml
+++ b/java/com/android/dialer/app/res/values-fr/strings.xml
@@ -80,6 +80,7 @@
"Ajouter une attente"
"Paramètres"
"Simulateur"
+ "Créer un raccourci vers la nouvelle interface"
"Tous les contacts"
"Utiliser le clavier DTMF"
"Reprendre l\'appel en cours"
@@ -104,12 +105,14 @@
"%s secondes"
"%s min et %s s"
"Annuler le mode d\'actions groupées"
- "message vocal"
- "messages vocaux"
- "Oui"
- "Non"
+ "Supprimer"
+ "Annuler"
"Supprimer les messages vocaux sélectionnés (%1$s) ?"
"%1$s sélectionnés"
+
+ - ""Supprimer ce message vocal ? ""
+ - ""Supprimer ces message vocaux ? ""
+
@string/call_log_header_today
"%1$s à %2$s"
"%1$02d:%2$02d"
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 ca31c5e4706a83aeefc8ae96fa0d28a518a5a2b5..b9e540750b864d6895df7775a32dd9bde6e967bc 100644
--- a/java/com/android/dialer/app/res/values-gl/strings.xml
+++ b/java/com/android/dialer/app/res/values-gl/strings.xml
@@ -80,6 +80,7 @@
"Engadir espera"
"Configuración"
"Simulador"
+ "Crear atallo para a nova IU"
"Todos os contactos"
"Usar teclado de tons táctiles"
"Volver á chamada en curso"
@@ -104,12 +105,14 @@
"%s s"
"%s min %s s"
"Cancela o modo de accións en lote"
- "correo de voz"
- "correos de voz"
- "Si"
- "Non"
+ "Eliminar"
+ "Cancelar"
"Queres eliminar a selección (%1$s)?"
"Cantidade seleccionada: %1$s"
+
+ - ""Queres eliminar estes correos de voz? ""
+ - ""Queres eliminar este correo de voz? ""
+
@string/call_log_header_today
"%1$s ás %2$s"
"%1$02d:%2$02d"
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 fbe4d0aaabc14b1559faa00b7d8c40c94640528e..ca8749ad37c41b0b102d97e7c30329f87c0ff870 100644
--- a/java/com/android/dialer/app/res/values-gu/strings.xml
+++ b/java/com/android/dialer/app/res/values-gu/strings.xml
@@ -80,6 +80,7 @@
"પ્રતીક્ષા ઉમેરો"
"સેટિંગ્સ"
"સિમ્યુલેટર"
+ "નવું UI શૉર્ટકટ્સ બનાવો"
"તમામ સંપર્કો"
"ટચ ટોન કીપેડનો ઉપયોગ કરો"
"કૉલ પર પાછા આવવું પ્રગતિ પર છે"
@@ -104,12 +105,14 @@
"%s સેકંડ"
"%s મિ %s સે"
"બૅચ ક્રિયા મોડ રદ કરો"
- "વૉઇસમેઇલ"
- "વૉઇસમેઇલ"
- "હા"
- "નહીં"
+ "કાઢી નાખો"
+ "રદ કરો"
"પસંદ કરેલ %1$sને કાઢી નાખીએ?"
"%1$s પસંદ કરી"
+
+ - ""આ વૉઇસમેઇલ કાઢી નાખીએ? ""
+ - ""આ વૉઇસમેઇલ કાઢી નાખીએ? ""
+
@string/call_log_header_today
"%1$s નાં રોજ %2$s વાગ્યે"
"%1$02d:%2$02d"
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 c998e4402cc70a3bab0d15cabaca03fe92fc09b0..3bc93192197bcd01b3cedac3c6dceba2d3458393 100644
--- a/java/com/android/dialer/app/res/values-hi/strings.xml
+++ b/java/com/android/dialer/app/res/values-hi/strings.xml
@@ -80,6 +80,7 @@
"प्रतीक्षा का समय बढ़ाएं"
"सेटिंग"
"सिम्युलेटर"
+ "नया UI शॉर्टकट बनाएं"
"सभी संपर्क"
"टच टोन कीपैड का उपयोग करें"
"कॉल पर लौटना प्रगति पर है"
@@ -104,12 +105,14 @@
"%s सेकंड"
"%s मि. %s से."
"बैच कार्रवाई मोड रद्द करें"
- "वॉयसमेल"
- "वॉयसमेल"
- "हां"
- "नहीं"
+ "हटाएं"
+ "रद्द करें"
"क्या चुने गए %1$s हटाना चाहते हैं?"
"%1$s चयनित"
+
+ - ""ये वॉइसमेल हटाएं? ""
+ - ""ये वॉइसमेल हटाएं? ""
+
@string/call_log_header_today
"%1$s को %2$s बजे"
"%1$02d:%2$02d"
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 5261cfb0dace4cb65ca819042a9a5c30e0f44b43..0d2147008acf7a6f030777ddaf55f56867cab447 100644
--- a/java/com/android/dialer/app/res/values-hr/strings.xml
+++ b/java/com/android/dialer/app/res/values-hr/strings.xml
@@ -81,6 +81,7 @@
"Dodaj čekanje"
"Postavke"
"Simulator"
+ "Izrada prečaca novog sučelja"
"Svi kontakti"
"Koristi dodirnu zvučnu tipkovnicu"
"Natrag na poziv u tijeku"
@@ -105,12 +106,15 @@
"%s s"
"%s min %s s"
"Otkaži način skupnih radnji"
- "poruka govorne pošte"
- "poruke govorne pošte"
- "Da"
- "Ne"
+ "Izbriši"
+ "Odustani"
"Želite li izbrisati odabranu poruku/e govorne pošte %1$s?"
"Odabrano: %1$s"
+
+ - ""Želite li izbrisati ove poruke govorne pošte? ""
+ - ""Želite li izbrisati ove poruke govorne pošte? ""
+ - ""Želite li izbrisati ove poruke govorne pošte? ""
+
@string/call_log_header_today
"%1$s u %2$s"
"%1$02d.%2$02d"
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 452f0da47d09b8edb28df882f5c6a3f6159a444e..9a373e6e8ddea0d3756a67afbf33d776ade4a675 100644
--- a/java/com/android/dialer/app/res/values-hu/strings.xml
+++ b/java/com/android/dialer/app/res/values-hu/strings.xml
@@ -80,6 +80,7 @@
"Várakozás hozzáadása"
"Beállítások"
"Szimulátor"
+ "Új felh. felület-parancsikon"
"Összes névjegy"
"Hangkódos telefonbillentyűzet használata"
"Vissza a folyamatban lévő híváshoz"
@@ -104,12 +105,14 @@
"%s másodperc"
"%s perc %s másodperc"
"Köteges művelet mód leállítva"
- "hangpostaüzenetet"
- "hangpostaüzeneteket"
- "Igen"
- "Nem"
+ "Törlés"
+ "Mégse"
"Törli a kiválasztott %1$s?"
"%1$s kiválasztva"
+
+ - ""Törli ezeket a hangpostaüzeneteket? ""
+ - ""Törli ezt a hangpostaüzenetet? ""
+
@string/call_log_header_today
"%1$s, %2$s"
"%1$02d:%2$02d"
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 97a84f2feff1c40a8c4d8e47122fb0b5321a91d9..2b2fbf61bc97fbf4645b05aeadc234a159b3fda3 100644
--- a/java/com/android/dialer/app/res/values-hy/strings.xml
+++ b/java/com/android/dialer/app/res/values-hy/strings.xml
@@ -80,12 +80,13 @@
"Ավելացնել սպասում"
"Կարգավորումներ"
"Նմանակիչ"
+ "Ստեղծել միջերեսի նոր դյուրանցում"
"Բոլոր կոնտակտները"
"Օգտագործել հնչերանգներով ստեղնաշարը"
"Վերադառնալ ընթացիկ զանգին"
"Ավելացնել զանգ"
"Մուտքային զանգեր"
- "Մուտք զանգվածային գործողությունների ռեժին"
+ "Դուք մտել եք զանգվածային գործողության ռեժիմ"
"Դուք դուրս եկաք զանգվածային գործողությունների ռեժիմից"
"Ընտրվեց՝ %1$s"
"Ապընտրվեց՝ %1$s"
@@ -104,12 +105,14 @@
"%s վրկ"
"%s րոպե %s վայրկյան"
"Չեղարկել փաթեթային գործողությունների ռեժիմը"
- "ձայնային հաղորդագրություն"
- "ձայնային հաղորդագրություններ"
- "Այո"
- "Ոչ"
+ "Ջնջել"
+ "Չեղարկել"
"Ջնջե՞լ նշված %1$sը"
"Ընտրվել է՝ %1$s"
+
+ - ""Delete these voicemails? ""
+ - ""Ջնջե՞լ այս ձայնային հաղորդագրությունները ""
+
@string/call_log_header_today
"%1$s-ին, ժամը %2$s-ին"
"%1$02d:%2$02d"
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 f309f927b3611ad5317d6dc113fea008e356bcf5..e72fd6337a7ee2cdf6f70c48c40cf5d6760e87f6 100644
--- a/java/com/android/dialer/app/res/values-in/strings.xml
+++ b/java/com/android/dialer/app/res/values-in/strings.xml
@@ -80,6 +80,7 @@
"Tambahkan tunggu"
"Setelan"
"Simulator"
+ "Buat Pintasan UI Baru"
"Semua kontak"
"Gunakan keypad nada sentuh"
"Kembali ke panggilan sedang berlangsung"
@@ -104,12 +105,14 @@
"%s dtk"
"%s mnt %s dtk"
"Membatalkan mode tindakan kelompok"
- "pesan suara"
- "pesan suara"
- "Ya"
- "Tidak"
+ "Hapus"
+ "Batal"
"Hapus %1$s yang dipilih?"
"%1$s dipilih"
+
+ - ""Hapus pesan suara ini? ""
+ - ""Hapus pesan suara ini? ""
+
@string/call_log_header_today
"%1$s pukul %2$s"
"%1$02d.%2$02d"
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 b291eae84a31717417e7b62e45b2bac14e652b42..bd329be9d602a2a99cea4e42569daf94ff6b7181 100644
--- a/java/com/android/dialer/app/res/values-is/strings.xml
+++ b/java/com/android/dialer/app/res/values-is/strings.xml
@@ -80,6 +80,7 @@
"Bæta töf við"
"Stillingar"
"Hermir"
+ "Stofna flýtileið í nýtt viðmót"
"Allir tengiliðir"
"Nota snertitónatakkaborð"
"Fara aftur í símtal í gangi"
@@ -104,12 +105,14 @@
"%s sek."
"%s mín. og %s sek."
"Hætta við runuaðgerðastillingu"
- "talhólfsskilaboð"
- "talhólfsskilaboð"
- "Já"
- "Nei"
+ "Eyða"
+ "Hætta við"
"Eyða völdum %1$s?"
"%1$s valin"
+
+ - ""Eyða þessum talhólfsskilaboðum? ""
+ - ""Eyða þessum talhólfsskilaboðum? ""
+
@string/call_log_header_today
"%1$s kl. %2$s"
"%1$02d:%2$02d"
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 711ab26eebf9975938701cf355ca654d0eac7494..356f5a603c4efef20118b35ee8c300d2a9a15cbf 100644
--- a/java/com/android/dialer/app/res/values-it/strings.xml
+++ b/java/com/android/dialer/app/res/values-it/strings.xml
@@ -80,6 +80,7 @@
"Aggiungi attesa"
"Impostazioni"
"Simulatore"
+ "Crea nuova scorciatoia UI"
"Tutti i contatti"
"Usa tastierino per selezione a toni"
"Torna alla chiamata in corso"
@@ -104,12 +105,14 @@
"%s secondi"
"%s min %s s"
"Annulla modalità di azione collettiva"
- "messaggio vocale"
- "messaggi vocali"
- "Sì"
- "No"
+ "Elimina"
+ "Annulla"
"Eliminare i %1$s selezionati?"
"%1$s selezionate"
+
+ - ""Eliminare questi messaggi vocali? ""
+ - ""Eliminare questo messaggio vocale? ""
+
@string/call_log_header_today
"%1$s alle ore %2$s"
"%1$02d:%2$02d"
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 bd2a05aec1ac83d21191692ca6eb313645945b61..230555a14e0d4ae1e174ff87a99ef4634952bca1 100644
--- a/java/com/android/dialer/app/res/values-iw/strings.xml
+++ b/java/com/android/dialer/app/res/values-iw/strings.xml
@@ -82,6 +82,7 @@
"הוסף המתנה"
"הגדרות"
"סימולטור"
+ "יצירת קיצור דרך לממשק החדש"
"כל אנשי הקשר"
"השתמש במקלדת עם חיוג צלילים"
"חזור לשיחה פעילה"
@@ -106,12 +107,16 @@
"%s שניות"
"%s דק\' %s שנ\'"
"ביטול המצב של ביצוע פעולות בכמות גדולה"
- "ההודעה הקולית"
- "ההודעות הקוליות"
- "כן"
- "לא"
+ "מחיקה"
+ "ביטול"
"האם למחוק את %1$s שבחרת?"
"%1$s נבחרו"
+
+ - ""האם למחוק את ההודעות הקוליות האלה? ""
+ - ""האם למחוק את ההודעות הקוליות האלה? ""
+ - ""האם למחוק את ההודעות הקוליות האלה? ""
+ - ""האם למחוק את ההודעה הקולית הזו? ""
+
@string/call_log_header_today
"%1$s ב-%2$s"
"%1$02d:%2$02d"
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 9ba40fb8f8c84de517a9c354905f67fd7fb3faa0..71fca83d5032b39086e90a07e16de65257175430 100644
--- a/java/com/android/dialer/app/res/values-ja/strings.xml
+++ b/java/com/android/dialer/app/res/values-ja/strings.xml
@@ -80,6 +80,7 @@
"待機を追加"
"設定"
"シミュレーション"
+ "新しいUIのショートカットを作成"
"すべての連絡先"
"プッシュホン式キーパッドを使う"
"通話に戻る"
@@ -104,12 +105,14 @@
"%s秒"
"%s分%s秒"
"一括操作モードをキャンセルします"
- "ボイスメール"
- "ボイスメール"
- "はい"
- "いいえ"
+ "削除"
+ "キャンセル"
"選択した%1$sを削除しますか？"
"%1$s 件選択済み"
+
+ - ""これらのボイスメールを削除しますか？""
+ - ""このボイスメールを削除しますか？""
+
@string/call_log_header_today
"%1$s、%2$s"
"%1$02d 分 %2$02d 秒"
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 dbb48f4f5091b6d8ef9d6e86f2f8fb9423092be4..fd9351f54c2fe0e6b04e414ad33027c83c91b62d 100644
--- a/java/com/android/dialer/app/res/values-ka/strings.xml
+++ b/java/com/android/dialer/app/res/values-ka/strings.xml
@@ -80,6 +80,7 @@
"ლოდინის დამატება"
"პარამეტრები"
"სიმულატორი"
+ "ახალი UI მალსახმობის შექმნა"
"ყველა კონტაქტი"
"ტონალური კლავიატურის გამოყენება"
"მიმდინარე ზარზე დაბრუნება"
@@ -104,12 +105,14 @@
"%s წმ"
"%s მინ %s წამ"
"ერთიანი ქმედების რეჟიმის გაუქმება"
- "ხმოვანი ფოსტა"
- "ხმოვანი ფოსტა"
- "დიახ"
- "არა"
+ "წაშლა"
+ "გაუქმება"
"გსურთ, წაშალოთ არჩეული %1$s?"
"არჩეულია %1$s"
+
+ - ""გსურთ ამ ხმოვანი შეტყობინებების წაშლა? ""
+ - ""გსურთ ამ ხმოვანი შეტყობინების წაშლა? ""
+
@string/call_log_header_today
"%1$s, %2$s"
"%1$02d:%2$02d"
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 8dfe531a1d7b0363fc4061f61fa06c1898ade826..f1763a21aba756324faa8502c455801cbe922d55 100644
--- a/java/com/android/dialer/app/res/values-kk/strings.xml
+++ b/java/com/android/dialer/app/res/values-kk/strings.xml
@@ -80,6 +80,7 @@
"Күтуді қосу"
"Параметрлер"
"Симулятор"
+ "Жаңа пайдаланушы интерфейсінің пернелер тіркесімін жасау"
"Барлық контактілер"
"Сенсорлы әуенді пернетақта"
"Қосылып тұрған қоңырауға оралу"
@@ -104,12 +105,14 @@
"%s сек."
"%s мин %s сек"
"Топтама әрекеттер режимін жабу"
- "дауыстық хабар"
- "дауыстық хабарлар"
- "Иә"
- "Жоқ"
+ "Жою"
+ "Жабу"
"Таңдалған %1$s хабарларын жою қажет пе?"
"%1$s таңдалды"
+
+ - ""Осы дауыстық хабарларды жою қажет пе? ""
+ - ""Осы дауыстық хабарды жою қажет пе? ""
+
@string/call_log_header_today
"%1$s, %2$s"
"%1$02d:%2$02d"
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 ed0db05e24856afdf2afc976533f14f930466c59..54f1a126ab600346e15f42c9856692b5342727aa 100644
--- a/java/com/android/dialer/app/res/values-km/strings.xml
+++ b/java/com/android/dialer/app/res/values-km/strings.xml
@@ -80,6 +80,7 @@
"បញ្ចូលការរង់ចាំ"
"ការកំណត់"
"កម្មវិធីធ្វើដូចមែនទែន"
+ "បង្កើតផ្លូវកាត់ UI ថ្មី"
"ទំនាក់ទំនងទាំងអស់"
"ប្រើសំឡេងប៉ះបន្ទះលេខ"
"កំពុងត្រឡប់ទៅកាន់ការហៅ"
@@ -104,12 +105,14 @@
"%s វិនាទី"
"%s នាទី %s វិនាទី"
"បោះបង់មុខងារសកម្មភាពជាក្រុម"
- "សារជាសំឡេង"
- "សារជាសំឡេង"
- "បាទ/ចាស"
- "ទេ"
+ "លុប"
+ "បោះបង់"
"លុប %1$s ដែលបានជ្រើសរើស?"
"បានជ្រើសរើស %1$s"
+
+ - ""លុបសារជាសំឡេងទាំងនេះ? ""
+ - ""លុបសារជាសំឡេងនេះ? ""
+
@string/call_log_header_today
"%1$s នៅម៉ោង %2$s"
"%1$02d:%2$02d"
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 932bc403509aa01536bd2421477b9cabdb47ae98..d7f3aabbcf125deb93c289e822012456149e3044 100644
--- a/java/com/android/dialer/app/res/values-kn/strings.xml
+++ b/java/com/android/dialer/app/res/values-kn/strings.xml
@@ -80,6 +80,7 @@
"ನಿರೀಕ್ಷೆಯನ್ನು ಸೇರಿಸಿ"
"ಸೆಟ್ಟಿಂಗ್ಗಳು"
"ಸಿಮ್ಯುಲೇಟರ್"
+ "ಹೊಸ UI ಶಾರ್ಟ್ಕಟ್ ರಚಿಸಿ"
"ಎಲ್ಲಾ ಸಂಪರ್ಕಗಳು"
"ಸ್ಪರ್ಶ ಟೋನ್ ಕೀಪ್ಯಾಡ್ ಬಳಸಿ"
"ಪ್ರತ್ಯತ್ತರ ಕರೆಯು ಪ್ರಗತಿಯಲ್ಲಿದೆ"
@@ -104,12 +105,14 @@
"%s ಸೆಕೆಂ"
"%s ನಿಮಿ %s ಸೆಕೆಂ"
"ಬ್ಯಾಚ್ ಕ್ರಿಯೆಗಳ ಮೋಡ್ ಅನ್ನು ರದ್ದುಮಾಡಿ"
- "ಧ್ವನಿಮೇಲ್"
- "ಧ್ವನಿಮೇಲ್ಗಳು"
- "ಹೌದು"
- "ಇಲ್ಲ"
+ "ಅಳಿಸಿ"
+ "ರದ್ದುಮಾಡಿ"
"ಆಯ್ಕೆ ಮಾಡಲಾದ %1$s ಅನ್ನು ಅಳಿಸುವುದೇ?"
"%1$s ಆಯ್ಕೆಮಾಡಲಾಗಿದೆ"
+
+ - ""ಈ ಧ್ವನಿಮೇಲ್ಗಳನ್ನು ಅಳಿಸುವುದೇ? ""
+ - ""ಈ ಧ್ವನಿಮೇಲ್ಗಳನ್ನು ಅಳಿಸುವುದೇ? ""
+
@string/call_log_header_today
"%1$s ರಂದು %2$s ಗಂಟೆಗೆ"
"%1$02d:%2$02d"
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 de6b93c01befb4c955f973ac06a64a7a25a37c3c..cb2e83c79e5800381cb16774c43599fe79261f24 100644
--- a/java/com/android/dialer/app/res/values-ko/strings.xml
+++ b/java/com/android/dialer/app/res/values-ko/strings.xml
@@ -80,6 +80,7 @@
"대기 시간 추가"
"설정"
"시뮬레이터"
+ "새 UI 바로가기 만들기"
"모든 연락처"
"터치톤 키패드 사용"
"진행 중인 통화로 돌아가기"
@@ -104,12 +105,14 @@
"%s초"
"%s분 %s초"
"일괄 작업 모드 취소"
- "음성사서함"
- "음성사서함"
- "예"
- "아니요"
+ "삭제"
+ "취소"
"선택한 %1$s을(를) 삭제하시겠습니까?"
"%1$s개 선택됨"
+
+ - ""이 음성사서함을 삭제하시겠습니까? ""
+ - ""이 음성사서함을 삭제하시겠습니까? ""
+
@string/call_log_header_today
"%1$s %2$s"
"%1$02d분 %2$02d초"
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 ac9a617ed8b8db5ac63068f63afa2e7eea273881..0a0b3e6618d2db966968319d70fd393f0cb00afa 100644
--- a/java/com/android/dialer/app/res/values-ky/strings.xml
+++ b/java/com/android/dialer/app/res/values-ky/strings.xml
@@ -80,6 +80,7 @@
"Тыныгуу кошуу"
"Жөндөөлөр"
"Симулятор"
+ "Жаңы интерфейс үчүн кыска жол түзүү"
"Бардык байланыштар"
"Тоналдык терүү тактасын колдонуу"
"Токтотулган чалууга кайтуу"
@@ -104,12 +105,14 @@
"%s сек."
"%s мүн. %s сек."
"Жапырт аракет режимин жокко чыгаруу"
- "үн почтасы"
- "үн почталары"
- "Ооба"
- "Жок"
+ "Жок кылуу"
+ "Жокко чыгаруу"
"Тандалган %1$s жок кылынсынбы?"
"%1$s тандалды"
+
+ - ""Бул үн почталар жок кылынсынбы? ""
+ - ""Бул үн почта жок кылынсынбы? ""
+
@string/call_log_header_today
"%1$s саат %2$s"
"%1$02d:%2$02d"
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 2a829730fd4452b97dc4cc464d472161c75ee5b5..267d1c6be91b1f6c9347637c2ab52ca52b4033c4 100644
--- a/java/com/android/dialer/app/res/values-lo/strings.xml
+++ b/java/com/android/dialer/app/res/values-lo/strings.xml
@@ -80,6 +80,7 @@
"ເພີ່ມການລໍຖ້າ"
"ການຕັ້ງຄ່າ"
"ຕົວຈຳລອງ"
+ "ສ້າງປຸ່ມລັດສ່ວນຕິດຕໍ່ຜູ້ໃຊ້ໃໝ່"
"ລາຍຊື່ຜູ່ຕິດຕໍ່ທັງໝົດ"
"ໃຊ້ປຸ່ມກົດສັນຍານສຽງ"
"ກັບໄປການໂທທີ່ກຳລັງດຳເນີນຢູ່"
@@ -104,12 +105,14 @@
"%s ວິນາທີ"
"%s ນທ %s ວິ"
"ຍົກເລີກໂໝດຄຳສັ່ງເປັນຊຸດ"
- "ຂໍ້ຄວາມສຽງ"
- "ຂໍ້ຄວາມສຽງ"
- "ແມ່ນແລ້ວ"
- "ບໍ່"
+ "ລຶບ"
+ "ຍົກເລີກ"
"ລຶບ %1$s ທີ່ເລືອກອອກໄປບໍ?"
"ເລືອກ %1$s ລາຍການແລ້ວ"
+
+ - ""ລຶບຂໍ້ຄວາມສຽງເຫຼົ່ານີ້ບໍ? ""
+ - ""ລຶບຂໍ້ຄວາມສຽງນີ້ບໍ? ""
+
@string/call_log_header_today
"%1$s ເວລາ %2$s"
"%1$02d:%2$02d"
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 367c928f4813319e169a503934d6eb159ee435e6..e26a909277b2e73ac699146a4f11724807558a8d 100644
--- a/java/com/android/dialer/app/res/values-lt/strings.xml
+++ b/java/com/android/dialer/app/res/values-lt/strings.xml
@@ -82,6 +82,7 @@
"Pridėti laukimą"
"Nustatymai"
"Simuliatorius"
+ "Sukurti naują NS spart. klav."
"Visi kontaktai"
"Naudoti jutiklinę klaviatūrą"
"Grįžti prie vykdomo skambučio"
@@ -106,12 +107,16 @@
"%s sek."
"%s min. %s sek."
"Atšaukti masinių veiksmų režimą"
- "balso pašto praneš."
- "balso pašto praneš."
- "Taip"
- "Ne"
+ "Ištrinti"
+ "Atšaukti"
"Ištrinti pasir. %1$s?"
"Pasirinkta: %1$s"
+
+ - ""Ištrinti šiuos balso pašto pranešimus? ""
+ - ""Ištrinti šiuos balso pašto pranešimus? ""
+ - ""Ištrinti šiuos balso pašto pranešimus? ""
+ - ""Ištrinti šiuos balso pašto pranešimus? ""
+
@string/call_log_header_today
"%1$s, %2$s"
"%1$02d:%2$02d"
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 2713b91b6e9793e8b4e9f7be8bc1beccff187cc0..8df2813c42c3c79be6f995c0f28c94cdc53118e7 100644
--- a/java/com/android/dialer/app/res/values-lv/strings.xml
+++ b/java/com/android/dialer/app/res/values-lv/strings.xml
@@ -81,6 +81,7 @@
"Pievienot gaidīšanu"
"Iestatījumi"
"Simulators"
+ "Jaunās liet. saskarnes saīsne"
"Visas kontaktpersonas"
"Izmantot skārientoņu tastatūru"
"Atgriezties pie pašreizējā zvana"
@@ -105,12 +106,15 @@
"%s s"
"%s min %s s"
"Iziet no grupas darbību režīma"
- "balss pasta ziņojums"
- "balss pasta ziņojumi"
- "Jā"
- "Nē"
+ "Dzēst"
+ "Atcelt"
"Vai dzēst atlasi: %1$s?"
"Atlasīti: %1$s"
+
+ - ""Vai dzēst šos balss pasta ziņojumus? ""
+ - ""Vai dzēst šos balss pasta ziņojumus? ""
+ - ""Vai dzēst šos balss pasta ziņojumus? ""
+
@string/call_log_header_today
"%1$s plkst. %2$s"
"%1$02d:%2$02d"
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 09725a64212b7523a343fe05e27a2e990df49d16..953a05569e82e5dcb8e9e7bc8f183f853ab9e118 100644
--- a/java/com/android/dialer/app/res/values-mk/strings.xml
+++ b/java/com/android/dialer/app/res/values-mk/strings.xml
@@ -80,6 +80,7 @@
"Додај почекај"
"Поставки"
"Симулатор"
+ "Создај крат. за нов интерфејс"
"Сите контакти"
"Користи тастатура со звуци на допир"
"Врати се на повик во тек"
@@ -104,12 +105,14 @@
"%s сек."
"%s мин. %s сек."
"Откажи го режимот на групни дејства"
- "говорна пошта"
- "говорни пораки"
- "Да"
- "Не"
+ "Избриши"
+ "Откажи"
"Да се избришат избраните %1$s?"
"Избрани се %1$s"
+
+ - ""Да се избришат говорните пораки? ""
+ - ""Да се избришат говорните пораки? ""
+
@string/call_log_header_today
"%1$s во %2$s"
"%1$02d:%2$02d"
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 7655dbe233778aa2f922050091721e9471f6aaac..0eef40748e2fa2d1bf668fa19638c2c9cd42ccc6 100644
--- a/java/com/android/dialer/app/res/values-ml/strings.xml
+++ b/java/com/android/dialer/app/res/values-ml/strings.xml
@@ -80,6 +80,7 @@
"കാത്തിരിക്കൽ ചേർക്കുക"
"ക്രമീകരണം"
"സിമുലേറ്റർ"
+ "പുതിയ UI കുറുക്കുവഴി സൃഷ്ടിക്കുക"
"എല്ലാ കോൺടാക്റ്റുകളും"
"ടച്ച് ടോൺ കീപാഡ് ഉപയോഗിക്കുക"
"വിളിച്ചുകൊണ്ടിരിക്കുന്ന കോളിലേക്ക് മടങ്ങുക"
@@ -104,12 +105,14 @@
"%s സെക്കൻഡ്"
"%s മി. %s സെ."
"\'ബാച്ച് പ്രവർത്തനങ്ങൾ\' മോഡ് റദ്ദാക്കുക"
- "വോയ്സ്മെയിൽ"
- "വോയ്സ്മെയിലുകൾ"
- "അതെ"
- "ഇല്ല"
+ "ഇല്ലാതാക്കുക"
+ "റദ്ദാക്കൂ"
"തിരഞ്ഞെടുത്ത %1$s ഇല്ലാതാക്കണോ?"
"%1$s എണ്ണം തിരഞ്ഞെടുത്തു"
+
+ - ""ഈ വോയ്സ്മെയിലുകൾ ഇല്ലാതാക്കണോ? ""
+ - ""ഈ വോയ്സ്മെയിൽ ഇല്ലാതാക്കണോ? ""
+
@string/call_log_header_today
"%1$s, %2$s-ന്"
"%1$02d:%2$02d"
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 29bd8af42229b21d8f6cacb77a708860876af332..e0cd987108f9eda40d55ff1b91b634a39b83714f 100644
--- a/java/com/android/dialer/app/res/values-mn/strings.xml
+++ b/java/com/android/dialer/app/res/values-mn/strings.xml
@@ -80,6 +80,7 @@
"Хүлээлт нэмэх"
"Тохиргоо"
"Симулятор"
+ "Шинэ UI үүсгэх товчлол"
"Бүх харилцагчид"
"Хүрэлтээр дуугардаг гар ашиглах"
"Үргэлжилж буй дуудлага руу буцах"
@@ -104,12 +105,14 @@
"%s сек"
"%s минут %s секунд"
"Багц үйлдлийн горимыг цуцлах"
- "дуут шуудан"
- "дуут шуудан"
- "Тийм"
- "Үгүй"
+ "Устгах"
+ "Цуцлах"
"Сонгосон %1$s-г устгах уу?"
"%1$s сонгосон"
+
+ - ""Эдгээр дуут шууданг устгах уу? ""
+ - ""Энэ дуут шууданг устгах уу? ""
+
@string/call_log_header_today
"%1$s %2$s-д"
"%1$02d:%2$02d"
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 ee21291e81eacdc08a37db17309a2c91ce1b1985..70e6d410cb26ac04af1c992f086837fcaaace826 100644
--- a/java/com/android/dialer/app/res/values-mr/strings.xml
+++ b/java/com/android/dialer/app/res/values-mr/strings.xml
@@ -80,6 +80,7 @@
"प्रतीक्षा करा जोडा"
"सेटिंग्ज"
"सिम्युलेटर"
+ "नवीन UI शॉर्टकट तयार करा"
"सर्व संपर्क"
"स्पर्श टोन कीपॅडचा वापर करा"
"चालू असलेल्या कॉलवर परत जा"
@@ -104,12 +105,14 @@
"%s सेकंद"
"%s मिनिट %s सेकंद"
"बॅच क्रिया मोड रद्द करा"
- "व्हॉइसमेल"
- "व्हॉइसमेल"
- "होय"
- "नाही"
+ "हटवा"
+ "रद्द करा"
"निवडलेले %1$s हटवायचेे?"
"%1$s निवडले"
+
+ - ""हा व्हॉइसमेल हटवायचा? ""
+ - ""हे व्हॉइसमेल हटवायचे? ""
+
@string/call_log_header_today
"%1$s रोजी %2$s वाजता"
"%1$02d:%2$02d"
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 dbb021359581d3a64dee78a75617161c682274b3..f58f08f0222e6518e0ff0d667f0303679744abff 100644
--- a/java/com/android/dialer/app/res/values-ms/strings.xml
+++ b/java/com/android/dialer/app/res/values-ms/strings.xml
@@ -80,6 +80,7 @@
"Tambah penungguan"
"Tetapan"
"Simulator"
+ "Buat Pintasan UI Baharu"
"Semua kenalan"
"Gunakan pad kekunci nada sentuh"
"Kembali ke panggilan yang sedang berlangsung"
@@ -104,12 +105,14 @@
"%s saat"
"%s min %s saat"
"Batalkan mod tindakan kelompok"
- "mel suara"
- "mel suara"
- "Ya"
- "Tidak"
+ "Padam"
+ "Batal"
"Padam %1$s yang dipilih?"
"%1$s dipilih"
+
+ - ""Padamkan mel suara ini? ""
+ - ""Padamkan mel suara ini? ""
+
@string/call_log_header_today
"%1$s pada %2$s"
"%1$02d:%2$02d"
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 eecfeb234d6d35f1baedcd418b75edf92180c9d0..60c3271a0487f6bb51e0ad7a58b9d817397452c9 100644
--- a/java/com/android/dialer/app/res/values-my/strings.xml
+++ b/java/com/android/dialer/app/res/values-my/strings.xml
@@ -80,6 +80,7 @@
"စောင့်ဆိုင်းခြင်း ထည့်ပါ"
"ဆက်တင်များ"
"အသစ်ကဲ့သို့ တုပသည့်စနစ်"
+ "UI ဖြတ်လမ်းလင့်ခ်အသစ် လုပ်ရန်"
"လိပ်စာများအားလုံး"
"touch tone ကီးခလုတ် ကိုအသုံးပြုပါ"
"ဖုန်းပြန်ခေါ်မှု ပြုလုပ်နေစဉ်"
@@ -104,12 +105,14 @@
"%s စက္ကန့်"
"%s မိနစ် %s စက္ကန့်"
"တပြိုင်နက်တည်း စုပြုံလုပ်ဆောင်ချက်များမုဒ်ကိ ပယ်ဖျက်ရန်"
- "အသံမေးလ်"
- "အသံမေးလ်များ"
- "Yes"
- "No"
+ "ဖျက်ပါ"
+ "မလုပ်တော့"
"ရွေးထားသော %1$s ကို ဖျက်လိုပါသလား။"
"%1$s ကို ရွေးချယ်ထားသည်"
+
+ - ""ဤအသံမေးလ်များကို ဖျက်မလား။ ""
+ - ""ဤအသံမေးလ်ကို ဖျက်မလား။ ""
+
@string/call_log_header_today
"%1$s %2$s ၌"
"%1$02d:%2$02d"
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 bda4915b50530a42ea5a4e8ff5e34a455d4bea1e..344a26a513dfb4b36aeaa0d240ae8dbdd57986ad 100644
--- a/java/com/android/dialer/app/res/values-nb/strings.xml
+++ b/java/com/android/dialer/app/res/values-nb/strings.xml
@@ -80,6 +80,7 @@
"Legg til Vent"
"Innstillinger"
"Simulator"
+ "Nytt grensesnitt – lag snarvei"
"Alle kontakter"
"Bruk tonetastatur"
"Gå tilbake til aktiv samtale"
@@ -104,12 +105,14 @@
"%s sek"
"%s min %s sek"
"Avbryt massehandlinsmodus"
- "talepost"
- "talepost"
- "Ja"
- "Nei"
+ "Slett"
+ "Avbryt"
"Slett markert %1$s?"
"%1$s er valgt"
+
+ - ""Vil du slette disse talemeldingene? ""
+ - ""Vil du slette denne talemeldingen? ""
+
@string/call_log_header_today
"%1$s kl. %2$s"
"%1$02d:%2$02d"
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 8262a316c4b10547d9f4dd354b29dff02f5944a7..5e70c40b657545fa4972b2b65f6eb862ac40844f 100644
--- a/java/com/android/dialer/app/res/values-ne/strings.xml
+++ b/java/com/android/dialer/app/res/values-ne/strings.xml
@@ -80,6 +80,7 @@
"पर्खाइ थप्नुहोस्"
"सेटिङ्हरू"
"सिम्युलेटर"
+ "नयाँ UI सर्टकट सिर्जना गर्ने"
"सबै सम्पर्कहरू"
"स्पर्श टोन किप्याडको प्रयोग गर्नुहोस्"
"हुदै गरेको कलमा फर्कनुहोस्"
@@ -104,12 +105,14 @@
"%s सेकेन्ड"
"%s मिनेट %s सकेन्ड"
"ब्याच सम्बन्धी कारबाहीको मोडलाई रद्द गर्नुहोस्"
- "भ्वाइस मेल"
- "भ्वाइस मेलहरू"
- "हो"
- "होइन"
+ "मेट्नुहोस्"
+ "रद्द गर्नुहोस्"
"चयन गरिएका %1$s लाई मेटाउने हो?"
"%1$s चयन गरियो"
+
+ - ""यी भ्वाइस मेलहरू मेट्ने हो? ""
+ - ""यो भ्वाइस मेल मेट्ने हो? ""
+
@string/call_log_header_today
"%1$s मा %2$s"
"%1$02d:%2$02d"
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 eed412d69f3f94c4eb0b37c53bbb5cf51f41d89c..dbd29bc785c4a56b68dfb17e4bad9afb850d7d77 100644
--- a/java/com/android/dialer/app/res/values-nl/strings.xml
+++ b/java/com/android/dialer/app/res/values-nl/strings.xml
@@ -80,6 +80,7 @@
"Wachten toevoegen"
"Instellingen"
"Simulator"
+ "Snelkoppeling voor nieuwe UI"
"Alle contacten"
"Toetsen voor toonkiezen gebruiken"
"Terug naar actief gesprek"
@@ -104,12 +105,14 @@
"%s sec."
"%s min. %s sec."
"Modus voor batchacties annuleren"
- "voicemail"
- "voicemails"
- "Ja"
- "Nee"
+ "Verwijderen"
+ "Annuleren"
"Geselecteerde %1$s verwijderen?"
"%1$s geselecteerd"
+
+ - ""Deze voicemails verwijderen? ""
+ - ""Deze voicemail verwijderen? ""
+
@string/call_log_header_today
"%1$s om %2$s"
"%1$02d:%2$02d"
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 bda4915b50530a42ea5a4e8ff5e34a455d4bea1e..344a26a513dfb4b36aeaa0d240ae8dbdd57986ad 100644
--- a/java/com/android/dialer/app/res/values-no/strings.xml
+++ b/java/com/android/dialer/app/res/values-no/strings.xml
@@ -80,6 +80,7 @@
"Legg til Vent"
"Innstillinger"
"Simulator"
+ "Nytt grensesnitt – lag snarvei"
"Alle kontakter"
"Bruk tonetastatur"
"Gå tilbake til aktiv samtale"
@@ -104,12 +105,14 @@
"%s sek"
"%s min %s sek"
"Avbryt massehandlinsmodus"
- "talepost"
- "talepost"
- "Ja"
- "Nei"
+ "Slett"
+ "Avbryt"
"Slett markert %1$s?"
"%1$s er valgt"
+
+ - ""Vil du slette disse talemeldingene? ""
+ - ""Vil du slette denne talemeldingen? ""
+
@string/call_log_header_today
"%1$s kl. %2$s"
"%1$02d:%2$02d"
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 8e6540727e79c399afd60a6371dc64ed2d6b344d..33afd5824740608c3bf1a0edaf26469858867568 100644
--- a/java/com/android/dialer/app/res/values-pa/strings.xml
+++ b/java/com/android/dialer/app/res/values-pa/strings.xml
@@ -80,6 +80,7 @@
"ਉਡੀਕ ਜੋੜੋ"
"ਸੈਟਿੰਗਾਂ"
"ਸਿਮੁਲੇਟਰ"
+ "ਨਵਾਂ UI ਸ਼ਾਰਟਕੱਟ ਬਣਾਓ"
"ਸਾਰੇ ਸੰਪਰਕ"
"ਟਚ ਟੋਨ ਕੀਪੈਡ ਵਰਤੋ"
"ਪ੍ਰਗਤੀ ਵਿੱਚ ਕਾਲ ਤੇ ਵਾਪਸ ਜਾਓ"
@@ -104,12 +105,14 @@
"%s ਸਕਿੰਟ"
"%s ਮਿੰਟ %s ਸਕਿੰਟ"
"ਬੈਚ ਕਾਰਵਾਈਆਂ ਮੋਡ ਨੂੰ ਰੱਦ ਕਰੋ"
- "ਵੌਇਸਮੇਲ"
- "ਵੌਇਸਮੇਲਾਂ"
- "ਹਾਂ"
- "ਨਹੀਂ"
+ "ਮਿਟਾਓ"
+ "ਰੱਦ ਕਰੋ"
"ਕੀ ਚੁਣੀ(ਆਂ) ਹੋਈ(ਆਂ) %1$s ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?"
"%1$s ਨੂੰ ਚੁਣਿਆ ਗਿਆ"
+
+ - ""ਕੀ ਇਸ ਵੌਇਸਮੇਲ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? ""
+ - ""ਕੀ ਇਹਨਾਂ ਵੌਇਸਮੇਲਾਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? ""
+
@string/call_log_header_today
"%1$s ਨੂੰ %2$s ਵਜੇ"
"%1$02d:%2$02d"
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 8f57a82b43ce412d0a73856ae1e02a2fe29626a3..7f6027c51d30855128ac20d5624d60215b3d8f81 100644
--- a/java/com/android/dialer/app/res/values-pl/strings.xml
+++ b/java/com/android/dialer/app/res/values-pl/strings.xml
@@ -82,6 +82,7 @@
"Dodaj oczekiwanie"
"Ustawienia"
"Symulator"
+ "Utwórz skrót do nowego interfejsu"
"Wszystkie kontakty"
"Użyj klawiatury tonowej"
"Wróć do aktywnego połączenia"
@@ -106,12 +107,16 @@
"%s s"
"%s min %s s"
"Anuluj tryb działań zbiorczych"
- "wiadomości głosowe"
- "wiadomości głosowe"
- "Tak"
- "Nie"
+ "Usuń"
+ "Anuluj"
"Usunąć wybrane %1$s?"
"Wybrane: %1$s"
+
+ - ""Usunąć te wiadomości głosowe? ""
+ - ""Usunąć te wiadomości głosowe? ""
+ - ""Usunąć te wiadomości głosowe? ""
+ - ""Usunąć tę wiadomość głosową? ""
+
@string/call_log_header_today
"%1$s o %2$s"
"%1$02d:%2$02d"
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 eb61923e99fd55d3a0d0d418e0e6681f1d10bf17..768ce57d4bbea5ee9c89d98a4dda4d9e5e6276ed 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
@@ -80,6 +80,7 @@
"Adicionar espera"
"Configurações"
"Simulador"
+ "Criar atalho para a nova IU"
"Todos os contatos"
"Usar teclado multifrequencial"
"Retornar para a chamada em espera"
@@ -104,12 +105,14 @@
"%s seg"
"%s m %s s"
"Cancelar modo de ações em lote"
- "correio de voz"
- "correios de voz"
- "Sim"
- "Não"
+ "Excluir"
+ "Cancelar"
"Excluir a seleção de %1$s?"
"Itens selecionados: %1$s"
+
+ - ""Excluir este correio de voz? ""
+ - ""Excluir estes correios de voz? ""
+
@string/call_log_header_today
"%1$s às %2$s"
"%1$02d:%2$02d"
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 493f846c4c98a177c1a8dbf6332eaf224c4443a5..3c636e1d60f0658677418de885a82307dc73fe29 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
@@ -80,6 +80,7 @@
"Adicionar espera"
"Definições"
"Simulador"
+ "Criar novo atalho de IU"
"Todos os contactos"
"Utilizar teclado numérico com tons de toque"
"Voltar à chamada em curso"
@@ -104,12 +105,14 @@
"%s seg"
"%s min. %s seg."
"Cancelar modo de ações em lote"
- "mensagem de correio de voz"
- "mensagens de correio de voz"
- "Sim"
- "Não"
+ "Eliminar"
+ "Cancelar"
"Pretende eliminar a(s) %1$s selecionada(s)?"
"%1$s selecionada(s)"
+
+ - ""Pretende eliminar esta(s) mensagem(ns) de correio de voz? ""
+ - ""Pretende eliminar estas mensagens de correio de voz? ""
+
@string/call_log_header_today
"%1$s às %2$s"
"%1$02d:%2$02d"
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 eb61923e99fd55d3a0d0d418e0e6681f1d10bf17..768ce57d4bbea5ee9c89d98a4dda4d9e5e6276ed 100644
--- a/java/com/android/dialer/app/res/values-pt/strings.xml
+++ b/java/com/android/dialer/app/res/values-pt/strings.xml
@@ -80,6 +80,7 @@
"Adicionar espera"
"Configurações"
"Simulador"
+ "Criar atalho para a nova IU"
"Todos os contatos"
"Usar teclado multifrequencial"
"Retornar para a chamada em espera"
@@ -104,12 +105,14 @@
"%s seg"
"%s m %s s"
"Cancelar modo de ações em lote"
- "correio de voz"
- "correios de voz"
- "Sim"
- "Não"
+ "Excluir"
+ "Cancelar"
"Excluir a seleção de %1$s?"
"Itens selecionados: %1$s"
+
+ - ""Excluir este correio de voz? ""
+ - ""Excluir estes correios de voz? ""
+
@string/call_log_header_today
"%1$s às %2$s"
"%1$02d:%2$02d"
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 93d01888a1002bcca70c94e562acf687749de049..b85f84987f245f0d36c6f37b6f3233784a8cb338 100644
--- a/java/com/android/dialer/app/res/values-ro/strings.xml
+++ b/java/com/android/dialer/app/res/values-ro/strings.xml
@@ -81,6 +81,7 @@
"Adăugați interval de așteptare"
"Setări"
"Simulator"
+ "Creați comandă rapidă IU nouă"
"Toată agenda"
"Tastatura tactilă cu sunet"
"Reveniți la apelul în curs"
@@ -105,12 +106,15 @@
"%s secunde"
"%s min. %s sec."
"Anulați modul de acțiuni în lot"
- "mesagerie vocală"
- "mesaje vocale"
- "Da"
- "Nu"
+ "Ștergeți"
+ "Anulați"
"Ștergeți cele %1$s selectate?"
"%1$s selectate"
+
+ - ""Ștergeți aceste mesaje vocale? ""
+ - ""Ștergeți aceste mesaje vocale? ""
+ - ""Ștergeți acest mesaj vocal? ""
+
@string/call_log_header_today
"%1$s la %2$s"
"%1$02d:%2$02d"
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 54278c40b135d64857dbc53346d25dca4a3d016e..91441cc56046e8463a8dfbeaea3ca54eda5fd9a1 100644
--- a/java/com/android/dialer/app/res/values-ru/strings.xml
+++ b/java/com/android/dialer/app/res/values-ru/strings.xml
@@ -82,6 +82,7 @@
"Добавить паузу"
"Настройки"
"Симулятор"
+ "Создать ярлык для нового интерфейса"
"Все контакты"
"Панель тонального набора"
"Вернуться к текущему вызову"
@@ -106,12 +107,16 @@
"%s сек."
"%s мин. %s сек."
"Отмена режима массового действия"
- "голосовое сообщение"
- "голосовые сообщения"
- "Да"
- "Нет"
+ "Удалить"
+ "Отмена"
"Удалить %1$s?"
"Выбрано: %1$s"
+
+ - ""Удалить эти голосовые сообщения? ""
+ - ""Удалить эти голосовые сообщения? ""
+ - ""Удалить эти голосовые сообщения? ""
+ - ""Удалить эти голосовые сообщения? ""
+
@string/call_log_header_today
"%1$s в %2$s"
"%1$02d:%2$02d"
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 63634577fa10eafc06c6b1a5c6f5e9483b486f35..8a748d53c91c8fbafd8fd834d69874b07467f9aa 100644
--- a/java/com/android/dialer/app/res/values-si/strings.xml
+++ b/java/com/android/dialer/app/res/values-si/strings.xml
@@ -80,6 +80,7 @@
"රැඳී සිටීම එක් කරන්න"
"සැකසීම්"
"සමාකෘතිය"
+ "නව UI කෙටිමග තනන්න"
"සියලුම සම්බන්ධතා"
"ස්පර්ශ නාද යතුරුපෑඩය භාවිතා කරන්න"
"පවතින ඇමතුමට නැවත යන්න"
@@ -104,12 +105,14 @@
"තත් %s"
"මිනි %s තත් %s"
"කාණ්ඩ ක්රියා ප්රකාරය අවලංගු කරන්න"
- "හඬ තැපෑල"
- "හඬ තැපැල්"
- "ඔව්"
- "නැත"
+ "මකන්න"
+ "අවලංගු කරන්න"
"තෝරා ගත් %1$s මකන්නද?"
"%1$s තෝරා ගන්නා ලදි"
+
+ - ""මෙම හඬ තැපැල් මකන්නද? ""
+ - ""මෙම හඬ තැපැල් මකන්නද? ""
+
@string/call_log_header_today
"%1$s දින %2$sට"
"%1$02d:%2$02d"
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 f7bf4237c44e0a116eb4cda074d72399a8328c8c..e84febb17130706570db8a0d3e5467783be1f4cd 100644
--- a/java/com/android/dialer/app/res/values-sk/strings.xml
+++ b/java/com/android/dialer/app/res/values-sk/strings.xml
@@ -82,6 +82,7 @@
"Pridať čakanie"
"Nastavenia"
"Simulátor"
+ "Vyt. skratku na nové rozhranie"
"Všetky kontakty"
"Použiť dotykovú tónovú klávesnicu"
"Návrat k prebiehajúcemu hovoru"
@@ -106,12 +107,16 @@
"%s s"
"%s min. %s s"
"Zrušiť režim hromadných akcií"
- "hlasová správa"
- "hlasové správy"
- "Áno"
- "Nie"
+ "Odstrániť"
+ "Zrušiť"
"Chcete odstrániť vybraté položky (%1$s)?"
"Vybraté: %1$s"
+
+ - ""Chcete odstrániť tieto hlasové správy? ""
+ - ""Chcete odstrániť tieto hlasové správy? ""
+ - ""Chcete odstrániť tieto hlasové správy? ""
+ - ""Chcete odstrániť túto hlasovú správu? ""
+
@string/call_log_header_today
"%1$s o %2$s"
"%1$02d:%2$02d"
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 d3c57dd92b1e04bba3d59b5e9eeca79dd5cac250..495b6e8020b26093e49fc778c78d5d2c42a70e77 100644
--- a/java/com/android/dialer/app/res/values-sl/strings.xml
+++ b/java/com/android/dialer/app/res/values-sl/strings.xml
@@ -82,6 +82,7 @@
"Dodaj premor"
"Nastavitve"
"Simulator"
+ "Ustvari bliž. za novi up. vm."
"Vsi stiki"
"Uporabi številčnico za tonsko klicanje"
"Nazaj na klic, ki poteka"
@@ -106,12 +107,16 @@
"%s s"
"%s min %s s"
"Prekliči način množičnega dejanja"
- "sporočilo v odzivniku"
- "sporočila v odzivniku"
- "Da"
- "Ne"
+ "Izbriši"
+ "Prekliči"
"Želite izbrisati %1$s?"
"Št. izbranih: %1$s"
+
+ - ""Želite izbrisati ta sporočila v odzivniku? ""
+ - ""Želite izbrisati ta sporočila v odzivniku? ""
+ - ""Želite izbrisati ta sporočila v odzivniku? ""
+ - ""Želite izbrisati ta sporočila v odzivniku? ""
+
@string/call_log_header_today
"%1$s ob %2$s"
"%1$02d:%2$02d"
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 84704459c738046bced67c0bc04d6f78d17262f3..809fd8a22eb0eef78cc27afa9b61f4e8fa51e617 100644
--- a/java/com/android/dialer/app/res/values-sq/strings.xml
+++ b/java/com/android/dialer/app/res/values-sq/strings.xml
@@ -80,6 +80,7 @@
"Shto një pritje"
"Cilësimet"
"Simuluesi"
+ "Krijo një shkurtore për ndërfaqen e re të përdoruesit"
"Të gjitha kontaktet"
"Përdor bllokun e tasteve"
"Kthehu te telefonata"
@@ -104,12 +105,14 @@
"%s sekonda"
"%s min. e %s sek."
"Anulo modalitetin e veprimeve në grup"
- "posta zanore"
- "postat zanore"
- "Po"
- "Jo"
+ "Fshi"
+ "Anulo"
"Të fshihen %1$s të zgjedhura?"
"%1$s të zgjedhura"
+
+ - ""Të fshihen këto posta zanore? ""
+ - ""Të fshihet kjo postë zanore? ""
+
@string/call_log_header_today
"%1$s në %2$s"
"%1$02d:%2$02d"
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 6cf7a7c8563d5c5d7bb0b4d23f1ff9f8164fc070..6f85c0ba8a5a3c19a10c36a9af4a4ac3a6b20b4c 100644
--- a/java/com/android/dialer/app/res/values-sr/strings.xml
+++ b/java/com/android/dialer/app/res/values-sr/strings.xml
@@ -81,6 +81,7 @@
"Додај чекање"
"Подешавања"
"Симулатор"
+ "Направите пречицу за нови UI"
"Сви контакти"
"Употребите бројчаник за тонско бирање"
"Врати се на позив који је у току"
@@ -105,12 +106,15 @@
"%s сек"
"%s мин %s сек"
"Откажите режим групних радњи"
- "говорну поруку"
- "говорне поруке"
- "Да"
- "Не"
+ "Избриши"
+ "Откажи"
"Желите ли да избришете изабрану(е) %1$s?"
"Изабраних: %1$s"
+
+ - ""Желите ли да избришете ове говорне поруке? ""
+ - ""Желите ли да избришете ове говорне поруке? ""
+ - ""Желите ли да избришете ове говорне поруке? ""
+
@string/call_log_header_today
"%1$s у %2$s"
"%1$02d:%2$02d"
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 71ef3e55bc8ad665093cf1a1f5daca7c9fd1e445..e8446cab1cf2034fd37c41dcd076b42d70ec5184 100644
--- a/java/com/android/dialer/app/res/values-sv/strings.xml
+++ b/java/com/android/dialer/app/res/values-sv/strings.xml
@@ -80,6 +80,7 @@
"Lägg till väntetid"
"Inställningar"
"Simulator"
+ "Skapa genväg till anv.gränssn."
"Alla kontakter"
"Använd tonvalstelefon"
"Återvänd till pågående samtal"
@@ -104,12 +105,14 @@
"%s sekund"
"%s min %s sek"
"Avbryt läget för massåtgärd"
- "röstbrevlåda"
- "röstmeddelanden"
- "Ja"
- "Nej"
+ "Radera"
+ "Avbryt"
"Vill du radera markerade %1$s?"
"%1$s har markerats"
+
+ - ""Vill du ta bort dessa röstmeddelanden? ""
+ - ""Vill du ta bort det här röstmeddelandet? ""
+
@string/call_log_header_today
"%1$s kl. %2$s"
"%1$02d:%2$02d"
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 9cbdd3e8e33ebbdc3901cb3045e7c8b18ae6204a..142aaf0de23131a68c36d9faef55ec6723d5e630 100644
--- a/java/com/android/dialer/app/res/values-sw/strings.xml
+++ b/java/com/android/dialer/app/res/values-sw/strings.xml
@@ -80,6 +80,7 @@
"Ongeza kusubiri"
"Mipangilio"
"Kielelezo"
+ "Unda Mkato Mpya wa Kiolesura"
"Anwani zote"
"Tumia kibao cha kuchapa cha sauti na kugusa"
"Rudi kwa simu inayoendelea"
@@ -104,12 +105,14 @@
"Sekunde %s"
"Dak %s sek %s"
"Ghairi hali ya kutekeleza vitendo vingi"
- "ujumbe wa sauti"
- "ujumbe wa sauti"
- "Ndiyo"
- "Hapana"
+ "Futa"
+ "Ghairi"
"Je, ungependa kufuta %1$s uliochagua?"
"%1$s zimechaguliwa"
+
+ - ""Je, unataka kufuta kila ujumbe wa sauti ulioonyeshwa? ""
+ - ""Je, unataka kufuta ujumbe huu wa sauti? ""
+
@string/call_log_header_today
"%1$s saa %2$s"
"%1$02d:%2$02d"
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 a91088c4fd0dd1dd1d3da47e30343c0f475d60a6..e270a3ceee72617ac04d61dc12f55724c94b27e2 100644
--- a/java/com/android/dialer/app/res/values-ta/strings.xml
+++ b/java/com/android/dialer/app/res/values-ta/strings.xml
@@ -80,6 +80,7 @@
"காத்திருப்பைச் சேர்"
"அமைப்பு"
"சிமுலேட்டர்"
+ "புதிய UI குறுக்குவழியை உருவாக்கு"
"எல்லா தொடர்புகளும்"
"டச் டோன் விசைப்பலகையைப் பயன்படுத்தவும்"
"செயலிலுள்ள அழைப்பிற்குத் திரும்பு"
@@ -104,12 +105,14 @@
"%s வி"
"%s நிமிடம் %s வினாடி"
"தொகுப்புச் செயல்கள் பயன்முறையை ரத்துசெய்யும்"
- "குரலஞ்சல்"
- "குரலஞ்சல்கள்"
- "ஆம்"
- "வேண்டாம்"
+ "நீக்கு"
+ "ரத்துசெய்"
"தேர்ந்தெடுத்த %1$sஐ நீக்கவா?"
"%1$s தேர்ந்தெடுக்கப்பட்டன"
+
+ - ""இந்தக் குரலஞ்சல்களை நீக்கவா? ""
+ - ""இந்தக் குரலஞ்சலை நீக்கவா? ""
+
@string/call_log_header_today
"%1$s அன்று %2$s மணிக்கு"
"%1$02d:%2$02d"
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 aecc1c4b93ac10e47a393ed27881676fee573544..8d2c66784559d44fd805be03a77e48b4cba68ed4 100644
--- a/java/com/android/dialer/app/res/values-te/strings.xml
+++ b/java/com/android/dialer/app/res/values-te/strings.xml
@@ -80,6 +80,7 @@
"నిరీక్షణ సమయాన్ని జోడించు"
"సెట్టింగ్లు"
"సిములేటర్"
+ "కొత్త UI సత్వరమార్గం సృష్టించు"
"అన్ని పరిచయాలు"
"టచ్ టోన్ కీప్యాడ్ను ఉపయోగించండి"
"ప్రోగ్రెస్లో ఉన్న కాల్కు వెళ్లు"
@@ -104,12 +105,14 @@
"%s సెక"
"%s నిమి %s సెక"
"సమూహ చర్యల మోడ్ను రద్దు చేస్తుంది"
- "వాయిస్ మెయిల్"
- "వాయిస్ మెయిల్లు"
- "అవును"
- "వద్దు"
+ "తొలగించు"
+ "రద్దు చేయి"
"ఎంచుకున్న %1$sను తొలగించాలా?"
"%1$s ఎంచుకోబడ్డాయి"
+
+ - ""ఈ వాయిస్ మెయిల్లను తొలగించాలా? ""
+ - ""ఈ వాయిస్ మెయిల్ను తొలగించాలా? ""
+
@string/call_log_header_today
"%1$s %2$sకి"
"%1$02d:%2$02d"
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 58507b49e6f88493ea1475fb6836dfa286537362..76a66e20e95c78e19b113dbbda7a40f1f1dd8ec9 100644
--- a/java/com/android/dialer/app/res/values-th/strings.xml
+++ b/java/com/android/dialer/app/res/values-th/strings.xml
@@ -80,6 +80,7 @@
"เพิ่มการรอ"
"การตั้งค่า"
"เครื่องมือจำลอง"
+ "สร้างทางลัด UI ใหม่"
"รายชื่อติดต่อทั้งหมด"
"ใช้ปุ่มกดสัญญาณเสียง"
"กลับไปคุยสายต่อ"
@@ -104,12 +105,14 @@
"%s วินาที"
"%s นาที %s วินาที"
"ยกเลิกโหมดการทำงานแบบกลุ่ม"
- "ข้อความเสียง"
- "ข้อความเสียง"
- "ใช่"
- "ไม่"
+ "ลบ"
+ "ยกเลิก"
"ลบ%1$sที่เลือกหรือไม่"
"เลือกไว้ %1$s รายการ"
+
+ - ""ลบข้อความเสียงเหล่านี้ไหม ""
+ - ""ลบข้อความเสียงนี้ไหม ""
+
@string/call_log_header_today
"วันที่ %1$s เวลา %2$s"
"%1$02d:%2$02d"
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 9a8157feaef526d063cbc9489583ea8d6eb3046f..51e7a665940e7d6cc3352671f4d8bda494b3248d 100644
--- a/java/com/android/dialer/app/res/values-tl/strings.xml
+++ b/java/com/android/dialer/app/res/values-tl/strings.xml
@@ -80,6 +80,7 @@
"Magdagdag ng paghihintay"
"Mga Setting"
"Simulator"
+ "Gawa ng Shortcut ng Bagong UI"
"Lahat ng mga contact"
"Gumamit ng touch tone na keypad"
"Bumalik sa kasalukuyang tawag"
@@ -104,12 +105,14 @@
"%s sec"
"%s min %s sec"
"Kanselahin ang batch actions mode"
- "voicemail"
- "mga voicemail"
- "Oo"
- "Hindi"
+ "I-delete"
+ "Kanselahin"
"I-delete ang napiling %1$s?"
"%1$s ang napili"
+
+ - ""I-delete ang mga voicemail na ito? ""
+ - ""I-delete ang mga voicemail na ito? ""
+
@string/call_log_header_today
"%1$s ng %2$s"
"%1$02d:%2$02d"
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 17bd6645c73180e8fcf74b513e8d20e39b834109..1ff0128d4b50c8516a03b4c86dd38a8166e82e4e 100644
--- a/java/com/android/dialer/app/res/values-tr/strings.xml
+++ b/java/com/android/dialer/app/res/values-tr/strings.xml
@@ -80,6 +80,7 @@
"Bekleme ekle"
"Ayarlar"
"Simülatör"
+ "Kull. Arayüzü Kısayolu Oluştur"
"Tüm kişiler"
"Telefon tuş takımını kullan"
"Çağrıya dön"
@@ -104,12 +105,14 @@
"%s sn."
"%s dk. %s sn."
"Toplu işlemler modu iptal edilir"
- "sesli mesaj"
- "sesli mesajlar"
- "Evet"
- "Hayır"
+ "Sil"
+ "İptal"
"Seçili %1$s silinsin mi?"
"%1$s öğe seçildi"
+
+ - ""Bu sesli mesajlar silinsin mi? ""
+ - ""Bu sesli mesaj silinsin mi? ""
+
@string/call_log_header_today
"%1$s, %2$s"
"%1$02d:%2$02d"
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 a020a1f1b7bcecd56cbebf77b577d23928d24d1c..b92970daa3677491cc41e84d02726fa96153166f 100644
--- a/java/com/android/dialer/app/res/values-uk/strings.xml
+++ b/java/com/android/dialer/app/res/values-uk/strings.xml
@@ -82,6 +82,7 @@
"Додати паузу"
"Налаштування"
"Симулятор"
+ "Створити ярлик для нової дії"
"Усі контакти"
"Використовувати тональний набір"
"Повернутися до поточного виклику"
@@ -106,12 +107,16 @@
"%s с"
"%s хв %s с"
"Скасувати режим масових дій"
- "голосова пошта"
- "голосова пошта"
- "Так"
- "Ні"
+ "Видалити"
+ "Скасувати"
"Видалити вибране (%1$s)?"
"Вибрано %1$s"
+
+ - ""Видалити ці повідомлення голосової пошти? ""
+ - ""Видалити ці повідомлення голосової пошти? ""
+ - ""Видалити ці повідомлення голосової пошти? ""
+ - ""Видалити ці повідомлення голосової пошти? ""
+
@string/call_log_header_today
"%1$s о %2$s"
"%1$02d:%2$02d"
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 d696bd54c16ca936c92050e34b1de77ff5b896d5..cb2eb9e333692e025b229a3d185f3244e8bce23c 100644
--- a/java/com/android/dialer/app/res/values-ur/strings.xml
+++ b/java/com/android/dialer/app/res/values-ur/strings.xml
@@ -80,6 +80,7 @@
"انتظار شامل کریں"
"ترتیبات"
"Simulator"
+ "نیا UI شارٹ کٹ تخلیق کریں"
"سبھی رابطے"
"ٹچ ٹون کی پیڈ کا استعمال کریں"
"جاری کال پر واپس لوٹیں"
@@ -104,12 +105,14 @@
"%s سیکنڈ"
"%s منٹ %s سیکنڈ"
"بیچ کاروائی موڈ منسوخ کریں"
- "صوتی میل"
- "صوتی میلز"
- "ہاں"
- "نہیں"
+ "حذف کریں"
+ "منسوخ کریں"
"منتخب کردہ %1$s حذف کریں؟"
"%1$s منتخب کردہ"
+
+ - ""ان صوتی میلز کو حذف کریں؟ ""
+ - ""اس صوتی میل کو حذف کریں؟ ""
+
@string/call_log_header_today
"%1$s بوقت %2$s"
"%1$02d:%2$02d"
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 aa645bf88c13e25b007f1efc68de75708f566889..c7d08f3bf07fca0fe8d64a496b9c2f20d634f2d1 100644
--- a/java/com/android/dialer/app/res/values-uz/strings.xml
+++ b/java/com/android/dialer/app/res/values-uz/strings.xml
@@ -80,6 +80,7 @@
"Kutishni qo‘shish"
"Sozlamalar"
"Simulyator"
+ "Yangi interfeys uchun yorliq"
"Barcha kontaktlar"
"Tovushli raqam tergich"
"Amaldagi chaqiruvga qaytish"
@@ -104,12 +105,14 @@
"%s soniya"
"%s daq %s son"
"Yoppasiga bajariladigan amallar rejimini bekor qilish"
- "ovozli xabar"
- "ovozli xabarlar"
- "Ha"
- "Yo‘q"
+ "O‘chirish"
+ "Bekor qilish"
"Tanlangan %1$s o‘chirib tashlansinmi?"
"Tanlandi: %1$s"
+
+ - ""Bu ovozli xabarlar o‘chirib tashlansinmi? ""
+ - ""Bu ovozli xabar o‘chirib tashlansinmi? ""
+
@string/call_log_header_today
"%1$s, %2$s"
"%1$02d:%2$02d"
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 dda7c1523058840433bd8fd9117c6e9193e5c2e9..c79e1ed20a98adaa064cd1ad8cb96f9c09234e1f 100644
--- a/java/com/android/dialer/app/res/values-vi/strings.xml
+++ b/java/com/android/dialer/app/res/values-vi/strings.xml
@@ -80,6 +80,7 @@
"Thêm chờ"
"Cài đặt"
"Trình mô phỏng"
+ "Tạo phím tắt giao diện người dùng mới"
"Tất cả liên hệ"
"Sử dụng bàn phím số cảm ứng có âm"
"Quay lại cuộc gọi đang thực hiện"
@@ -104,12 +105,14 @@
"%s giây"
"%s phút %s giây"
"Hủy chế độ tác vụ hàng loạt"
- "thư thoại"
- "thư thoại"
- "Có"
- "Không"
+ "Xóa"
+ "Hủy"
"Xóa %1$s đã chọn?"
"Đã chọn %1$s"
+
+ - ""Xóa các thư thoại này? ""
+ - ""Xóa thư thoại này? ""
+
@string/call_log_header_today
"%1$s lúc %2$s"
"%1$02d:%2$02d"
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 672614e484db7ebc333234be8fdd2b2595a39a36..3262c1a029f3457b7cec14c4124a732a0397883a 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
@@ -80,6 +80,7 @@
"延长等待时间"
"设置"
"模拟器"
+ "创建可在新界面中使用的快捷键"
"所有联系人"
"使用按键式键盘"
"返回正在进行的通话"
@@ -104,12 +105,14 @@
"%s 秒"
"%s 分钟 %s 秒"
"取消批量操作模式"
- "语音邮件"
- "语音邮件"
- "是"
- "否"
+ "删除"
+ "取消"
"要删除所选的%1$s吗？"
"已选择 %1$s 封"
+
+ - ""要删除这些语音邮件吗？""
+ - ""要删除这封语音邮件吗？""
+
@string/call_log_header_today
"%1$s%2$s"
"%1$02d:%2$02d"
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 f3dc44baf9f2986d91a82513f47f4112e9a5fa06..71e62eddccf3e47cefe5d95e49b6a667e78b2669 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
@@ -80,6 +80,7 @@
"新增插播功能"
"設定"
"模擬器"
+ "建立新使用者介面捷徑"
"所有聯絡人"
"使用觸控音頻按鍵"
"返回進行中的通話"
@@ -104,12 +105,14 @@
"%s 秒"
"%s 分 %s 秒"
"取消批量操作模式"
- "留言"
- "留言"
- "是"
- "否"
+ "刪除"
+ "取消"
"要刪除所選的%1$s嗎？"
"已選取 %1$s 個"
+
+ - ""要刪除這些留言嗎？""
+ - ""要刪除此留言嗎？""
+
@string/call_log_header_today
"%1$s%2$s"
"%1$02d:%2$02d"
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 473955c5d9f1d926b12d881eca579894a72d6679..9178dcf676e25e1381f9e4069531b6647360a652 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
@@ -80,6 +80,7 @@
"延長等待時間"
"設定"
"模擬工具"
+ "建立新版 UI 捷徑"
"所有聯絡人"
"使用觸控音按鍵"
"返回進行中的通話"
@@ -104,12 +105,14 @@
"%s 秒"
"%s 分 %s 秒"
"取消批次操作模式"
- "語音留言"
- "語音留言"
- "是"
- "否"
+ "刪除"
+ "取消"
"要刪除選取的%1$s嗎？"
"已選取 %1$s 個"
+
+ - ""要刪除這些語音留言嗎？""
+ - ""要刪除這則語音留言嗎？""
+
@string/call_log_header_today
"%1$s%2$s"
"%1$02d:%2$02d"
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 93843aa2cad485f44307ab15e20847c1352cdb28..f52f597c817af2b8cd53c82953d946fc0ac23d4b 100644
--- a/java/com/android/dialer/app/res/values-zu/strings.xml
+++ b/java/com/android/dialer/app/res/values-zu/strings.xml
@@ -80,6 +80,7 @@
"Yengeza ukulinda"
"Izilungiselelo"
"Isilingisi"
+ "Dala isinqamuleli esisha se-UI"
"Bonke othintana nabo"
"Sebenzisa ikhiphedi yethoni yokuthinta"
"Buyela kukholi eqhubekayo"
@@ -104,12 +105,14 @@
"%s isekhondi"
"%s amaminithi %s amasekhondi"
"Khansela imodi lezenzo zeqoqo"
- "ivoyisimeyili"
- "ama-meyli ezwi"
- "Yebo"
- "Cha"
+ "Susa"
+ "Khansela"
"Susa okukhethiwe %1$s?"
"Engu-%1$s ekhethiwe"
+
+ - ""Sula lawa mavoyisimeyili? ""
+ - ""Sula lawa mavoyisimeyili? ""
+
@string/call_log_header_today
"%1$s ngo-%2$s"
"%1$02d:%2$02d"
diff --git a/java/com/android/dialer/app/res/values/dimens.xml b/java/com/android/dialer/app/res/values/dimens.xml
index 57c43ebbd47662fc895dae79e14ff841ece0fdbe..90a8bb879c55200bee8ab67963ede534bcf0e300 100644
--- a/java/com/android/dialer/app/res/values/dimens.xml
+++ b/java/com/android/dialer/app/res/values/dimens.xml
@@ -24,6 +24,11 @@
-->
16dp
+
+ 14sp
+ 16dp
+ 18dp
+
8dp
32dp
diff --git a/java/com/android/dialer/app/res/values/strings.xml b/java/com/android/dialer/app/res/values/strings.xml
index 6110601d81322fd5895258bba9f0a5355124db0e..e02c6fb30c3013093240009e0ffd9279aeb014db 100644
--- a/java/com/android/dialer/app/res/values/strings.xml
+++ b/java/com/android/dialer/app/res/values/strings.xml
@@ -114,7 +114,7 @@
- Voicemail
- -
+
-
%1$d
Voicemails
@@ -131,12 +131,12 @@
[CHAR LIMIT=10]
-->
- %1$s,
+ %1$s,
%2$s
- New voicemail from
+ New voicemail from
%1$s
@@ -165,7 +165,7 @@
Missed calls only
- (%1$d)
+ (%1$d)
%2$s
@@ -258,6 +258,9 @@
and testing. [CHAR LIMIT=30]-->
Simulator
+
+ Create New UI Shortcut
+
All contacts
@@ -395,14 +398,18 @@
[CHAR LIMIT=NONE] -->
Cancel batch actions mode
- voicemail
- voicemails
- Yes
- No
+ Delete
+ Cancel
Delete selected %1$s?
%1$s selected
+
+
+ - Delete this voicemail?
+ - Delete these voicemails?
+
+
@@ -516,7 +523,7 @@
Undo
- Call
+ Call
%s
@@ -579,13 +586,13 @@
-
+
Call ^1
-
+
Missed call from ^1, ^2, ^3, ^4.
-
+
Call ^1
@@ -629,7 +636,7 @@
action triggers a return video call to the named person/number.
Note: AccessibilityServices uses this attribute to announce the purpose of the button.
[CHAR LIMIT=NONE] -->
-
+
Video call ^1.
@@ -638,21 +645,21 @@
triggers playing back the voicemail.
Note: AccessibilityServices uses this attribute to announce the purpose of the button.
[CHAR LIMIT=NONE] -->
-
+
Listen to voicemail from ^1
-
+
Play voicemail from ^1
-
+
Pause voicemail from ^1
@@ -660,7 +667,7 @@
-
+
Delete voicemail from ^1
@@ -674,14 +681,14 @@
-
+
Create contact for ^1
-
+
Add ^1 to existing contact
@@ -689,7 +696,7 @@
displays the call details screen for an entry in the call log. This shows the calls to
and from the specified number associated with the call log entry.
[CHAR LIMIT=NONE] -->
-
+
Call details for ^1
@@ -798,14 +805,14 @@
-
+
Call blocking temporarily off
-
+
Call blocking has been disabled because you contacted emergency services from this phone
within the last 48 hours. It will be automatically reenabled once the 48 hour period
expires.
@@ -818,7 +825,7 @@
-
+
You previously marked some callers to be automatically sent to voicemail via other apps.
@@ -840,13 +847,13 @@
-
+
Calls from these numbers will be blocked and voicemails will be automatically deleted.
-
+
Calls from these numbers will be blocked, but they may still be able to leave you voicemails.
@@ -855,7 +862,7 @@
- %1$s
+ %1$s
is already blocked.
diff --git a/java/com/android/dialer/app/res/values/styles.xml b/java/com/android/dialer/app/res/values/styles.xml
index 592f06d29fe835d1c681611f9faeeb568a774024..e0122e81c65d844ae16e549a6242b021d6187a4d 100644
--- a/java/com/android/dialer/app/res/values/styles.xml
+++ b/java/com/android/dialer/app/res/values/styles.xml
@@ -16,6 +16,11 @@
-->
+
+
+
+
+
diff --git a/java/com/android/dialer/notification/AndroidManifest.xml b/java/com/android/dialer/notification/AndroidManifest.xml
index 741f481caae1ce876e6127e7fda3c8c0f5a6eafe..b89d8f816611478d1cf4aa5f40ff15dfe4c1b544 100644
--- a/java/com/android/dialer/notification/AndroidManifest.xml
+++ b/java/com/android/dialer/notification/AndroidManifest.xml
@@ -1,3 +1,4 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/com/android/dialer/notification/GroupedNotificationUtil.java b/java/com/android/dialer/notification/GroupedNotificationUtil.java
deleted file mode 100644
index 3925248d5cfee2313370bfcd92cb3682a4c0f559..0000000000000000000000000000000000000000
--- a/java/com/android/dialer/notification/GroupedNotificationUtil.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.notification;
-
-import android.app.NotificationManager;
-import android.service.notification.StatusBarNotification;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import java.util.Objects;
-
-/** Utilities for dealing with grouped notifications */
-public final class GroupedNotificationUtil {
-
- /**
- * Remove notification(s) that were added as part of a group. Will ensure that if this is the last
- * notification in the group the summary will be removed.
- *
- * @param tag String tag as included in {@link NotificationManager#notify(String, int,
- * android.app.Notification)}. If null will remove all notifications under id
- * @param id notification id as included with {@link NotificationManager#notify(String, int,
- * android.app.Notification)}.
- * @param summaryTag String tag of the summary notification
- */
- public static void removeNotification(
- @NonNull NotificationManager notificationManager,
- @Nullable String tag,
- int id,
- @NonNull String summaryTag) {
- if (tag == null) {
- // Clear all grouped notifications
- for (StatusBarNotification notification : notificationManager.getActiveNotifications()) {
- if (notification.getId() == id) {
- notificationManager.cancel(notification.getTag(), id);
- }
- }
- } else {
- notificationManager.cancel(tag, id);
-
- // See if other non-summary grouped notifications exist, and if not then clear the summary
- boolean clearSummary = true;
- for (StatusBarNotification notification : notificationManager.getActiveNotifications()) {
- if (notification.getId() == id && !Objects.equals(summaryTag, notification.getTag())) {
- clearSummary = false;
- break;
- }
- }
- if (clearSummary) {
- notificationManager.cancel(summaryTag, id);
- }
- }
- }
-}
diff --git a/java/com/android/dialer/notification/NotificationChannelId.java b/java/com/android/dialer/notification/NotificationChannelId.java
new file mode 100644
index 0000000000000000000000000000000000000000..4ab3d44f2bc54ee336acaa73f8a228f44e980741
--- /dev/null
+++ b/java/com/android/dialer/notification/NotificationChannelId.java
@@ -0,0 +1,41 @@
+/*
+ * 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.notification;
+
+import android.support.annotation.StringDef;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/** Centralized source of all notification channels used by Dialer. */
+@Retention(RetentionPolicy.SOURCE)
+@StringDef({
+ NotificationChannelId.INCOMING_CALL,
+ NotificationChannelId.ONGOING_CALL,
+ NotificationChannelId.MISSED_CALL,
+ NotificationChannelId.DEFAULT,
+})
+public @interface NotificationChannelId {
+ // This value is white listed in the system.
+ // See /vendor/google/nexus_overlay/common/frameworks/base/core/res/res/values/config.xml
+ String INCOMING_CALL = "phone_incoming_call";
+
+ String ONGOING_CALL = "phone_ongoing_call";
+
+ String MISSED_CALL = "phone_missed_call";
+
+ String DEFAULT = "phone_default";
+}
diff --git a/java/com/android/dialer/notification/NotificationChannelManager.java b/java/com/android/dialer/notification/NotificationChannelManager.java
index 88679066dbc1ed5755692bf55104366e5361296c..790aac36fc7971346001c8f0be5d01506a099868 100644
--- a/java/com/android/dialer/notification/NotificationChannelManager.java
+++ b/java/com/android/dialer/notification/NotificationChannelManager.java
@@ -17,366 +17,156 @@
package com.android.dialer.notification;
import android.annotation.TargetApi;
-import android.app.Notification;
import android.app.NotificationChannel;
-import android.app.NotificationChannelGroup;
import android.app.NotificationManager;
import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
import android.media.AudioAttributes;
-import android.net.Uri;
import android.os.Build.VERSION_CODES;
-import android.provider.Settings;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.annotation.StringDef;
import android.support.v4.os.BuildCompat;
-import android.telecom.PhoneAccount;
import android.telecom.PhoneAccountHandle;
-import android.telecom.TelecomManager;
-import android.telephony.TelephonyManager;
-import com.android.contacts.common.compat.TelephonyManagerCompat;
-import com.android.dialer.buildtype.BuildType;
+import android.util.ArraySet;
+import com.android.dialer.common.Assert;
import com.android.dialer.common.LogUtil;
-import com.android.dialer.common.concurrent.DialerExecutors;
-import com.android.dialer.telecom.TelecomUtil;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.List;
-import java.util.Objects;
+import java.util.Set;
-/** Contains info on how to create {@link NotificationChannel NotificationChannels} */
-public class NotificationChannelManager {
-
- private static final String PREFS_FILENAME = "NotificationChannelManager";
- private static final String PREF_NEED_FIRST_INIT = "needFirstInit";
- private static NotificationChannelManager instance;
-
- public static NotificationChannelManager getInstance() {
- if (instance == null) {
- instance = new NotificationChannelManager();
- }
- return instance;
- }
+/** Creates all notification channels for Dialer. */
+@TargetApi(VERSION_CODES.O)
+public final class NotificationChannelManager {
/**
- * Set the channel of notification appropriately. Will create the channel if it does not already
- * exist. Safe to call pre-O (will no-op).
+ * Creates all the notification channels Dialer will need. This method is called at app startup
+ * and must be fast. Currently it takes between 3 to 7 milliseconds on a Pixel XL.
+ *
+ * An alternative approach would be to lazily create channels when we actualy post a
+ * notification. The advatange to precreating channels is that:
*
- *
phoneAccount should only be null if channelName is {@link Channel#DEFAULT} or {@link
- * Channel#MISSED_CALL} since these do not have account-specific settings.
+ *
+ * - channels will be available to user right away. For example, users can customize voicemail
+ * sounds when they first get their device without waiting for a voicemail to arrive first.
+ *
- code that posts a notification can be simpler
+ *
- channel management code is simpler and it's easier to ensure that the correct set of
+ * channels are visible.
+ *
*/
- @TargetApi(26)
- public static void applyChannel(
- @NonNull Notification.Builder notification,
- @NonNull Context context,
- @Channel String channelName,
- @Nullable PhoneAccountHandle phoneAccount) {
- checkNullity(channelName, phoneAccount);
-
- if (BuildCompat.isAtLeastO()) {
- NotificationChannel channel =
- NotificationChannelManager.getInstance().getChannel(context, channelName, phoneAccount);
- notification.setChannelId(channel.getId());
- }
- }
-
- private static void checkNullity(
- @Channel String channelName, @Nullable PhoneAccountHandle phoneAccount) {
- if (phoneAccount != null || channelAllowsNullPhoneAccountHandle(channelName)) {
- return;
- }
-
- // TODO (b/36568553): don't throw an exception once most cases have been identified
- IllegalArgumentException exception =
- new IllegalArgumentException(
- "Phone account handle must not be null on channel " + channelName);
- if (BuildType.get() == BuildType.RELEASE) {
- LogUtil.e("NotificationChannelManager.applyChannel", null, exception);
- } else {
- throw exception;
- }
- }
-
- private static boolean channelAllowsNullPhoneAccountHandle(@Channel String channelName) {
- switch (channelName) {
- case Channel.DEFAULT:
- case Channel.MISSED_CALL:
- return true;
- default:
- return false;
- }
- }
+ public static void initChannels(@NonNull Context context) {
+ Assert.checkArgument(BuildCompat.isAtLeastO());
+ Assert.isNotNull(context);
- /** The base Channel IDs for {@link NotificationChannel} */
- @Retention(RetentionPolicy.SOURCE)
- @StringDef({
- Channel.INCOMING_CALL,
- Channel.ONGOING_CALL,
- Channel.ONGOING_CALL_OLD,
- Channel.MISSED_CALL,
- Channel.VOICEMAIL,
- Channel.EXTERNAL_CALL,
- Channel.DEFAULT
- })
- public @interface Channel {
- @Deprecated String ONGOING_CALL_OLD = "ongoingCall";
- String INCOMING_CALL = "incomingCall";
- String ONGOING_CALL = "ongoingCall2";
- String MISSED_CALL = "missedCall";
- String VOICEMAIL = "voicemail";
- String EXTERNAL_CALL = "externalCall";
- String DEFAULT = "default";
- }
-
- @Channel
- private static final String[] prepopulatedAccountChannels =
- new String[] {Channel.INCOMING_CALL, Channel.ONGOING_CALL, Channel.VOICEMAIL};
-
- @Channel
- private static final String[] prepopulatedGlobalChannels =
- new String[] {Channel.MISSED_CALL, Channel.DEFAULT};
-
- private NotificationChannelManager() {}
-
- public void firstInitIfNeeded(@NonNull Context context) {
- if (BuildCompat.isAtLeastO()) {
- DialerExecutors.createNonUiTaskBuilder(this::firstInitIfNeededSync)
- .build()
- .executeSerial(context);
- }
- }
-
- private boolean firstInitIfNeededSync(@NonNull Context context) {
- if (needsFirstInit(context)) {
- initChannels(context);
- return true;
- }
- return false;
- }
-
- public boolean needsFirstInit(@NonNull Context context) {
- return (BuildCompat.isAtLeastO()
- && getSharedPreferences(context).getBoolean(PREF_NEED_FIRST_INIT, true));
- }
-
- @RequiresApi(VERSION_CODES.N)
- private SharedPreferences getSharedPreferences(@NonNull Context context) {
- // Use device protected storage since in some cases this will need to be accessed while device
- // is locked
- context = context.createDeviceProtectedStorageContext();
- return context.getSharedPreferences(PREFS_FILENAME, Context.MODE_PRIVATE);
- }
-
- @RequiresApi(26)
- public Intent getSettingsIntentForChannel(
- @NonNull Context context, @Channel String channelName, PhoneAccountHandle accountHandle) {
- checkNullity(channelName, accountHandle);
- Intent intent = new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS);
- intent.putExtra(
- Settings.EXTRA_CHANNEL_ID, getChannel(context, channelName, accountHandle).getId());
- intent.putExtra(Settings.EXTRA_APP_PACKAGE, context.getPackageName());
- return intent;
- }
+ NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+ Set desiredChannelIds = getAllDesiredChannelIds(context);
+ Set existingChannelIds = getAllExistingChannelIds(context);
- @TargetApi(26)
- @SuppressWarnings("AndroidApiChecker")
- public void initChannels(@NonNull Context context) {
- if (!BuildCompat.isAtLeastO()) {
+ if (desiredChannelIds.equals(existingChannelIds)) {
return;
}
- LogUtil.enterBlock("NotificationChannelManager.initChannels");
- List phoneAccounts = TelecomUtil.getCallCapablePhoneAccounts(context);
-
- // Remove notification channels for PhoneAccounts that don't exist anymore
- NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
- List notificationChannelGroups =
- notificationManager.getNotificationChannelGroups();
- notificationChannelGroups
- .stream()
- .filter(group -> !idExists(group.getId(), phoneAccounts))
- .forEach(group -> deleteGroup(notificationManager, group));
-
- for (PhoneAccountHandle phoneAccountHandle : phoneAccounts) {
- for (@Channel String channel : prepopulatedAccountChannels) {
- getChannel(context, channel, phoneAccountHandle);
+ LogUtil.i(
+ "NotificationChannelManager.initChannels",
+ "doing an expensive initialization of all notification channels");
+ LogUtil.i(
+ "NotificationChannelManager.initChannels", "desired channel IDs: " + desiredChannelIds);
+ LogUtil.i(
+ "NotificationChannelManager.initChannels", "existing channel IDs: " + existingChannelIds);
+
+ // Delete any old channels that we don't use any more. This is safe because if we're recreate
+ // this later then any user settings will be restored. An example is SIM specific voicemail
+ // channel that gets deleted when the user removes the SIM and is then restored when the user
+ // re-inserts the SIM.
+ for (String existingChannelId : existingChannelIds) {
+ if (!desiredChannelIds.contains(existingChannelId)) {
+ notificationManager.deleteNotificationChannel(existingChannelId);
}
}
- for (@Channel String channel : prepopulatedGlobalChannels) {
- getChannel(context, channel, null);
- }
- getSharedPreferences(context).edit().putBoolean(PREF_NEED_FIRST_INIT, false).apply();
- }
-
- @TargetApi(26)
- private void deleteGroup(
- @NonNull NotificationManager notificationManager, @NonNull NotificationChannelGroup group) {
- for (NotificationChannel channel : group.getChannels()) {
- notificationManager.deleteNotificationChannel(channel.getId());
- }
- notificationManager.deleteNotificationChannelGroup(group.getId());
- }
-
- private boolean idExists(String id, List phoneAccountHandles) {
- for (PhoneAccountHandle handle : phoneAccountHandles) {
- if (Objects.equals(handle.getId(), id)) {
- return true;
- }
- }
- return false;
+ // Just recreate all desired channels. We won't do this often so it's ok to do this now.
+ createIncomingCallChannel(context);
+ createOngoingCallChannel(context);
+ createMissedCallChannel(context);
+ createDefaultChannel(context);
+ VoicemailChannelUtils.createAllChannels(context);
}
@NonNull
- @RequiresApi(26)
- private NotificationChannel getChannel(
- @NonNull Context context,
- @Channel String channelName,
- @Nullable PhoneAccountHandle phoneAccount) {
- String channelId = channelNameToId(channelName, phoneAccount);
- NotificationChannel channel = getNotificationManager(context).getNotificationChannel(channelId);
- if (channel == null) {
- channel = createChannel(context, channelName, phoneAccount);
- }
- return channel;
+ public static String getVoicemailChannelId(
+ @NonNull Context context, @Nullable PhoneAccountHandle handle) {
+ Assert.checkArgument(BuildCompat.isAtLeastO());
+ Assert.isNotNull(context);
+ return VoicemailChannelUtils.getChannelId(context, handle);
}
- private static String channelNameToId(
- @Channel String name, @Nullable PhoneAccountHandle phoneAccountHandle) {
- if (phoneAccountHandle == null) {
- return name;
- } else {
- return name + ":" + phoneAccountHandle.getId();
- }
- }
-
- @RequiresApi(26)
- private NotificationChannel createChannel(
- Context context,
- @Channel String channelName,
- @Nullable PhoneAccountHandle phoneAccountHandle) {
- String channelId = channelNameToId(channelName, phoneAccountHandle);
-
- if (phoneAccountHandle != null) {
- PhoneAccount account = getTelecomManager(context).getPhoneAccount(phoneAccountHandle);
- NotificationChannelGroup group =
- new NotificationChannelGroup(
- phoneAccountHandle.getId(),
- (account == null) ? phoneAccountHandle.getId() : account.getLabel().toString());
- getNotificationManager(context)
- .createNotificationChannelGroup(group); // No-op if already exists
- } else if (!channelAllowsNullPhoneAccountHandle(channelName)) {
- LogUtil.w(
- "NotificationChannelManager.createChannel",
- "Null PhoneAccountHandle with channel " + channelName);
- }
-
- Uri silentRingtone = Uri.EMPTY;
-
- CharSequence name;
- int importance;
- boolean canShowBadge;
- boolean lights;
- boolean vibration;
- Uri sound;
- switch (channelName) {
- case Channel.INCOMING_CALL:
- name = context.getText(R.string.notification_channel_incoming_call);
- importance = NotificationManager.IMPORTANCE_MAX;
- canShowBadge = false;
- lights = true;
- vibration = false;
- sound = silentRingtone;
- break;
- case Channel.MISSED_CALL:
- name = context.getText(R.string.notification_channel_missed_call);
- importance = NotificationManager.IMPORTANCE_DEFAULT;
- canShowBadge = true;
- lights = true;
- vibration = true;
- sound = silentRingtone;
- break;
- case Channel.ONGOING_CALL:
- name = context.getText(R.string.notification_channel_ongoing_call);
- importance = NotificationManager.IMPORTANCE_DEFAULT;
- canShowBadge = false;
- lights = false;
- vibration = false;
- sound = silentRingtone;
- deleteOldOngoingCallChannelIfNeeded(context, phoneAccountHandle);
- break;
- case Channel.VOICEMAIL:
- name = context.getText(R.string.notification_channel_voicemail);
- importance = NotificationManager.IMPORTANCE_DEFAULT;
- canShowBadge = true;
- lights = true;
- vibration =
- TelephonyManagerCompat.isVoicemailVibrationEnabled(
- getTelephonyManager(context), phoneAccountHandle);
- sound =
- TelephonyManagerCompat.getVoicemailRingtoneUri(
- getTelephonyManager(context), phoneAccountHandle);
- break;
- case Channel.EXTERNAL_CALL:
- name = context.getText(R.string.notification_channel_external_call);
- importance = NotificationManager.IMPORTANCE_HIGH;
- canShowBadge = false;
- lights = true;
- vibration = true;
- sound = null;
- break;
- case Channel.DEFAULT:
- name = context.getText(R.string.notification_channel_misc);
- importance = NotificationManager.IMPORTANCE_DEFAULT;
- canShowBadge = false;
- lights = true;
- vibration = true;
- sound = null;
- break;
- default:
- throw new IllegalArgumentException("Unknown channel: " + channelName);
- }
-
- NotificationChannel channel = new NotificationChannel(channelId, name, importance);
- channel.setShowBadge(canShowBadge);
- if (sound != null) {
- // silentRingtone acts as a sentinel value to indicate that setSound should still be called,
- // but with a null value to indicate no sound.
- channel.setSound(
- sound.equals(silentRingtone) ? null : sound,
- new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION).build());
- }
- channel.enableLights(lights);
- channel.enableVibration(vibration);
- getNotificationManager(context).createNotificationChannel(channel);
- return channel;
- }
-
- @RequiresApi(26)
- private void deleteOldOngoingCallChannelIfNeeded(
- @NonNull Context context, PhoneAccountHandle phoneAccountHandle) {
- String channelId = channelNameToId(Channel.ONGOING_CALL_OLD, phoneAccountHandle);
- NotificationManager notificationManager = getNotificationManager(context);
- NotificationChannel channel = notificationManager.getNotificationChannel(channelId);
- if (channel != null) {
- LogUtil.i(
- "NotificationManager.deleteOldOngoingCallChannelIfNeeded",
- "Old ongoing channel found. Deleting to create new channel");
- notificationManager.deleteNotificationChannel(channel.getId());
- }
- }
-
- private static NotificationManager getNotificationManager(@NonNull Context context) {
- return context.getSystemService(NotificationManager.class);
- }
-
- private static TelephonyManager getTelephonyManager(@NonNull Context context) {
- return context.getSystemService(TelephonyManager.class);
+ private static Set getAllExistingChannelIds(@NonNull Context context) {
+ Set result = new ArraySet<>();
+ NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+ for (NotificationChannel channel : notificationManager.getNotificationChannels()) {
+ result.add(channel.getId());
+ }
+ return result;
+ }
+
+ private static Set getAllDesiredChannelIds(@NonNull Context context) {
+ Set result = new ArraySet<>();
+ result.add(NotificationChannelId.INCOMING_CALL);
+ result.add(NotificationChannelId.ONGOING_CALL);
+ result.add(NotificationChannelId.MISSED_CALL);
+ result.add(NotificationChannelId.DEFAULT);
+ result.addAll(VoicemailChannelUtils.getAllChannelIds(context));
+ return result;
+ }
+
+ private static void createIncomingCallChannel(@NonNull Context context) {
+ NotificationChannel channel =
+ new NotificationChannel(
+ NotificationChannelId.INCOMING_CALL,
+ context.getText(R.string.notification_channel_incoming_call),
+ NotificationManager.IMPORTANCE_MAX);
+ channel.setShowBadge(false);
+ channel.enableLights(true);
+ channel.enableVibration(false);
+ channel.setSound(
+ null, new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION).build());
+ context.getSystemService(NotificationManager.class).createNotificationChannel(channel);
+ }
+
+ private static void createOngoingCallChannel(@NonNull Context context) {
+ NotificationChannel channel =
+ new NotificationChannel(
+ NotificationChannelId.ONGOING_CALL,
+ context.getText(R.string.notification_channel_ongoing_call),
+ NotificationManager.IMPORTANCE_DEFAULT);
+ channel.setShowBadge(false);
+ channel.enableLights(false);
+ channel.enableVibration(false);
+ channel.setSound(
+ null, new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION).build());
+ context.getSystemService(NotificationManager.class).createNotificationChannel(channel);
+ }
+
+ private static void createMissedCallChannel(@NonNull Context context) {
+ NotificationChannel channel =
+ new NotificationChannel(
+ NotificationChannelId.MISSED_CALL,
+ context.getText(R.string.notification_channel_missed_call),
+ NotificationManager.IMPORTANCE_DEFAULT);
+ channel.setShowBadge(true);
+ channel.enableLights(true);
+ channel.enableVibration(true);
+ channel.setSound(
+ null, new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION).build());
+ context.getSystemService(NotificationManager.class).createNotificationChannel(channel);
+ }
+
+ private static void createDefaultChannel(@NonNull Context context) {
+ NotificationChannel channel =
+ new NotificationChannel(
+ NotificationChannelId.DEFAULT,
+ context.getText(R.string.notification_channel_misc),
+ NotificationManager.IMPORTANCE_DEFAULT);
+ channel.setShowBadge(false);
+ channel.enableLights(true);
+ channel.enableVibration(true);
+ context.getSystemService(NotificationManager.class).createNotificationChannel(channel);
}
- private static TelecomManager getTelecomManager(@NonNull Context context) {
- return context.getSystemService(TelecomManager.class);
- }
+ private NotificationChannelManager() {}
}
diff --git a/java/com/android/dialer/notification/VoicemailChannelUtils.java b/java/com/android/dialer/notification/VoicemailChannelUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..dc74799ca8cca2cd2104c6df559e44a5c8374929
--- /dev/null
+++ b/java/com/android/dialer/notification/VoicemailChannelUtils.java
@@ -0,0 +1,217 @@
+/*
+ * 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.notification;
+
+import android.annotation.TargetApi;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.media.AudioAttributes;
+import android.os.Build.VERSION_CODES;
+import android.provider.Settings;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.os.BuildCompat;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.ArraySet;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/** Utilities for working with voicemail channels. */
+@TargetApi(VERSION_CODES.O)
+/* package */ final class VoicemailChannelUtils {
+ private static final String GLOBAL_VOICEMAIL_CHANNEL_ID = "phone_voicemail";
+ private static final String PER_ACCOUNT_VOICEMAIL_CHANNEL_ID_PREFIX = "phone_voicemail_account_";
+
+ static Set getAllChannelIds(@NonNull Context context) {
+ Assert.checkArgument(BuildCompat.isAtLeastO());
+ Assert.isNotNull(context);
+
+ Set result = new ArraySet<>();
+ if (isSingleSimDevice(context)) {
+ result.add(GLOBAL_VOICEMAIL_CHANNEL_ID);
+ } else {
+ for (PhoneAccountHandle handle : getAllEligableAccounts(context)) {
+ result.add(getChannelIdForAccount(handle));
+ }
+ }
+ return result;
+ }
+
+ static void createAllChannels(@NonNull Context context) {
+ Assert.checkArgument(BuildCompat.isAtLeastO());
+ Assert.isNotNull(context);
+
+ if (isSingleSimDevice(context)) {
+ createGlobalVoicemailChannel(context);
+ } else {
+ for (PhoneAccountHandle handle : getAllEligableAccounts(context)) {
+ createVoicemailChannelForAccount(context, handle);
+ }
+ }
+ }
+
+ @NonNull
+ static String getChannelId(@NonNull Context context, @Nullable PhoneAccountHandle handle) {
+ Assert.checkArgument(BuildCompat.isAtLeastO());
+ Assert.isNotNull(context);
+
+ // Most devices we deal with have a single SIM slot. No need to distinguish between phone
+ // accounts.
+ if (isSingleSimDevice(context)) {
+ return GLOBAL_VOICEMAIL_CHANNEL_ID;
+ }
+
+ // We can get a null phone account at random points (modem reboot, etc...). Gracefully degrade
+ // by using the default channel.
+ if (handle == null) {
+ LogUtil.i(
+ "VoicemailChannelUtils.getChannelId",
+ "no phone account on a multi-SIM device, using default channel");
+ return NotificationChannelId.DEFAULT;
+ }
+
+ // Voicemail notifications should always be associated with a SIM based phone account.
+ if (!isChannelAllowedForAccount(context, handle)) {
+ LogUtil.i(
+ "VoicemailChannelUtils.getChannelId",
+ "phone account is not for a SIM, using default channel");
+ return NotificationChannelId.DEFAULT;
+ }
+
+ // Now we're in the multi-SIM case.
+ String channelId = getChannelIdForAccount(handle);
+ if (!doesChannelExist(context, channelId)) {
+ LogUtil.i(
+ "VoicemailChannelUtils.getChannelId",
+ "voicemail channel not found for phone account (possible SIM swap?), creating a new one");
+ createVoicemailChannelForAccount(context, handle);
+ }
+ return channelId;
+ }
+
+ private static boolean doesChannelExist(@NonNull Context context, @NonNull String channelId) {
+ return context.getSystemService(NotificationManager.class).getNotificationChannel(channelId)
+ != null;
+ }
+
+ private static String getChannelIdForAccount(@NonNull PhoneAccountHandle handle) {
+ Assert.isNotNull(handle);
+ return PER_ACCOUNT_VOICEMAIL_CHANNEL_ID_PREFIX + ":" + handle.getId();
+ }
+
+ /**
+ * Creates a voicemail channel but doesn't associate it with a SIM. For devices with only one SIM
+ * slot this is ideal because there won't be duplication in the settings UI.
+ */
+ private static void createGlobalVoicemailChannel(@NonNull Context context) {
+ NotificationChannel channel = newChannel(context, GLOBAL_VOICEMAIL_CHANNEL_ID, null);
+
+ TelecomManager telecomManager = context.getSystemService(TelecomManager.class);
+ PhoneAccountHandle handle =
+ telecomManager.getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_TEL);
+ if (handle == null) {
+ LogUtil.i(
+ "VoicemailChannelUtils.createGlobalVoicemailChannel",
+ "phone account is null, not migrating sound settings");
+ } else if (!isChannelAllowedForAccount(context, handle)) {
+ LogUtil.i(
+ "VoicemailChannelUtils.createGlobalVoicemailChannel",
+ "phone account is not eligable, not migrating sound settings");
+ } else {
+ migrateVoicemailSoundSettings(context, channel, handle);
+ }
+ context.getSystemService(NotificationManager.class).createNotificationChannel(channel);
+ }
+
+ private static List getAllEligableAccounts(@NonNull Context context) {
+ List handles = new ArrayList<>();
+ TelecomManager telecomManager = context.getSystemService(TelecomManager.class);
+ for (PhoneAccountHandle handle : telecomManager.getCallCapablePhoneAccounts()) {
+ if (isChannelAllowedForAccount(context, handle)) {
+ handles.add(handle);
+ }
+ }
+ return handles;
+ }
+
+ private static void createVoicemailChannelForAccount(
+ @NonNull Context context, @NonNull PhoneAccountHandle handle) {
+ PhoneAccount phoneAccount =
+ context.getSystemService(TelecomManager.class).getPhoneAccount(handle);
+ NotificationChannel channel =
+ newChannel(context, getChannelIdForAccount(handle), phoneAccount.getLabel());
+ migrateVoicemailSoundSettings(context, channel, handle);
+ context.getSystemService(NotificationManager.class).createNotificationChannel(channel);
+ }
+
+ private static void migrateVoicemailSoundSettings(
+ @NonNull Context context,
+ @NonNull NotificationChannel channel,
+ @NonNull PhoneAccountHandle handle) {
+ TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
+ channel.enableVibration(telephonyManager.isVoicemailVibrationEnabled(handle));
+ channel.setSound(
+ telephonyManager.getVoicemailRingtoneUri(handle),
+ new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION).build());
+ }
+
+ private static boolean isChannelAllowedForAccount(
+ @NonNull Context context, @NonNull PhoneAccountHandle handle) {
+ PhoneAccount phoneAccount =
+ context.getSystemService(TelecomManager.class).getPhoneAccount(handle);
+ if (phoneAccount == null) {
+ return false;
+ }
+ if (!phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
+ return false;
+ }
+ return true;
+ }
+
+ private static NotificationChannel newChannel(
+ @NonNull Context context, @NonNull String channelId, @Nullable CharSequence nameSuffix) {
+ CharSequence name = context.getText(R.string.notification_channel_voicemail);
+ // TODO: Use a string resource template after v10.
+ if (!TextUtils.isEmpty(nameSuffix)) {
+ name = TextUtils.concat(name, ": ", nameSuffix);
+ }
+
+ NotificationChannel channel =
+ new NotificationChannel(channelId, name, NotificationManager.IMPORTANCE_DEFAULT);
+ channel.setShowBadge(true);
+ channel.enableLights(true);
+ channel.enableVibration(true);
+ channel.setSound(
+ Settings.System.DEFAULT_NOTIFICATION_URI,
+ new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION).build());
+ return channel;
+ }
+
+ private static boolean isSingleSimDevice(@NonNull Context context) {
+ return context.getSystemService(TelephonyManager.class).getPhoneCount() <= 1;
+ }
+
+ private VoicemailChannelUtils() {}
+}
diff --git a/java/com/android/dialer/notification/res/values-af/strings.xml b/java/com/android/dialer/notification/res/values-af/strings.xml
index 08dd754ddc726b520213cea7ded71328d52ecb3b..e48249b3c8dda6a2fe25b91605b3c29d35246d41 100644
--- a/java/com/android/dialer/notification/res/values-af/strings.xml
+++ b/java/com/android/dialer/notification/res/values-af/strings.xml
@@ -21,6 +21,5 @@
"Deurlopende oproepe"
"Gemiste oproepe"
"Stemboodskappe"
- "Ekterne oproepe"
"Verstek"
diff --git a/java/com/android/dialer/notification/res/values-am/strings.xml b/java/com/android/dialer/notification/res/values-am/strings.xml
index 56d6c2ca1205dcf9a813b1209efad8320dd5bc50..0983e0591f1fcec562746c1fcc2a6cfda6ba7a57 100644
--- a/java/com/android/dialer/notification/res/values-am/strings.xml
+++ b/java/com/android/dialer/notification/res/values-am/strings.xml
@@ -21,6 +21,5 @@
"በመካሄድ ላይ ያሉ ጥሪዎች"
"ያመለጡ ጥሪዎች"
"የድምፅ መልዕክቶች"
- "ውጫዊ ጥሪዎች"
"ነባሪ"
diff --git a/java/com/android/dialer/notification/res/values-ar/strings.xml b/java/com/android/dialer/notification/res/values-ar/strings.xml
index 71857c274a7e449270d094409350c19cd5829643..ab6059ff1f12ad03c9b29e1daca14d562a451fcb 100644
--- a/java/com/android/dialer/notification/res/values-ar/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ar/strings.xml
@@ -21,6 +21,5 @@
"المكالمات الجارية"
"المكالمات الفائتة"
"رسائل البريد الصوتي"
- "المكالمات الخارجية"
"افتراضي"
diff --git a/java/com/android/dialer/notification/res/values-az/strings.xml b/java/com/android/dialer/notification/res/values-az/strings.xml
index f907e554ebc07e09309a7896ab931d1622c9f5aa..425f30ad79e56ad33c271170eb972195c077d7db 100644
--- a/java/com/android/dialer/notification/res/values-az/strings.xml
+++ b/java/com/android/dialer/notification/res/values-az/strings.xml
@@ -21,6 +21,5 @@
"Gedən zənglər"
"Buraxılmış zənglər"
"Səsli məktublar"
- "External calls"
"Defolt"
diff --git a/java/com/android/dialer/notification/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/notification/res/values-b+sr+Latn/strings.xml
index 4d5b5e78a4d3c655a6ddc80fa480c2c97ada45e7..4598e764419a200bf1ebd5f228ee75eec823cbf4 100644
--- a/java/com/android/dialer/notification/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/notification/res/values-b+sr+Latn/strings.xml
@@ -21,6 +21,5 @@
"Pozivi u toku"
"Propušteni pozivi"
"Govorne poruke"
- "Spoljni pozivi"
"Podrazumevano"
diff --git a/java/com/android/dialer/notification/res/values-be/strings.xml b/java/com/android/dialer/notification/res/values-be/strings.xml
index 70defe342d2e2e0ce04b7b1174a706a4f0f4e9c7..586a36c3109897d0e70eb31de052d9b32cda1180 100644
--- a/java/com/android/dialer/notification/res/values-be/strings.xml
+++ b/java/com/android/dialer/notification/res/values-be/strings.xml
@@ -21,6 +21,5 @@
"Адбываючыяся выклікі"
"Прапушчаныя выклікі"
"Галасавая пошта"
- "Знешнія выклікі"
"Стандартны"
diff --git a/java/com/android/dialer/notification/res/values-bg/strings.xml b/java/com/android/dialer/notification/res/values-bg/strings.xml
index 1ec202e6c016d2231bd85a7dc6ad5cb523ea36fc..9bc8f8f028a73c597ca6b17815bfa9941f7d5b84 100644
--- a/java/com/android/dialer/notification/res/values-bg/strings.xml
+++ b/java/com/android/dialer/notification/res/values-bg/strings.xml
@@ -21,6 +21,5 @@
"Текущи обаждания"
"Пропуснати обаждания"
"Гласови съобщения"
- "Външни обаждания"
"По подразбиране"
diff --git a/java/com/android/dialer/notification/res/values-bn/strings.xml b/java/com/android/dialer/notification/res/values-bn/strings.xml
index 886f8317dafe09f2ee114e6f82298643d30934b6..1d778179760640c29447b085bd85dd2fcdc65c5a 100644
--- a/java/com/android/dialer/notification/res/values-bn/strings.xml
+++ b/java/com/android/dialer/notification/res/values-bn/strings.xml
@@ -21,6 +21,5 @@
"সংযুক্ত কল"
"মিস করা কল"
"ভয়েসমেল"
- "বাহ্যিক কল"
"ডিফল্ট"
diff --git a/java/com/android/dialer/notification/res/values-bs/strings.xml b/java/com/android/dialer/notification/res/values-bs/strings.xml
index e408a6468feb02b8f3790a36fe7a7fdae1b76e22..dedbb1c2dafa83fe9c611adec5f827e157d21d0d 100644
--- a/java/com/android/dialer/notification/res/values-bs/strings.xml
+++ b/java/com/android/dialer/notification/res/values-bs/strings.xml
@@ -21,6 +21,5 @@
"Tekući pozivi"
"Propušteni pozivi"
"Poruke govorne pošte"
- "Vanjski pozivi"
"Zadano"
diff --git a/java/com/android/dialer/notification/res/values-ca/strings.xml b/java/com/android/dialer/notification/res/values-ca/strings.xml
index ea81b627a32e138e46f27d2c7f02266e41d800cd..1c19d0f74beca78992daaf4f0bd40d4f4137bd36 100644
--- a/java/com/android/dialer/notification/res/values-ca/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ca/strings.xml
@@ -21,6 +21,5 @@
"Trucades en curs"
"Trucades perdudes"
"Missatges de veu"
- "Trucades externes"
"Predeterminat"
diff --git a/java/com/android/dialer/notification/res/values-cs/strings.xml b/java/com/android/dialer/notification/res/values-cs/strings.xml
index 9ea7b61cad884f7f8f911bb4c01a57189a605257..c428ca2f3225264f944875a4ca98b97fcefab8b0 100644
--- a/java/com/android/dialer/notification/res/values-cs/strings.xml
+++ b/java/com/android/dialer/notification/res/values-cs/strings.xml
@@ -21,6 +21,5 @@
"Probíhající hovory"
"Zmeškané hovory"
"Hlasové zprávy"
- "Externí hovory"
"Výchozí"
diff --git a/java/com/android/dialer/notification/res/values-da/strings.xml b/java/com/android/dialer/notification/res/values-da/strings.xml
index e4fc4ddedb27c7c651746df6133b40432ba278ca..7f0ce9f1059babb925bd9dcd983349aff11a016d 100644
--- a/java/com/android/dialer/notification/res/values-da/strings.xml
+++ b/java/com/android/dialer/notification/res/values-da/strings.xml
@@ -21,6 +21,5 @@
"Igangværende opkald"
"Ubesvarede opkald"
"Talebeskeder"
- "Eksterne opkald"
"Standard"
diff --git a/java/com/android/dialer/notification/res/values-de/strings.xml b/java/com/android/dialer/notification/res/values-de/strings.xml
index 7fce6bf47bd0067fc8cad5b06414b3827029e4c7..86b7520169acb799702c21b53eb3c3a0af04a7f6 100644
--- a/java/com/android/dialer/notification/res/values-de/strings.xml
+++ b/java/com/android/dialer/notification/res/values-de/strings.xml
@@ -21,6 +21,5 @@
"Laufende Anrufe"
"Entgangene Anrufe"
"Mailboxnachrichten"
- "Externe Anrufe"
"Standard"
diff --git a/java/com/android/dialer/notification/res/values-el/strings.xml b/java/com/android/dialer/notification/res/values-el/strings.xml
index a25bb43e9e7fb5f26b1308aae475d3feb0936876..812dc25642f73ffef958d9d1d8970e41474741c9 100644
--- a/java/com/android/dialer/notification/res/values-el/strings.xml
+++ b/java/com/android/dialer/notification/res/values-el/strings.xml
@@ -21,6 +21,5 @@
"Κλήσεις σε εξέλιξη"
"Αναπάντητες κλήσεις"
"Μηνύματα αυτόματου τηλεφωνητή"
- "Εξωτερικές κλήσεις"
"Προεπιλογή"
diff --git a/java/com/android/dialer/notification/res/values-en-rAU/strings.xml b/java/com/android/dialer/notification/res/values-en-rAU/strings.xml
index 7d4bd825bb0eda9492e6c37f911fc36584bf104d..43b722bebb93b41f9604649f5592ec580f1c8871 100644
--- a/java/com/android/dialer/notification/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/notification/res/values-en-rAU/strings.xml
@@ -21,6 +21,5 @@
"Ongoing calls"
"Missed calls"
"Voicemail"
- "External calls"
"Default"
diff --git a/java/com/android/dialer/notification/res/values-en-rGB/strings.xml b/java/com/android/dialer/notification/res/values-en-rGB/strings.xml
index 7d4bd825bb0eda9492e6c37f911fc36584bf104d..43b722bebb93b41f9604649f5592ec580f1c8871 100644
--- a/java/com/android/dialer/notification/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/notification/res/values-en-rGB/strings.xml
@@ -21,6 +21,5 @@
"Ongoing calls"
"Missed calls"
"Voicemail"
- "External calls"
"Default"
diff --git a/java/com/android/dialer/notification/res/values-en-rIN/strings.xml b/java/com/android/dialer/notification/res/values-en-rIN/strings.xml
index 7d4bd825bb0eda9492e6c37f911fc36584bf104d..43b722bebb93b41f9604649f5592ec580f1c8871 100644
--- a/java/com/android/dialer/notification/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/notification/res/values-en-rIN/strings.xml
@@ -21,6 +21,5 @@
"Ongoing calls"
"Missed calls"
"Voicemail"
- "External calls"
"Default"
diff --git a/java/com/android/dialer/notification/res/values-es-rUS/strings.xml b/java/com/android/dialer/notification/res/values-es-rUS/strings.xml
index fe8fe1354c8794718d495b1c55abec77e92355ca..c56edcfe6ec4a5a9d1dd0e386b38fc15802967c7 100644
--- a/java/com/android/dialer/notification/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/notification/res/values-es-rUS/strings.xml
@@ -21,6 +21,5 @@
"Llamadas en curso"
"Llamadas perdidas"
"Mensajes de voz"
- "Llamadas externas"
"Predeterminado"
diff --git a/java/com/android/dialer/notification/res/values-es/strings.xml b/java/com/android/dialer/notification/res/values-es/strings.xml
index fe8fe1354c8794718d495b1c55abec77e92355ca..c56edcfe6ec4a5a9d1dd0e386b38fc15802967c7 100644
--- a/java/com/android/dialer/notification/res/values-es/strings.xml
+++ b/java/com/android/dialer/notification/res/values-es/strings.xml
@@ -21,6 +21,5 @@
"Llamadas en curso"
"Llamadas perdidas"
"Mensajes de voz"
- "Llamadas externas"
"Predeterminado"
diff --git a/java/com/android/dialer/notification/res/values-et/strings.xml b/java/com/android/dialer/notification/res/values-et/strings.xml
index 41623951f25c932c28d73fe9e15e5b30abe12b2c..9c60a319503cac1c7d0c60be4f238d3dd3f17c63 100644
--- a/java/com/android/dialer/notification/res/values-et/strings.xml
+++ b/java/com/android/dialer/notification/res/values-et/strings.xml
@@ -21,6 +21,5 @@
"Käimasolevad kõned"
"Vastamata kõned"
"Kõnepostisõnumid"
- "Välised kõned"
"Vaikeseade"
diff --git a/java/com/android/dialer/notification/res/values-eu/strings.xml b/java/com/android/dialer/notification/res/values-eu/strings.xml
index 326ac0ab650b6756a12366d82220f0d956cc4f82..d94ac0ab67be743f908c40f7f6bf6ec18f7785f6 100644
--- a/java/com/android/dialer/notification/res/values-eu/strings.xml
+++ b/java/com/android/dialer/notification/res/values-eu/strings.xml
@@ -21,6 +21,5 @@
"Abian diren deiak"
"Dei galduak"
"Ahots-mezuak"
- "Kanpoko deiak"
"Lehenetsia"
diff --git a/java/com/android/dialer/notification/res/values-fa/strings.xml b/java/com/android/dialer/notification/res/values-fa/strings.xml
index f1a7efc3d9bb1e38906a0b097a73355e841de292..edbc98336650686838b31a7fdc8916bcc4ccf685 100644
--- a/java/com/android/dialer/notification/res/values-fa/strings.xml
+++ b/java/com/android/dialer/notification/res/values-fa/strings.xml
@@ -21,6 +21,5 @@
"تماسهای درحال انجام"
"تماسهای بیپاسخ"
"پستهای صوتی"
- "تماسهای خارجی"
"پیشفرض"
diff --git a/java/com/android/dialer/notification/res/values-fi/strings.xml b/java/com/android/dialer/notification/res/values-fi/strings.xml
index c88c2325ad98b315ed3451ef2f13f6377156f868..87652f8a86234686682828641c8bbf45a377a44a 100644
--- a/java/com/android/dialer/notification/res/values-fi/strings.xml
+++ b/java/com/android/dialer/notification/res/values-fi/strings.xml
@@ -21,6 +21,5 @@
"Käynnissä olevat puhelut"
"Vastaamattomat puhelut"
"Vastaajaviestit"
- "Ulkopuoliset puhelut"
"Oletus"
diff --git a/java/com/android/dialer/notification/res/values-fr-rCA/strings.xml b/java/com/android/dialer/notification/res/values-fr-rCA/strings.xml
index a21d6b28b8ed3c70c811e6f30136851764687caf..5a2d7dcfe2f4023eb7f22d41e310c46e6a391987 100644
--- a/java/com/android/dialer/notification/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/notification/res/values-fr-rCA/strings.xml
@@ -21,6 +21,5 @@
"Appels en cours"
"Appels manqués"
"Messages vocaux"
- "Appels externes"
"Par défaut"
diff --git a/java/com/android/dialer/notification/res/values-fr/strings.xml b/java/com/android/dialer/notification/res/values-fr/strings.xml
index a21d6b28b8ed3c70c811e6f30136851764687caf..5a2d7dcfe2f4023eb7f22d41e310c46e6a391987 100644
--- a/java/com/android/dialer/notification/res/values-fr/strings.xml
+++ b/java/com/android/dialer/notification/res/values-fr/strings.xml
@@ -21,6 +21,5 @@
"Appels en cours"
"Appels manqués"
"Messages vocaux"
- "Appels externes"
"Par défaut"
diff --git a/java/com/android/dialer/notification/res/values-gl/strings.xml b/java/com/android/dialer/notification/res/values-gl/strings.xml
index 3b57a59b32fe30b74834953755edb316546da4e8..0e7fb612b3addd794d2567499d3adf0fc714aab1 100644
--- a/java/com/android/dialer/notification/res/values-gl/strings.xml
+++ b/java/com/android/dialer/notification/res/values-gl/strings.xml
@@ -21,6 +21,5 @@
"Chamadas saíntes"
"Chamadas perdidas"
"Correos de voz"
- "Chamadas externas"
"Predeterminado"
diff --git a/java/com/android/dialer/notification/res/values-gu/strings.xml b/java/com/android/dialer/notification/res/values-gu/strings.xml
index f185e5971fa401162abf84cdbbb070c80da04b82..a4a0a7ae10ea7fdf531118c2d5c9fe9e6c9ca334 100644
--- a/java/com/android/dialer/notification/res/values-gu/strings.xml
+++ b/java/com/android/dialer/notification/res/values-gu/strings.xml
@@ -21,6 +21,5 @@
"ચાલુ કૉલ"
"છૂટેલા કૉલ"
"વૉઇસમેઇલ"
- "બાહ્ય કૉલ"
"ડિફૉલ્ટ"
diff --git a/java/com/android/dialer/notification/res/values-hi/strings.xml b/java/com/android/dialer/notification/res/values-hi/strings.xml
index 89c8e55475d8ae3434536b6976c287f8028a8b86..69ed9b0b21ae4c04545892ecba215408a92deb99 100644
--- a/java/com/android/dialer/notification/res/values-hi/strings.xml
+++ b/java/com/android/dialer/notification/res/values-hi/strings.xml
@@ -21,6 +21,5 @@
"चल रहे कॉल"
"छूटे कॉल"
"वॉइसमेल"
- "बाहरी कॉल"
"डिफ़ॉल्ट"
diff --git a/java/com/android/dialer/notification/res/values-hr/strings.xml b/java/com/android/dialer/notification/res/values-hr/strings.xml
index 9f786d7d8de57a85d35e7071c0eec63a42b95ec5..a5924c3ce5b070200fd68b5da2a40c2096ab0bd1 100644
--- a/java/com/android/dialer/notification/res/values-hr/strings.xml
+++ b/java/com/android/dialer/notification/res/values-hr/strings.xml
@@ -21,6 +21,5 @@
"Pozivi u tijeku"
"Propušteni pozivi"
"Poruke govorne pošte"
- "Vanjski pozivi"
"Zadano"
diff --git a/java/com/android/dialer/notification/res/values-hu/strings.xml b/java/com/android/dialer/notification/res/values-hu/strings.xml
index 09fa795d62b11f8c2892e687d9383adaaac8ee83..719252f0fa3521a581c915c3ce8a8e68250e1ee8 100644
--- a/java/com/android/dialer/notification/res/values-hu/strings.xml
+++ b/java/com/android/dialer/notification/res/values-hu/strings.xml
@@ -21,6 +21,5 @@
"Kimenő hívások"
"Nem fogadott hívások"
"Hangüzenetek"
- "Külső hívások"
"Alapértelmezett"
diff --git a/java/com/android/dialer/notification/res/values-hy/strings.xml b/java/com/android/dialer/notification/res/values-hy/strings.xml
index 693898a55c29959b570521cd2291ad4a911f9616..6bb2c34e30a029f73b511eae88d289e2e122e0d0 100644
--- a/java/com/android/dialer/notification/res/values-hy/strings.xml
+++ b/java/com/android/dialer/notification/res/values-hy/strings.xml
@@ -21,6 +21,5 @@
"Ընթացիկ զանգեր"
"Բաց թողնված զանգեր"
"Ձայնային փոստ"
- "Արտաքին զանգեր"
"Կանխադրված"
diff --git a/java/com/android/dialer/notification/res/values-in/strings.xml b/java/com/android/dialer/notification/res/values-in/strings.xml
index 405b2927dea2a58029bfbbbed2391dfa47527fb5..88ef3d5241f546f7e194ba38be0c1dbf58b5d8b1 100644
--- a/java/com/android/dialer/notification/res/values-in/strings.xml
+++ b/java/com/android/dialer/notification/res/values-in/strings.xml
@@ -21,6 +21,5 @@
"Panggilan keluar"
"Panggilan tak terjawab"
"Pesan suara"
- "Panggilan eksternal"
"Default"
diff --git a/java/com/android/dialer/notification/res/values-is/strings.xml b/java/com/android/dialer/notification/res/values-is/strings.xml
index be84917fcd4c1ce7a59d47e7aba818977c4d7dd8..166d9744348055dc1bcbc5ca29664c0baff41b89 100644
--- a/java/com/android/dialer/notification/res/values-is/strings.xml
+++ b/java/com/android/dialer/notification/res/values-is/strings.xml
@@ -21,6 +21,5 @@
"Símtöl í gangi"
"Ósvöruð símtöl"
"Talhólfsskilaboð"
- "Utanaðkomandi símtöl"
"Sjálfgefið"
diff --git a/java/com/android/dialer/notification/res/values-it/strings.xml b/java/com/android/dialer/notification/res/values-it/strings.xml
index 1ac6e2d41e48b0557a77f10196af65fe28f9a254..7b55da99187cbe7b93c093b4f71d237315e22b8b 100644
--- a/java/com/android/dialer/notification/res/values-it/strings.xml
+++ b/java/com/android/dialer/notification/res/values-it/strings.xml
@@ -21,6 +21,5 @@
"Chiamate in uscita"
"Chiamate perse"
"Messaggi vocali"
- "Chiamate esterne"
"Predefinito"
diff --git a/java/com/android/dialer/notification/res/values-iw/strings.xml b/java/com/android/dialer/notification/res/values-iw/strings.xml
index ed07b8643ea7e48cd92f2e948942db146f4c109b..2b8b9df33adb8871c25c3b8a4c8808ec3dc997de 100644
--- a/java/com/android/dialer/notification/res/values-iw/strings.xml
+++ b/java/com/android/dialer/notification/res/values-iw/strings.xml
@@ -21,6 +21,5 @@
"שיחות יוצאות"
"שיחות שלא נענו"
"הודעות קוליות"
- "שיחות חיצוניות"
"ברירת מחדל"
diff --git a/java/com/android/dialer/notification/res/values-ja/strings.xml b/java/com/android/dialer/notification/res/values-ja/strings.xml
index 3265d7266f03309bf8be90c8d9ea53d79fdbef8b..2ff8da7d0727899a1b0fe863474e0fe1ff22cb6a 100644
--- a/java/com/android/dialer/notification/res/values-ja/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ja/strings.xml
@@ -21,6 +21,5 @@
"通話中"
"不在着信"
"ボイスメール"
- "外部通話"
"デフォルト"
diff --git a/java/com/android/dialer/notification/res/values-ka/strings.xml b/java/com/android/dialer/notification/res/values-ka/strings.xml
index 6d81465e272e3c0ed2f7b2aafd52ce5da3487d94..73394efebc56991cf61f7e06858ee647cbbf7f8f 100644
--- a/java/com/android/dialer/notification/res/values-ka/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ka/strings.xml
@@ -21,6 +21,5 @@
"გამავალი ზარები"
"გამოტოვებული ზარები"
"ხმოვანი ფოსტა"
- "გარე ზარები"
"ნაგულისხმევი"
diff --git a/java/com/android/dialer/notification/res/values-kk/strings.xml b/java/com/android/dialer/notification/res/values-kk/strings.xml
index 35733fb0495454fc0e1ee4ecc4da3c8892d03a7c..8151c9ca9e3c02ec6e8a88415f8e3f2941a28dbf 100644
--- a/java/com/android/dialer/notification/res/values-kk/strings.xml
+++ b/java/com/android/dialer/notification/res/values-kk/strings.xml
@@ -21,6 +21,5 @@
"Қазіргі қоңыраулар"
"Қабылданбаған қоңыраулар"
"Дауыстық хабарлар"
- "Сыртқы қоңыраулар"
"Әдепкі"
diff --git a/java/com/android/dialer/notification/res/values-km/strings.xml b/java/com/android/dialer/notification/res/values-km/strings.xml
index 42bc1135044dc392bd97d3e0567f0e68745a28a7..22131ff398a63bbe9e64fe3833e47b0c58a14cfc 100644
--- a/java/com/android/dialer/notification/res/values-km/strings.xml
+++ b/java/com/android/dialer/notification/res/values-km/strings.xml
@@ -21,6 +21,5 @@
"ការហៅបន្ត"
"ការហៅដែលមិនបានទទួល"
"សារជាសំឡេង"
- "ការហៅខាងក្រៅ"
"លំនាំដើម"
diff --git a/java/com/android/dialer/notification/res/values-kn/strings.xml b/java/com/android/dialer/notification/res/values-kn/strings.xml
index 45f26e378b9ca2cf678af92b7b1f37fe338dc1f8..d6e55bdb182d84035de0228693912ee401e7f7a5 100644
--- a/java/com/android/dialer/notification/res/values-kn/strings.xml
+++ b/java/com/android/dialer/notification/res/values-kn/strings.xml
@@ -21,6 +21,5 @@
"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆಗಳು"
"ಮಿಸ್ಡ್ ಕರೆಗಳು"
"ಧ್ವನಿಮೇಲ್ಗಳು"
- "ಹೊರಗಿನ ಕರೆಗಳು"
"ಡಿಫಾಲ್ಟ್"
diff --git a/java/com/android/dialer/notification/res/values-ko/strings.xml b/java/com/android/dialer/notification/res/values-ko/strings.xml
index d806cad0651a23d6486e1a8c1e7dfc83016e367d..5a667176d1ab30fd6874731114ba0d7283601e60 100644
--- a/java/com/android/dialer/notification/res/values-ko/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ko/strings.xml
@@ -21,6 +21,5 @@
"진행 중인 전화"
"부재중 전화"
"음성사서함"
- "외부 전화"
"기본"
diff --git a/java/com/android/dialer/notification/res/values-ky/strings.xml b/java/com/android/dialer/notification/res/values-ky/strings.xml
index eb6adf6e794bdbdff71cdc42eb5462c285a7da62..c5259315af3887af72bb0126d2d371e067cff7e8 100644
--- a/java/com/android/dialer/notification/res/values-ky/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ky/strings.xml
@@ -21,6 +21,5 @@
"Учурдагы чалуулар"
"Кабыл алынбаган чалуулар"
"Үнкаттар"
- "Тышкы чалуулар"
"Демейки"
diff --git a/java/com/android/dialer/notification/res/values-lo/strings.xml b/java/com/android/dialer/notification/res/values-lo/strings.xml
index f439807deff12937af3a7eaa4578ab59bed3d3e0..a52d9df143d76038ff04c525acb128fa5a4c9ac5 100644
--- a/java/com/android/dialer/notification/res/values-lo/strings.xml
+++ b/java/com/android/dialer/notification/res/values-lo/strings.xml
@@ -21,6 +21,5 @@
"ສາຍໂທອອກ"
"ສາຍບໍ່ໄດ້ຮັບ"
"ຂໍ້ຄວາມສຽງ"
- "ສາຍພາຍນອກ"
"ຄ່າເລີ່ມຕົ້ນ"
diff --git a/java/com/android/dialer/notification/res/values-lt/strings.xml b/java/com/android/dialer/notification/res/values-lt/strings.xml
index f08697ad6617bb2854a6d0595defcec3cc2a4293..6f26d3e66a76f0b651ab85d70f244505cdc654fb 100644
--- a/java/com/android/dialer/notification/res/values-lt/strings.xml
+++ b/java/com/android/dialer/notification/res/values-lt/strings.xml
@@ -21,6 +21,5 @@
"Vykstantys skambučiai"
"Praleisti skambučiai"
"Balso pašto pranešimai"
- "Išoriniai skambučiai"
"Numatytasis"
diff --git a/java/com/android/dialer/notification/res/values-lv/strings.xml b/java/com/android/dialer/notification/res/values-lv/strings.xml
index d465b682d1d9a3168c2aab277a156c08310288cc..1819d810ab7aa3e6c4a20c343ffdc9a788ca0268 100644
--- a/java/com/android/dialer/notification/res/values-lv/strings.xml
+++ b/java/com/android/dialer/notification/res/values-lv/strings.xml
@@ -21,6 +21,5 @@
"Aktīvie zvani"
"Neatbildētie zvani"
"Balss pasta ziņojumi"
- "Ārējie zvani"
"Noklusējums"
diff --git a/java/com/android/dialer/notification/res/values-mk/strings.xml b/java/com/android/dialer/notification/res/values-mk/strings.xml
index 838065ba9fb93cea5ab257262f94bca6d97a2ebb..56459c479de9ad00b3ddbb1bcfb755cf06cc30f9 100644
--- a/java/com/android/dialer/notification/res/values-mk/strings.xml
+++ b/java/com/android/dialer/notification/res/values-mk/strings.xml
@@ -21,6 +21,5 @@
"Појдовни повици"
"Пропуштени повици"
"Говорни пораки"
- "Надворешни повици"
"Стандардно"
diff --git a/java/com/android/dialer/notification/res/values-ml/strings.xml b/java/com/android/dialer/notification/res/values-ml/strings.xml
index 448186a36e9c8f7cfabc55db494c856dc81bf44e..49a64e8f565541b1dcd0e182875204edb35273d0 100644
--- a/java/com/android/dialer/notification/res/values-ml/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ml/strings.xml
@@ -21,6 +21,5 @@
"നിലവിലുള്ള കോളുകൾ"
"മിസ്ഡ് കോളുകൾ"
"വോയ്സ്മെയിലുകൾ"
- "എക്സ്റ്റേണൽ കോളുകൾ"
"ഡിഫോൾട്ട്"
diff --git a/java/com/android/dialer/notification/res/values-mn/strings.xml b/java/com/android/dialer/notification/res/values-mn/strings.xml
index 3dca52e6b5c6035fecf201f8d8f2fcd5f5ec4f80..28297b3c1ce6e2f498f987d9570af6b7726cda43 100644
--- a/java/com/android/dialer/notification/res/values-mn/strings.xml
+++ b/java/com/android/dialer/notification/res/values-mn/strings.xml
@@ -21,6 +21,5 @@
"Үргэлжилж буй дуудлага"
"Аваагүй дуудлага"
"Дуут шуудан"
- "Гадаад дуудлага"
"Өгөгдмөл"
diff --git a/java/com/android/dialer/notification/res/values-mr/strings.xml b/java/com/android/dialer/notification/res/values-mr/strings.xml
index 5685376401f3b34927d873c339561c3ceb860d08..38fbd606a84acbd4dc4ed9bbb4db4404702e8b36 100644
--- a/java/com/android/dialer/notification/res/values-mr/strings.xml
+++ b/java/com/android/dialer/notification/res/values-mr/strings.xml
@@ -21,6 +21,5 @@
"सुरू असलेले कॉल"
"सुटलेले कॉल"
"व्हॉइसमेल"
- "बाह्य कॉल"
"डीफॉल्ट"
diff --git a/java/com/android/dialer/notification/res/values-ms/strings.xml b/java/com/android/dialer/notification/res/values-ms/strings.xml
index a1961c4a46889fc04171b12558c74345a4d7213d..ec7be04efbbf13cd8c5bf9fe2f5911a1c5ff7946 100644
--- a/java/com/android/dialer/notification/res/values-ms/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ms/strings.xml
@@ -21,6 +21,5 @@
"Panggilan sedang berlangsung"
"Panggilan terlepas"
"Mel suara"
- "Panggilan luar"
"Lalai"
diff --git a/java/com/android/dialer/notification/res/values-my/strings.xml b/java/com/android/dialer/notification/res/values-my/strings.xml
index 26398b4593d36e089dd71282a17b9f347f4ab4c1..44df8479873a565171b29a6ee9fb8af9364c14ad 100644
--- a/java/com/android/dialer/notification/res/values-my/strings.xml
+++ b/java/com/android/dialer/notification/res/values-my/strings.xml
@@ -21,6 +21,5 @@
"လက်ရှိခေါ်ဆိုမှုများ"
"လွဲသွားသော ခေါ်ဆိုမှုများ"
"အသံစာပို့စနစ်များ"
- "ပြင်ပခေါ်ဆိုမှုများ"
"မူရင်း"
diff --git a/java/com/android/dialer/notification/res/values-nb/strings.xml b/java/com/android/dialer/notification/res/values-nb/strings.xml
index e4ccd48a09a5a46a4dfc917001419128644aeb6f..8e63fd24bb85e75e9f7251267ffc9c28f22a50f6 100644
--- a/java/com/android/dialer/notification/res/values-nb/strings.xml
+++ b/java/com/android/dialer/notification/res/values-nb/strings.xml
@@ -21,6 +21,5 @@
"Pågående samtaler"
"Tapte anrop"
"Talepost"
- "Eksterne anrop"
"Standard"
diff --git a/java/com/android/dialer/notification/res/values-ne/strings.xml b/java/com/android/dialer/notification/res/values-ne/strings.xml
index 8ccd2997aef2655ec48c5435bf41b31a7336be37..e653bb3f8cc525c7f4e8f497b7dc550cd676b56d 100644
--- a/java/com/android/dialer/notification/res/values-ne/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ne/strings.xml
@@ -21,6 +21,5 @@
"जारी रहेका कलहरू"
"छुटेका कलहरू"
"भ्वाइस मेलहरू"
- "बाह्य कलहरू"
"पूर्वनिर्धारित मान"
diff --git a/java/com/android/dialer/notification/res/values-nl/strings.xml b/java/com/android/dialer/notification/res/values-nl/strings.xml
index e46dd19e38228ced78dd701b629b3076b6a7db21..094cc357f6b718705a13d2b3beec43a17d839360 100644
--- a/java/com/android/dialer/notification/res/values-nl/strings.xml
+++ b/java/com/android/dialer/notification/res/values-nl/strings.xml
@@ -21,6 +21,5 @@
"Actieve oproepen"
"Gemiste oproepen"
"Voicemails"
- "Externe oproepen"
"Standaard"
diff --git a/java/com/android/dialer/notification/res/values-no/strings.xml b/java/com/android/dialer/notification/res/values-no/strings.xml
index e4ccd48a09a5a46a4dfc917001419128644aeb6f..8e63fd24bb85e75e9f7251267ffc9c28f22a50f6 100644
--- a/java/com/android/dialer/notification/res/values-no/strings.xml
+++ b/java/com/android/dialer/notification/res/values-no/strings.xml
@@ -21,6 +21,5 @@
"Pågående samtaler"
"Tapte anrop"
"Talepost"
- "Eksterne anrop"
"Standard"
diff --git a/java/com/android/dialer/notification/res/values-pa/strings.xml b/java/com/android/dialer/notification/res/values-pa/strings.xml
index 40709c1acdcbccf0c343563d6703e36049da189b..c4ee97b223f57d65ad4b58be1565ae78d4677fd7 100644
--- a/java/com/android/dialer/notification/res/values-pa/strings.xml
+++ b/java/com/android/dialer/notification/res/values-pa/strings.xml
@@ -21,6 +21,5 @@
"ਆਊਟਗੋਇੰਗ ਕਾਲਾਂ"
"ਖੁੰਝੀਆਂ ਕਾਲਾਂ"
"ਵੌਇਸਮੇਲਾਂ"
- "ਬਾਹਰੀ ਕਾਲਾਂ"
"ਪੂਰਵ-ਨਿਰਧਾਰਤ"
diff --git a/java/com/android/dialer/notification/res/values-pl/strings.xml b/java/com/android/dialer/notification/res/values-pl/strings.xml
index 73b795cff7627e9cc5aadc7eb62175203f1e9516..4b3346001a3e9d1cee7236437b0614efab1c0280 100644
--- a/java/com/android/dialer/notification/res/values-pl/strings.xml
+++ b/java/com/android/dialer/notification/res/values-pl/strings.xml
@@ -21,6 +21,5 @@
"Połączenia trwające"
"Połączenia nieodebrane"
"Wiadomości głosowe"
- "Połączenia zewnętrzne"
"Domyślny"
diff --git a/java/com/android/dialer/notification/res/values-pt-rBR/strings.xml b/java/com/android/dialer/notification/res/values-pt-rBR/strings.xml
index f6e41cb11231d2ced7ebf22de6d150572f07796e..4b988c3ccafd58ee788e399e809becf0a8506d81 100644
--- a/java/com/android/dialer/notification/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/notification/res/values-pt-rBR/strings.xml
@@ -21,6 +21,5 @@
"Chamadas em andamento"
"Chamadas perdidas"
"Correios de voz"
- "Chamadas externas"
"Padrão"
diff --git a/java/com/android/dialer/notification/res/values-pt-rPT/strings.xml b/java/com/android/dialer/notification/res/values-pt-rPT/strings.xml
index ec42a5bf5723370193e3d02fc49c7b4b008fcdc5..45b31ebd005d3d05a89f4a7ef9e6bd90d8c784f6 100644
--- a/java/com/android/dialer/notification/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/notification/res/values-pt-rPT/strings.xml
@@ -21,6 +21,5 @@
"Chamadas efetuadas"
"Chamadas não atendidas"
"Mensagens de correio de voz"
- "Chamadas externas"
"Predefinição"
diff --git a/java/com/android/dialer/notification/res/values-pt/strings.xml b/java/com/android/dialer/notification/res/values-pt/strings.xml
index f6e41cb11231d2ced7ebf22de6d150572f07796e..4b988c3ccafd58ee788e399e809becf0a8506d81 100644
--- a/java/com/android/dialer/notification/res/values-pt/strings.xml
+++ b/java/com/android/dialer/notification/res/values-pt/strings.xml
@@ -21,6 +21,5 @@
"Chamadas em andamento"
"Chamadas perdidas"
"Correios de voz"
- "Chamadas externas"
"Padrão"
diff --git a/java/com/android/dialer/notification/res/values-ro/strings.xml b/java/com/android/dialer/notification/res/values-ro/strings.xml
index 7deeabba379cd109f55d48d44fa13ce597cbf60c..040c58ad2c10d05b25eb6083c3e274641d17c4f8 100644
--- a/java/com/android/dialer/notification/res/values-ro/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ro/strings.xml
@@ -21,6 +21,5 @@
"Apeluri în desfășurare"
"Apeluri nepreluate"
"Mesaje vocale"
- "Apeluri externe"
"Prestabilit"
diff --git a/java/com/android/dialer/notification/res/values-ru/strings.xml b/java/com/android/dialer/notification/res/values-ru/strings.xml
index 3a114045598b54c5f2213c3853220da1318285f0..a8117990a8fbfaaeee85b829dcbc04544fde2483 100644
--- a/java/com/android/dialer/notification/res/values-ru/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ru/strings.xml
@@ -21,6 +21,5 @@
"Текущие вызовы"
"Пропущенные вызовы"
"Голосовые сообщения"
- "Внешние вызовы"
"По умолчанию"
diff --git a/java/com/android/dialer/notification/res/values-si/strings.xml b/java/com/android/dialer/notification/res/values-si/strings.xml
index bf0a5a798672c330449bacd0c85cf9d26c703955..3ad0af7296bebab24566313c1fe5ea70c2bada50 100644
--- a/java/com/android/dialer/notification/res/values-si/strings.xml
+++ b/java/com/android/dialer/notification/res/values-si/strings.xml
@@ -21,6 +21,5 @@
"යන ඇමතුම්"
"මඟ හැරුණු ඇමතුම්"
"හඬ තැපැල්"
- "බාහිර ඇමතුම්"
"පෙරනිමි"
diff --git a/java/com/android/dialer/notification/res/values-sk/strings.xml b/java/com/android/dialer/notification/res/values-sk/strings.xml
index 4a67e60d2c8727d1ffa0100cd2878028f099cded..30941bcd56539d90b11f95b51aadc1f170db6bd5 100644
--- a/java/com/android/dialer/notification/res/values-sk/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sk/strings.xml
@@ -21,6 +21,5 @@
"Prebiehajúce hovory"
"Zmeškané hovory"
"Hlasové správy"
- "Externé hovory"
"Predvolené"
diff --git a/java/com/android/dialer/notification/res/values-sl/strings.xml b/java/com/android/dialer/notification/res/values-sl/strings.xml
index e54111d12ae861c309c5b87fc629f12ec6a2a537..70474b87b86211c3eeb2f7e49437eb348022d84c 100644
--- a/java/com/android/dialer/notification/res/values-sl/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sl/strings.xml
@@ -21,6 +21,5 @@
"Aktivni klici"
"Neodgovorjeni klici"
"Sporočila v odzivniku"
- "Zunanji klici"
"Privzeto"
diff --git a/java/com/android/dialer/notification/res/values-sq/strings.xml b/java/com/android/dialer/notification/res/values-sq/strings.xml
index 42d4daac3dbd11b4f25f170412ad6dca9c7cf55f..03bc24775838b8ca00bd8403847c88077dc212ac 100644
--- a/java/com/android/dialer/notification/res/values-sq/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sq/strings.xml
@@ -21,6 +21,5 @@
"Telefonatat në vazhdim"
"Telefonatat e humbura"
"Postat zanore"
- "Telefonatat e jashtme"
"I parazgjedhur"
diff --git a/java/com/android/dialer/notification/res/values-sr/strings.xml b/java/com/android/dialer/notification/res/values-sr/strings.xml
index 10477170f308a43f92515e08b5eb3937cadff7df..8326c0403894c2c5a9e35d3fc6a55307df49e5b6 100644
--- a/java/com/android/dialer/notification/res/values-sr/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sr/strings.xml
@@ -21,6 +21,5 @@
"Позиви у току"
"Пропуштени позиви"
"Говорне поруке"
- "Спољни позиви"
"Подразумевано"
diff --git a/java/com/android/dialer/notification/res/values-sv/strings.xml b/java/com/android/dialer/notification/res/values-sv/strings.xml
index 6c9ff83b716132a3a7215d5f533348b778827102..e3170d48f13cc746c3a32dcef916a51d95afae16 100644
--- a/java/com/android/dialer/notification/res/values-sv/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sv/strings.xml
@@ -21,6 +21,5 @@
"Pågående samtal"
"Missade samtal"
"Röstmeddelanden"
- "Externa samtal"
"Standard"
diff --git a/java/com/android/dialer/notification/res/values-sw/strings.xml b/java/com/android/dialer/notification/res/values-sw/strings.xml
index a493f88977a81d61423f0a60a232be1eddd2e254..d0a65b08c363cd13b29b2809d8e9e2db800c96e4 100644
--- a/java/com/android/dialer/notification/res/values-sw/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sw/strings.xml
@@ -21,6 +21,5 @@
"Simu zinazoendelea"
"Simu ambazo hukujibu"
"Ujumbe wa sauti"
- "Simu za nje"
"Chaguo-msingi"
diff --git a/java/com/android/dialer/notification/res/values-ta/strings.xml b/java/com/android/dialer/notification/res/values-ta/strings.xml
index d3000cf90544efd5fbad81f94ff7841eb21ba203..8a6ae89a8c877e88d842e9082db3c2ed7507dbf2 100644
--- a/java/com/android/dialer/notification/res/values-ta/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ta/strings.xml
@@ -21,6 +21,5 @@
"செயலில் உள்ள அழைப்புகள்"
"தவறிய அழைப்புகள்"
"குரலஞ்சல்கள்"
- "வெளி அழைப்புகள்"
"இயல்பு"
diff --git a/java/com/android/dialer/notification/res/values-te/strings.xml b/java/com/android/dialer/notification/res/values-te/strings.xml
index b14b210712efdcd83cdd6c70957534ac15530aba..b1911d34d6ae6f8fd6d35ce17962de81b5fe2bce 100644
--- a/java/com/android/dialer/notification/res/values-te/strings.xml
+++ b/java/com/android/dialer/notification/res/values-te/strings.xml
@@ -21,6 +21,5 @@
"కొనసాగుతున్న కాల్లు"
"సమాధానమివ్వని కాల్లు"
"వాయిస్ మెయిల్లు"
- "బాహ్య కాల్లు"
"డిఫాల్ట్"
diff --git a/java/com/android/dialer/notification/res/values-th/strings.xml b/java/com/android/dialer/notification/res/values-th/strings.xml
index 45248bbbe7c3a437e19ba04676b15dc5f6552a8a..b2949e42f6a8e28e203fc7c5b907db1310aee7e2 100644
--- a/java/com/android/dialer/notification/res/values-th/strings.xml
+++ b/java/com/android/dialer/notification/res/values-th/strings.xml
@@ -21,6 +21,5 @@
"สายที่สนทนาอยู่"
"สายที่ไม่ได้รับ"
"ข้อความเสียง"
- "สายนอก"
"ค่าเริ่มต้น"
diff --git a/java/com/android/dialer/notification/res/values-tl/strings.xml b/java/com/android/dialer/notification/res/values-tl/strings.xml
index 3e88a055fe0d9abdff997c570ba022b7d256e3ec..1219ad86f4d3c4f85f6590e94cca667f15fcee5f 100644
--- a/java/com/android/dialer/notification/res/values-tl/strings.xml
+++ b/java/com/android/dialer/notification/res/values-tl/strings.xml
@@ -21,6 +21,5 @@
"Mga kasalukuyang tawag"
"Mga hindi nasagot na tawag"
"Mga voicemail"
- "Mga external na tawag"
"Default"
diff --git a/java/com/android/dialer/notification/res/values-tr/strings.xml b/java/com/android/dialer/notification/res/values-tr/strings.xml
index d4e063bc2ac43ee3830da37a7b7c1fdd6aaf5765..71c91c806275dad843e93c40413b7aabc733f70d 100644
--- a/java/com/android/dialer/notification/res/values-tr/strings.xml
+++ b/java/com/android/dialer/notification/res/values-tr/strings.xml
@@ -21,6 +21,5 @@
"Devam eden çağrılar"
"Cevapsız çağrılar"
"Sesli mesajlar"
- "Harici çağrılar"
"Varsayılan"
diff --git a/java/com/android/dialer/notification/res/values-uk/strings.xml b/java/com/android/dialer/notification/res/values-uk/strings.xml
index a83a58460b635bb9a3793f71a2f16c891b736835..a002f42e1e711b59ca4bcd9a024de7731cc1479f 100644
--- a/java/com/android/dialer/notification/res/values-uk/strings.xml
+++ b/java/com/android/dialer/notification/res/values-uk/strings.xml
@@ -21,6 +21,5 @@
"Поточні виклики"
"Пропущені виклики"
"Голосова пошта"
- "Зовнішні виклики"
"За умовчанням"
diff --git a/java/com/android/dialer/notification/res/values-ur/strings.xml b/java/com/android/dialer/notification/res/values-ur/strings.xml
index ba6e0d1dab3cb32a4e653983d25703d6b2064ebf..805fe08f81a18b2f8e85c34b53ab441a08bbbc9b 100644
--- a/java/com/android/dialer/notification/res/values-ur/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ur/strings.xml
@@ -21,6 +21,5 @@
"جاری کالیں"
"چھوٹی ہوئی کالیں"
"صوتی میلز"
- "بیرونی کالیں"
"ڈیفالٹ"
diff --git a/java/com/android/dialer/notification/res/values-uz/strings.xml b/java/com/android/dialer/notification/res/values-uz/strings.xml
index d45ff47d2fa27e9e98b5b79fa229ebd016f5494e..16075b0317a8f869fc7e5e009ff423f8ba1cbfc9 100644
--- a/java/com/android/dialer/notification/res/values-uz/strings.xml
+++ b/java/com/android/dialer/notification/res/values-uz/strings.xml
@@ -21,6 +21,5 @@
"Davom etayotgan suhbatlar"
"Javobsiz chaqiruvlar"
"Ovozli xabarlar"
- "Tashqi chaqiruvlar"
"Standart"
diff --git a/java/com/android/dialer/notification/res/values-vi/strings.xml b/java/com/android/dialer/notification/res/values-vi/strings.xml
index 6df88721ef9fee19b510bcec574c54f8f7359bd8..b6ab3d2d8fbc978fc4c2fc95e2003803fa319d0d 100644
--- a/java/com/android/dialer/notification/res/values-vi/strings.xml
+++ b/java/com/android/dialer/notification/res/values-vi/strings.xml
@@ -21,6 +21,5 @@
"Cuộc gọi đến"
"Cuộc gọi nhỡ"
"Thư thoại"
- "Cuộc gọi bên ngoài"
"Mặc định"
diff --git a/java/com/android/dialer/notification/res/values-zh-rCN/strings.xml b/java/com/android/dialer/notification/res/values-zh-rCN/strings.xml
index fa5f0a65743fda5870d28662842ce64b63926adf..1ef46c2b99261210d659ece0c0b846811148e988 100644
--- a/java/com/android/dialer/notification/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/notification/res/values-zh-rCN/strings.xml
@@ -21,6 +21,5 @@
"正在进行的通话"
"未接电话"
"语音邮件"
- "外部来电"
"默认"
diff --git a/java/com/android/dialer/notification/res/values-zh-rHK/strings.xml b/java/com/android/dialer/notification/res/values-zh-rHK/strings.xml
index 307a7f9bff97e5c6780220f41614747f62951cba..43a6fabf699ae8ac86f0305c981623d201c3c8f5 100644
--- a/java/com/android/dialer/notification/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/notification/res/values-zh-rHK/strings.xml
@@ -21,6 +21,5 @@
"進行中的通話"
"未接來電"
"留言信箱"
- "外部通話"
"預設"
diff --git a/java/com/android/dialer/notification/res/values-zh-rTW/strings.xml b/java/com/android/dialer/notification/res/values-zh-rTW/strings.xml
index 054a2d737b014ff269ac2590309ce9551dfaf626..35236be1dfeb0d79d7faf2c2f428195fe89d213e 100644
--- a/java/com/android/dialer/notification/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/notification/res/values-zh-rTW/strings.xml
@@ -21,6 +21,5 @@
"進行中的通話"
"未接來電"
"語音留言"
- "外部通話"
"預設"
diff --git a/java/com/android/dialer/notification/res/values-zu/strings.xml b/java/com/android/dialer/notification/res/values-zu/strings.xml
index 744ffc8164d2d2ad5036d4d89b2090282a52da47..f3d95531f07bdf971646ca48cff3c27341d7b42f 100644
--- a/java/com/android/dialer/notification/res/values-zu/strings.xml
+++ b/java/com/android/dialer/notification/res/values-zu/strings.xml
@@ -21,6 +21,5 @@
"Amakholi aqhubekayo"
"Amakholi akuphuthile"
"Amavoyisimeyili"
- "Amakholi angaphandle"
"Okuzenzakalelayo"
diff --git a/java/com/android/dialer/notification/res/values/strings.xml b/java/com/android/dialer/notification/res/values/strings.xml
index cb3119f67acfdcb406174e2dbff57f9bdb2e911a..a3c6935aa21c72fc71c40f448b6ffcefc4966c09 100644
--- a/java/com/android/dialer/notification/res/values/strings.xml
+++ b/java/com/android/dialer/notification/res/values/strings.xml
@@ -20,7 +20,6 @@
Ongoing calls
Missed calls
Voicemails
- External calls
Default
diff --git a/java/com/android/dialer/oem/CequintCallerIdManager.java b/java/com/android/dialer/oem/CequintCallerIdManager.java
index 806d553eb29f71505794c4082e973a681ee5aa1b..86097c41ad529c6fc1802c08d315e3238905dd41 100644
--- a/java/com/android/dialer/oem/CequintCallerIdManager.java
+++ b/java/com/android/dialer/oem/CequintCallerIdManager.java
@@ -28,8 +28,8 @@ import android.support.annotation.WorkerThread;
import android.telephony.PhoneNumberUtils;
import android.text.TextUtils;
import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
import java.util.concurrent.ConcurrentHashMap;
/**
diff --git a/java/com/android/dialer/oem/MotorolaUtils.java b/java/com/android/dialer/oem/MotorolaUtils.java
index 2c91e60abe307373339d34c71d839fbcdf1e41f2..ffab8ea23523c4f994fc2a627f97095acc6573dd 100644
--- a/java/com/android/dialer/oem/MotorolaUtils.java
+++ b/java/com/android/dialer/oem/MotorolaUtils.java
@@ -18,9 +18,9 @@ package com.android.dialer.oem;
import android.content.Context;
import android.content.res.Resources;
import android.telephony.TelephonyManager;
-import com.android.dialer.common.ConfigProviderBindings;
import com.android.dialer.common.LogUtil;
import com.android.dialer.common.PackageUtils;
+import com.android.dialer.configprovider.ConfigProviderBindings;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff --git a/java/com/android/dialer/p13n/inference/P13nRanking.java b/java/com/android/dialer/p13n/inference/P13nRanking.java
index 0682e85db1972df11c6743a0b9198979fdbb96c7..79b4d7136f4e5bb736194ce7bfa01fce345ac37b 100644
--- a/java/com/android/dialer/p13n/inference/P13nRanking.java
+++ b/java/com/android/dialer/p13n/inference/P13nRanking.java
@@ -22,7 +22,7 @@ import android.support.annotation.MainThread;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderBindings;
import com.android.dialer.p13n.inference.protocol.P13nRanker;
import com.android.dialer.p13n.inference.protocol.P13nRankerFactory;
import java.util.List;
diff --git a/java/com/android/dialer/performancereport/PerformanceReport.java b/java/com/android/dialer/performancereport/PerformanceReport.java
new file mode 100644
index 0000000000000000000000000000000000000000..27fd7485b7407c98e37668e2a5c8d8b0a250d35f
--- /dev/null
+++ b/java/com/android/dialer/performancereport/PerformanceReport.java
@@ -0,0 +1,155 @@
+/*
+ * 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.performancereport;
+
+import android.os.SystemClock;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.RecyclerView;
+import android.widget.AbsListView;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.logging.UiAction;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/** Tracks UI performance for a call. */
+public final class PerformanceReport {
+
+ private static final long INVALID_TIME = -1;
+ private static final long ACTIVE_DURATION = TimeUnit.MINUTES.toMillis(5);
+
+ private static final List actions = new ArrayList<>();
+ private static final List actionTimestamps = new ArrayList<>();
+
+ private static final RecyclerView.OnScrollListener recordOnScrollListener =
+ new RecyclerView.OnScrollListener() {
+ @Override
+ public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+ if (newState == RecyclerView.SCROLL_STATE_SETTLING) {
+ PerformanceReport.recordClick(UiAction.Type.SCROLL);
+ }
+ super.onScrollStateChanged(recyclerView, newState);
+ }
+ };
+
+ private static boolean recording = false;
+ private static long appLaunchTimeMillis = INVALID_TIME;
+ private static long firstClickTimeMillis = INVALID_TIME;
+ private static long lastActionTimeMillis = INVALID_TIME;
+
+ @Nullable private static UiAction.Type ignoreActionOnce = null;
+
+ private PerformanceReport() {}
+
+ public static void startRecording() {
+ LogUtil.enterBlock("PerformanceReport.startRecording");
+
+ appLaunchTimeMillis = SystemClock.elapsedRealtime();
+ lastActionTimeMillis = appLaunchTimeMillis;
+ if (!actions.isEmpty()) {
+ actions.clear();
+ actionTimestamps.clear();
+ }
+ recording = true;
+ }
+
+ public static void stopRecording() {
+ LogUtil.enterBlock("PerformanceReport.stopRecording");
+ recording = false;
+ }
+
+ public static void recordClick(UiAction.Type action) {
+ if (!recording) {
+ return;
+ }
+
+ if (action == ignoreActionOnce) {
+ LogUtil.i("PerformanceReport.recordClick", "%s is ignored", action.toString());
+ ignoreActionOnce = null;
+ return;
+ }
+ ignoreActionOnce = null;
+
+ LogUtil.v("PerformanceReport.recordClick", action.toString());
+
+ // Timeout
+ long currentTime = SystemClock.elapsedRealtime();
+ if (currentTime - lastActionTimeMillis > ACTIVE_DURATION) {
+ startRecording();
+ recordClick(action);
+ return;
+ }
+
+ lastActionTimeMillis = currentTime;
+ if (actions.isEmpty()) {
+ firstClickTimeMillis = currentTime;
+ }
+ actions.add(action);
+ actionTimestamps.add(currentTime - appLaunchTimeMillis);
+ }
+
+ public static void recordScrollStateChange(int scrollState) {
+ if (scrollState == AbsListView.OnScrollListener.SCROLL_STATE_TOUCH_SCROLL) {
+ recordClick(UiAction.Type.SCROLL);
+ }
+ }
+
+ public static void logOnScrollStateChange(RecyclerView recyclerView) {
+ // Remove the listener in case it was added before
+ recyclerView.removeOnScrollListener(recordOnScrollListener);
+ recyclerView.addOnScrollListener(recordOnScrollListener);
+ }
+
+ public static boolean isRecording() {
+ return recording;
+ }
+
+ public static long getTimeSinceAppLaunch() {
+ if (appLaunchTimeMillis == INVALID_TIME) {
+ return INVALID_TIME;
+ }
+ return SystemClock.elapsedRealtime() - appLaunchTimeMillis;
+ }
+
+ public static long getTimeSinceFirstClick() {
+ if (firstClickTimeMillis == INVALID_TIME) {
+ return INVALID_TIME;
+ }
+ return SystemClock.elapsedRealtime() - firstClickTimeMillis;
+ }
+
+ public static List getActions() {
+ return actions;
+ }
+
+ public static List getActionTimestamps() {
+ return actionTimestamps;
+ }
+
+ @Nullable
+ public static UiAction.Type getIgnoreActionOnce() {
+ return ignoreActionOnce;
+ }
+
+ public static void setIgnoreActionOnce(@Nullable UiAction.Type ignoreActionOnce) {
+ PerformanceReport.ignoreActionOnce = ignoreActionOnce;
+ LogUtil.i(
+ "PerformanceReport.setIgnoreActionOnce",
+ "next action will be ignored once if it is %s",
+ ignoreActionOnce.toString());
+ }
+}
diff --git a/java/com/android/dialer/phonenumbercache/CachedNumberLookupService.java b/java/com/android/dialer/phonenumbercache/CachedNumberLookupService.java
index 2aed9e75ec9f9454c8c48993aaee8bfacedb6c2d..c398251e41e3ec6ddb67184b1251b73240782ba3 100644
--- a/java/com/android/dialer/phonenumbercache/CachedNumberLookupService.java
+++ b/java/com/android/dialer/phonenumbercache/CachedNumberLookupService.java
@@ -49,6 +49,8 @@ public interface CachedNumberLookupService {
boolean canReportAsInvalid(ContactSource.Type sourceType, String objectId);
+ boolean reportAsInvalid(Context context, CachedContactInfo cachedContactInfo);
+
/** @return return {@link Uri} to the photo or return {@code null} when failing to add photo */
@Nullable
Uri addPhoto(Context context, String number, InputStream in);
diff --git a/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java b/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java
index c9e940ef4a87992b01b12f3671d1ae70b0663757..4fa3147eb3c5bcd85ef7431bdff1273332465d9c 100644
--- a/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java
+++ b/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java
@@ -203,6 +203,7 @@ public class ContactInfoHelper {
return info;
}
+ @Nullable
public ContactInfo lookupNumber(String number, String countryIso) {
return lookupNumber(number, countryIso, -1);
}
@@ -223,12 +224,14 @@ public class ContactInfoHelper {
@SuppressWarnings("ReferenceEquality")
public ContactInfo lookupNumber(String number, String countryIso, long directoryId) {
if (TextUtils.isEmpty(number)) {
+ LogUtil.d("ContactInfoHelper.lookupNumber", "number is empty");
return null;
}
ContactInfo info;
if (PhoneNumberHelper.isUriNumber(number)) {
+ LogUtil.d("ContactInfoHelper.lookupNumber", "number is sip");
// The number is a SIP address..
info = lookupContactFromUri(getContactInfoLookupUri(number, directoryId));
if (info == null || info == ContactInfo.EMPTY) {
@@ -246,6 +249,7 @@ public class ContactInfoHelper {
final ContactInfo updatedInfo;
if (info == null) {
// The lookup failed.
+ LogUtil.d("ContactInfoHelper.lookupNumber", "lookup failed");
updatedInfo = null;
} else {
// If we did not find a matching contact, generate an empty contact info for the number.
@@ -325,9 +329,11 @@ public class ContactInfoHelper {
*/
ContactInfo lookupContactFromUri(Uri uri) {
if (uri == null) {
+ LogUtil.d("ContactInfoHelper.lookupContactFromUri", "uri is null");
return null;
}
if (!PermissionsUtil.hasContactsReadPermissions(mContext)) {
+ LogUtil.d("ContactInfoHelper.lookupContactFromUri", "no contact permission, return empty");
return ContactInfo.EMPTY;
}
@@ -336,10 +342,12 @@ public class ContactInfoHelper {
String[] projection = PhoneQuery.getPhoneLookupProjection(uri);
phoneLookupCursor = mContext.getContentResolver().query(uri, projection, null, null, null);
} catch (NullPointerException e) {
+ LogUtil.e("ContactInfoHelper.lookupContactFromUri", "phone lookup", e);
// Trap NPE from pre-N CP2
return null;
}
if (phoneLookupCursor == null) {
+ LogUtil.d("ContactInfoHelper.lookupContactFromUri", "phoneLookupCursor is null");
return null;
}
@@ -408,19 +416,32 @@ public class ContactInfoHelper {
private ContactInfo queryContactInfoForPhoneNumber(
String number, String countryIso, long directoryId) {
if (TextUtils.isEmpty(number)) {
+ LogUtil.d("ContactInfoHelper.queryContactInfoForPhoneNumber", "number is empty");
return null;
}
ContactInfo info = lookupContactFromUri(getContactInfoLookupUri(number, directoryId));
+ if (info == null) {
+ LogUtil.d("ContactInfoHelper.queryContactInfoForPhoneNumber", "info looked up is null");
+ }
if (info != null && info != ContactInfo.EMPTY) {
info.formattedNumber = formatPhoneNumber(number, null, countryIso);
+ if (directoryId == -1) {
+ // Contact found in the default directory
+ info.sourceType = ContactSource.Type.SOURCE_TYPE_DIRECTORY;
+ } else {
+ // Contact found in the extended directory specified by directoryId
+ info.sourceType = ContactSource.Type.SOURCE_TYPE_EXTENDED;
+ }
} else if (mCachedNumberLookupService != null) {
CachedContactInfo cacheInfo =
mCachedNumberLookupService.lookupCachedContactFromNumber(mContext, number);
if (cacheInfo != null) {
- info = cacheInfo.getContactInfo().isBadData ? null : cacheInfo.getContactInfo();
- } else {
- info = null;
+ if (!cacheInfo.getContactInfo().isBadData) {
+ info = cacheInfo.getContactInfo();
+ } else {
+ LogUtil.i("ContactInfoHelper.queryContactInfoForPhoneNumber", "info is bad data");
+ }
}
}
return info;
diff --git a/java/com/android/dialer/phonenumberproto/Converter.java b/java/com/android/dialer/phonenumberproto/Converter.java
new file mode 100644
index 0000000000000000000000000000000000000000..453b98844f6df1fceef5e1c99a7891a4114af154
--- /dev/null
+++ b/java/com/android/dialer/phonenumberproto/Converter.java
@@ -0,0 +1,120 @@
+/*
+ * 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.phonenumberproto;
+
+import com.android.dialer.DialerInternalPhoneNumber;
+import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+
+/**
+ * Methods for converting from {@link PhoneNumber} POJOs to {@link DialerInternalPhoneNumber} protos
+ * and back.
+ */
+class Converter {
+
+ static DialerInternalPhoneNumber pojoToProto(PhoneNumber pojo) {
+ DialerInternalPhoneNumber.Builder proto = DialerInternalPhoneNumber.newBuilder();
+ if (pojo.hasCountryCode()) {
+ proto.setCountryCode(pojo.getCountryCode());
+ }
+ if (pojo.hasCountryCodeSource()) {
+ switch (pojo.getCountryCodeSource()) {
+ case FROM_NUMBER_WITH_PLUS_SIGN:
+ proto.setCountryCodeSource(
+ DialerInternalPhoneNumber.CountryCodeSource.FROM_NUMBER_WITH_PLUS_SIGN);
+ break;
+ case FROM_NUMBER_WITH_IDD:
+ proto.setCountryCodeSource(
+ DialerInternalPhoneNumber.CountryCodeSource.FROM_NUMBER_WITH_IDD);
+ break;
+ case FROM_NUMBER_WITHOUT_PLUS_SIGN:
+ proto.setCountryCodeSource(
+ DialerInternalPhoneNumber.CountryCodeSource.FROM_NUMBER_WITHOUT_PLUS_SIGN);
+ break;
+ case FROM_DEFAULT_COUNTRY:
+ proto.setCountryCodeSource(
+ DialerInternalPhoneNumber.CountryCodeSource.FROM_DEFAULT_COUNTRY);
+ break;
+ default:
+ throw new IllegalArgumentException(
+ "unsupported country code source: " + pojo.getCountryCodeSource());
+ }
+ }
+ if (pojo.hasExtension()) {
+ proto.setExtension(pojo.getExtension());
+ }
+ if (pojo.hasItalianLeadingZero()) {
+ proto.setItalianLeadingZero(pojo.isItalianLeadingZero());
+ }
+ if (pojo.hasNationalNumber()) {
+ proto.setNationalNumber(pojo.getNationalNumber());
+ }
+ if (pojo.hasNumberOfLeadingZeros()) {
+ proto.setNumberOfLeadingZeros(pojo.getNumberOfLeadingZeros());
+ }
+ if (pojo.hasPreferredDomesticCarrierCode()) {
+ proto.setPreferredDomesticCarrierCode(pojo.getPreferredDomesticCarrierCode());
+ }
+ if (pojo.hasRawInput()) {
+ proto.setRawInput(pojo.getRawInput());
+ }
+ return proto.build();
+ }
+
+ static PhoneNumber protoToPojo(DialerInternalPhoneNumber proto) {
+ PhoneNumber pojo = new PhoneNumber();
+ if (proto.hasCountryCode()) {
+ pojo.setCountryCode(proto.getCountryCode());
+ }
+ if (proto.hasCountryCodeSource()) {
+ switch (proto.getCountryCodeSource()) {
+ case FROM_NUMBER_WITH_PLUS_SIGN:
+ pojo.setCountryCodeSource(PhoneNumber.CountryCodeSource.FROM_NUMBER_WITH_PLUS_SIGN);
+ break;
+ case FROM_NUMBER_WITH_IDD:
+ pojo.setCountryCodeSource(PhoneNumber.CountryCodeSource.FROM_NUMBER_WITH_IDD);
+ break;
+ case FROM_NUMBER_WITHOUT_PLUS_SIGN:
+ pojo.setCountryCodeSource(PhoneNumber.CountryCodeSource.FROM_NUMBER_WITHOUT_PLUS_SIGN);
+ break;
+ case FROM_DEFAULT_COUNTRY:
+ pojo.setCountryCodeSource(PhoneNumber.CountryCodeSource.FROM_DEFAULT_COUNTRY);
+ break;
+ default:
+ throw new IllegalArgumentException(
+ "unsupported country code source: " + proto.getCountryCodeSource());
+ }
+ }
+ if (proto.hasExtension()) {
+ pojo.setExtension(proto.getExtension());
+ }
+ if (proto.hasItalianLeadingZero()) {
+ pojo.setItalianLeadingZero(proto.getItalianLeadingZero());
+ }
+ if (proto.hasNationalNumber()) {
+ pojo.setNationalNumber(proto.getNationalNumber());
+ }
+ if (proto.hasNumberOfLeadingZeros()) {
+ pojo.setNumberOfLeadingZeros(proto.getNumberOfLeadingZeros());
+ }
+ if (proto.hasPreferredDomesticCarrierCode()) {
+ pojo.setPreferredDomesticCarrierCode(proto.getPreferredDomesticCarrierCode());
+ }
+ if (proto.hasRawInput()) {
+ pojo.setRawInput(proto.getRawInput());
+ }
+ return pojo;
+ }
+}
diff --git a/java/com/android/dialer/phonenumberproto/DialerPhoneNumberUtil.java b/java/com/android/dialer/phonenumberproto/DialerPhoneNumberUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..cc509f41ba57fd67ba4707bce6d3cb4954b7775f
--- /dev/null
+++ b/java/com/android/dialer/phonenumberproto/DialerPhoneNumberUtil.java
@@ -0,0 +1,108 @@
+/*
+ * 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.phonenumberproto;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.WorkerThread;
+import com.android.dialer.DialerInternalPhoneNumber;
+import com.android.dialer.DialerPhoneNumber;
+import com.android.dialer.DialerPhoneNumber.RawInput;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.google.i18n.phonenumbers.NumberParseException;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+import com.google.i18n.phonenumbers.PhoneNumberUtil.MatchType;
+
+/**
+ * Wrapper for selected methods in {@link PhoneNumberUtil} which uses the {@link DialerPhoneNumber}
+ * lite proto instead of the {@link com.google.i18n.phonenumbers.Phonenumber.PhoneNumber} POJO.
+ *
+ * All methods should be called on a worker thread.
+ */
+public class DialerPhoneNumberUtil {
+ private final PhoneNumberUtil phoneNumberUtil;
+
+ @WorkerThread
+ public DialerPhoneNumberUtil(@NonNull PhoneNumberUtil phoneNumberUtil) {
+ Assert.isWorkerThread();
+ this.phoneNumberUtil = Assert.isNotNull(phoneNumberUtil);
+ }
+
+ /**
+ * Parses the provided raw phone number into a {@link DialerPhoneNumber}.
+ *
+ * @see PhoneNumberUtil#parse(String, String)
+ */
+ @WorkerThread
+ public DialerPhoneNumber parse(@Nullable String numberToParse, @Nullable String defaultRegion) {
+ Assert.isWorkerThread();
+
+ DialerPhoneNumber.Builder dialerPhoneNumber = DialerPhoneNumber.newBuilder();
+ RawInput.Builder rawInput = RawInput.newBuilder();
+ // Numbers can be null or empty for incoming "unknown" calls.
+ if (numberToParse != null) {
+ rawInput.setNumber(numberToParse);
+ }
+ if (defaultRegion != null) {
+ rawInput.setCountryIso(defaultRegion);
+ }
+ dialerPhoneNumber.setRawInput(rawInput.build());
+
+ try {
+ dialerPhoneNumber.setDialerInternalPhoneNumber(
+ Converter.pojoToProto(phoneNumberUtil.parse(numberToParse, defaultRegion)));
+ } catch (NumberParseException e) {
+ LogUtil.w("DialerPhoneNumberUtil.parse", "couldn't parse phone number", e);
+ }
+ return dialerPhoneNumber.build();
+ }
+
+ /**
+ * Returns true if the two numbers were parseable by libphonenumber and are an {@link
+ * MatchType#EXACT_MATCH} or if they have the same raw input.
+ */
+ @WorkerThread
+ public boolean isExactMatch(
+ @NonNull DialerPhoneNumber firstNumberIn, @NonNull DialerPhoneNumber secondNumberIn) {
+ Assert.isWorkerThread();
+ if (!Assert.isNotNull(firstNumberIn).hasDialerInternalPhoneNumber()
+ || !Assert.isNotNull(secondNumberIn).hasDialerInternalPhoneNumber()) {
+ return firstNumberIn.getRawInput().equals(secondNumberIn.getRawInput());
+ }
+ return isNumberMatch(
+ firstNumberIn.getDialerInternalPhoneNumber(),
+ secondNumberIn.getDialerInternalPhoneNumber())
+ == MatchType.EXACT_MATCH;
+ }
+
+ /**
+ * Compares the provided phone numbers.
+ *
+ * @see PhoneNumberUtil#isNumberMatch(com.google.i18n.phonenumbers.Phonenumber.PhoneNumber,
+ * com.google.i18n.phonenumbers.Phonenumber.PhoneNumber)
+ */
+ @WorkerThread
+ private MatchType isNumberMatch(
+ @NonNull DialerInternalPhoneNumber firstNumberIn,
+ @NonNull DialerInternalPhoneNumber secondNumberIn) {
+ Assert.isWorkerThread();
+ return phoneNumberUtil.isNumberMatch(
+ Converter.protoToPojo(Assert.isNotNull(firstNumberIn)),
+ Converter.protoToPojo(Assert.isNotNull(secondNumberIn)));
+ }
+}
diff --git a/java/com/android/dialer/phonenumberproto/dialer_phone_number.proto b/java/com/android/dialer/phonenumberproto/dialer_phone_number.proto
new file mode 100644
index 0000000000000000000000000000000000000000..a0f362631b6fd269318e15c5fd8a3576143d51f8
--- /dev/null
+++ b/java/com/android/dialer/phonenumberproto/dialer_phone_number.proto
@@ -0,0 +1,172 @@
+// 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
+
+syntax = "proto2";
+
+option java_package = "com.android.dialer";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+package com.android.dialer;
+
+// A phone number for use in the dialer application. It consists of a
+// DialerInternalPhoneNumber, which is a copy of libphonenumber's PhoneNumber
+// proto, and the raw input used to create it.
+message DialerPhoneNumber {
+ // libphonenumber representation of the phone number. May be empty if the raw
+ // input failed to parse, in which case raw_input should be used.
+ optional DialerInternalPhoneNumber dialer_internal_phone_number = 1;
+
+ // The raw input which was used to create a DialerPhoneNumber.
+ message RawInput {
+ // The phone number as it was entered or received.
+ optional string number = 1;
+ // The ISO 3166-1 two letter country code of the country where the user made
+ // or received the call.
+ optional string country_iso = 2;
+ }
+ // Prefer to use dialer_internal_phone_number if present.
+ optional RawInput raw_input = 2;
+}
+
+// This is a copy of libphonenumber proto file for use in the dialer codebase.
+// We cannot depend on the real libphonenumber proto because it is not exposed
+// in any open source library. As such, this file could fall out of sync with
+// that proto over time.
+//
+// The only difference between this proto and the libphonenumber proto (as of
+// when this file was created) is the package name and proto name.
+//
+// If the libphonenumber proto becomes accessible some day, it may be possible
+// to remove this proto and use the real libphonenumber proto assuming this
+// proto is kept wire-compatible with it.
+message DialerInternalPhoneNumber {
+ // The country calling code for this number, as defined by the International
+ // Telecommunication Union (ITU). For example, this would be 1 for NANPA
+ // countries, and 33 for France.
+ required int32 country_code = 1;
+
+ // The National (significant) Number, as defined in International
+ // Telecommunication Union (ITU) Recommendation E.164, without any leading
+ // zero. The leading-zero is stored separately if required, since this is an
+ // uint64 and hence cannot store such information. Do not use this field
+ // directly: if you want the national significant number, call the
+ // getNationalSignificantNumber method of PhoneNumberUtil.
+ //
+ // For countries which have the concept of an "area code" or "national
+ // destination code", this is included in the National (significant) Number.
+ // Although the ITU says the maximum length should be 15, we have found longer
+ // numbers in some countries e.g. Germany.
+ // Note that the National (significant) Number does not contain the National
+ // (trunk) prefix. Obviously, as a uint64, it will never contain any
+ // formatting (hyphens, spaces, parentheses), nor any alphanumeric spellings.
+ required uint64 national_number = 2 [jstype = JS_NUMBER];
+
+ // Extension is not standardized in ITU recommendations, except for being
+ // defined as a series of numbers with a maximum length of 40 digits. It is
+ // defined as a string here to accommodate for the possible use of a leading
+ // zero in the extension (organizations have complete freedom to do so, as
+ // there is no standard defined). Other than digits, some other dialling
+ // characters such as "," (indicating a wait) may be stored here.
+ optional string extension = 3;
+
+ // In some countries, the national (significant) number starts with one or
+ // more "0"s without this being a national prefix or trunk code of some kind.
+ // For example, the leading zero in the national (significant) number of an
+ // Italian phone number indicates the number is a fixed-line number. There
+ // have been plans to migrate fixed-line numbers to start with the digit two
+ // since December 2000, but it has not happened yet. See
+ // http://en.wikipedia.org/wiki/%2B39 for more details.
+ //
+ // These fields can be safely ignored (there is no need to set them) for most
+ // countries. Some limited number of countries behave like Italy - for these
+ // cases, if the leading zero(s) of a number would be retained even when
+ // dialling internationally, set this flag to true, and also set the number of
+ // leading zeros.
+ //
+ // Clients who use the parsing or conversion functionality of the i18n phone
+ // number libraries (go/phonenumbers) will have these fields set if necessary
+ // automatically.
+ optional bool italian_leading_zero = 4;
+ optional int32 number_of_leading_zeros = 8 [default = 1];
+
+ // The next few fields are non-essential fields for a phone number. They
+ // retain extra information about the form the phone number was in when it was
+ // provided to us to parse. They can be safely ignored by most clients. To
+ // populate them, call parseAndKeepRawInput on PhoneNumberUtil.
+
+ // This field is used to store the raw input string containing phone numbers
+ // before it was canonicalized by the library. For example, it could be used
+ // to store alphanumerical numbers such as "1-800-GOOG-411".
+ optional string raw_input = 5;
+
+ // The source from which the country_code is derived. This is not set in the
+ // general parsing method, but in the method that parses and keeps raw_input.
+ // New fields could be added upon request.
+ enum CountryCodeSource {
+ // The country_code is derived based on a phone number with a leading "+",
+ // e.g. the French number "+33 1 42 68 53 00".
+ FROM_NUMBER_WITH_PLUS_SIGN = 1;
+
+ // The country_code is derived based on a phone number with a leading IDD,
+ // e.g. the French number "011 33 1 42 68 53 00", as it is dialled from US.
+ FROM_NUMBER_WITH_IDD = 5;
+
+ // The country_code is derived based on a phone number without a leading
+ // "+", e.g. the French number "33 1 42 68 53 00" when defaultCountry is
+ // supplied as France.
+ FROM_NUMBER_WITHOUT_PLUS_SIGN = 10;
+
+ // The country_code is derived NOT based on the phone number itself, but
+ // from the defaultCountry parameter provided in the parsing function by the
+ // clients. This happens mostly for numbers written in the national format
+ // (without country code). For example, this would be set when parsing the
+ // French number "01 42 68 53 00", when defaultCountry is supplied as
+ // France.
+ FROM_DEFAULT_COUNTRY = 20;
+ }
+
+ // The source from which the country_code is derived.
+ optional CountryCodeSource country_code_source = 6;
+
+ // The carrier selection code that is preferred when calling this phone number
+ // domestically. This also includes codes that need to be dialed in some
+ // countries when calling from landlines to mobiles or vice versa. For
+ // example, in Columbia, a "3" needs to be dialed before the phone number
+ // itself when calling from a mobile phone to a domestic landline phone and
+ // vice versa.
+ //
+ // Note this is the "preferred" code, which means other codes may work as
+ // well.
+ optional string preferred_domestic_carrier_code = 7;
+}
+
+// Examples:
+//
+// Google MTV, +1 650-253-0000, (650) 253-0000
+// country_code: 1
+// national_number: 6502530000
+//
+// Google Paris, +33 (0)1 42 68 53 00, 01 42 68 53 00
+// country_code: 33
+// national_number: 142685300
+//
+// Google Beijing, +86-10-62503000, (010) 62503000
+// country_code: 86
+// national_number: 1062503000
+//
+// Google Italy, +39 02-36618 300, 02-36618 300
+// country_code: 39
+// national_number: 236618300
+// italian_leading_zero: true
\ No newline at end of file
diff --git a/java/com/android/dialer/postcall/PostCall.java b/java/com/android/dialer/postcall/PostCall.java
index 7eb83b1339fde8e29d208f9ca9dcb12332aaa2c6..b17a9b66d200f24403dd20b2ac008472c92c59e1 100644
--- a/java/com/android/dialer/postcall/PostCall.java
+++ b/java/com/android/dialer/postcall/PostCall.java
@@ -26,22 +26,23 @@ import android.support.design.widget.Snackbar;
import android.telephony.TelephonyManager;
import android.view.View;
import android.view.View.OnClickListener;
-import com.android.dialer.common.ConfigProvider;
-import com.android.dialer.common.ConfigProviderBindings;
import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProvider;
+import com.android.dialer.configprovider.ConfigProviderBindings;
import com.android.dialer.enrichedcall.EnrichedCallCapabilities;
import com.android.dialer.enrichedcall.EnrichedCallComponent;
import com.android.dialer.enrichedcall.EnrichedCallManager;
import com.android.dialer.logging.DialerImpression;
import com.android.dialer.logging.Logger;
+import com.android.dialer.performancereport.PerformanceReport;
import com.android.dialer.util.DialerUtils;
import com.android.dialer.util.IntentUtil;
/** Helper class to handle all post call actions. */
public class PostCall {
- private static final String KEY_POST_CALL_CALL_CONNECT_TIME = "post_call_call_connect_time";
private static final String KEY_POST_CALL_CALL_DISCONNECT_TIME = "post_call_call_disconnect_time";
+ private static final String KEY_POST_CALL_CALL_CONNECT_TIME = "post_call_call_connect_time";
private static final String KEY_POST_CALL_CALL_NUMBER = "post_call_call_number";
private static final String KEY_POST_CALL_MESSAGE_SENT = "post_call_message_sent";
@@ -53,6 +54,8 @@ public class PostCall {
promptUserToViewSentMessage(activity, rootView);
} else if (shouldPromptUserToSendMessage(activity)) {
promptUserToSendMessage(activity, rootView);
+ } else {
+ clear(activity);
}
}
}
@@ -158,6 +161,19 @@ public class PostCall {
.apply();
}
+ /**
+ * Restart performance recording if there is a recent call (disconnect time to now is under
+ * threshold)
+ */
+ public static void restartPerformanceRecordingIfARecentCallExist(Context context) {
+ long disconnectTimeMillis =
+ DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context)
+ .getLong(PostCall.KEY_POST_CALL_CALL_DISCONNECT_TIME, -1);
+ if (disconnectTimeMillis != -1 && PerformanceReport.isRecording()) {
+ PerformanceReport.startRecording();
+ }
+ }
+
private static void clear(Context context) {
activeSnackbar = null;
diff --git a/java/com/android/dialer/searchfragment/NewSearchFragment.java b/java/com/android/dialer/searchfragment/NewSearchFragment.java
deleted file mode 100644
index e7283d0ad5c672cddb40293aad2fe4fd50fd3e8f..0000000000000000000000000000000000000000
--- a/java/com/android/dialer/searchfragment/NewSearchFragment.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.searchfragment;
-
-import android.app.Fragment;
-import android.app.LoaderManager.LoaderCallbacks;
-import android.content.Loader;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-/** Fragment used for searching contacts. */
-public final class NewSearchFragment extends Fragment implements LoaderCallbacks {
-
- private RecyclerView recyclerView;
- private SearchAdapter adapter;
- private String query;
-
- @Nullable
- @Override
- public View onCreateView(
- LayoutInflater inflater, @Nullable ViewGroup parent, @Nullable Bundle bundle) {
- getLoaderManager().initLoader(0, null, this);
- View view = inflater.inflate(R.layout.fragment_search, parent, false);
- recyclerView = view.findViewById(R.id.recycler_view);
- recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-
- getLoaderManager().initLoader(0, null, this);
- return view;
- }
-
- @Override
- public Loader onCreateLoader(int id, Bundle bundle) {
- // TODO add more loaders
- return new SearchContactsCursorLoader(getContext());
- }
-
- @Override
- public void onLoadFinished(Loader loader, Cursor cursor) {
- if (adapter == null) {
- adapter = new SearchAdapter(getContext());
- }
- if (loader instanceof SearchContactsCursorLoader) {
- adapter.setContactsCursor(new SearchContactCursor(cursor, query));
- }
- recyclerView.setAdapter(adapter);
- }
-
- @Override
- public void onLoaderReset(Loader loader) {
- if (adapter != null) {
- adapter.clear();
- adapter = null;
- }
- recyclerView.setAdapter(null);
- }
-
- public void setQuery(String query) {
- this.query = query;
- if (adapter != null) {
- adapter.setQuery(query);
- }
- }
-}
diff --git a/java/com/android/dialer/searchfragment/common/AndroidManifest.xml b/java/com/android/dialer/searchfragment/common/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..178cd83c3967d4c5314ced7f9cd1fd315ef77738
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/common/AndroidManifest.xml
@@ -0,0 +1,16 @@
+
+
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/SearchContactsCursorLoader.java b/java/com/android/dialer/searchfragment/common/Projections.java
similarity index 73%
rename from java/com/android/dialer/searchfragment/SearchContactsCursorLoader.java
rename to java/com/android/dialer/searchfragment/common/Projections.java
index 309dfffd933a41381366c7fab7c6f2c9352d3bab..37e20d19544059718dec76c371d97555626edbb3 100644
--- a/java/com/android/dialer/searchfragment/SearchContactsCursorLoader.java
+++ b/java/com/android/dialer/searchfragment/common/Projections.java
@@ -11,17 +11,15 @@
* 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.
+ * limitations under the License
*/
-package com.android.dialer.searchfragment;
+package com.android.dialer.searchfragment.common;
-import android.content.Context;
-import android.content.CursorLoader;
import android.provider.ContactsContract.CommonDataKinds.Phone;
-/** Cursor Loader for {@link NewSearchFragment}. */
-final class SearchContactsCursorLoader extends CursorLoader {
+/** Class containing relevant projections for searching contacts. */
+public class Projections {
public static final int PHONE_ID = 0;
public static final int PHONE_TYPE = 1;
@@ -34,9 +32,9 @@ final class SearchContactsCursorLoader extends CursorLoader {
public static final int PHONE_CARRIER_PRESENCE = 8;
@SuppressWarnings("unused")
- public static final int PHONE_SOFT_KEY = 9;
+ public static final int PHONE_SORT_KEY = 9;
- static final String[] PHONE_PROJECTION =
+ public static final String[] PHONE_PROJECTION =
new String[] {
Phone._ID, // 0
Phone.TYPE, // 1
@@ -49,9 +47,4 @@ final class SearchContactsCursorLoader extends CursorLoader {
Phone.CARRIER_PRESENCE, // 8
Phone.SORT_KEY_PRIMARY // 9
};
-
- SearchContactsCursorLoader(Context context) {
- super(
- context, Phone.CONTENT_URI, PHONE_PROJECTION, null, null, Phone.SORT_KEY_PRIMARY + " ASC");
- }
}
diff --git a/java/com/android/dialer/searchfragment/QueryUtil.java b/java/com/android/dialer/searchfragment/common/QueryBoldingUtil.java
similarity index 52%
rename from java/com/android/dialer/searchfragment/QueryUtil.java
rename to java/com/android/dialer/searchfragment/common/QueryBoldingUtil.java
index a3f44ab831a8046320935160d7d633f4dac18db1..7bdd69567588b9cd48c8737c15068c2e521bf4e1 100644
--- a/java/com/android/dialer/searchfragment/QueryUtil.java
+++ b/java/com/android/dialer/searchfragment/common/QueryBoldingUtil.java
@@ -14,23 +14,18 @@
* limitations under the License
*/
-package com.android.dialer.searchfragment;
+package com.android.dialer.searchfragment.common;
import android.graphics.Typeface;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
-import android.telephony.PhoneNumberUtils;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.TextUtils;
import android.text.style.StyleSpan;
-import java.util.regex.Pattern;
-/** Contains utility methods for comparing and filtering strings with search queries. */
-final class QueryUtil {
-
- /** Matches strings with "-", "(", ")", 2-9 of at least length one. */
- static final Pattern T9_PATTERN = Pattern.compile("[\\-()2-9]+");
+/** Utility class for handling bolding queries contained in string. */
+public class QueryBoldingUtil {
/**
* Compares a name and query and returns a {@link CharSequence} with bolded characters.
@@ -47,7 +42,7 @@ final class QueryUtil {
* @param name of a contact/string that query will compare to
* @return name with query bolded if query can be found in the name.
*/
- static CharSequence getNameWithQueryBolded(@Nullable String query, @NonNull String name) {
+ public static CharSequence getNameWithQueryBolded(@Nullable String query, @NonNull String name) {
if (TextUtils.isEmpty(query)) {
return name;
}
@@ -55,9 +50,10 @@ final class QueryUtil {
int index = -1;
int numberOfBoldedCharacters = 0;
- if (nameMatchesT9Query(query, name)) {
+ if (QueryFilteringUtil.nameMatchesT9Query(query, name)) {
// Bold the characters that match the t9 query
- index = indexOfQueryNonDigitsIgnored(query, getT9Representation(name));
+ String t9 = QueryFilteringUtil.getT9Representation(name);
+ index = QueryFilteringUtil.indexOfQueryNonDigitsIgnored(query, t9);
if (index == -1) {
return getNameWithInitialsBolded(query, name);
}
@@ -98,7 +94,7 @@ final class QueryUtil {
while (++nameIndex < name.length() && initialsBolded < query.length()) {
if ((nameIndex == 0 || name.charAt(nameIndex - 1) == ' ')
- && getDigit(name.charAt(nameIndex)) == query.charAt(initialsBolded)) {
+ && QueryFilteringUtil.getDigit(name.charAt(nameIndex)) == query.charAt(initialsBolded)) {
boldedInitials.setSpan(
new StyleSpan(Typeface.BOLD),
nameIndex,
@@ -122,12 +118,13 @@ final class QueryUtil {
* @param number phone number of a contact that the query will compare to.
* @return number with query bolded if query can be found in the number.
*/
- static CharSequence getNumberWithQueryBolded(@Nullable String query, @NonNull String number) {
- if (TextUtils.isEmpty(query) || !numberMatchesNumberQuery(query, number)) {
+ public static CharSequence getNumberWithQueryBolded(
+ @Nullable String query, @NonNull String number) {
+ if (TextUtils.isEmpty(query) || !QueryFilteringUtil.numberMatchesNumberQuery(query, number)) {
return number;
}
- int index = indexOfQueryNonDigitsIgnored(query, number);
+ int index = QueryFilteringUtil.indexOfQueryNonDigitsIgnored(query, number);
int boldedCharacters = query.length();
for (char c : query.toCharArray()) {
@@ -154,116 +151,4 @@ final class QueryUtil {
new StyleSpan(Typeface.BOLD), index, index + numBolded, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
return span;
}
-
- /**
- * @return true if the query is of T9 format and the name's T9 representation belongs to the
- * query; false otherwise.
- */
- static boolean nameMatchesT9Query(String query, String name) {
- if (!T9_PATTERN.matcher(query).matches()) {
- return false;
- }
-
- // Substring
- if (indexOfQueryNonDigitsIgnored(query, getT9Representation(name)) != -1) {
- return true;
- }
-
- // Check matches initials
- // TODO investigate faster implementation
- query = digitsOnly(query);
- int queryIndex = 0;
-
- String[] names = name.toLowerCase().split("\\s");
- for (int i = 0; i < names.length && queryIndex < query.length(); i++) {
- if (TextUtils.isEmpty(names[i])) {
- continue;
- }
-
- if (getDigit(names[i].charAt(0)) == query.charAt(queryIndex)) {
- queryIndex++;
- }
- }
-
- return queryIndex == query.length();
- }
-
- /** @return true if the number belongs to the query. */
- static boolean numberMatchesNumberQuery(String query, String number) {
- return PhoneNumberUtils.isGlobalPhoneNumber(query)
- && indexOfQueryNonDigitsIgnored(query, number) != -1;
- }
-
- /**
- * Checks if query is contained in number while ignoring all characters in both that are not
- * digits (i.e. {@link Character#isDigit(char)} returns false).
- *
- * @return index where query is found with all non-digits removed, -1 if it's not found.
- */
- private static int indexOfQueryNonDigitsIgnored(@NonNull String query, @NonNull String number) {
- return digitsOnly(number).indexOf(digitsOnly(query));
- }
-
- // Returns string with letters replaced with their T9 representation.
- private static String getT9Representation(String s) {
- StringBuilder builder = new StringBuilder(s.length());
- for (char c : s.toLowerCase().toCharArray()) {
- builder.append(getDigit(c));
- }
- return builder.toString();
- }
-
- /** @return String s with only digits recognized by Character#isDigit() remaining */
- static String digitsOnly(String s) {
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < s.length(); i++) {
- char c = s.charAt(i);
- if (Character.isDigit(c)) {
- sb.append(c);
- }
- }
- return sb.toString();
- }
-
- // Returns the T9 representation of a lower case character, otherwise returns the character.
- private static char getDigit(char c) {
- switch (c) {
- case 'a':
- case 'b':
- case 'c':
- return '2';
- case 'd':
- case 'e':
- case 'f':
- return '3';
- case 'g':
- case 'h':
- case 'i':
- return '4';
- case 'j':
- case 'k':
- case 'l':
- return '5';
- case 'm':
- case 'n':
- case 'o':
- return '6';
- case 'p':
- case 'q':
- case 'r':
- case 's':
- return '7';
- case 't':
- case 'u':
- case 'v':
- return '8';
- case 'w':
- case 'x':
- case 'y':
- case 'z':
- return '9';
- default:
- return c;
- }
- }
}
diff --git a/java/com/android/dialer/searchfragment/common/QueryFilteringUtil.java b/java/com/android/dialer/searchfragment/common/QueryFilteringUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..b23315b1505c384f19fbd8ea17e544c9ac4aec3b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/common/QueryFilteringUtil.java
@@ -0,0 +1,141 @@
+/*
+ * 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.searchfragment.common;
+
+import android.support.annotation.NonNull;
+import android.telephony.PhoneNumberUtils;
+import android.text.TextUtils;
+import java.util.regex.Pattern;
+
+/** Utility class for filtering, comparing and handling strings and queries. */
+public class QueryFilteringUtil {
+
+ /** Matches strings with "-", "(", ")", 2-9 of at least length one. */
+ static final Pattern T9_PATTERN = Pattern.compile("[\\-()2-9]+");
+
+ /**
+ * @return true if the query is of T9 format and the name's T9 representation belongs to the
+ * query; false otherwise.
+ */
+ public static boolean nameMatchesT9Query(String query, String name) {
+ if (!T9_PATTERN.matcher(query).matches()) {
+ return false;
+ }
+
+ // Substring
+ if (indexOfQueryNonDigitsIgnored(query, getT9Representation(name)) != -1) {
+ return true;
+ }
+
+ // Check matches initials
+ // TODO investigate faster implementation
+ query = digitsOnly(query);
+ int queryIndex = 0;
+
+ String[] names = name.toLowerCase().split("\\s");
+ for (int i = 0; i < names.length && queryIndex < query.length(); i++) {
+ if (TextUtils.isEmpty(names[i])) {
+ continue;
+ }
+
+ if (getDigit(names[i].charAt(0)) == query.charAt(queryIndex)) {
+ queryIndex++;
+ }
+ }
+
+ return queryIndex == query.length();
+ }
+
+ /** @return true if the number belongs to the query. */
+ public static boolean numberMatchesNumberQuery(String query, String number) {
+ return PhoneNumberUtils.isGlobalPhoneNumber(query)
+ && indexOfQueryNonDigitsIgnored(query, number) != -1;
+ }
+
+ /**
+ * Checks if query is contained in number while ignoring all characters in both that are not
+ * digits (i.e. {@link Character#isDigit(char)} returns false).
+ *
+ * @return index where query is found with all non-digits removed, -1 if it's not found.
+ */
+ static int indexOfQueryNonDigitsIgnored(@NonNull String query, @NonNull String number) {
+ return digitsOnly(number).indexOf(digitsOnly(query));
+ }
+
+ // Returns string with letters replaced with their T9 representation.
+ static String getT9Representation(String s) {
+ StringBuilder builder = new StringBuilder(s.length());
+ for (char c : s.toLowerCase().toCharArray()) {
+ builder.append(getDigit(c));
+ }
+ return builder.toString();
+ }
+
+ /** @return String s with only digits recognized by Character#isDigit() remaining */
+ public static String digitsOnly(String s) {
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < s.length(); i++) {
+ char c = s.charAt(i);
+ if (Character.isDigit(c)) {
+ sb.append(c);
+ }
+ }
+ return sb.toString();
+ }
+
+ // Returns the T9 representation of a lower case character, otherwise returns the character.
+ static char getDigit(char c) {
+ switch (c) {
+ case 'a':
+ case 'b':
+ case 'c':
+ return '2';
+ case 'd':
+ case 'e':
+ case 'f':
+ return '3';
+ case 'g':
+ case 'h':
+ case 'i':
+ return '4';
+ case 'j':
+ case 'k':
+ case 'l':
+ return '5';
+ case 'm':
+ case 'n':
+ case 'o':
+ return '6';
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ return '7';
+ case 't':
+ case 'u':
+ case 'v':
+ return '8';
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z':
+ return '9';
+ default:
+ return c;
+ }
+ }
+}
diff --git a/java/com/android/dialer/searchfragment/res/layout/search_contact_row.xml b/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml
similarity index 80%
rename from java/com/android/dialer/searchfragment/res/layout/search_contact_row.xml
rename to java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml
index efeca0e9d1e9b039529912ee77b319a79c1e7352..dd871af709ed43c4a4578d836696b282f2d32445 100644
--- a/java/com/android/dialer/searchfragment/res/layout/search_contact_row.xml
+++ b/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml
@@ -19,8 +19,8 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="@dimen/search_row_height"
- android:paddingStart="16dp"
- android:paddingEnd="16dp"
+ android:paddingStart="8dp"
+ android:paddingEnd="8dp"
android:background="?android:attr/selectableItemBackground">
+ android:fontFamily="sans-serif"
+ style="@style/PrimaryText"/>
+ android:fontFamily="sans-serif"
+ style="@style/SecondaryText"/>
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/res/values/dimens.xml b/java/com/android/dialer/searchfragment/common/res/values/dimens.xml
similarity index 100%
rename from java/com/android/dialer/searchfragment/res/values/dimens.xml
rename to java/com/android/dialer/searchfragment/common/res/values/dimens.xml
diff --git a/java/com/android/dialer/searchfragment/SearchContactCursor.java b/java/com/android/dialer/searchfragment/cp2/SearchContactCursor.java
similarity index 91%
rename from java/com/android/dialer/searchfragment/SearchContactCursor.java
rename to java/com/android/dialer/searchfragment/cp2/SearchContactCursor.java
index 5006e1a6013eb6b86426ad5cd92321418c9b17e2..a2ef58c3cdbfe20b58f9c3f0ba992bbee4ea4470 100644
--- a/java/com/android/dialer/searchfragment/SearchContactCursor.java
+++ b/java/com/android/dialer/searchfragment/cp2/SearchContactCursor.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.dialer.searchfragment;
+package com.android.dialer.searchfragment.cp2;
import android.content.ContentResolver;
import android.database.CharArrayBuffer;
@@ -26,6 +26,8 @@ import android.os.Bundle;
import android.support.annotation.IntDef;
import android.support.annotation.Nullable;
import android.text.TextUtils;
+import com.android.dialer.searchfragment.common.Projections;
+import com.android.dialer.searchfragment.common.QueryFilteringUtil;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
@@ -37,7 +39,7 @@ import java.util.List;
* This cursor removes duplicate phone numbers associated with the same contact and can filter
* contacts based on a query by calling {@link #filter(String)}.
*/
-final class SearchContactCursor implements Cursor {
+public final class SearchContactCursor implements Cursor {
private final Cursor cursor;
// List of cursor ids that are valid for displaying after filtering.
@@ -61,10 +63,10 @@ final class SearchContactCursor implements Cursor {
}
/**
- * @param cursor with projection {@link SearchContactsCursorLoader#PHONE_PROJECTION}.
+ * @param cursor with projection {@link Projections#PHONE_PROJECTION}.
* @param query to filter cursor results.
*/
- SearchContactCursor(Cursor cursor, @Nullable String query) {
+ public SearchContactCursor(Cursor cursor, @Nullable String query) {
// TODO investigate copying this into a MatrixCursor and holding in memory
this.cursor = cursor;
filter(query);
@@ -77,7 +79,7 @@ final class SearchContactCursor implements Cursor {
*
*
* - A phone number
- *
- A T9 representation of a name (matches {@link QueryUtil#T9_PATTERN}).
+ *
- A T9 representation of a name (matches {@link QueryFilteringUtil#T9_PATTERN}).
*
- A name
*
*
@@ -89,7 +91,7 @@ final class SearchContactCursor implements Cursor {
* - Its name contains the query
*
*/
- void filter(@Nullable String query) {
+ public void filter(@Nullable String query) {
if (query == null) {
query = "";
}
@@ -108,8 +110,8 @@ final class SearchContactCursor implements Cursor {
while (cursor.moveToNext()) {
int position = cursor.getPosition();
- String currentNumber = cursor.getString(SearchContactsCursorLoader.PHONE_NUMBER);
- String currentName = cursor.getString(SearchContactsCursorLoader.PHONE_DISPLAY_NAME);
+ String currentNumber = cursor.getString(Projections.PHONE_NUMBER);
+ String currentName = cursor.getString(Projections.PHONE_DISPLAY_NAME);
if (!previousName.equals(currentName)) {
previousName = currentName;
@@ -138,8 +140,8 @@ final class SearchContactCursor implements Cursor {
}
if (TextUtils.isEmpty(query)
- || QueryUtil.nameMatchesT9Query(query, previousName)
- || QueryUtil.numberMatchesNumberQuery(query, previousMostQualifiedNumber)
+ || QueryFilteringUtil.nameMatchesT9Query(query, previousName)
+ || QueryFilteringUtil.numberMatchesNumberQuery(query, previousMostQualifiedNumber)
|| previousName.contains(query)) {
queryFilteredPositions.add(previousMostQualifiedPosition);
}
@@ -156,8 +158,8 @@ final class SearchContactCursor implements Cursor {
*/
private @Qualification int getQualification(String number, String mostQualifiedNumber) {
// Ignore formatting
- String numberDigits = QueryUtil.digitsOnly(number);
- String qualifiedNumberDigits = QueryUtil.digitsOnly(mostQualifiedNumber);
+ String numberDigits = QueryFilteringUtil.digitsOnly(number);
+ String qualifiedNumberDigits = QueryFilteringUtil.digitsOnly(mostQualifiedNumber);
// If the numbers are identical, return version with more formatting
if (qualifiedNumberDigits.equals(numberDigits)) {
diff --git a/java/com/android/dialer/searchfragment/SearchContactViewHolder.java b/java/com/android/dialer/searchfragment/cp2/SearchContactViewHolder.java
similarity index 77%
rename from java/com/android/dialer/searchfragment/SearchContactViewHolder.java
rename to java/com/android/dialer/searchfragment/cp2/SearchContactViewHolder.java
index 4ac6af33edcb5f9e708f0c9331a1c7697590b482..5f06b5991efb0fc18d78b15f177a6a89ef640f69 100644
--- a/java/com/android/dialer/searchfragment/SearchContactViewHolder.java
+++ b/java/com/android/dialer/searchfragment/cp2/SearchContactViewHolder.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.dialer.searchfragment;
+package com.android.dialer.searchfragment.cp2;
import android.content.Context;
import android.content.res.Resources;
@@ -35,20 +35,19 @@ import com.android.contacts.common.lettertiles.LetterTileDrawable;
import com.android.dialer.callintent.CallInitiationType.Type;
import com.android.dialer.callintent.CallIntentBuilder;
import com.android.dialer.common.Assert;
+import com.android.dialer.searchfragment.common.Projections;
+import com.android.dialer.searchfragment.common.QueryBoldingUtil;
+import com.android.dialer.searchfragment.common.R;
import com.android.dialer.telecom.TelecomUtil;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-/** ViewHolder for a contact row in {@link NewSearchFragment}. */
-final class SearchContactViewHolder extends ViewHolder implements OnClickListener {
+/** ViewHolder for a contact row. */
+public final class SearchContactViewHolder extends ViewHolder implements OnClickListener {
/** IntDef for the different types of actions that can be shown. */
@Retention(RetentionPolicy.SOURCE)
- @IntDef({
- SearchContactViewHolder.CallToAction.NONE,
- SearchContactViewHolder.CallToAction.VIDEO_CALL,
- SearchContactViewHolder.CallToAction.SHARE_AND_CALL
- })
+ @IntDef({CallToAction.NONE, CallToAction.VIDEO_CALL, CallToAction.SHARE_AND_CALL})
@interface CallToAction {
int NONE = 0;
int VIDEO_CALL = 1;
@@ -64,7 +63,7 @@ final class SearchContactViewHolder extends ViewHolder implements OnClickListene
private String number;
private @CallToAction int currentAction;
- SearchContactViewHolder(View view) {
+ public SearchContactViewHolder(View view) {
super(view);
view.setOnClickListener(this);
photo = view.findViewById(R.id.photo);
@@ -78,29 +77,29 @@ final class SearchContactViewHolder extends ViewHolder implements OnClickListene
* Binds the ViewHolder with a cursor from {@link SearchContactsCursorLoader} with the data found
* at the cursors set position.
*/
- void bind(Cursor cursor, String query) {
- number = cursor.getString(SearchContactsCursorLoader.PHONE_NUMBER);
- String name = cursor.getString(SearchContactsCursorLoader.PHONE_DISPLAY_NAME);
+ public void bind(Cursor cursor, String query) {
+ number = cursor.getString(Projections.PHONE_NUMBER);
+ String name = cursor.getString(Projections.PHONE_DISPLAY_NAME);
String label = getLabel(context.getResources(), cursor);
String secondaryInfo =
TextUtils.isEmpty(label)
? number
- : context.getString(R.string.call_subject_type_and_number, label, number);
+ : context.getString(
+ com.android.contacts.common.R.string.call_subject_type_and_number, label, number);
- nameOrNumberView.setText(QueryUtil.getNameWithQueryBolded(query, name));
- numberView.setText(QueryUtil.getNumberWithQueryBolded(query, secondaryInfo));
+ nameOrNumberView.setText(QueryBoldingUtil.getNameWithQueryBolded(query, name));
+ numberView.setText(QueryBoldingUtil.getNumberWithQueryBolded(query, secondaryInfo));
setCallToAction(cursor);
if (shouldShowPhoto(cursor, name)) {
nameOrNumberView.setVisibility(View.VISIBLE);
photo.setVisibility(View.VISIBLE);
- photo.setContentDescription(context.getString(R.string.description_quick_contact_for, name));
- String photoUri = cursor.getString(SearchContactsCursorLoader.PHONE_PHOTO_URI);
+ String photoUri = cursor.getString(Projections.PHONE_PHOTO_URI);
ContactPhotoManager.getInstance(context)
.loadDialerThumbnailOrPhoto(
photo,
getContactUri(cursor),
- cursor.getLong(SearchContactsCursorLoader.PHONE_PHOTO_ID),
+ cursor.getLong(Projections.PHONE_PHOTO_ID),
photoUri == null ? null : Uri.parse(photoUri),
name,
LetterTileDrawable.TYPE_DEFAULT);
@@ -116,23 +115,23 @@ final class SearchContactViewHolder extends ViewHolder implements OnClickListene
return true;
} else {
cursor.moveToPosition(currentPosition - 1);
- String previousName = cursor.getString(SearchContactsCursorLoader.PHONE_DISPLAY_NAME);
+ String previousName = cursor.getString(Projections.PHONE_DISPLAY_NAME);
cursor.moveToPosition(currentPosition);
return !currentName.equals(previousName);
}
}
private static Uri getContactUri(Cursor cursor) {
- long contactId = cursor.getLong(SearchContactsCursorLoader.PHONE_ID);
- String lookupKey = cursor.getString(SearchContactsCursorLoader.PHONE_LOOKUP_KEY);
+ long contactId = cursor.getLong(Projections.PHONE_ID);
+ String lookupKey = cursor.getString(Projections.PHONE_LOOKUP_KEY);
return Contacts.getLookupUri(contactId, lookupKey);
}
// TODO: handle CNAP and cequint types.
// TODO: unify this into a utility method with CallLogAdapter#getNumberType
private static String getLabel(Resources resources, Cursor cursor) {
- int numberType = cursor.getInt(SearchContactsCursorLoader.PHONE_TYPE);
- String numberLabel = cursor.getString(SearchContactsCursorLoader.PHONE_LABEL);
+ int numberType = cursor.getInt(Projections.PHONE_TYPE);
+ String numberLabel = cursor.getString(Projections.PHONE_LABEL);
// Returns empty label instead of "custom" if the custom label is empty.
if (numberType == Phone.TYPE_CUSTOM && TextUtils.isEmpty(numberLabel)) {
@@ -150,7 +149,8 @@ final class SearchContactViewHolder extends ViewHolder implements OnClickListene
break;
case CallToAction.SHARE_AND_CALL:
callToActionView.setVisibility(View.VISIBLE);
- callToActionView.setImageDrawable(context.getDrawable(R.drawable.ic_phone_attach));
+ callToActionView.setImageDrawable(
+ context.getDrawable(com.android.contacts.common.R.drawable.ic_phone_attach));
callToActionView.setOnClickListener(this);
break;
case CallToAction.VIDEO_CALL:
@@ -166,7 +166,7 @@ final class SearchContactViewHolder extends ViewHolder implements OnClickListene
}
private static @CallToAction int getCallToAction(Cursor cursor) {
- int carrierPresence = cursor.getInt(SearchContactsCursorLoader.PHONE_CARRIER_PRESENCE);
+ int carrierPresence = cursor.getInt(Projections.PHONE_CARRIER_PRESENCE);
if ((carrierPresence & Phone.CARRIER_PRESENCE_VT_CAPABLE) == 1) {
return CallToAction.VIDEO_CALL;
}
@@ -181,7 +181,8 @@ final class SearchContactViewHolder extends ViewHolder implements OnClickListene
switch (currentAction) {
case CallToAction.SHARE_AND_CALL:
callToActionView.setVisibility(View.VISIBLE);
- callToActionView.setImageDrawable(context.getDrawable(R.drawable.ic_phone_attach));
+ callToActionView.setImageDrawable(
+ context.getDrawable(com.android.contacts.common.R.drawable.ic_phone_attach));
// TODO: open call composer.
break;
case CallToAction.VIDEO_CALL:
diff --git a/java/com/android/dialer/searchfragment/cp2/SearchContactsCursorLoader.java b/java/com/android/dialer/searchfragment/cp2/SearchContactsCursorLoader.java
new file mode 100644
index 0000000000000000000000000000000000000000..c72f28b25abc4df48d4706ec8aa0143b6d3d0a4e
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/SearchContactsCursorLoader.java
@@ -0,0 +1,42 @@
+/*
+ * 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.searchfragment.cp2;
+
+import android.content.Context;
+import android.content.CursorLoader;
+import android.database.Cursor;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import com.android.dialer.searchfragment.common.Projections;
+
+/** Cursor Loader for CP2 contacts. */
+public final class SearchContactsCursorLoader extends CursorLoader {
+
+ public SearchContactsCursorLoader(Context context) {
+ super(
+ context,
+ Phone.CONTENT_URI,
+ Projections.PHONE_PROJECTION,
+ null,
+ null,
+ Phone.SORT_KEY_PRIMARY + " ASC");
+ }
+
+ @Override
+ public Cursor loadInBackground() {
+ return new SearchContactCursor(super.loadInBackground(), null);
+ }
+}
diff --git a/java/com/android/dialer/searchfragment/AndroidManifest.xml b/java/com/android/dialer/searchfragment/list/AndroidManifest.xml
similarity index 91%
rename from java/com/android/dialer/searchfragment/AndroidManifest.xml
rename to java/com/android/dialer/searchfragment/list/AndroidManifest.xml
index 88ce67c133317e7cff7392990dd35444ce07f135..e0890cc2c48abef7e2e9c41bbbaeba1246493c6b 100644
--- a/java/com/android/dialer/searchfragment/AndroidManifest.xml
+++ b/java/com/android/dialer/searchfragment/list/AndroidManifest.xml
@@ -13,4 +13,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/list/HeaderViewHolder.java b/java/com/android/dialer/searchfragment/list/HeaderViewHolder.java
new file mode 100644
index 0000000000000000000000000000000000000000..dd35b13eecae01e748872d5e273067ce0da70707
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/HeaderViewHolder.java
@@ -0,0 +1,36 @@
+/*
+ * 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.searchfragment.list;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.TextView;
+
+/** ViewHolder for header rows in {@link NewSearchFragment}. */
+final class HeaderViewHolder extends RecyclerView.ViewHolder {
+
+ private final TextView header;
+
+ HeaderViewHolder(View view) {
+ super(view);
+ header = view.findViewById(R.id.header);
+ }
+
+ public void setHeader(String header) {
+ this.header.setText(header);
+ }
+}
diff --git a/java/com/android/dialer/searchfragment/list/NewSearchFragment.java b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java
new file mode 100644
index 0000000000000000000000000000000000000000..fcc87c386d33cb83e824d23487ba6f800aa35a7c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java
@@ -0,0 +1,125 @@
+/*
+ * 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.searchfragment.list;
+
+import android.app.Fragment;
+import android.app.LoaderManager.LoaderCallbacks;
+import android.content.Loader;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import com.android.contacts.common.extensions.PhoneDirectoryExtenderAccessor;
+import com.android.dialer.common.concurrent.ThreadUtil;
+import com.android.dialer.searchfragment.cp2.SearchContactsCursorLoader;
+import com.android.dialer.searchfragment.nearbyplaces.NearbyPlacesCursorLoader;
+
+/** Fragment used for searching contacts. */
+public final class NewSearchFragment extends Fragment implements LoaderCallbacks {
+
+ // Since some of our queries can generate network requests, we should delay them until the user
+ // stops typing to prevent generating too much network traffic.
+ private static final int NETWORK_SEARCH_DELAY_MILLIS = 300;
+
+ private static final int CONTACTS_LOADER_ID = 0;
+ private static final int NEARBY_PLACES_ID = 1;
+
+ private RecyclerView recyclerView;
+ private SearchAdapter adapter;
+ private String query;
+
+ private final Runnable loadNearbyPlacesRunnable =
+ () -> getLoaderManager().restartLoader(NEARBY_PLACES_ID, null, this);
+
+ @Nullable
+ @Override
+ public View onCreateView(
+ LayoutInflater inflater, @Nullable ViewGroup parent, @Nullable Bundle bundle) {
+ getLoaderManager().initLoader(0, null, this);
+ View view = inflater.inflate(R.layout.fragment_search, parent, false);
+ adapter = new SearchAdapter(getContext());
+ recyclerView = view.findViewById(R.id.recycler_view);
+ recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+ recyclerView.setAdapter(adapter);
+
+ getLoaderManager().initLoader(CONTACTS_LOADER_ID, null, this);
+ loadNearbyPlacesCursor();
+ return view;
+ }
+
+ @Override
+ public Loader onCreateLoader(int id, Bundle bundle) {
+ // TODO add enterprise loader
+ if (id == CONTACTS_LOADER_ID) {
+ return new SearchContactsCursorLoader(getContext());
+ } else if (id == NEARBY_PLACES_ID) {
+ return new NearbyPlacesCursorLoader(getContext(), query);
+ } else {
+ throw new IllegalStateException("Invalid loader id: " + id);
+ }
+ }
+
+ @Override
+ public void onLoadFinished(Loader loader, Cursor cursor) {
+ if (loader instanceof SearchContactsCursorLoader) {
+ adapter.setContactsCursor(cursor);
+ } else if (loader instanceof NearbyPlacesCursorLoader) {
+ adapter.setNearbyPlacesCursor(cursor);
+ } else {
+ throw new IllegalStateException("Invalid loader: " + loader);
+ }
+ }
+
+ @Override
+ public void onLoaderReset(Loader loader) {
+ adapter.clear();
+ recyclerView.setAdapter(null);
+ }
+
+ public void setQuery(String query) {
+ this.query = query;
+ if (adapter != null) {
+ adapter.setQuery(query);
+ loadNearbyPlacesCursor();
+ }
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ // close adapters
+ adapter.setNearbyPlacesCursor(null);
+ adapter.setContactsCursor(null);
+ ThreadUtil.getUiThreadHandler().removeCallbacks(loadNearbyPlacesRunnable);
+ }
+
+ private void loadNearbyPlacesCursor() {
+ // Cancel existing load if one exists.
+ ThreadUtil.getUiThreadHandler().removeCallbacks(loadNearbyPlacesRunnable);
+
+ // If nearby places is not enabled, do not try to load them.
+ if (!PhoneDirectoryExtenderAccessor.get(getContext()).isEnabled(getContext())) {
+ return;
+ }
+ ThreadUtil.getUiThreadHandler()
+ .postDelayed(loadNearbyPlacesRunnable, NETWORK_SEARCH_DELAY_MILLIS);
+ }
+}
diff --git a/java/com/android/dialer/searchfragment/SearchAdapter.java b/java/com/android/dialer/searchfragment/list/SearchAdapter.java
similarity index 56%
rename from java/com/android/dialer/searchfragment/SearchAdapter.java
rename to java/com/android/dialer/searchfragment/list/SearchAdapter.java
index 8f52415579e421a0c36b35cef74717879b74a5c4..023513e478a371e2818cd37ef2d5d1bcb56c055a 100644
--- a/java/com/android/dialer/searchfragment/SearchAdapter.java
+++ b/java/com/android/dialer/searchfragment/list/SearchAdapter.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.dialer.searchfragment;
+package com.android.dialer.searchfragment.list;
import android.content.Context;
import android.database.Cursor;
@@ -23,7 +23,9 @@ import android.support.v7.widget.RecyclerView.ViewHolder;
import android.view.LayoutInflater;
import android.view.ViewGroup;
import com.android.dialer.common.Assert;
-import com.android.dialer.searchfragment.SearchCursorManager.RowType;
+import com.android.dialer.searchfragment.cp2.SearchContactViewHolder;
+import com.android.dialer.searchfragment.list.SearchCursorManager.RowType;
+import com.android.dialer.searchfragment.nearbyplaces.NearbyPlaceViewHolder;
/** RecyclerView adapter for {@link NewSearchFragment}. */
class SearchAdapter extends RecyclerView.Adapter {
@@ -38,33 +40,50 @@ class SearchAdapter extends RecyclerView.Adapter {
this.context = context;
}
- // TODO: fill in the rest of the view holders.
@Override
- public ViewHolder onCreateViewHolder(ViewGroup root, int position) {
- @RowType int rowType = searchCursorManager.getRowType(position);
+ public ViewHolder onCreateViewHolder(ViewGroup root, @RowType int rowType) {
switch (rowType) {
case RowType.CONTACT_ROW:
return new SearchContactViewHolder(
LayoutInflater.from(context).inflate(R.layout.search_contact_row, root, false));
+ case RowType.NEARBY_PLACES_ROW:
+ return new NearbyPlaceViewHolder(
+ LayoutInflater.from(context).inflate(R.layout.search_contact_row, root, false));
case RowType.DIRECTORY_HEADER:
- case RowType.DIRECTORY_ROW:
- case RowType.INVALID:
case RowType.NEARBY_PLACES_HEADER:
- case RowType.NEARBY_PLACES_ROW:
- return null;
+ return new HeaderViewHolder(
+ LayoutInflater.from(context).inflate(R.layout.header_layout, root, false));
+ case RowType.DIRECTORY_ROW: // TODO: add directory rows to search
+ case RowType.INVALID:
default:
throw Assert.createIllegalStateFailException("Invalid RowType: " + rowType);
}
}
+ @Override
+ public @RowType int getItemViewType(int position) {
+ return searchCursorManager.getRowType(position);
+ }
+
@Override
public void onBindViewHolder(ViewHolder holder, int position) {
- Cursor cursor = searchCursorManager.getCursor(position);
- ((SearchContactViewHolder) holder).bind(cursor, query);
+ if (holder instanceof SearchContactViewHolder) {
+ Cursor cursor = searchCursorManager.getCursor(position);
+ ((SearchContactViewHolder) holder).bind(cursor, query);
+ } else if (holder instanceof NearbyPlaceViewHolder) {
+ Cursor cursor = searchCursorManager.getCursor(position);
+ ((NearbyPlaceViewHolder) holder).bind(cursor, query);
+ } else if (holder instanceof HeaderViewHolder) {
+ String header = context.getString(searchCursorManager.getHeaderText(position));
+ ((HeaderViewHolder) holder).setHeader(header);
+ } else {
+ throw Assert.createIllegalStateFailException("Invalid ViewHolder: " + holder);
+ }
}
void setContactsCursor(Cursor cursor) {
searchCursorManager.setContactsCursor(cursor);
+ notifyDataSetChanged();
}
void clear() {
@@ -81,4 +100,9 @@ class SearchAdapter extends RecyclerView.Adapter {
searchCursorManager.setQuery(query);
notifyDataSetChanged();
}
+
+ public void setNearbyPlacesCursor(Cursor nearbyPlacesCursor) {
+ searchCursorManager.setNearbyPlacesCursor(nearbyPlacesCursor);
+ notifyDataSetChanged();
+ }
}
diff --git a/java/com/android/dialer/searchfragment/SearchCursorManager.java b/java/com/android/dialer/searchfragment/list/SearchCursorManager.java
similarity index 84%
rename from java/com/android/dialer/searchfragment/SearchCursorManager.java
rename to java/com/android/dialer/searchfragment/list/SearchCursorManager.java
index 64c4fc1707653da56bad1b3ef5549a66b4f182b0..216a9ada942e7d08c9c5d3702a234d3d2d2fa345 100644
--- a/java/com/android/dialer/searchfragment/SearchCursorManager.java
+++ b/java/com/android/dialer/searchfragment/list/SearchCursorManager.java
@@ -14,11 +14,13 @@
* limitations under the License
*/
-package com.android.dialer.searchfragment;
+package com.android.dialer.searchfragment.list;
import android.database.Cursor;
import android.support.annotation.IntDef;
+import android.support.annotation.StringRes;
import com.android.dialer.common.Assert;
+import com.android.dialer.searchfragment.cp2.SearchContactCursor;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -73,6 +75,14 @@ final class SearchCursorManager {
private Cursor corpDirectoryCursor = null;
void setContactsCursor(Cursor cursor) {
+ if (cursor == contactsCursor) {
+ return;
+ }
+
+ if (contactsCursor != null && !contactsCursor.isClosed()) {
+ contactsCursor.close();
+ }
+
if (cursor != null && cursor.getCount() > 0) {
contactsCursor = cursor;
} else {
@@ -81,6 +91,14 @@ final class SearchCursorManager {
}
void setNearbyPlacesCursor(Cursor cursor) {
+ if (cursor == nearbyPlacesCursor) {
+ return;
+ }
+
+ if (nearbyPlacesCursor != null && !nearbyPlacesCursor.isClosed()) {
+ nearbyPlacesCursor.close();
+ }
+
if (cursor != null && cursor.getCount() > 0) {
nearbyPlacesCursor = cursor;
} else {
@@ -89,6 +107,14 @@ final class SearchCursorManager {
}
void setCorpDirectoryCursor(Cursor cursor) {
+ if (cursor == corpDirectoryCursor) {
+ return;
+ }
+
+ if (corpDirectoryCursor != null && !corpDirectoryCursor.isClosed()) {
+ corpDirectoryCursor.close();
+ }
+
if (cursor != null && cursor.getCount() > 0) {
corpDirectoryCursor = cursor;
} else {
@@ -98,6 +124,7 @@ final class SearchCursorManager {
void setQuery(String query) {
if (contactsCursor != null) {
+ // TODO: abstract this
((SearchContactCursor) contactsCursor).filter(query);
}
}
@@ -209,6 +236,23 @@ final class SearchCursorManager {
throw Assert.createIllegalStateFailException("No valid cursor.");
}
+ @StringRes
+ int getHeaderText(int position) {
+ @RowType int rowType = getRowType(position);
+ switch (rowType) {
+ case RowType.NEARBY_PLACES_HEADER:
+ return R.string.nearby_places;
+ case RowType.DIRECTORY_HEADER: // TODO
+ case RowType.DIRECTORY_ROW:
+ case RowType.CONTACT_ROW:
+ case RowType.NEARBY_PLACES_ROW:
+ case RowType.INVALID:
+ default:
+ throw Assert.createIllegalStateFailException(
+ "Invalid row type, position " + position + " is rowtype " + rowType);
+ }
+ }
+
/** removes all cursors. */
void clear() {
if (contactsCursor != null) {
diff --git a/java/com/android/dialer/searchfragment/res/layout/fragment_search.xml b/java/com/android/dialer/searchfragment/list/res/layout/fragment_search.xml
similarity index 100%
rename from java/com/android/dialer/searchfragment/res/layout/fragment_search.xml
rename to java/com/android/dialer/searchfragment/list/res/layout/fragment_search.xml
diff --git a/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml b/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml
new file mode 100644
index 0000000000000000000000000000000000000000..36af42ed9f2986b9d60836cd53765ca7f2b525fb
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml
@@ -0,0 +1,22 @@
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/AndroidManifest.xml b/java/com/android/dialer/searchfragment/nearbyplaces/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..178cd83c3967d4c5314ced7f9cd1fd315ef77738
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/AndroidManifest.xml
@@ -0,0 +1,16 @@
+
+
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlaceViewHolder.java b/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlaceViewHolder.java
new file mode 100644
index 0000000000000000000000000000000000000000..b6e5a9013f65310be3c15fe4286d50572ea498e2
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlaceViewHolder.java
@@ -0,0 +1,90 @@
+/*
+ * 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.searchfragment.nearbyplaces;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.ContactsContract;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.QuickContactBadge;
+import android.widget.TextView;
+import com.android.contacts.common.ContactPhotoManager;
+import com.android.contacts.common.lettertiles.LetterTileDrawable;
+import com.android.dialer.callintent.CallInitiationType;
+import com.android.dialer.callintent.CallIntentBuilder;
+import com.android.dialer.searchfragment.common.Projections;
+import com.android.dialer.searchfragment.common.QueryBoldingUtil;
+import com.android.dialer.searchfragment.common.R;
+import com.android.dialer.telecom.TelecomUtil;
+
+/** ViewHolder for a nearby place row. */
+public final class NearbyPlaceViewHolder extends RecyclerView.ViewHolder
+ implements View.OnClickListener {
+
+ private final Context context;
+ private final TextView placeName;
+ private final TextView placeAddress;
+ private final QuickContactBadge photo;
+
+ private String number;
+
+ public NearbyPlaceViewHolder(View view) {
+ super(view);
+ view.setOnClickListener(this);
+ photo = view.findViewById(R.id.photo);
+ placeName = view.findViewById(R.id.primary);
+ placeAddress = view.findViewById(R.id.secondary);
+ context = view.getContext();
+ }
+
+ /**
+ * Binds the ViewHolder with a cursor from {@link NearbyPlacesCursorLoader} with the data found at
+ * the cursors set position.
+ */
+ public void bind(Cursor cursor, String query) {
+ number = cursor.getString(Projections.PHONE_NUMBER);
+ String name = cursor.getString(Projections.PHONE_DISPLAY_NAME);
+ String address = cursor.getString(Projections.PHONE_LABEL);
+
+ placeName.setText(QueryBoldingUtil.getNameWithQueryBolded(query, name));
+ placeAddress.setText(QueryBoldingUtil.getNameWithQueryBolded(query, address));
+
+ String photoUri = cursor.getString(Projections.PHONE_PHOTO_URI);
+ ContactPhotoManager.getInstance(context)
+ .loadDialerThumbnailOrPhoto(
+ photo,
+ getContactUri(cursor),
+ cursor.getLong(Projections.PHONE_PHOTO_ID),
+ photoUri == null ? null : Uri.parse(photoUri),
+ name,
+ LetterTileDrawable.TYPE_DEFAULT);
+ }
+
+ private static Uri getContactUri(Cursor cursor) {
+ long contactId = cursor.getLong(Projections.PHONE_ID);
+ String lookupKey = cursor.getString(Projections.PHONE_LOOKUP_KEY);
+ return ContactsContract.Contacts.getLookupUri(contactId, lookupKey);
+ }
+
+ @Override
+ public void onClick(View v) {
+ TelecomUtil.placeCall(
+ context, new CallIntentBuilder(number, CallInitiationType.Type.REGULAR_SEARCH).build());
+ }
+}
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlacesCursorLoader.java b/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlacesCursorLoader.java
new file mode 100644
index 0000000000000000000000000000000000000000..9f3193e9223aa3aea3cc0cdafa26b2b16a78150a
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlacesCursorLoader.java
@@ -0,0 +1,43 @@
+/*
+ * 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.searchfragment.nearbyplaces;
+
+import android.content.Context;
+import android.content.CursorLoader;
+import android.net.Uri;
+import android.provider.ContactsContract;
+import com.android.contacts.common.extensions.PhoneDirectoryExtenderAccessor;
+import com.android.dialer.searchfragment.common.Projections;
+
+/** Cursor loader for nearby places search results. */
+public final class NearbyPlacesCursorLoader extends CursorLoader {
+
+ private static final String MAX_RESULTS = "3";
+
+ public NearbyPlacesCursorLoader(Context context, String query) {
+ super(context, getContentUri(context, query), Projections.PHONE_PROJECTION, null, null, null);
+ }
+
+ private static Uri getContentUri(Context context, String query) {
+ return PhoneDirectoryExtenderAccessor.get(context)
+ .getContentUri()
+ .buildUpon()
+ .appendPath(query)
+ .appendQueryParameter(ContactsContract.LIMIT_PARAM_KEY, MAX_RESULTS)
+ .build();
+ }
+}
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-af/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-af/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..21eb4b11d9294e4f391b466808d55022c9b88396
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-af/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "Nabygeleë plekke"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-am/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-am/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-am/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ar/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ar/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d68b4d1ee597c89bd13b6847151358cf3441bf47
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ar/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "الأماكن المجاورة"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-az/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-az/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-az/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bb9f06fe7666dc25c37ce0772e1dcdbf203098d6
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "Obližnja mesta"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-be/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-be/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-be/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bg/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bg/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e8839532afe089d68c977109bfcb6ca0cc595881
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bg/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "Места в района"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bn/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bn/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4bc3fedb43c4771fe4fde7baa6d883d12b615d2d
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bn/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "আশপাশের জায়গাগুলি"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bs/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bs/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f3fb92187d7646892eb4458da74302a49aa7f2c0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bs/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "Mjesta u blizini"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ca/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ca/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ca/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-cs/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-cs/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-cs/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-da/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-da/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-da/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-de/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-de/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9e2db4a325a92027be618f36cae024a7040b41f4
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-de/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "Orte in der Nähe"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-el/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-el/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-el/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rAU/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0778273154aa2ca279c4b76ee535cf76aca62478
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rAU/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "Places nearby"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rGB/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0778273154aa2ca279c4b76ee535cf76aca62478
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rGB/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "Places nearby"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rIN/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0778273154aa2ca279c4b76ee535cf76aca62478
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rIN/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "Places nearby"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es-rUS/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es-rUS/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fada6bcafe7c9e9e7609ff5f2c90d3e0e06e0d0c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "Sitios cercanos"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-et/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-et/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-et/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-eu/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-eu/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-eu/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fa/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fa/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fa/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fi/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fi/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fi/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr-rCA/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d65e7bd5523b72fec6a03a98557f473cb8845497
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr-rCA/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "Adresses à proximité"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d65e7bd5523b72fec6a03a98557f473cb8845497
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "Adresses à proximité"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gl/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gl/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5a4cce7e083ded49212424f447978e25f63dd28e
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gl/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "Lugares próximos"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gu/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gu/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ee32e466f8a3d1d178fd15bb807b93fbae929647
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gu/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "નજીકના સ્થળો"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hi/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hi/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..079c03e0467d55bf2cf575157d9c7c8bb50e6355
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hi/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "आस-पास के स्थल"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hr/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hr/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hr/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hu/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hu/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hu/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hy/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hy/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3a2ba393844375cbf4bc148c25a347f9cbe3d0d7
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hy/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "Մոտակա վայրեր"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-in/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-in/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-in/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-is/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-is/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-is/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-it/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-it/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-it/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-iw/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-iw/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0f07995f3283ada28bbe4d59e7242cf213dc9f97
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-iw/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "מקומות קרובים"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ja/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ja/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ja/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ka/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ka/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ka/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kk/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kk/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kk/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-km/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-km/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-km/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kn/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kn/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kn/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ko/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ko/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f05a332898f22ac965e3701c0d81bdd4d0cb5023
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ko/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "주변 장소"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ky/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ky/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ky/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lo/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lo/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2ff0e854821f2e3355b3b7d31c843a1e9634f59d
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lo/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "ສະຖານທີ່ໃກ້ຄຽງ"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lt/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lt/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9baf54044cb04a2a7e41135a81dea1eb0a50deb9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lt/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "Netoliese esančios vietos"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lv/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lv/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lv/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mk/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mk/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mk/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ml/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ml/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ml/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mn/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mn/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..707a6c955947258b5dd6eacf9a57bf380a62fec9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mn/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "Ойролцоох газрууд"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mr/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mr/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..862cd041947e54a6bf880032c1d07fb0d1e4674a
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mr/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "जवळपासची ठिकाणे"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ms/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ms/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..aed0bbb4d01aa09b3c20cf78b57a20cb066180f9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ms/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "Tempat berdekatan"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-my/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-my/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..74e60a089f939f082ac6ec457332ddd7c39548fa
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-my/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "အနီးတဝိုက်ရှိ နေရာများ"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nb/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nb/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nb/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ne/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ne/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..29b6854fec040a372eb910ea83a8fdd54d784528
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ne/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "नजिकका स्थानहरू"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nl/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nl/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nl/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-no/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-no/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-no/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pa/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pa/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1d4d472a3c8eb8125cbe674c8e9f33341b9af0bb
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pa/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "ਨਜ਼ਦੀਕੀ ਸਥਾਨ"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pl/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pl/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c00b6081a86bcf050986da5b05eb78100236b820
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pl/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "Miejsca w pobliżu"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rBR/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rBR/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rPT/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rPT/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ro/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ro/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ro/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ru/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ru/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ru/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-si/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-si/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-si/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sk/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sk/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sk/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sl/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sl/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sl/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sq/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sq/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sq/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sr/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sr/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..21af04328e32dc8ad10441feab6f978f01776004
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sr/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "Оближња места"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sv/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sv/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c309b8df47575787c09a6da1fc11e925c7660b53
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sv/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "Platser i närheten"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sw/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sw/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sw/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ta/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ta/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ce7496e530a17dac5e746e744f5995da41bf0f81
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ta/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "அருகிலுள்ள இடங்கள்"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-te/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-te/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c8229fb649c491fe80e2ec1fbc59de475a1c156f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-te/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "సమీప స్థలాలు"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-th/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-th/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1167d2f57b023f5b7ea8e1a94e9aee649c250bb1
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-th/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "สถานที่ใกล้เคียง"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tl/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tl/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tl/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tr/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tr/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tr/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uk/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uk/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a3936be25633040dfe21bc9b6c56fd23e931288b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uk/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "Місця поблизу"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ur/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ur/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1a220b3c22a11b9bc2c7751e4f6cf9b53476dd95
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ur/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "قریبی مقامات"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uz/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uz/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uz/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-vi/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-vi/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-vi/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rCN/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e060cb589fa91b14e3fc5c35ccfb99abfe1bf82f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rCN/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "附近的地点"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rHK/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5cdf5b9a77fbe5e83e31db5c783d01bc4d84776f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rHK/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ "附近地點"
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rTW/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rTW/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zu/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zu/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8039ea04abe795cd14324416cdfb01861c56db5c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zu/strings.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/java/com/android/dialer/notification/res/values/ids.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values/strings.xml
similarity index 59%
rename from java/com/android/dialer/notification/res/values/ids.xml
rename to java/com/android/dialer/searchfragment/nearbyplaces/res/values/strings.xml
index c965f319d89b5a676ceb530e9884d18b6e3c3056..ed8068018b125d372b34d0f87bf81e375f7b87b3 100644
--- a/java/com/android/dialer/notification/res/values/ids.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values/strings.xml
@@ -14,14 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
-
-