From 9779f967ebb9512e5b19090b071572c9c4f0f2a6 Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Mon, 27 Mar 2017 12:31:48 -0700 Subject: Update AOSP Dialer source from internal google3 repository at cl/151342913. Test: make, treehugger This CL updates the AOSP Dialer source with all the changes that have gone into the private google3 repository. This includes all the changes from cl/151128062 (3/24/2017) to cl/151342913 (3/27/2017). This goal of these drops is to keep the AOSP source in sync with the internal google3 repository. Currently these sync are done by hand with very minor modifications to the internal source code. See the Android.mk file for list of modifications. Our current goal is to do frequent drops (daily if possible) and eventually switched to an automated process. Change-Id: I8d4855628b62e9067e71f32ed40317617a1e3b02 --- .../contacts/common/res/values-mr/strings.xml | 2 +- .../android/dialer/app/calllog/CallLogAdapter.java | 19 +- .../dialer/app/calllog/CallLogAsyncTaskUtil.java | 4 +- .../dialer/app/contactinfo/ContactInfoCache.java | 34 +-- .../android/dialer/app/res/values-ne/strings.xml | 2 +- .../android/dialer/app/res/values-uz/strings.xml | 4 +- .../app/voicemail/VoicemailPlaybackPresenter.java | 4 +- .../callcomposer/camera/ImagePersistTask.java | 2 +- .../callcomposer/util/CopyAndResizeImageTask.java | 2 +- .../dialer/calldetails/CallDetailsActivity.java | 2 +- .../android/dialer/common/AsyncTaskExecutor.java | 51 ---- .../android/dialer/common/AsyncTaskExecutors.java | 91 ------- .../android/dialer/common/FallibleAsyncTask.java | 94 ------- .../common/concurrent/AsyncTaskExecutor.java | 51 ++++ .../common/concurrent/AsyncTaskExecutors.java | 92 +++++++ .../common/concurrent/DialerAsyncTaskHelper.java | 2 - .../common/concurrent/FallibleAsyncTask.java | 94 +++++++ .../dialer/enrichedcall/RcsVideoShareFactory.java | 1 + java/com/android/dialer/oem/AndroidManifest.xml | 15 ++ .../android/dialer/oem/CequintCallerIdManager.java | 297 +++++++++++++++++++++ .../dialer/phonenumbercache/ContactInfo.java | 11 +- .../dialer/phonenumbercache/ContactInfoHelper.java | 38 ++- .../dialer/shortcuts/ShortcutRefresher.java | 6 +- .../dialer/shortcuts/ShortcutUsageReporter.java | 4 +- java/com/android/incallui/AndroidManifest.xml | 4 + java/com/android/incallui/ContactInfoCache.java | 27 ++ .../incallui/answer/impl/AnswerFragment.java | 5 +- .../answer/impl/hint/res/values-af/strings.xml | 6 +- .../answer/impl/hint/res/values-am/strings.xml | 6 +- .../answer/impl/hint/res/values-ar/strings.xml | 6 +- .../answer/impl/hint/res/values-az/strings.xml | 6 +- .../answer/impl/hint/res/values-be/strings.xml | 6 +- .../answer/impl/hint/res/values-bg/strings.xml | 6 +- .../answer/impl/hint/res/values-bn/strings.xml | 6 +- .../answer/impl/hint/res/values-bs/strings.xml | 6 +- .../answer/impl/hint/res/values-ca/strings.xml | 6 +- .../answer/impl/hint/res/values-cs/strings.xml | 6 +- .../answer/impl/hint/res/values-da/strings.xml | 6 +- .../answer/impl/hint/res/values-de/strings.xml | 6 +- .../answer/impl/hint/res/values-el/strings.xml | 6 +- .../answer/impl/hint/res/values-en-rAU/strings.xml | 6 +- .../answer/impl/hint/res/values-en-rGB/strings.xml | 6 +- .../answer/impl/hint/res/values-en-rIN/strings.xml | 6 +- .../answer/impl/hint/res/values-es-rUS/strings.xml | 6 +- .../answer/impl/hint/res/values-es/strings.xml | 6 +- .../answer/impl/hint/res/values-et/strings.xml | 6 +- .../answer/impl/hint/res/values-eu/strings.xml | 6 +- .../answer/impl/hint/res/values-fa/strings.xml | 6 +- .../answer/impl/hint/res/values-fi/strings.xml | 6 +- .../answer/impl/hint/res/values-fr-rCA/strings.xml | 6 +- .../answer/impl/hint/res/values-fr/strings.xml | 6 +- .../answer/impl/hint/res/values-gl/strings.xml | 6 +- .../answer/impl/hint/res/values-gu/strings.xml | 6 +- .../answer/impl/hint/res/values-hi/strings.xml | 6 +- .../answer/impl/hint/res/values-hr/strings.xml | 6 +- .../answer/impl/hint/res/values-hu/strings.xml | 6 +- .../answer/impl/hint/res/values-hy/strings.xml | 6 +- .../answer/impl/hint/res/values-in/strings.xml | 6 +- .../answer/impl/hint/res/values-is/strings.xml | 6 +- .../answer/impl/hint/res/values-it/strings.xml | 6 +- .../answer/impl/hint/res/values-iw/strings.xml | 6 +- .../answer/impl/hint/res/values-ja/strings.xml | 6 +- .../answer/impl/hint/res/values-ka/strings.xml | 6 +- .../answer/impl/hint/res/values-kk/strings.xml | 6 +- .../answer/impl/hint/res/values-km/strings.xml | 6 +- .../answer/impl/hint/res/values-kn/strings.xml | 6 +- .../answer/impl/hint/res/values-ko/strings.xml | 6 +- .../answer/impl/hint/res/values-ky/strings.xml | 6 +- .../answer/impl/hint/res/values-lo/strings.xml | 6 +- .../answer/impl/hint/res/values-lt/strings.xml | 6 +- .../answer/impl/hint/res/values-lv/strings.xml | 6 +- .../answer/impl/hint/res/values-mk/strings.xml | 6 +- .../answer/impl/hint/res/values-ml/strings.xml | 6 +- .../answer/impl/hint/res/values-mn/strings.xml | 6 +- .../answer/impl/hint/res/values-mr/strings.xml | 6 +- .../answer/impl/hint/res/values-ms/strings.xml | 6 +- .../answer/impl/hint/res/values-my/strings.xml | 6 +- .../answer/impl/hint/res/values-nb/strings.xml | 6 +- .../answer/impl/hint/res/values-ne/strings.xml | 6 +- .../answer/impl/hint/res/values-nl/strings.xml | 6 +- .../answer/impl/hint/res/values-no/strings.xml | 6 +- .../answer/impl/hint/res/values-pa/strings.xml | 6 +- .../answer/impl/hint/res/values-pl/strings.xml | 6 +- .../answer/impl/hint/res/values-pt-rBR/strings.xml | 6 +- .../answer/impl/hint/res/values-pt-rPT/strings.xml | 6 +- .../answer/impl/hint/res/values-pt/strings.xml | 6 +- .../answer/impl/hint/res/values-ro/strings.xml | 6 +- .../answer/impl/hint/res/values-ru/strings.xml | 6 +- .../answer/impl/hint/res/values-si/strings.xml | 6 +- .../answer/impl/hint/res/values-sk/strings.xml | 6 +- .../answer/impl/hint/res/values-sl/strings.xml | 6 +- .../answer/impl/hint/res/values-sq/strings.xml | 6 +- .../answer/impl/hint/res/values-sr/strings.xml | 6 +- .../answer/impl/hint/res/values-sv/strings.xml | 6 +- .../answer/impl/hint/res/values-sw/strings.xml | 6 +- .../answer/impl/hint/res/values-ta/strings.xml | 6 +- .../answer/impl/hint/res/values-te/strings.xml | 6 +- .../answer/impl/hint/res/values-th/strings.xml | 6 +- .../answer/impl/hint/res/values-tl/strings.xml | 6 +- .../answer/impl/hint/res/values-tr/strings.xml | 6 +- .../answer/impl/hint/res/values-uk/strings.xml | 6 +- .../answer/impl/hint/res/values-ur/strings.xml | 6 +- .../answer/impl/hint/res/values-uz/strings.xml | 6 +- .../answer/impl/hint/res/values-vi/strings.xml | 6 +- .../answer/impl/hint/res/values-zh-rCN/strings.xml | 6 +- .../answer/impl/hint/res/values-zh-rHK/strings.xml | 6 +- .../answer/impl/hint/res/values-zh-rTW/strings.xml | 6 +- .../answer/impl/hint/res/values-zu/strings.xml | 6 +- .../incallui/answer/impl/res/values-bn/strings.xml | 6 +- .../incallui/answer/impl/res/values-ca/strings.xml | 4 +- .../incallui/answer/impl/res/values-de/strings.xml | 10 +- .../incallui/answer/impl/res/values-es/strings.xml | 10 +- .../incallui/answer/impl/res/values-th/strings.xml | 4 +- .../BlockedNumberContentObserver.java | 4 +- .../incallui/spam/NumberInCallHistoryTask.java | 4 +- .../videotech/utils/SessionModificationState.java | 1 + 116 files changed, 864 insertions(+), 623 deletions(-) delete mode 100644 java/com/android/dialer/common/AsyncTaskExecutor.java delete mode 100644 java/com/android/dialer/common/AsyncTaskExecutors.java delete mode 100644 java/com/android/dialer/common/FallibleAsyncTask.java create mode 100644 java/com/android/dialer/common/concurrent/AsyncTaskExecutor.java create mode 100644 java/com/android/dialer/common/concurrent/AsyncTaskExecutors.java create mode 100644 java/com/android/dialer/common/concurrent/FallibleAsyncTask.java create mode 100644 java/com/android/dialer/oem/CequintCallerIdManager.java (limited to 'java') diff --git a/java/com/android/contacts/common/res/values-mr/strings.xml b/java/com/android/contacts/common/res/values-mr/strings.xml index ee3af801f..72e52823b 100644 --- a/java/com/android/contacts/common/res/values-mr/strings.xml +++ b/java/com/android/contacts/common/res/values-mr/strings.xml @@ -46,7 +46,7 @@ "मोबाईलवर मजकूर पाठवा" "कार्यस्थानी मजकूर पाठवा" "कार्य फॅक्सवर मजकूर पाठवा" - "निवासस्थान फॅक्सवर मजकूर पाठवा" + "घर फॅक्सवर मजकूर पाठवा" "पेजरवर मजकूर पाठवा" "मजकूर" "कॉलबॅक वर मजकूर पाठवा" diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java index b23e18d6b..301fc009e 100644 --- a/java/com/android/dialer/app/calllog/CallLogAdapter.java +++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java @@ -58,9 +58,9 @@ import com.android.dialer.calldetails.nano.CallDetailsEntries.CallDetailsEntry; import com.android.dialer.calllogutils.PhoneAccountUtils; import com.android.dialer.calllogutils.PhoneCallDetails; import com.android.dialer.common.Assert; -import com.android.dialer.common.AsyncTaskExecutor; -import com.android.dialer.common.AsyncTaskExecutors; import com.android.dialer.common.LogUtil; +import com.android.dialer.common.concurrent.AsyncTaskExecutor; +import com.android.dialer.common.concurrent.AsyncTaskExecutors; import com.android.dialer.enrichedcall.EnrichedCallCapabilities; import com.android.dialer.enrichedcall.EnrichedCallComponent; import com.android.dialer.enrichedcall.EnrichedCallManager; @@ -457,6 +457,7 @@ public class CallLogAdapter extends GroupingListAdapter final long rowId, final PhoneCallDetails details, final CallDetailsEntries callDetailsEntries) { + LogUtil.d("CallLogAdapter.loadAndRender", "position: %d", views.getAdapterPosition()); // Reset block and spam information since this view could be reused which may contain // outdated data. views.isSpam = false; @@ -667,12 +668,13 @@ public class CallLogAdapter extends GroupingListAdapter && !isVoicemailNumber) { // Lookup contacts with this number // Only do remote lookup in first 5 rows. + int position = views.getAdapterPosition(); info = mContactInfoCache.getValue( details.number + details.postDialDigits, details.countryIso, details.cachedContactInfo, - rowId + position < Bindings.get(mActivity) .getConfigProvider() .getLong("number_of_call_to_do_remote_lookup", 5L)); @@ -699,6 +701,17 @@ public class CallLogAdapter extends GroupingListAdapter details.objectId = info.objectId; details.contactUserType = info.userType; } + LogUtil.d( + "CallLogAdapter.loadData", + "position:%d, update geo info: %s, cequint caller id geo: %s, photo uri: %s <- %s", + views.getAdapterPosition(), + details.geocode, + info.geoDescription, + details.photoUri, + info.photoUri); + if (!TextUtils.isEmpty(info.geoDescription)) { + details.geocode = info.geoDescription; + } views.info = info; views.numberType = diff --git a/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java b/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java index 2198626d6..2aedb6f17 100644 --- a/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java +++ b/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java @@ -28,8 +28,8 @@ import android.provider.VoicemailContract.Voicemails; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; -import com.android.dialer.common.AsyncTaskExecutor; -import com.android.dialer.common.AsyncTaskExecutors; +import com.android.dialer.common.concurrent.AsyncTaskExecutor; +import com.android.dialer.common.concurrent.AsyncTaskExecutors; import com.android.dialer.util.PermissionsUtil; import com.android.voicemail.VoicemailClient; diff --git a/java/com/android/dialer/app/contactinfo/ContactInfoCache.java b/java/com/android/dialer/app/contactinfo/ContactInfoCache.java index 6c35711a8..ab5541b6f 100644 --- a/java/com/android/dialer/app/contactinfo/ContactInfoCache.java +++ b/java/com/android/dialer/app/contactinfo/ContactInfoCache.java @@ -18,9 +18,11 @@ package com.android.dialer.app.contactinfo; import android.os.Handler; import android.os.Message; +import android.os.SystemClock; import android.support.annotation.NonNull; import android.support.annotation.VisibleForTesting; import android.text.TextUtils; +import com.android.dialer.common.LogUtil; import com.android.dialer.phonenumbercache.ContactInfo; import com.android.dialer.phonenumbercache.ContactInfoHelper; import com.android.dialer.util.ExpirableCache; @@ -97,39 +99,29 @@ public class ContactInfoCache { NumberWithCountryIso numberCountryIso = new NumberWithCountryIso(number, countryIso); ExpirableCache.CachedValue cachedInfo = mCache.getCachedValue(numberCountryIso); ContactInfo info = cachedInfo == null ? null : cachedInfo.getValue(); + int requestType = + remoteLookupIfNotFoundLocally + ? ContactInfoRequest.TYPE_LOCAL_AND_REMOTE + : ContactInfoRequest.TYPE_LOCAL; if (cachedInfo == null) { mCache.put(numberCountryIso, ContactInfo.EMPTY); // Use the cached contact info from the call log. info = callLogContactInfo; // The db request should happen on a non-UI thread. // Request the contact details immediately since they are currently missing. - int requestType = - remoteLookupIfNotFoundLocally - ? ContactInfoRequest.TYPE_LOCAL_AND_REMOTE - : ContactInfoRequest.TYPE_LOCAL; enqueueRequest(number, countryIso, callLogContactInfo, /* immediate */ true, requestType); // We will format the phone number when we make the background request. } else { if (cachedInfo.isExpired()) { // The contact info is no longer up to date, we should request it. However, we // do not need to request them immediately. - enqueueRequest( - number, - countryIso, - callLogContactInfo, /* immediate */ - false, - ContactInfoRequest.TYPE_LOCAL); + enqueueRequest(number, countryIso, callLogContactInfo, /* immediate */ false, requestType); } else if (!callLogInfoMatches(callLogContactInfo, info)) { // The call log information does not match the one we have, look it up again. // We could simply update the call log directly, but that needs to be done in a // background thread, so it is easier to simply request a new lookup, which will, as // a side-effect, update the call log. - enqueueRequest( - number, - countryIso, - callLogContactInfo, /* immediate */ - false, - ContactInfoRequest.TYPE_LOCAL); + enqueueRequest(number, countryIso, callLogContactInfo, /* immediate */ false, requestType); } if (info == ContactInfo.EMPTY) { @@ -152,9 +144,19 @@ public class ContactInfoCache { * to update its content. */ private boolean queryContactInfo(ContactInfoRequest request) { + LogUtil.d( + "ContactInfoCache.queryContactInfo", + "request number: %s, type: %d", + LogUtil.sanitizePhoneNumber(request.number), + request.type); ContactInfo info; if (request.isLocalRequest()) { info = mContactInfoHelper.lookupNumber(request.number, request.countryIso); + // TODO: Maybe skip look up if it's already available in cached number lookup service. + long start = SystemClock.uptimeMillis(); + mContactInfoHelper.updateFromCequintCallerId(info, request.number); + long time = SystemClock.uptimeMillis() - start; + LogUtil.d("ContactInfoCache.queryContactInfo", "Cequint Caller Id look up takes %d ms", time); if (request.type == ContactInfoRequest.TYPE_LOCAL_AND_REMOTE) { if (!mContactInfoHelper.hasName(info)) { enqueueRequest( 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 29eaccdb5..33989648e 100644 --- a/java/com/android/dialer/app/res/values-ne/strings.xml +++ b/java/com/android/dialer/app/res/values-ne/strings.xml @@ -193,7 +193,7 @@ "कल रोक्दै" "भ्वाइस मेल" "कल अवरुद्ध अस्थायी रुपमा निष्क्रिय" - "कल अवरुद्ध अस्थायी रुपमा असक्षम गरिएको छ किनभने तपाईँले अन्तिम ४८ घण्टा भित्र यस फोनबाट आपत्कालीन सेवाहरू सम्पर्क गर्नुभयो। एकपटक ४८ घण्टा अवधि समाप्त भएपछि यो स्वचालित रूपले पुनः सक्रिय हुनेछ।" + "कल अवरुद्ध अस्थायी रुपमा असक्षम गरिएको छ किनभने तपाईँले अन्तिम ४८ घन्टा भित्र यस फोनबाट आपत्कालीन सेवाहरू सम्पर्क गर्नुभयो। एकपटक ४८ घन्टा अवधि समाप्त भएपछि यो स्वचालित रूपले पुनः सक्रिय हुनेछ।" "नम्बरहरू आयात गर्नुहोस्" "तपाईँले पहिल्यै केही कल गर्ने व्यक्तिहरूलाई अन्य अनुप्रयोगहरू मार्फत स्वत: रूपमा भ्वाइस मेल पठाउन नै चिन्ह लगाउनु भएको थियो।" "नम्बरहरू हेर्नुहोस्" 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 d26c53cf4..11befbc51 100644 --- a/java/com/android/dialer/app/res/values-uz/strings.xml +++ b/java/com/android/dialer/app/res/values-uz/strings.xml @@ -40,7 +40,7 @@ "Javobsiz chaqiruvlar" "%d ta javobsiz chaqiruv" "Telefon" - "SMS yuborish" + "SMS yozish" "%1$s: %2$s" %1$d ta ovozli xabar @@ -143,7 +143,7 @@ "Barcha raqamlarni ko‘rish uchun rasm ustiga bosing yoki joyini o‘zgartirish uchun rasmni bosib turing." "O‘chirish" "Video qo‘ng‘iroq" - "SMS yuborish" + "Xabar yuborish" "Chaqiruv tafsilotlari" "Yuborish:" "Qo‘ng‘iroq qilish: ^1" diff --git a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java index 994160ff9..492f2088b 100644 --- a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java +++ b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java @@ -46,10 +46,10 @@ import com.android.common.io.MoreCloseables; import com.android.dialer.app.R; import com.android.dialer.app.calllog.CallLogListItemViewHolder; import com.android.dialer.common.Assert; -import com.android.dialer.common.AsyncTaskExecutor; -import com.android.dialer.common.AsyncTaskExecutors; import com.android.dialer.common.ConfigProviderBindings; import com.android.dialer.common.LogUtil; +import com.android.dialer.common.concurrent.AsyncTaskExecutor; +import com.android.dialer.common.concurrent.AsyncTaskExecutors; import com.android.dialer.constants.Constants; import com.android.dialer.logging.Logger; import com.android.dialer.logging.nano.DialerImpression; diff --git a/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java b/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java index a23014bf0..80921cdd8 100644 --- a/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java +++ b/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java @@ -29,7 +29,7 @@ import com.android.dialer.callcomposer.camera.exif.ExifInterface; import com.android.dialer.callcomposer.camera.exif.ExifTag; import com.android.dialer.callcomposer.util.CopyAndResizeImageTask; import com.android.dialer.common.Assert; -import com.android.dialer.common.FallibleAsyncTask; +import com.android.dialer.common.concurrent.FallibleAsyncTask; import com.android.dialer.constants.Constants; import com.android.dialer.util.DialerUtils; import java.io.File; diff --git a/java/com/android/dialer/callcomposer/util/CopyAndResizeImageTask.java b/java/com/android/dialer/callcomposer/util/CopyAndResizeImageTask.java index 83580fd38..be08555f9 100644 --- a/java/com/android/dialer/callcomposer/util/CopyAndResizeImageTask.java +++ b/java/com/android/dialer/callcomposer/util/CopyAndResizeImageTask.java @@ -26,8 +26,8 @@ import android.os.Build.VERSION_CODES; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import com.android.dialer.common.Assert; -import com.android.dialer.common.FallibleAsyncTask; import com.android.dialer.common.LogUtil; +import com.android.dialer.common.concurrent.FallibleAsyncTask; import com.android.dialer.util.DialerUtils; import java.io.File; import java.io.FileOutputStream; diff --git a/java/com/android/dialer/calldetails/CallDetailsActivity.java b/java/com/android/dialer/calldetails/CallDetailsActivity.java index 6070640a0..bb2f58083 100644 --- a/java/com/android/dialer/calldetails/CallDetailsActivity.java +++ b/java/com/android/dialer/calldetails/CallDetailsActivity.java @@ -32,7 +32,7 @@ import com.android.dialer.callcomposer.nano.CallComposerContact; import com.android.dialer.calldetails.nano.CallDetailsEntries; import com.android.dialer.calldetails.nano.CallDetailsEntries.CallDetailsEntry; import com.android.dialer.common.Assert; -import com.android.dialer.common.AsyncTaskExecutors; +import com.android.dialer.common.concurrent.AsyncTaskExecutors; import com.android.dialer.logging.Logger; import com.android.dialer.logging.nano.DialerImpression; import com.android.dialer.protos.ProtoParsers; diff --git a/java/com/android/dialer/common/AsyncTaskExecutor.java b/java/com/android/dialer/common/AsyncTaskExecutor.java deleted file mode 100644 index caadfe7ce..000000000 --- a/java/com/android/dialer/common/AsyncTaskExecutor.java +++ /dev/null @@ -1,51 +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.common; - -import android.os.AsyncTask; -import android.support.annotation.MainThread; -import java.util.concurrent.Executor; - -/** - * Interface used to submit {@link AsyncTask} objects to run in the background. - * - *

This interface has a direct parallel with the {@link Executor} interface. It exists to - * decouple the mechanics of AsyncTask submission from the description of how that AsyncTask will - * execute. - * - *

One immediate benefit of this approach is that testing becomes much easier, since it is easy - * to introduce a mock or fake AsyncTaskExecutor in unit/integration tests, and thus inspect which - * tasks have been submitted and control their execution in an orderly manner. - * - *

Another benefit in due course will be the management of the submitted tasks. An extension to - * this interface is planned to allow Activities to easily cancel all the submitted tasks that are - * still pending in the onDestroy() method of the Activity. - */ -public interface AsyncTaskExecutor { - - /** - * Executes the given AsyncTask with the default Executor. - * - *

This method must only be called from the ui thread. - * - *

The identifier supplied is any Object that can be used to identify the task later. Most - * commonly this will be an enum which the tests can also refer to. {@code null} is also accepted, - * though of course this won't help in identifying the task later. - */ - @MainThread - AsyncTask submit(Object identifier, AsyncTask task, T... params); -} diff --git a/java/com/android/dialer/common/AsyncTaskExecutors.java b/java/com/android/dialer/common/AsyncTaskExecutors.java deleted file mode 100644 index 77bebdb36..000000000 --- a/java/com/android/dialer/common/AsyncTaskExecutors.java +++ /dev/null @@ -1,91 +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.common; - -import android.os.AsyncTask; -import android.support.annotation.MainThread; -import java.util.concurrent.Executor; - -/** - * Factory methods for creating AsyncTaskExecutors. - * - *

All of the factory methods on this class check first to see if you have set a static {@link - * AsyncTaskExecutorFactory} set through the {@link #setFactoryForTest(AsyncTaskExecutorFactory)} - * method, and if so delegate to that instead, which is one way of injecting dependencies for - * testing classes whose construction cannot be controlled such as {@link android.app.Activity}. - */ -public final class AsyncTaskExecutors { - - /** - * A single instance of the {@link AsyncTaskExecutorFactory}, to which we delegate if it is - * non-null, for injecting when testing. - */ - private static AsyncTaskExecutorFactory mInjectedAsyncTaskExecutorFactory = null; - - /** - * Creates an AsyncTaskExecutor that submits tasks to run with {@link AsyncTask#SERIAL_EXECUTOR}. - */ - public static AsyncTaskExecutor createAsyncTaskExecutor() { - synchronized (AsyncTaskExecutors.class) { - if (mInjectedAsyncTaskExecutorFactory != null) { - return mInjectedAsyncTaskExecutorFactory.createAsyncTaskExeuctor(); - } - return new SimpleAsyncTaskExecutor(AsyncTask.SERIAL_EXECUTOR); - } - } - - /** - * Creates an AsyncTaskExecutor that submits tasks to run with {@link - * AsyncTask#THREAD_POOL_EXECUTOR}. - */ - public static AsyncTaskExecutor createThreadPoolExecutor() { - synchronized (AsyncTaskExecutors.class) { - if (mInjectedAsyncTaskExecutorFactory != null) { - return mInjectedAsyncTaskExecutorFactory.createAsyncTaskExeuctor(); - } - return new SimpleAsyncTaskExecutor(AsyncTask.THREAD_POOL_EXECUTOR); - } - } - - public static void setFactoryForTest(AsyncTaskExecutorFactory factory) { - synchronized (AsyncTaskExecutors.class) { - mInjectedAsyncTaskExecutorFactory = factory; - } - } - - /** Interface for creating AsyncTaskExecutor objects. */ - public interface AsyncTaskExecutorFactory { - - AsyncTaskExecutor createAsyncTaskExeuctor(); - } - - private static class SimpleAsyncTaskExecutor implements AsyncTaskExecutor { - - private final Executor mExecutor; - - public SimpleAsyncTaskExecutor(Executor executor) { - mExecutor = executor; - } - - @Override - @MainThread - public AsyncTask submit(Object identifer, AsyncTask task, T... params) { - Assert.isMainThread(); - return task.executeOnExecutor(mExecutor, params); - } - } -} diff --git a/java/com/android/dialer/common/FallibleAsyncTask.java b/java/com/android/dialer/common/FallibleAsyncTask.java deleted file mode 100644 index f3abace1a..000000000 --- a/java/com/android/dialer/common/FallibleAsyncTask.java +++ /dev/null @@ -1,94 +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.common; - -import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import com.android.dialer.common.FallibleAsyncTask.FallibleTaskResult; -import com.google.auto.value.AutoValue; - -/** - * A task that runs work in the background, passing Throwables from {@link - * #doInBackground(Object[])} to {@link #onPostExecute(Object)} through a {@link - * FallibleTaskResult}. - * - * @param the type of the parameters sent to the task upon execution - * @param the type of the progress units published during the background computation - * @param the type of the result of the background computation - */ -public abstract class FallibleAsyncTask - extends AsyncTask> { - - @Override - protected final FallibleTaskResult doInBackground(ParamsT... params) { - try { - return FallibleTaskResult.createSuccessResult(doInBackgroundFallible(params)); - } catch (Throwable t) { - return FallibleTaskResult.createFailureResult(t); - } - } - - /** Performs background work that may result in a Throwable. */ - @Nullable - protected abstract ResultT doInBackgroundFallible(ParamsT... params) throws Throwable; - - /** - * Holds the result of processing from {@link #doInBackground(Object[])}. - * - * @param the type of the result of the background computation - */ - @AutoValue - public abstract static class FallibleTaskResult { - - /** Creates an instance of FallibleTaskResult for the given throwable. */ - private static FallibleTaskResult createFailureResult(@NonNull Throwable t) { - return new AutoValue_FallibleAsyncTask_FallibleTaskResult<>(t, null); - } - - /** Creates an instance of FallibleTaskResult for the given result. */ - private static FallibleTaskResult createSuccessResult( - @Nullable ResultT result) { - return new AutoValue_FallibleAsyncTask_FallibleTaskResult<>(null, result); - } - - /** - * Returns the Throwable thrown in {@link #doInBackground(Object[])}, or {@code null} if - * background work completed without throwing. - */ - @Nullable - public abstract Throwable getThrowable(); - - /** - * Returns the result of {@link #doInBackground(Object[])}, which may be {@code null}, or {@code - * null} if the background work threw a Throwable. - * - *

Use {@link #isFailure()} to determine if a {@code null} return is the result of a - * Throwable from the background work. - */ - @Nullable - public abstract ResultT getResult(); - - /** - * Returns {@code true} if this object is the result of background work that threw a Throwable. - */ - public boolean isFailure() { - //noinspection ThrowableResultOfMethodCallIgnored - return getThrowable() != null; - } - } -} diff --git a/java/com/android/dialer/common/concurrent/AsyncTaskExecutor.java b/java/com/android/dialer/common/concurrent/AsyncTaskExecutor.java new file mode 100644 index 000000000..3bdcd035b --- /dev/null +++ b/java/com/android/dialer/common/concurrent/AsyncTaskExecutor.java @@ -0,0 +1,51 @@ +/* + * 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.common.concurrent; + +import android.os.AsyncTask; +import android.support.annotation.MainThread; +import java.util.concurrent.Executor; + +/** + * Interface used to submit {@link AsyncTask} objects to run in the background. + * + *

This interface has a direct parallel with the {@link Executor} interface. It exists to + * decouple the mechanics of AsyncTask submission from the description of how that AsyncTask will + * execute. + * + *

One immediate benefit of this approach is that testing becomes much easier, since it is easy + * to introduce a mock or fake AsyncTaskExecutor in unit/integration tests, and thus inspect which + * tasks have been submitted and control their execution in an orderly manner. + * + *

Another benefit in due course will be the management of the submitted tasks. An extension to + * this interface is planned to allow Activities to easily cancel all the submitted tasks that are + * still pending in the onDestroy() method of the Activity. + */ +public interface AsyncTaskExecutor { + + /** + * Executes the given AsyncTask with the default Executor. + * + *

This method must only be called from the ui thread. + * + *

The identifier supplied is any Object that can be used to identify the task later. Most + * commonly this will be an enum which the tests can also refer to. {@code null} is also accepted, + * though of course this won't help in identifying the task later. + */ + @MainThread + AsyncTask submit(Object identifier, AsyncTask task, T... params); +} diff --git a/java/com/android/dialer/common/concurrent/AsyncTaskExecutors.java b/java/com/android/dialer/common/concurrent/AsyncTaskExecutors.java new file mode 100644 index 000000000..fd358328e --- /dev/null +++ b/java/com/android/dialer/common/concurrent/AsyncTaskExecutors.java @@ -0,0 +1,92 @@ +/* + * 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.common.concurrent; + +import android.os.AsyncTask; +import android.support.annotation.MainThread; +import com.android.dialer.common.Assert; +import java.util.concurrent.Executor; + +/** + * Factory methods for creating AsyncTaskExecutors. + * + *

All of the factory methods on this class check first to see if you have set a static {@link + * AsyncTaskExecutorFactory} set through the {@link #setFactoryForTest(AsyncTaskExecutorFactory)} + * method, and if so delegate to that instead, which is one way of injecting dependencies for + * testing classes whose construction cannot be controlled such as {@link android.app.Activity}. + */ +public final class AsyncTaskExecutors { + + /** + * A single instance of the {@link AsyncTaskExecutorFactory}, to which we delegate if it is + * non-null, for injecting when testing. + */ + private static AsyncTaskExecutorFactory mInjectedAsyncTaskExecutorFactory = null; + + /** + * Creates an AsyncTaskExecutor that submits tasks to run with {@link AsyncTask#SERIAL_EXECUTOR}. + */ + public static AsyncTaskExecutor createAsyncTaskExecutor() { + synchronized (AsyncTaskExecutors.class) { + if (mInjectedAsyncTaskExecutorFactory != null) { + return mInjectedAsyncTaskExecutorFactory.createAsyncTaskExeuctor(); + } + return new SimpleAsyncTaskExecutor(AsyncTask.SERIAL_EXECUTOR); + } + } + + /** + * Creates an AsyncTaskExecutor that submits tasks to run with {@link + * AsyncTask#THREAD_POOL_EXECUTOR}. + */ + public static AsyncTaskExecutor createThreadPoolExecutor() { + synchronized (AsyncTaskExecutors.class) { + if (mInjectedAsyncTaskExecutorFactory != null) { + return mInjectedAsyncTaskExecutorFactory.createAsyncTaskExeuctor(); + } + return new SimpleAsyncTaskExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + } + } + + public static void setFactoryForTest(AsyncTaskExecutorFactory factory) { + synchronized (AsyncTaskExecutors.class) { + mInjectedAsyncTaskExecutorFactory = factory; + } + } + + /** Interface for creating AsyncTaskExecutor objects. */ + public interface AsyncTaskExecutorFactory { + + AsyncTaskExecutor createAsyncTaskExeuctor(); + } + + private static class SimpleAsyncTaskExecutor implements AsyncTaskExecutor { + + private final Executor mExecutor; + + public SimpleAsyncTaskExecutor(Executor executor) { + mExecutor = executor; + } + + @Override + @MainThread + public AsyncTask submit(Object identifer, AsyncTask task, T... params) { + Assert.isMainThread(); + return task.executeOnExecutor(mExecutor, params); + } + } +} diff --git a/java/com/android/dialer/common/concurrent/DialerAsyncTaskHelper.java b/java/com/android/dialer/common/concurrent/DialerAsyncTaskHelper.java index acfcda7f6..65b408094 100644 --- a/java/com/android/dialer/common/concurrent/DialerAsyncTaskHelper.java +++ b/java/com/android/dialer/common/concurrent/DialerAsyncTaskHelper.java @@ -23,8 +23,6 @@ import android.os.Bundle; import android.support.annotation.MainThread; import android.support.annotation.WorkerThread; import com.android.dialer.common.Assert; -import com.android.dialer.common.AsyncTaskExecutor; -import com.android.dialer.common.AsyncTaskExecutors; import com.android.dialer.common.LogUtil; /** diff --git a/java/com/android/dialer/common/concurrent/FallibleAsyncTask.java b/java/com/android/dialer/common/concurrent/FallibleAsyncTask.java new file mode 100644 index 000000000..6d02fe67f --- /dev/null +++ b/java/com/android/dialer/common/concurrent/FallibleAsyncTask.java @@ -0,0 +1,94 @@ +/* + * 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.common.concurrent; + +import android.os.AsyncTask; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import com.android.dialer.common.concurrent.FallibleAsyncTask.FallibleTaskResult; +import com.google.auto.value.AutoValue; + +/** + * A task that runs work in the background, passing Throwables from {@link + * #doInBackground(Object[])} to {@link #onPostExecute(Object)} through a {@link + * FallibleTaskResult}. + * + * @param the type of the parameters sent to the task upon execution + * @param the type of the progress units published during the background computation + * @param the type of the result of the background computation + */ +public abstract class FallibleAsyncTask + extends AsyncTask> { + + @Override + protected final FallibleTaskResult doInBackground(ParamsT... params) { + try { + return FallibleTaskResult.createSuccessResult(doInBackgroundFallible(params)); + } catch (Throwable t) { + return FallibleTaskResult.createFailureResult(t); + } + } + + /** Performs background work that may result in a Throwable. */ + @Nullable + protected abstract ResultT doInBackgroundFallible(ParamsT... params) throws Throwable; + + /** + * Holds the result of processing from {@link #doInBackground(Object[])}. + * + * @param the type of the result of the background computation + */ + @AutoValue + public abstract static class FallibleTaskResult { + + /** Creates an instance of FallibleTaskResult for the given throwable. */ + private static FallibleTaskResult createFailureResult(@NonNull Throwable t) { + return new AutoValue_FallibleAsyncTask_FallibleTaskResult<>(t, null); + } + + /** Creates an instance of FallibleTaskResult for the given result. */ + private static FallibleTaskResult createSuccessResult( + @Nullable ResultT result) { + return new AutoValue_FallibleAsyncTask_FallibleTaskResult<>(null, result); + } + + /** + * Returns the Throwable thrown in {@link #doInBackground(Object[])}, or {@code null} if + * background work completed without throwing. + */ + @Nullable + public abstract Throwable getThrowable(); + + /** + * Returns the result of {@link #doInBackground(Object[])}, which may be {@code null}, or {@code + * null} if the background work threw a Throwable. + * + *

Use {@link #isFailure()} to determine if a {@code null} return is the result of a + * Throwable from the background work. + */ + @Nullable + public abstract ResultT getResult(); + + /** + * Returns {@code true} if this object is the result of background work that threw a Throwable. + */ + public boolean isFailure() { + //noinspection ThrowableResultOfMethodCallIgnored + return getThrowable() != null; + } + } +} diff --git a/java/com/android/dialer/enrichedcall/RcsVideoShareFactory.java b/java/com/android/dialer/enrichedcall/RcsVideoShareFactory.java index 566d9f339..38f91da7d 100644 --- a/java/com/android/dialer/enrichedcall/RcsVideoShareFactory.java +++ b/java/com/android/dialer/enrichedcall/RcsVideoShareFactory.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License */ + package com.android.dialer.enrichedcall; import android.support.annotation.NonNull; diff --git a/java/com/android/dialer/oem/AndroidManifest.xml b/java/com/android/dialer/oem/AndroidManifest.xml index e161a6d14..685bc3d20 100644 --- a/java/com/android/dialer/oem/AndroidManifest.xml +++ b/java/com/android/dialer/oem/AndroidManifest.xml @@ -1,3 +1,18 @@ + + \ No newline at end of file diff --git a/java/com/android/dialer/oem/CequintCallerIdManager.java b/java/com/android/dialer/oem/CequintCallerIdManager.java new file mode 100644 index 000000000..094cc842d --- /dev/null +++ b/java/com/android/dialer/oem/CequintCallerIdManager.java @@ -0,0 +1,297 @@ +/* + * 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.oem; + +import android.annotation.TargetApi; +import android.content.Context; +import android.content.pm.PackageManager; +import android.database.ContentObserver; +import android.database.Cursor; +import android.net.Uri; +import android.os.Build.VERSION_CODES; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +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 java.util.concurrent.ConcurrentHashMap; + +/** + * Cequint Caller ID manager to provide caller information. + * + *

This is only enabled on Motorola devices for Sprint. + * + *

If it's enabled, this class will be called by call log and incall to get caller info from + * Cequint Caller ID. It also caches any information fetched in static map, which lives through + * whole application lifecycle. + */ +@TargetApi(VERSION_CODES.M) +public class CequintCallerIdManager { + + private static final String CONFIG_CALLER_ID_ENABLED = "config_caller_id_enabled"; + + private static final String PROVIDER_NAME = "com.cequint.ecid"; + + private static final Uri CONTENT_URI = Uri.parse("content://" + PROVIDER_NAME + "/lookup"); + + private static final int CALLER_ID_LOOKUP_USER_PROVIDED_CID = 0x0001; + private static final int CALLER_ID_LOOKUP_SYSTEM_PROVIDED_CID = 0x0002; + private static final int CALLER_ID_LOOKUP_INCOMING_CALL = 0x0020; + + private static final Uri CONTENT_URI_FOR_INCALL = + Uri.parse("content://" + PROVIDER_NAME + "/incalllookup"); + + // Column names in Cequint provider. + private static final String CITY_NAME = "cid_pCityName"; + private static final String STATE_NAME = "cid_pStateName"; + private static final String STATE_ABBR = "cid_pStateAbbr"; + private static final String COUNTRY_NAME = "cid_pCountryName"; + private static final String COMPANY = "cid_pCompany"; + private static final String NAME = "cid_pName"; + private static final String FIRST_NAME = "cid_pFirstName"; + private static final String LAST_NAME = "cid_pLastName"; + private static final String IMAGE = "cid_pImage"; + private static final String DISPLAY_NAME = "cid_pDisplayName"; + + // TODO: Revisit it and maybe remove it if it's not necessary. + private static final ConcurrentHashMap callLogCache = + new ConcurrentHashMap<>(); + // Cache for incall lookup. Key is phone number + "i" for incoming call or "o" for outgoing call. + // TODO: Revisit it and maybe remove it if it's not necessary. + private static final ConcurrentHashMap incallCache = + new ConcurrentHashMap<>(); + private static boolean hasRegisteredContentObserver; + private static boolean hasAlreadyCheckedCequintCallerIdPackage; + private static boolean isCequintCallerIdEnabled; + + /** Cequint caller id contact information. */ + public static class CequintCallerIdContact { + public final String name; + public final String geoDescription; + public final String imageUrl; + + private CequintCallerIdContact(String name, String geoDescription, String imageUrl) { + this.name = name; + this.geoDescription = geoDescription; + this.imageUrl = imageUrl; + } + } + + /** Check whether Cequint Caller Id provider package is available and enabled. */ + public static synchronized boolean isCequintCallerIdEnabled(@NonNull Context context) { + if (!ConfigProviderBindings.get(context).getBoolean(CONFIG_CALLER_ID_ENABLED, true)) { + return false; + } + if (!hasAlreadyCheckedCequintCallerIdPackage) { + hasAlreadyCheckedCequintCallerIdPackage = true; + isCequintCallerIdEnabled = false; + + try { + context.getPackageManager().getPackageInfo(PROVIDER_NAME, 0); + isCequintCallerIdEnabled = true; + } catch (PackageManager.NameNotFoundException e) { + isCequintCallerIdEnabled = false; + } + } + return isCequintCallerIdEnabled; + } + + @WorkerThread + public static CequintCallerIdContact getCequintCallerIdContact(Context context, String number) { + Assert.isWorkerThread(); + LogUtil.d( + "CequintCallerIdManager.getCequintCallerIdContact", + "number: %s", + LogUtil.sanitizePhoneNumber(number)); + registerContentObserver(context); + if (callLogCache.containsKey(number)) { + return callLogCache.get(number); + } + CequintCallerIdContact cequintCallerIdContact = + lookup( + context, + CONTENT_URI, + PhoneNumberUtils.stripSeparators(number), + new String[] {"system"}); + if (cequintCallerIdContact != null) { + callLogCache.put(number, cequintCallerIdContact); + } + return cequintCallerIdContact; + } + + @WorkerThread + public static CequintCallerIdContact getCequintCallerIdContactForInCall( + Context context, String number, String cnapName, boolean isIncoming) { + Assert.isWorkerThread(); + LogUtil.d( + "CequintCallerIdManager.getCequintCallerIdContactForInCall", + "number: %s, cnapName: %s, isIncoming: %b", + LogUtil.sanitizePhoneNumber(number), + LogUtil.sanitizePii(cnapName), + isIncoming); + registerContentObserver(context); + String key = number + (isIncoming ? "i" : "o"); + if (incallCache.containsKey(key)) { + return incallCache.get(key); + } + int flag = 0; + if (isIncoming) { + flag |= CALLER_ID_LOOKUP_INCOMING_CALL; + flag |= CALLER_ID_LOOKUP_SYSTEM_PROVIDED_CID; + } else { + flag |= CALLER_ID_LOOKUP_USER_PROVIDED_CID; + } + String[] flags = {cnapName, String.valueOf(flag)}; + CequintCallerIdContact cequintCallerIdContact = + lookup(context, CONTENT_URI_FOR_INCALL, number, flags); + if (cequintCallerIdContact != null) { + incallCache.put(key, cequintCallerIdContact); + } + return cequintCallerIdContact; + } + + @WorkerThread + @Nullable + private static CequintCallerIdContact lookup( + Context context, Uri uri, String number, String[] flags) { + Assert.isWorkerThread(); + + // Cequint is using custom arguments for content provider. See more details in b/35766080. + try (Cursor cursor = context.getContentResolver().query(uri, null, number, flags, null)) { + if (cursor != null && cursor.moveToFirst()) { + String city = getString(cursor, cursor.getColumnIndex(CITY_NAME)); + String state = getString(cursor, cursor.getColumnIndex(STATE_NAME)); + String stateAbbr = getString(cursor, cursor.getColumnIndex(STATE_ABBR)); + String country = getString(cursor, cursor.getColumnIndex(COUNTRY_NAME)); + String company = getString(cursor, cursor.getColumnIndex(COMPANY)); + String name = getString(cursor, cursor.getColumnIndex(NAME)); + String firstName = getString(cursor, cursor.getColumnIndex(FIRST_NAME)); + String lastName = getString(cursor, cursor.getColumnIndex(LAST_NAME)); + String imageUrl = getString(cursor, cursor.getColumnIndex(IMAGE)); + String displayName = getString(cursor, cursor.getColumnIndex(DISPLAY_NAME)); + + String contactName = + TextUtils.isEmpty(displayName) + ? generateDisplayName(firstName, lastName, company, name) + : displayName; + String geoDescription = getGeoDescription(city, state, stateAbbr, country); + LogUtil.d( + "CequintCallerIdManager.lookup", + "number: %s, contact name: %s, geo: %s, photo url: %s", + LogUtil.sanitizePhoneNumber(number), + LogUtil.sanitizePii(contactName), + LogUtil.sanitizePii(geoDescription), + imageUrl); + return new CequintCallerIdContact(contactName, geoDescription, imageUrl); + } else { + LogUtil.d("CequintCallerIdManager.lookup", "No CequintCallerIdContact found"); + return null; + } + } + } + + private static String getString(Cursor cursor, int columnIndex) { + if (!cursor.isNull(columnIndex)) { + String string = cursor.getString(columnIndex); + if (!TextUtils.isEmpty(string)) { + return string; + } + } + return null; + } + + /** + * Returns generated name from other names, e.g. first name, last name etc. Returns null if there + * is no other names. + */ + @Nullable + private static String generateDisplayName( + String firstName, String lastName, String company, String name) { + boolean hasFirstName = !TextUtils.isEmpty(firstName); + boolean hasLastName = !TextUtils.isEmpty(lastName); + boolean hasCompanyName = !TextUtils.isEmpty(company); + boolean hasName = !TextUtils.isEmpty(name); + + StringBuilder stringBuilder = new StringBuilder(); + + if (hasFirstName || hasLastName) { + if (hasFirstName) { + stringBuilder.append(firstName); + if (hasLastName) { + stringBuilder.append(" "); + } + } + if (hasLastName) { + stringBuilder.append(lastName); + } + } else if (hasCompanyName) { + stringBuilder.append(company); + } else if (hasName) { + stringBuilder.append(name); + } else { + return null; + } + + if (stringBuilder.length() > 0) { + return stringBuilder.toString(); + } + return null; + } + + /** Returns geo location information. e.g. Mountain View, CA. */ + private static String getGeoDescription( + String city, String state, String stateAbbr, String country) { + String geoDescription = null; + + if (TextUtils.isEmpty(city) && !TextUtils.isEmpty(state)) { + geoDescription = state; + } else if (!TextUtils.isEmpty(city) && !TextUtils.isEmpty(stateAbbr)) { + geoDescription = city + ", " + stateAbbr; + } else if (!TextUtils.isEmpty(country)) { + geoDescription = country; + } + return geoDescription; + } + + private static void registerContentObserver(Context context) { + if (hasRegisteredContentObserver) { + return; + } + ContentObserver contentObserver = + new ContentObserver(null) { + @Override + public void onChange(boolean selfChange) { + invalidateCache(); + } + }; + + context.getContentResolver().registerContentObserver(CONTENT_URI, true, contentObserver); + context + .getContentResolver() + .registerContentObserver(CONTENT_URI_FOR_INCALL, true, contentObserver); + hasRegisteredContentObserver = true; + } + + private static void invalidateCache() { + callLogCache.clear(); + incallCache.clear(); + } + + private CequintCallerIdManager() {} +} diff --git a/java/com/android/dialer/phonenumbercache/ContactInfo.java b/java/com/android/dialer/phonenumbercache/ContactInfo.java index d7a75c34f..03240cc62 100644 --- a/java/com/android/dialer/phonenumbercache/ContactInfo.java +++ b/java/com/android/dialer/phonenumbercache/ContactInfo.java @@ -38,6 +38,7 @@ public class ContactInfo { public String label; public String number; public String formattedNumber; + public String geoDescription; /* * ContactInfo.normalizedNumber is a column value returned by PhoneLookup query. By definition, * it's E164 representation. @@ -121,7 +122,13 @@ public class ContactInfo { if (userType != other.userType) { return false; } - return carrierPresence == other.carrierPresence; + if (carrierPresence != other.carrierPresence) { + return false; + } + if (!TextUtils.equals(geoDescription, other.geoDescription)) { + return false; + } + return true; } @Override @@ -160,6 +167,8 @@ public class ContactInfo { + userType + ", carrierPresence=" + carrierPresence + + ", geoDescription=" + + geoDescription + '}'; } } diff --git a/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java b/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java index 6a5e2e6b4..66ddd06fd 100644 --- a/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java +++ b/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java @@ -33,12 +33,14 @@ import android.provider.ContactsContract.PhoneLookup; import android.support.annotation.Nullable; import android.telephony.PhoneNumberUtils; import android.text.TextUtils; -import android.util.Log; import com.android.contacts.common.ContactsUtils; import com.android.contacts.common.ContactsUtils.UserType; import com.android.contacts.common.compat.DirectoryCompat; import com.android.contacts.common.util.Constants; import com.android.contacts.common.util.UriUtils; +import com.android.dialer.common.LogUtil; +import com.android.dialer.oem.CequintCallerIdManager; +import com.android.dialer.oem.CequintCallerIdManager.CequintCallerIdContact; import com.android.dialer.phonenumbercache.CachedNumberLookupService.CachedContactInfo; import com.android.dialer.phonenumberutil.PhoneNumberHelper; import com.android.dialer.telecom.TelecomUtil; @@ -131,7 +133,7 @@ public class ContactInfoHelper { } } catch (IllegalArgumentException e) { // Avoid dialer crash when lookup key is not valid - Log.e(TAG, "IllegalArgumentException in lookUpDisplayNameAlternative", e); + LogUtil.e(TAG, "IllegalArgumentException in lookUpDisplayNameAlternative", e); } finally { if (cursor != null) { cursor.close(); @@ -508,6 +510,11 @@ public class ContactInfoHelper { values.put(Calls.CACHED_FORMATTED_NUMBER, updatedInfo.formattedNumber); needsUpdate = true; } + + if (!TextUtils.equals(updatedInfo.geoDescription, callLogInfo.geoDescription)) { + values.put(Calls.GEOCODED_LOCATION, updatedInfo.geoDescription); + needsUpdate = true; + } } else { // No previous values, store all of them. values.put(Calls.CACHED_NAME, updatedInfo.name); @@ -521,6 +528,7 @@ public class ContactInfoHelper { Calls.CACHED_PHOTO_URI, UriUtils.uriToString(UriUtils.nullForNonContactsUri(updatedInfo.photoUri))); values.put(Calls.CACHED_FORMATTED_NUMBER, updatedInfo.formattedNumber); + values.put(Calls.GEOCODED_LOCATION, updatedInfo.geoDescription); needsUpdate = true; } @@ -547,7 +555,7 @@ public class ContactInfoHelper { new String[] {number, countryIso}); } } catch (SQLiteFullException e) { - Log.e(TAG, "Unable to update contact info in call log db", e); + LogUtil.e(TAG, "Unable to update contact info in call log db", e); } } @@ -583,4 +591,28 @@ public class ContactInfoHelper { return mCachedNumberLookupService != null && mCachedNumberLookupService.canReportAsInvalid(sourceType, objectId); } + + /** + * Update ContactInfo by querying to Cequint Caller ID. Only name, geoDescription and photo uri + * will be updated if available. + */ + public void updateFromCequintCallerId(ContactInfo info, String number) { + if (!CequintCallerIdManager.isCequintCallerIdEnabled(mContext)) { + return; + } + CequintCallerIdContact cequintCallerIdContact = + CequintCallerIdManager.getCequintCallerIdContact(mContext, number); + if (cequintCallerIdContact == null) { + return; + } + if (!TextUtils.isEmpty(cequintCallerIdContact.name)) { + info.name = cequintCallerIdContact.name; + } + if (!TextUtils.isEmpty(cequintCallerIdContact.geoDescription)) { + info.geoDescription = cequintCallerIdContact.geoDescription; + } + if (cequintCallerIdContact.imageUrl != null) { + info.photoUri = UriUtils.parseUriOrNull(cequintCallerIdContact.imageUrl); + } + } } diff --git a/java/com/android/dialer/shortcuts/ShortcutRefresher.java b/java/com/android/dialer/shortcuts/ShortcutRefresher.java index f5ff64874..120382dc5 100644 --- a/java/com/android/dialer/shortcuts/ShortcutRefresher.java +++ b/java/com/android/dialer/shortcuts/ShortcutRefresher.java @@ -23,10 +23,10 @@ import android.support.annotation.NonNull; import android.support.annotation.WorkerThread; import com.android.contacts.common.list.ContactEntry; import com.android.dialer.common.Assert; -import com.android.dialer.common.AsyncTaskExecutor; -import com.android.dialer.common.AsyncTaskExecutors; -import com.android.dialer.common.FallibleAsyncTask; import com.android.dialer.common.LogUtil; +import com.android.dialer.common.concurrent.AsyncTaskExecutor; +import com.android.dialer.common.concurrent.AsyncTaskExecutors; +import com.android.dialer.common.concurrent.FallibleAsyncTask; import java.util.ArrayList; import java.util.List; diff --git a/java/com/android/dialer/shortcuts/ShortcutUsageReporter.java b/java/com/android/dialer/shortcuts/ShortcutUsageReporter.java index 50130fc49..3f0b2a632 100644 --- a/java/com/android/dialer/shortcuts/ShortcutUsageReporter.java +++ b/java/com/android/dialer/shortcuts/ShortcutUsageReporter.java @@ -35,9 +35,9 @@ import android.support.annotation.WorkerThread; import android.support.v4.content.ContextCompat; import android.text.TextUtils; import com.android.dialer.common.Assert; -import com.android.dialer.common.AsyncTaskExecutor; -import com.android.dialer.common.AsyncTaskExecutors; import com.android.dialer.common.LogUtil; +import com.android.dialer.common.concurrent.AsyncTaskExecutor; +import com.android.dialer.common.concurrent.AsyncTaskExecutors; /** * Reports outgoing calls as shortcut usage. diff --git a/java/com/android/incallui/AndroidManifest.xml b/java/com/android/incallui/AndroidManifest.xml index 276b47a5e..4ddaa6ab5 100644 --- a/java/com/android/incallui/AndroidManifest.xml +++ b/java/com/android/incallui/AndroidManifest.xml @@ -37,6 +37,10 @@ + + + - - - + "Paw-modus is geaktiveer" + "Paw-modus is gedeaktiveer" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-am/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-am/strings.xml index 31e4843f6..5d96ebb62 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-am/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-am/strings.xml @@ -1,8 +1,6 @@ - - - - + "የPaw ሁነታ ነቅቷል" + "የPaw ሁነታ ተሰናክሏል" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ar/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ar/strings.xml index 31e4843f6..f926057e5 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-ar/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-ar/strings.xml @@ -1,8 +1,6 @@ - - - - + "‏تم تمكين وضع المخلب" + "تم تعطيل وضع المخلب" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-az/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-az/strings.xml index 31e4843f6..7d73d4198 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-az/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-az/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw rejimi aktiv edildi" + "Paw rejimi deaktiv edildi" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-be/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-be/strings.xml index 31e4843f6..4203585ca 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-be/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-be/strings.xml @@ -1,8 +1,6 @@ - - - - + "Уключаны рэжым Paw" + "Выключаны рэжым Paw" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-bg/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-bg/strings.xml index 31e4843f6..5dfab89d1 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-bg/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-bg/strings.xml @@ -1,8 +1,6 @@ - - - - + "Режимът Paw бе активиран" + "Режимът Paw бе деактивиран" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-bn/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-bn/strings.xml index 31e4843f6..1d7ea8a70 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-bn/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-bn/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw মোড সক্ষম করা আছে" + "Paw মোড অক্ষম করা আছে" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-bs/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-bs/strings.xml index 31e4843f6..e3aad7d09 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-bs/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-bs/strings.xml @@ -1,8 +1,6 @@ - - - - + "Ručni način rada je omogućen" + "Ručni način rada je onemogućen" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ca/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ca/strings.xml index 31e4843f6..161c584d1 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-ca/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-ca/strings.xml @@ -1,8 +1,6 @@ - - - - + "Mode PAW activat" + "Mode PAW desactivat" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-cs/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-cs/strings.xml index 31e4843f6..1f680ce8b 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-cs/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-cs/strings.xml @@ -1,8 +1,6 @@ - - - - + "Režim Paw byl aktivován" + "Režim Paw byl deaktivován" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-da/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-da/strings.xml index 31e4843f6..c6e98768b 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-da/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-da/strings.xml @@ -1,8 +1,6 @@ - - - - + "Tilstanden Paw blev aktiveret" + "Tilstanden Paw blev deaktiveret" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-de/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-de/strings.xml index 31e4843f6..1de03a55c 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-de/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-de/strings.xml @@ -1,8 +1,6 @@ - - - - + "PAW-Modus aktiviert" + "PAW-Modus deaktiviert" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-el/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-el/strings.xml index 31e4843f6..ffc4b6d1f 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-el/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-el/strings.xml @@ -1,8 +1,6 @@ - - - - + "Λειτουργία αποτυπώματος ενεργοποιημένη" + "Λειτουργία αποτυπώματος απενεργοποιημένη" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-en-rAU/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-en-rAU/strings.xml index 31e4843f6..bdfce36af 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-en-rAU/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-en-rAU/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw mode enabled" + "Paw mode disabled" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-en-rGB/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-en-rGB/strings.xml index 31e4843f6..bdfce36af 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-en-rGB/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-en-rGB/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw mode enabled" + "Paw mode disabled" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-en-rIN/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-en-rIN/strings.xml index 31e4843f6..bdfce36af 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-en-rIN/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-en-rIN/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw mode enabled" + "Paw mode disabled" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-es-rUS/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-es-rUS/strings.xml index 31e4843f6..760ec37a2 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-es-rUS/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-es-rUS/strings.xml @@ -1,8 +1,6 @@ - - - - + "Modo mascota habilitado" + "Modo mascota deshabilitado" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-es/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-es/strings.xml index 31e4843f6..ebd8e2f0e 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-es/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-es/strings.xml @@ -1,8 +1,6 @@ - - - - + "Modo PAW habilitado" + "Modo PAW inhabilitado" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-et/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-et/strings.xml index 31e4843f6..73a96af8b 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-et/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-et/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw-režiim on lubatud" + "Paw-režiim on keelatud" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-eu/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-eu/strings.xml index 31e4843f6..19b078ead 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-eu/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-eu/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw modua gaitu da" + "Paw modua desgaitu da" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-fa/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-fa/strings.xml index 31e4843f6..ad7ee6a30 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-fa/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-fa/strings.xml @@ -1,8 +1,6 @@ - - - - + "‏حالت Paw فعال شد" + "‏حالت Paw غیرفعال شد" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-fi/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-fi/strings.xml index 31e4843f6..f269e70a1 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-fi/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-fi/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw-tila käytössä" + "Paw-tila pois käytöstä" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-fr-rCA/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-fr-rCA/strings.xml index 31e4843f6..2ccb5292f 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-fr-rCA/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-fr-rCA/strings.xml @@ -1,8 +1,6 @@ - - - - + "Mode Paw activé" + "Mode Paw désactivé" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-fr/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-fr/strings.xml index 31e4843f6..95ea5292c 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-fr/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-fr/strings.xml @@ -1,8 +1,6 @@ - - - - + "Mode PAW activé" + "Mode PAW désactivé" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-gl/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-gl/strings.xml index 31e4843f6..0e0d1a7d6 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-gl/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-gl/strings.xml @@ -1,8 +1,6 @@ - - - - + "Modo Paw activado" + "Modo Paw desactivado" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-gu/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-gu/strings.xml index 31e4843f6..d204d123f 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-gu/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-gu/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw મોડ સક્ષમ કર્યો" + "Paw મોડ અક્ષમ કર્યો" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-hi/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-hi/strings.xml index 31e4843f6..eb44da145 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-hi/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-hi/strings.xml @@ -1,8 +1,6 @@ - - - - + "पॉ मोड सक्षम किया गया" + "पॉ मोड अक्षम किया गया" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-hr/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-hr/strings.xml index 31e4843f6..abbeaf15f 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-hr/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-hr/strings.xml @@ -1,8 +1,6 @@ - - - - + "Omogućen PAW način rada" + "Onemoguće način rada PAW" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-hu/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-hu/strings.xml index 31e4843f6..11d7502eb 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-hu/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-hu/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw mód engedélyezve" + "Paw mód letiltva" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-hy/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-hy/strings.xml index 31e4843f6..eac59c1c9 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-hy/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-hy/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw ռեժիմը միացված է" + "Paw ռեժիմն անջատված է" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-in/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-in/strings.xml index 31e4843f6..f641a3c61 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-in/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-in/strings.xml @@ -1,8 +1,6 @@ - - - - + "Mode paw diaktifkan" + "Mode paw dinonaktifkan" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-is/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-is/strings.xml index 31e4843f6..d0e5561c3 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-is/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-is/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw-stilling virkjuð" + "Slökkt á Paw-stillingu" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-it/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-it/strings.xml index 31e4843f6..f1f3cc22f 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-it/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-it/strings.xml @@ -1,8 +1,6 @@ - - - - + "Modalità Paw attivata" + "Modalità Paw disattivata" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-iw/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-iw/strings.xml index 31e4843f6..452cd6b88 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-iw/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-iw/strings.xml @@ -1,8 +1,6 @@ - - - - + "‏מצב טלפיים הופעל" + "‏מצב טלפיים הושבת" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ja/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ja/strings.xml index 31e4843f6..910c7302a 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-ja/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-ja/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw モードを有効にしました" + "Paw モードを無効にしました" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ka/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ka/strings.xml index 31e4843f6..9b06694e4 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-ka/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-ka/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw რეჟიმი ჩართულია" + "Paw რეჟიმი გამორთულია" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-kk/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-kk/strings.xml index 31e4843f6..119562c09 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-kk/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-kk/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw режимі қосулы" + "Paw режимі өшірулі" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-km/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-km/strings.xml index 31e4843f6..0df78f2ca 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-km/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-km/strings.xml @@ -1,8 +1,6 @@ - - - - + "បាន​បើក​មុខងារ​ប៉ះ" + "បាន​បិទ​មុខងារ​ប៉ះ" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-kn/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-kn/strings.xml index 31e4843f6..bda40d711 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-kn/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-kn/strings.xml @@ -1,8 +1,6 @@ - - - - + "ಪಾವ್ ಮೋಡ್ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ" + "ಪಾವ್ ಮೋಡ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ko/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ko/strings.xml index 31e4843f6..ab16b8c87 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-ko/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-ko/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw 모드 사용 설정" + "Paw 모드 사용 중지" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ky/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ky/strings.xml index 31e4843f6..c22b73e19 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-ky/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-ky/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw режими иштетилди" + "Paw режими өчүрүлдү" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-lo/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-lo/strings.xml index 31e4843f6..66e863d80 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-lo/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-lo/strings.xml @@ -1,8 +1,6 @@ - - - - + "ເປີດໂໝດ Paw ແລ້ວ" + "ປິດໂໝດ Paw ແລ້ວ" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-lt/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-lt/strings.xml index 31e4843f6..8c9ecc49e 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-lt/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-lt/strings.xml @@ -1,8 +1,6 @@ - - - - + "„Paw“ režimas įgalintas" + "„Paw“ režimas išjungtas" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-lv/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-lv/strings.xml index 31e4843f6..2ecc5bb0a 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-lv/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-lv/strings.xml @@ -1,8 +1,6 @@ - - - - + "PAW režīms iespējots" + "PAW režīms atspējots" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-mk/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-mk/strings.xml index 31e4843f6..d5e96400d 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-mk/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-mk/strings.xml @@ -1,8 +1,6 @@ - - - - + "Овозможен е режим на фаќање" + "Оневозможен е режим на фаќање" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ml/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ml/strings.xml index 31e4843f6..56ec68954 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-ml/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-ml/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw മോഡ് പ്രവർത്തനക്ഷമമാക്കി" + "Paw മോഡ് പ്രവർത്തനരഹിതമാക്കി" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-mn/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-mn/strings.xml index 31e4843f6..3a3e39696 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-mn/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-mn/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw горимыг идэвхжүүлсэн" + "Paw горимыг идэвхгүй болгосон" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-mr/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-mr/strings.xml index 31e4843f6..1f0c82035 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-mr/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-mr/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw मोड सक्षम केला" + "Paw मोड अक्षम केला" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ms/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ms/strings.xml index 31e4843f6..cfa6ed37c 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-ms/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-ms/strings.xml @@ -1,8 +1,6 @@ - - - - + "Mod tapak kaki didayakan" + "Mod tapak kaki dilumpuhkan" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-my/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-my/strings.xml index 31e4843f6..88a250b5b 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-my/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-my/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw မုဒ် ဖွင့်ထားသည်" + "Paw မုဒ် ပိတ်ထားသည်" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-nb/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-nb/strings.xml index 31e4843f6..b71d3bd70 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-nb/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-nb/strings.xml @@ -1,8 +1,6 @@ - - - - + "PAW-modus er på" + "PAW-modus er av" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ne/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ne/strings.xml index 31e4843f6..3b6fd0fd3 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-ne/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-ne/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw मोड सक्षम पारियो" + "Paw मोड असक्षम पारियो" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-nl/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-nl/strings.xml index 31e4843f6..9659c6815 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-nl/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-nl/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw-modus ingeschakeld" + "Paw-modus uitgeschakeld" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-no/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-no/strings.xml index 31e4843f6..b71d3bd70 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-no/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-no/strings.xml @@ -1,8 +1,6 @@ - - - - + "PAW-modus er på" + "PAW-modus er av" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-pa/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-pa/strings.xml index 31e4843f6..df7d61660 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-pa/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-pa/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw ਮੋਡ ਯੋਗ ਬਣਾਇਆ ਗਿਆ" + "Paw ਮੋਡ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-pl/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-pl/strings.xml index 31e4843f6..a0a42766b 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-pl/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-pl/strings.xml @@ -1,8 +1,6 @@ - - - - + "Tryb Paw włączony" + "Tryb Paw wyłączony" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-pt-rBR/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-pt-rBR/strings.xml index 31e4843f6..71b333398 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-pt-rBR/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-pt-rBR/strings.xml @@ -1,8 +1,6 @@ - - - - + "Modo PAW ativado" + "Modo PAW ativado" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-pt-rPT/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-pt-rPT/strings.xml index 31e4843f6..1ac61cee1 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-pt-rPT/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-pt-rPT/strings.xml @@ -1,8 +1,6 @@ - - - - + "Modo Paw ativado" + "Modo Paw desativado" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-pt/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-pt/strings.xml index 31e4843f6..71b333398 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-pt/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-pt/strings.xml @@ -1,8 +1,6 @@ - - - - + "Modo PAW ativado" + "Modo PAW ativado" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ro/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ro/strings.xml index 31e4843f6..d0ef36f84 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-ro/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-ro/strings.xml @@ -1,8 +1,6 @@ - - - - + "Modul Paw a fost activat" + "Modul Paw a fost dezactivat." diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ru/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ru/strings.xml index 31e4843f6..913a362ec 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-ru/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-ru/strings.xml @@ -1,8 +1,6 @@ - - - - + "Режим PAW включен" + "Режим PAW отключен" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-si/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-si/strings.xml index 31e4843f6..e3e9d6534 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-si/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-si/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw ප්‍රකාරය සබල කෙ‍රිණි" + "Paw ප්‍රකාරය අබල කෙරිණි" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-sk/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-sk/strings.xml index 31e4843f6..08ebf853d 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-sk/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-sk/strings.xml @@ -1,8 +1,6 @@ - - - - + "Režim Paw bol aktivovaný" + "Režim Paw bol deaktivovaný" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-sl/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-sl/strings.xml index 31e4843f6..4ce16ab9a 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-sl/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-sl/strings.xml @@ -1,8 +1,6 @@ - - - - + "Način PAW je omogočen" + "Način PAW je onemogočen" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-sq/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-sq/strings.xml index 31e4843f6..39efd19c5 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-sq/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-sq/strings.xml @@ -1,8 +1,6 @@ - - - - + "Modaliteti Paw u aktivizua" + "Modaliteti Paw u çaktivizua" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-sr/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-sr/strings.xml index 31e4843f6..eb78565a5 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-sr/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-sr/strings.xml @@ -1,8 +1,6 @@ - - - - + "PAW режим је омогућен" + "PAW режим је онемогућен" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-sv/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-sv/strings.xml index 31e4843f6..cbc8056e6 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-sv/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-sv/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw-läge aktiverat" + "Paw-läge inaktiverat" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-sw/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-sw/strings.xml index 31e4843f6..e137b1de6 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-sw/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-sw/strings.xml @@ -1,8 +1,6 @@ - - - - + "Hali ya gusagusa imewashwa" + "Hali ya gusagusa imezimwa" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ta/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ta/strings.xml index 31e4843f6..de00f026a 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-ta/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-ta/strings.xml @@ -1,8 +1,6 @@ - - - - + "பாவ் பயன்முறை இயக்கப்பட்டது" + "பாவ் பயன்முறை முடக்கப்பட்டது" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-te/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-te/strings.xml index 31e4843f6..a85038cfd 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-te/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-te/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw మోడ్ ప్రారంభించబడింది" + "Paw మోడ్ నిలిపివేయబడింది" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-th/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-th/strings.xml index 31e4843f6..acc3ce915 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-th/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-th/strings.xml @@ -1,8 +1,6 @@ - - - - + "เปิดโหมด Paw" + "ปิดโหมด Paw" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-tl/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-tl/strings.xml index 31e4843f6..48901801d 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-tl/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-tl/strings.xml @@ -1,8 +1,6 @@ - - - - + "Naka-enable ang paw mode" + "Naka-disable ang paw mode" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-tr/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-tr/strings.xml index 31e4843f6..6aaa71e13 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-tr/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-tr/strings.xml @@ -1,8 +1,6 @@ - - - - + "PAW modu etkinleştirildi" + "PAW modu devre dışı bırakıldı" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-uk/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-uk/strings.xml index 31e4843f6..a137510b5 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-uk/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-uk/strings.xml @@ -1,8 +1,6 @@ - - - - + "Paw-режим увімкнено" + "Paw-режим вимкнено" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ur/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ur/strings.xml index 31e4843f6..a6c365fc6 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-ur/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-ur/strings.xml @@ -1,8 +1,6 @@ - - - - + "‏Paw موڈ فعال ہے" + "‏Paw موڈ غیرفعال ہے" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-uz/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-uz/strings.xml index 31e4843f6..cbe9ef267 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-uz/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-uz/strings.xml @@ -1,8 +1,6 @@ - - - - + "PAW rejimi yoniq" + "PAW rejimi o‘chiq" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-vi/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-vi/strings.xml index 31e4843f6..f86077525 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-vi/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-vi/strings.xml @@ -1,8 +1,6 @@ - - - - + "Đã bật chế độ Paw" + "Đã tắt chế độ Paw" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-zh-rCN/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-zh-rCN/strings.xml index 31e4843f6..2a6cbb14d 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-zh-rCN/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-zh-rCN/strings.xml @@ -1,8 +1,6 @@ - - - - + "已启用 Paw 模式" + "已停用 Paw 模式" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-zh-rHK/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-zh-rHK/strings.xml index 31e4843f6..90c9187a4 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-zh-rHK/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-zh-rHK/strings.xml @@ -1,8 +1,6 @@ - - - - + "已啟用爪子模式" + "已停用爪子模式" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-zh-rTW/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-zh-rTW/strings.xml index 31e4843f6..3b86457ab 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-zh-rTW/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-zh-rTW/strings.xml @@ -1,8 +1,6 @@ - - - - + "已啟用 Paw 模式" + "已停用 Paw 模式" diff --git a/java/com/android/incallui/answer/impl/hint/res/values-zu/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-zu/strings.xml index 31e4843f6..a75c4254b 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-zu/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-zu/strings.xml @@ -1,8 +1,6 @@ - - - - + "Imodi ye-Paw inikwe amandla" + "Imodi ye-Paw ikhutshaziwe" diff --git a/java/com/android/incallui/answer/impl/res/values-bn/strings.xml b/java/com/android/incallui/answer/impl/res/values-bn/strings.xml index 073d3dee4..6ad8aaf3d 100644 --- a/java/com/android/incallui/answer/impl/res/values-bn/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-bn/strings.xml @@ -5,7 +5,7 @@ "একটি অডিও কল হিসেবে উত্তর দিতে আইকন থেকে সোয়াইপ করুন" "উত্তর দিতে এবং চালু থাকা কল হোল্ড করতে উপরের দিকে সোয়াইপ করুন" "উত্তর দিতে এবং হোল্ডে থাকা কল কেটে দিতে উপরের দিকে সোয়াইপ করুন" - "আগত কলের উত্তর দিতে এবং চালু থাকা কল কেটে দিতে আইকন থেকে সোয়াইপ করুন" + "ইনকামিং কলের উত্তর দিতে এবং চালু থাকা কল কেটে দিতে আইকন থেকে সোয়াইপ করুন" "আপনার নিজের পছন্দ মত লিখুন…" "হ্যান্ডসেট" "স্পিকারফোন" @@ -14,10 +14,10 @@ "পাঠান" "একটি বার্তা সহ এই কলটি প্রত্যাখ্যান করুন" "অডিও কল হিসেবে উত্তর দিন" - "আগত কলের উত্তর এবং চালু থাকা কল কেটে দিন" + "ইনকামিং কলের উত্তর এবং চালু থাকা কল কেটে দিন" "বার্তা সহ প্রত্যাখ্যান করুন" "অডিও কল হিসেবে উত্তর দিন" - "আগত কলের উত্তর এবং চালু থাকা কল কেটে দিন" + "ইনকামিং কলের উত্তর এবং চালু থাকা কল কেটে দিন" "ভিডিও বন্ধ আছে" "উত্তর দিতে উপরের দিকে, প্রত্যাখ্যান করতে নিচের দিকে দুই আঙুল দিয়ে সোয়াইপ করুন৷" "গুরুত্বপূর্ণ কল" diff --git a/java/com/android/incallui/answer/impl/res/values-ca/strings.xml b/java/com/android/incallui/answer/impl/res/values-ca/strings.xml index f73aed7bc..7a9f1a88a 100644 --- a/java/com/android/incallui/answer/impl/res/values-ca/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-ca/strings.xml @@ -3,8 +3,8 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "Llisca des de la icona per rebutjar la trucada amb un missatge" "Llisca des de la icona per respondre amb una trucada d\'àudio" - "Llisca cap amunt per respondre a la trucada i mantenir en espera l\'actual" - "Llisca cap amunt per respondre a la trucada i finalitzar l\'actual" + "Llisca cap amunt per respondre a la trucada i posar l\'actual en espera" + "Llisca cap amunt per respondre a la trucada i finalitzar la que està en espera" "Llisca des de la icona per respondre a la trucada entrant i finalitzar l\'actual" "Escriu la teva…" "Auricular" diff --git a/java/com/android/incallui/answer/impl/res/values-de/strings.xml b/java/com/android/incallui/answer/impl/res/values-de/strings.xml index 6ea77eb41..d4cab75ac 100644 --- a/java/com/android/incallui/answer/impl/res/values-de/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-de/strings.xml @@ -3,9 +3,9 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "Zum Ablehnen mit Nachricht vom Symbol wegwischen" "Zum Annehmen als Sprachanruf vom Symbol wegwischen" - "Nach oben wischen, um den Anruf anzunehmen und den laufenden Anruf zu halten" - "Nach oben wischen, um den Anruf anzunehmen und den gehaltenen Anruf zu beenden" - "Vom Symbol wegwischen, um den eingehenden Anruf anzunehmen und den laufenden Anruf zu beenden" + "Wische nach oben, um den Anruf anzunehmen und den aktuellen Anruf zu halten" + "Wische nach oben, um den Anruf anzunehmen und den gehaltenen Anruf zu beenden" + "Wische vom Symbol weg, um den eingehenden Anruf anzunehmen und den aktuellen Anruf zu beenden" "Eigene Antwort schreiben…" "Mobiltelefon" "Freisprechfunktion" @@ -14,10 +14,10 @@ "Senden" "Diesen Anruf mit einer Nachricht ablehnen" "Als Sprachanruf annehmen" - "Eingehenden Anruf annehmen und laufenden Anruf beenden" + "Nimm den eingehenden Anruf an und beende den aktuellen Anruf" "Mit Nachricht ablehnen" "Als Sprachanruf annehmen" - "Eingehenden Anruf annehmen und laufenden Anruf beenden" + "Nimm den eingehenden Anruf an und beende den aktuellen Anruf" "Video deaktiviert" "Zum Annehmen mit zwei Fingern nach oben wischen. Zum Ablehnen mit zwei Fingern nach unten wischen." "Wichtiger Anruf" diff --git a/java/com/android/incallui/answer/impl/res/values-es/strings.xml b/java/com/android/incallui/answer/impl/res/values-es/strings.xml index fd80cf57d..8b6c9fa4c 100644 --- a/java/com/android/incallui/answer/impl/res/values-es/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-es/strings.xml @@ -3,9 +3,9 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "Desliza desde el icono para rechazar con mensaje" "Desliza desde el icono para responder como una llamada de audio" - "Desliza el dedo hacia arriba para responder a una llamada y para ponerla en espera" - "Desliza el dedo hacia arriba para responder a una llamada y para finalizar una llamada en espera" - "Desliza el dedo desde el icono para responder a una llamada entrante y para finalizar una llamada" + "Desliza el dedo hacia arriba para responder a una llamada y para poner en espera la llamada en curso" + "Desliza el dedo hacia arriba para responder a una llamada y para finalizar la llamada en espera" + "Desliza el dedo desde el icono para responder a una llamada entrante y para finalizar la llamada en curso" "Escribe tu propia respuesta…" "Auricular" "Altavoz" @@ -14,10 +14,10 @@ "Enviar" "Rechaza esta llamada con un mensaje" "Responde como llamada de audio" - "Responder a una llamada entrante y finalizar una llamada" + "Responder a una llamada entrante y finalizar una llamada en curso" "Rechaza con un mensaje" "Responde como llamada de audio" - "Responder a una llamada entrante y finalizar una llamada" + "Responder a una llamada entrante y finalizar una llamada en curso" "El vídeo está desconectado" "Desliza dos dedos hacia arriba para responder o hacia abajo para rechazar la llamada." "Llamada importante" diff --git a/java/com/android/incallui/answer/impl/res/values-th/strings.xml b/java/com/android/incallui/answer/impl/res/values-th/strings.xml index 4f5e3208e..6df79594c 100644 --- a/java/com/android/incallui/answer/impl/res/values-th/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-th/strings.xml @@ -3,8 +3,8 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "เลื่อนไอคอนเพื่อปฏิเสธสายด้วยข้อความ" "เลื่อนไอคอนเพื่อรับสายเป็นการโทรด้วยเสียง" - "เลื่อนหน้าจอขึ้นเพื่อรับสายและพักสายปัจจุบัน" - "เลื่อนหน้าจอขึ้นเพื่อรับสายและวางสายที่พักไว้" + "เลื่อนขึ้นเพื่อรับและพักสายปัจจุบัน" + "เลื่อนขึ้นเพื่อรับและวางสายที่พักไว้" "เลื่อนจากไอคอนเพื่อรับสายเรียกเข้าและวางสายปัจจุบัน" "เขียนคำตอบของคุณเอง…" "มือถือ" diff --git a/java/com/android/incallui/legacyblocking/BlockedNumberContentObserver.java b/java/com/android/incallui/legacyblocking/BlockedNumberContentObserver.java index 9b5335b69..33e133d7f 100644 --- a/java/com/android/incallui/legacyblocking/BlockedNumberContentObserver.java +++ b/java/com/android/incallui/legacyblocking/BlockedNumberContentObserver.java @@ -21,9 +21,9 @@ import android.database.ContentObserver; import android.os.Handler; import android.provider.CallLog; import android.support.annotation.NonNull; -import com.android.dialer.common.AsyncTaskExecutor; -import com.android.dialer.common.AsyncTaskExecutors; import com.android.dialer.common.LogUtil; +import com.android.dialer.common.concurrent.AsyncTaskExecutor; +import com.android.dialer.common.concurrent.AsyncTaskExecutors; import java.util.Objects; /** diff --git a/java/com/android/incallui/spam/NumberInCallHistoryTask.java b/java/com/android/incallui/spam/NumberInCallHistoryTask.java index a225606f6..886933fb5 100644 --- a/java/com/android/incallui/spam/NumberInCallHistoryTask.java +++ b/java/com/android/incallui/spam/NumberInCallHistoryTask.java @@ -27,9 +27,9 @@ import android.provider.CallLog.Calls; import android.support.annotation.NonNull; import android.telephony.PhoneNumberUtils; import android.text.TextUtils; -import com.android.dialer.common.AsyncTaskExecutor; -import com.android.dialer.common.AsyncTaskExecutors; import com.android.dialer.common.LogUtil; +import com.android.dialer.common.concurrent.AsyncTaskExecutor; +import com.android.dialer.common.concurrent.AsyncTaskExecutors; import com.android.dialer.telecom.TelecomUtil; import com.android.dialer.util.PermissionsUtil; import com.android.incallui.call.DialerCall; diff --git a/java/com/android/incallui/videotech/utils/SessionModificationState.java b/java/com/android/incallui/videotech/utils/SessionModificationState.java index 24b0ca369..9272f8f3d 100644 --- a/java/com/android/incallui/videotech/utils/SessionModificationState.java +++ b/java/com/android/incallui/videotech/utils/SessionModificationState.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License */ + package com.android.incallui.videotech.utils; import android.support.annotation.IntDef; -- cgit v1.2.3