summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2020-09-23 23:53:00 +0000
committerandroid-build-prod (mdb) <android-build-team-robot@google.com>2020-09-23 23:53:00 +0000
commite1dd88ed505f132dcc0eedb7ebf01c0c96773f08 (patch)
tree4c6cb097359f35ff2368e358db0cf68cf5d991d3
parent64ac09f716f8be7a24b20625014c2bd314a71792 (diff)
parent9a8c760538de0a7f91db349bb9754262f3154baf (diff)
downloadplatform_packages_apps_Car_Dialer-simpleperf-release.tar.gz
platform_packages_apps_Car_Dialer-simpleperf-release.tar.bz2
platform_packages_apps_Car_Dialer-simpleperf-release.zip
Snap for 6859336 from 9a8c760538de0a7f91db349bb9754262f3154baf to simpleperf-releasesimpleperf-release
Change-Id: If942aa54a058952269bc7a31580f060dc97c02e2
-rw-r--r--res/values-bn/strings.xml2
-rw-r--r--res/values-eu/strings.xml4
-rw-r--r--src/com/android/car/dialer/ui/contact/ContactDetailsViewHolder.java11
3 files changed, 12 insertions, 5 deletions
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index c8dccde2..0b95d782 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -31,7 +31,7 @@
<string name="answer_call" msgid="3272474440561548115">"উত্তর দিন"</string>
<string name="call_back" msgid="5745638356098600872">"কল ব্যাক করুন"</string>
<string name="audio_route_vehicle" msgid="6250361588960528769">"গাড়ির স্পিকার"</string>
- <string name="audio_route_phone_speaker" msgid="4608904003558187244">"ফোনের স্পিকার"</string>
+ <string name="audio_route_phone_speaker" msgid="4608904003558187244">"ফেনের স্পিকার"</string>
<string name="audio_route_handset" msgid="9133081623895172144">"ফোন"</string>
<string name="dial_a_number" msgid="7432322177412387160">"নম্বর ডায়াল করুন"</string>
<string name="favorites_title" msgid="4767723901530488145">"পছন্দসই"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 64b5ea0e..920f22d5 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -18,8 +18,8 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="phone_app_name" msgid="238824437273544459">"Telefonoa"</string>
<string name="no_hfp" msgid="7371139867234667691">"Dei egiteko, konektatu telefonoa autoarekin Bluetooth bidez."</string>
- <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth-a ez dago erabilgarri."</string>
- <string name="bluetooth_disabled" msgid="1275246762067907843">"Deiak jaso edo egiteko, aktibatu Bluetooth-a."</string>
+ <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth konexioa ez dago erabilgarri."</string>
+ <string name="bluetooth_disabled" msgid="1275246762067907843">"Deiak jaso edo egiteko, aktibatu Bluetooth konexioa."</string>
<string name="bluetooth_unpaired" msgid="1600552386483652892">"Deiak jaso edo egiteko, parekatu telefonoa autoarekin."</string>
<string name="connect_bluetooth_button_text" msgid="293188695227298042">"Konektatu Bluetooth-era"</string>
<string name="emergency_button_text" msgid="3467659545392931727">"Larrialdi-deia"</string>
diff --git a/src/com/android/car/dialer/ui/contact/ContactDetailsViewHolder.java b/src/com/android/car/dialer/ui/contact/ContactDetailsViewHolder.java
index 1eb1d4a8..cc1f3e28 100644
--- a/src/com/android/car/dialer/ui/contact/ContactDetailsViewHolder.java
+++ b/src/com/android/car/dialer/ui/contact/ContactDetailsViewHolder.java
@@ -16,11 +16,11 @@
package com.android.car.dialer.ui.contact;
+import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
-import android.net.Uri;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
@@ -33,6 +33,7 @@ import com.android.car.apps.common.BackgroundImageView;
import com.android.car.apps.common.LetterTileDrawable;
import com.android.car.apps.common.util.ViewUtils;
import com.android.car.dialer.R;
+import com.android.car.dialer.log.L;
import com.android.car.dialer.telecom.UiCallManager;
import com.android.car.dialer.ui.view.ContactAvatarOutputlineProvider;
import com.android.car.telephony.common.Contact;
@@ -49,6 +50,8 @@ import com.bumptech.glide.request.transition.Transition;
* ViewHolder for {@link ContactDetailsFragment}.
*/
class ContactDetailsViewHolder extends RecyclerView.ViewHolder {
+ private static final String TAG = "CD.ContactDetailsVH";
+
// Applies to all
@NonNull
private final TextView mTitle;
@@ -204,6 +207,10 @@ class ContactDetailsViewHolder extends RecyclerView.ViewHolder {
}
private void openMapWithMapIntent(Context context, Intent mapIntent) {
- context.startActivity(mapIntent);
+ try {
+ context.startActivity(mapIntent);
+ } catch (ActivityNotFoundException e) {
+ L.w(TAG, "Map is not available.");
+ }
}
}