am e6f46829: (-s ours) Import translations. DO NOT MERGE
* commit 'e6f468299b7fa7befbaec1df5f0782756e077a23':
Import translations. DO NOT MERGE
diff --git a/res/drawable/ic_close_lt.xml b/res/drawable/ic_close_lt.xml
new file mode 100644
index 0000000..178b8a0
--- /dev/null
+++ b/res/drawable/ic_close_lt.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2014 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/ic_close_dk"
+ android:autoMirrored="true"
+ android:tint="@android:color/black" />
\ No newline at end of file
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index dd56f89..9870127 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Kies \'n kontakkortpad"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Kies \'n nommer om te bel"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Kies \'n nommer om te stuur"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Voeg by kontakte"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Kies \'n kontak"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Skep nuwe kontak"</string>
<string name="starredList" msgid="4817256136413959463">"Gester"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 14e4bf0..b0b21ca 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"የዕውቂያአቋራጭ ምረጥ"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"ለመደወል ቁጥር ምረጥ"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"መልዕክትለመላክ ቁጥር ምረጥ"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"ወደ ዕውቂያ አክል"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"ዕውቅያ ምረጥ"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"አዲስ እውቂያ ይፍጠሩ"</string>
<string name="starredList" msgid="4817256136413959463">"ኮከብ የተደረገባቸው"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 619145f..93e1e57 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"اختيار اختصار لجهة الاتصال"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"اختيار رقم للاتصال به"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"اختيار رقم لإرسال رسالة له"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"إضافة إلى جهة اتصال"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"اختيار جهة اتصال"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"إنشاء جهة اتصال جديدة"</string>
<string name="starredList" msgid="4817256136413959463">"مميّزة بنجمة"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 7dee020..665e69f 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Избор на пряк път до контакт"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Избор на номер за обаждане"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Избор на номер за изпращане на съобщение"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Добавяне към контакта"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Избор на контакт"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Създайте нов контакт"</string>
<string name="starredList" msgid="4817256136413959463">"Със звезда"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 46ab365..9601971 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Trieu una drecera de contacte"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Trieu un número per trucar-hi"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Trieu un número per enviar-hi un missatge"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Afegeix al contacte"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Tria un contacte"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Crea un contacte nou"</string>
<string name="starredList" msgid="4817256136413959463">"Destacats"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9fd8e5c..b921501 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Výběr zkratky kontaktu"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Výběr čísla pro hovor"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Výběr čísla pro zprávu"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Přidat do kontaktu"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Vyberte kontakt"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Vytvořte nový kontakt"</string>
<string name="starredList" msgid="4817256136413959463">"Označené hvězdičkou"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 4ea0f65..59a9939 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Vælg en kontaktgenvej"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Vælg et nummer at ringe til"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Vælg et nummer, som beskeden skal sendes til"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Føj til kontaktperson"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Vælg en kontaktperson"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Opret ny kontaktperson"</string>
<string name="starredList" msgid="4817256136413959463">"Stjernemarkerede"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 35bddc0..4f8b53a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Verknüpfung für Kontakt auswählen"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Nummer für den Anruf auswählen"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Nummer für Nachricht auswählen"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Zu Kontakt hinzufügen"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Kontakt auswählen"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Neuen Kontakt erstellen"</string>
<string name="starredList" msgid="4817256136413959463">"Markiert"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ce4c977..f2b56c9 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Επιλογή μιας συντόμευσης επαφών"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Επιλογή ενός αριθμού για κλήση"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Επιλογή ενός αριθμού για μήνυμα"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Προσθήκη σε επαφή"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Επιλέξτε μια επαφή"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Δημιουργία νέας επαφής"</string>
<string name="starredList" msgid="4817256136413959463">"Με αστέρι"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 2615069..4225c93 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Choose a contact short cut"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Choose a number to call"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Choose a number to message"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Add to contact"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Choose a contact"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Create new contact"</string>
<string name="starredList" msgid="4817256136413959463">"Starred"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 2615069..4225c93 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Choose a contact short cut"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Choose a number to call"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Choose a number to message"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Add to contact"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Choose a contact"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Create new contact"</string>
<string name="starredList" msgid="4817256136413959463">"Starred"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index e3faf85..329b22f 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Seleccionar un acceso directo"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Seleccionar un número para la llamada"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Seleccionar un número para el mensaje"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Agregar al contacto"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Seleccionar un contacto"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Crear contacto nuevo"</string>
<string name="starredList" msgid="4817256136413959463">"Destacados"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 4b960ac..880d58a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Elegir un acceso directo para el contacto"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Elegir un número para la llamada"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Elegir un número para el mensaje"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Añadir al contacto"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Seleccionar un contacto"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Crear nuevo contacto"</string>
<string name="starredList" msgid="4817256136413959463">"Destacados"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 5013d91..a61519d 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Kontakti otsetee valimine"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Valige helistamiseks number"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Valige sõnumi jaoks number"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Kontaktile lisamine"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Kontakti valimine"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Loo uus kontakt"</string>
<string name="starredList" msgid="4817256136413959463">"Tärniga"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 8f4ffe2..fbbb148 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"انتخاب یک میانبر مخاطب"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"انتخاب یک شماره برای تماس"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"انتخاب یک شماره برای پیام"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"افزودن به مخاطب"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"انتخاب یک مخاطب"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"ایجاد مخاطب جدید"</string>
<string name="starredList" msgid="4817256136413959463">"ستارهدار"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f3408aa..152c03f 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -25,6 +25,8 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Valitse pikakuvakkeen yhteystieto"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Valitse vastaanottajan numero"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Valitse vastaanottajan numero"</string>
+ <!-- no translation found for contactInsertOrEditActivityTitle (6527505405325862674) -->
+ <skip />
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Valitse yhteystieto"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Luo uusi yhteystieto"</string>
<string name="starredList" msgid="4817256136413959463">"Tähdelliset"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 27eb930..5ab08e3 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Choisir un contact pour le raccourci"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Choisissez le numéro à appeler"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Choisissez le numéro auquel envoyer le message"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Ajouter au contact"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Sélectionner un contact"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Créer un contact"</string>
<string name="starredList" msgid="4817256136413959463">"Favoris"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index cc357e6..3db8214 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Choisissez un contact pour le raccourci"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Choisissez le numéro à appeler"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Choisissez le numéro auquel envoyer le message"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Ajouter au contact"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Sélectionner un contact"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Créer un contact"</string>
<string name="starredList" msgid="4817256136413959463">"Favoris"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index dd60f0b..03ed33d 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"कोई संपर्क शॉर्टकट चुनें"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"कॉल करने के लिए कोई नंबर चुनें"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"संदेश भेजने के लिए कोई नंबर चुनें"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"संपर्क में जोड़ें"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"कोई संपर्क चुनें"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"नया संपर्क बनाएं"</string>
<string name="starredList" msgid="4817256136413959463">"तारांकित"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 792fdc8..eff4e3d 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Odaberite prečac kontakta"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Odaberite broj za pozivanje"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Odabir broja za poruku"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Dodavanje kontaktu"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Odaberite kontakt"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Izrada novog kontakta"</string>
<string name="starredList" msgid="4817256136413959463">"Sa zvjezdicom"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index bbc2df8..90ff1c7 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Válasszon névjegyet a parancsikonhoz"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Válasszon telefonszámot a híváshoz"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Válasszon telefonszámot az üzenetküldéshez"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Hozzáadás névjegyhez"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Névjegy kiválasztása"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Új névjegy létrehozása"</string>
<string name="starredList" msgid="4817256136413959463">"Csillaggal megjelölt"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 1d0eb73..b1e4174 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -25,6 +25,8 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Ընտրել կոնտակտի դյուրանցումը"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Ընտրել զանգելու համարը"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Ընտրել համարը՝ հաղորդագրելու համար"</string>
+ <!-- no translation found for contactInsertOrEditActivityTitle (6527505405325862674) -->
+ <skip />
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Ընտրել կոնտակտ"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Ստեղծել նոր կոնտակտ"</string>
<string name="starredList" msgid="4817256136413959463">"Աստղանշված"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 69d44df..8e41fdf 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Pilih pintasan kontak"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Pilih nomor untuk dipanggil"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Pilih nomor untuk dikirimi pesan"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Tambahkan ke kontak"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Pilih kontak"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Buat kontak baru"</string>
<string name="starredList" msgid="4817256136413959463">"Yang berbintang"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 31890ba..a023736 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Scegli una scorciatoia contatto"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Scegli un numero da chiamare"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Scegli un numero a cui inviare il messaggio"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Aggiungi al contatto"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Scegli un contatto"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Crea nuovo contatto"</string>
<string name="starredList" msgid="4817256136413959463">"Speciali"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2356765..47e9121 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"בחר קיצור דרך של איש קשר"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"בחר מספר להתקשר אליו"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"בחר מספר לשליחת הודעה"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"הוסף לאיש קשר"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"בחר איש קשר"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"צור איש קשר חדש"</string>
<string name="starredList" msgid="4817256136413959463">"מסומן בכוכב"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index fb1f83f..dd131f6 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"連絡先ショートカットを選択"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"発信する番号の選択"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"メッセージを送る番号の選択"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"連絡先に追加"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"連絡先を選択"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"新しい連絡先を作成"</string>
<string name="starredList" msgid="4817256136413959463">"スター付き"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 80676a9..f235b56 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -25,6 +25,8 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"კონტაქტის მალსახმობის არჩევა"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"დასარეკად აირჩიეთ ნომერი"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"ნომრის შერჩევა შეტყობინების გასაგზავნად"</string>
+ <!-- no translation found for contactInsertOrEditActivityTitle (6527505405325862674) -->
+ <skip />
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"კონტაქტის არჩევა"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"ახალი კონტაქტის შექმნა"</string>
<string name="starredList" msgid="4817256136413959463">"ვარსკვლავიანი"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 0c6eada..7aafa8d 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -25,6 +25,8 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"ជ្រើសផ្លូវកាត់ទំនាក់ទំនង"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"ជ្រើសលេខដើម្បីហៅ"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"ជ្រើសលេខដើម្បីផ្ញើសារ"</string>
+ <!-- no translation found for contactInsertOrEditActivityTitle (6527505405325862674) -->
+ <skip />
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"ជ្រើសទំនាក់ទំនង"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"បង្កើតទំនាក់ទំនងថ្មី"</string>
<string name="starredList" msgid="4817256136413959463">"បានដាក់ផ្កាយ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index be5a949..a78560d 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"연락처 바로가기 선택"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"전화번호 선택"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"메시지를 보낼 번호 선택"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"연락처에 추가"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"연락처 선택"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"새 연락처 만들기"</string>
<string name="starredList" msgid="4817256136413959463">"중요주소록"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 19e3161..fad1c3f 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"ເລືອກທາງລັດລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"ເລືອກໝາຍເລກເພື່ອໂທ"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"ເລືອກເບີເພື່ອສົ່ງຂໍ້ຄວາມ"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"ເພີ່ມໃສ່ລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"ເລືອກລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"ສ້າງລາຍຊື່ຜູ່ຕິດຕໍ່ໃໝ່"</string>
<string name="starredList" msgid="4817256136413959463">"ໝາຍດາວແລ້ວ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index f49cec7..691cb34 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Pasirinkti adresato nuorodą"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Pasirinkite numerį, kuriuo skambinsite"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Pasirinkti numerį, kuriuo bus siunčiamas pranešimas"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Pridėti prie kontakto"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Pasirinkti kontaktą"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Kurti naują kontaktą"</string>
<string name="starredList" msgid="4817256136413959463">"Pažymėta žvaigždute"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 2dad650..5afaa0b 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Izvēlieties kontaktpersonas saīsni"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Izvēlieties numuru, uz kuru zvanīt"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Izvēlieties numuru, uz kuru sūtīt īsziņu"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Pievienot kontaktpersonai"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Kontaktpersonas izvēle"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Radiet jaunu kontaktpersonu"</string>
<string name="starredList" msgid="4817256136413959463">"Atzīmēti ar zvaigznīti"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 02d0b0b..bc9bc3c 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Харилцагчийн товчилборыг сонгоно уу"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Залгах дугаарыг сонгоно уу"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Зурвас илгээх дугаарыг сонгох"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Харилцагчид нэмэх"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Харилцагч сонгоно уу"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Шинэ харилцагч үүсгэх"</string>
<string name="starredList" msgid="4817256136413959463">"Одтой"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index d85edc6..89bb40f 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -25,6 +25,8 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Pilih pintasan kenalan"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Pilih nombor untuk memanggil"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Pilih nombor untuk menghantar mesej"</string>
+ <!-- no translation found for contactInsertOrEditActivityTitle (6527505405325862674) -->
+ <skip />
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Pilih kenalan"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Buat kenalan baharu"</string>
<string name="starredList" msgid="4817256136413959463">"Dibintangkan"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 726441d..1fe2605 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Velg en kontaktsnarvei"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Velg et nummer å ringe"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Velg et nummer å sende melding til"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Legg til kontakt"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Velg en kontakt"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Opprett ny kontakt"</string>
<string name="starredList" msgid="4817256136413959463">"Med stjerne"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 905d6fe..4dba8be 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Kies een contactsnelkoppeling"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Kies een nummer om te bellen"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Kies een nummer voor bericht"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Aan contact toevoegen"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Een contact kiezen"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Nieuw contact maken"</string>
<string name="starredList" msgid="4817256136413959463">"Met ster"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 31f136e..0be94be 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Wybierz skrót kontaktu"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Wybierz numer, aby nawiązać połączenie"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Wybierz numer, aby wysłać wiadomość"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Dodaj do kontaktu"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Wybierz kontakt"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Utwórz nowy kontakt"</string>
<string name="starredList" msgid="4817256136413959463">"Oznaczony gwiazdką"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 2e738ac..8e23762 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Seleccionar um atalho de contacto"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Seleccionar um número a marcar"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Seleccionar um número para enviar mensagem"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Adicionar ao contacto"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Escolher um contacto"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Criar novo contacto"</string>
<string name="starredList" msgid="4817256136413959463">"Marcado com estrela"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 8f1ef21..277f8c3 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -25,6 +25,8 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Escolha o atalho para um contato"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Escolha um número a ser chamado"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Escolha um número para enviar uma mensagem"</string>
+ <!-- no translation found for contactInsertOrEditActivityTitle (6527505405325862674) -->
+ <skip />
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Escolha um contato"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Criar novo contato"</string>
<string name="starredList" msgid="4817256136413959463">"Com estrela"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index e170030..c0e1d70 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -25,6 +25,8 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Alegeţi o persoană din agendă pentru a crea o comandă rapidă"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Alegeţi un număr pentru apelare"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Alegeţi un număr pentru trimiterea mesajului"</string>
+ <!-- no translation found for contactInsertOrEditActivityTitle (6527505405325862674) -->
+ <skip />
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Alegeţi o persoană de contact"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Creați intrare nouă în Agendă"</string>
<string name="starredList" msgid="4817256136413959463">"Cu stea"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 1f6fa51..a208593 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Выбрать контакт для быстрого вызова"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Выберите номер для вызова"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Выбрать номер для отправки сообщения"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Добавление данных"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Выбор контакта"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Добавить контакт"</string>
<string name="starredList" msgid="4817256136413959463">"Помеченные"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 9528363..bc04a0d 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Výber skratky kontaktu"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Výber čísla pre hovor"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Výber čísla pre správu"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Pridať ku kontaktu"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Vyberte kontakt"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Vytvoriť nový kontakt"</string>
<string name="starredList" msgid="4817256136413959463">"Označené hviezdičkou"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index d121fa1..01adad8 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Izberite bližnjico stika"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Izberite klicno številko"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Izberi številko za pošiljanje sporočila"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Dodajanje v stik"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Izbira stika"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Ustvarite nov stik"</string>
<string name="starredList" msgid="4817256136413959463">"Z zvezdico"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index c17ab6d..5183aff 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Одаберите пречицу за контакт"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Одаберите број за позив"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Одаберите број за слање порука"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Додајте контакту"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Изаберите контакт"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Направи нови контакт"</string>
<string name="starredList" msgid="4817256136413959463">"Са звездицом"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f05e255..0dc5476 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Välj genväg till kontakten"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Välj ett nummer som du vill ringa"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Välj ett nummer för meddelandet"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Lägg till kontakt"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Välj en kontakt"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Skapa ny kontakt"</string>
<string name="starredList" msgid="4817256136413959463">"Stjärnmärkta"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d68adcb..8777980 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Chagua njia ya mkato ya anwani"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Chagua nambari ya kupiga"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Chagua nambari ya kutumia ujumbe"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Ongeza kwenye anwani"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Chagua mwasiliani"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Ongeza anwani mpya"</string>
<string name="starredList" msgid="4817256136413959463">"Zenye nyota"</string>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 2c542ba..1af9d75 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -15,8 +15,6 @@
-->
<resources>
<dimen name="editor_padding_top">32dip</dimen>
- <dimen name="editor_round_button_padding_left">16dip</dimen>
- <dimen name="editor_round_button_padding_right">16dip</dimen>
<dimen name="editor_type_label_width">122dip</dimen>
<dimen name="editor_add_field_label_left_padding">16dip</dimen>
<dimen name="detail_item_vertical_margin">16dip</dimen>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index d0c3c94..74f7225 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"เลือกทางลัดของสมุดโทรศัพท์"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"เลือกหมายเลขที่จะโทร"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"เลือกหมายเลขที่จะส่งข้อความ"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"เพิ่มลงในรายชื่อติดต่อ"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"เลือกรายชื่อติดต่อ"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"สร้างรายชื่อติดต่อใหม่"</string>
<string name="starredList" msgid="4817256136413959463">"ที่ติดดาว"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 9a7a742..2aad633 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Pumili ng shortcut sa contact"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Pumili ng tatawagang numero"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Pumili ng numero na padadalhan ng mensahe"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Idagdag sa contact"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Pumili ng isang contact"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Gumawa ng bagong contact"</string>
<string name="starredList" msgid="4817256136413959463">"Naka-star"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 3c6e44c..592aaf3 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Bir kişi kısayolu seçin"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Aranacak numarayı seçin"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"İleti gönderilecek bir numara seçin"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Kişiye ekle"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Bir kişi seçin"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Yeni kişi oluştur"</string>
<string name="starredList" msgid="4817256136413959463">"Yıldızlı"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index ca9f6be..3c799d8 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Вибрати ярлик контакту"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Вибір номера для виклику"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Вибір номера для надс. повід."</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Додати в контактні дані"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Вибрати контакт"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Створити новий контакт"</string>
<string name="starredList" msgid="4817256136413959463">"Із зіроч."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index ea2833e..d95657a 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Chọn lối tắt cho liên hệ"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Chọn một số để gọi"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Chọn một số để gửi tin nhắn"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Thêm vào địa chỉ liên hệ"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Chọn địa chỉ liên hệ"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Tạo liên hệ mới"</string>
<string name="starredList" msgid="4817256136413959463">"Được gắn dấu sao"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8857cef..227522e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -25,6 +25,8 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"选择联系人快捷方式"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"选择一个可直接拨号的号码"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"选择一个可直接向其发送短信的号码"</string>
+ <!-- no translation found for contactInsertOrEditActivityTitle (6527505405325862674) -->
+ <skip />
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"选择联系人"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"创建新联系人"</string>
<string name="starredList" msgid="4817256136413959463">"已加星标的内容"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 4bdee84..0791692 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"選擇聯絡人捷徑"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"選擇撥打號碼"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"選擇傳訊號碼"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"新增至通訊錄"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"選擇聯絡人"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"建立新聯絡人"</string>
<string name="starredList" msgid="4817256136413959463">"已加星號"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 15b96e7..4e4fed6 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"選擇聯絡人捷徑"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"選擇去電號碼"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"選擇傳訊號碼"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"加入聯絡人"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"選擇聯絡人"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"建立新聯絡人"</string>
<string name="starredList" msgid="4817256136413959463">"已加星號"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 0758e36..aa5eaaf 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -25,6 +25,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Khetha isinqamuleli sothintana naye"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Khetha inombolo ozoyishayela"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Khetha inombolo kumyalezo"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Faka koxhumana nabo"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Khetha oxhumana naye"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Dala othintana naye omusha"</string>
<string name="starredList" msgid="4817256136413959463">"Okunenkanyezi"</string>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 865704f..cd9795c 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -27,10 +27,10 @@
<dimen name="editor_padding_top">0dip</dimen>
<!-- Padding of the rounded plus/minus/expand/collapse buttons in the editor -->
- <dimen name="editor_round_button_padding_left">8dip</dimen>
- <dimen name="editor_round_button_padding_right">8dip</dimen>
- <dimen name="editor_round_button_padding_top">8dip</dimen>
- <dimen name="editor_round_button_padding_bottom">8dip</dimen>
+ <dimen name="editor_round_button_padding_left">16dip</dimen>
+ <dimen name="editor_round_button_padding_right">16dip</dimen>
+ <dimen name="editor_round_button_padding_top">16dip</dimen>
+ <dimen name="editor_round_button_padding_bottom">16dip</dimen>
<!-- Minimum height of a row in the Editor -->
<dimen name="editor_min_line_item_height">48dip</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8d1c405..68b1190 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -47,6 +47,9 @@
<!-- Activity title when the user is selecting a contact for a direct message shortcut. -->
<string name="messageShortcutActivityTitle">Choose a number to message</string>
+ <!-- Activity title when the user is inserting into an existing contact, or creating a new one. [CHAR LIMIT=128] -->
+ <string name="contactInsertOrEditActivityTitle">Add to contact</string>
+
<!-- Activity title when the user is selecting a contact. [CHAR LIMIT=128] -->
<string name="contactPickerActivityTitle">Choose a contact</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e2bf0aa..d66cf4e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -59,6 +59,7 @@
<item name="android:homeAsUpIndicator">@drawable/ic_back_arrow</item>
<!-- Style for the overflow button in the actionbar. -->
<item name="android:actionOverflowButtonStyle">@style/ContactsActionBarOverflowQP</item>
+ <item name="android:actionModeCloseDrawable">@drawable/ic_close_lt</item>
<item name="android:fastScrollThumbDrawable">@drawable/fastscroll_thumb</item>
<item name="android:textColorPrimary">@color/primary_text_color</item>
<item name="android:textColorSecondary">@color/secondary_text_color</item>
diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java
index c35f192..7bfdf5b 100644
--- a/src/com/android/contacts/activities/ContactSelectionActivity.java
+++ b/src/com/android/contacts/activities/ContactSelectionActivity.java
@@ -223,7 +223,7 @@
int actionCode = mRequest.getActionCode();
switch (actionCode) {
case ContactsRequest.ACTION_INSERT_OR_EDIT_CONTACT: {
- setTitle(R.string.contactPickerActivityTitle);
+ setTitle(R.string.contactInsertOrEditActivityTitle);
break;
}
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index e5574d9..b7270e8 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -191,10 +191,12 @@
private static final String MIMETYPE_GPLUS_PROFILE =
"vnd.android.cursor.item/vnd.googleplus.profile";
- private static final String INTENT_DATA_GPLUS_PROFILE_ADD_TO_CIRCLE = "Add to circle";
+ private static final String GPLUS_PROFILE_DATA_5_ADD_TO_CIRCLE = "addtocircle";
+ private static final String GPLUS_PROFILE_DATA_5_VIEW_PROFILE = "view";
private static final String MIMETYPE_HANGOUTS =
"vnd.android.cursor.item/vnd.googleplus.profile.comm";
- private static final String INTENT_DATA_HANGOUTS_VIDEO = "Start video call";
+ private static final String HANGOUTS_DATA_5_VIDEO = "hangout";
+ private static final String HANGOUTS_DATA_5_MESSAGE = "conversation";
private static final String CALL_ORIGIN_QUICK_CONTACTS_ACTIVITY =
"com.android.contacts.quickcontact.QuickContactActivity";
@@ -1241,9 +1243,11 @@
* additional dependencies on unsafe things (like the Activity).
*
* @param dataItem The {@link DataItem} to convert.
+ * @param secondDataItem A second {@link DataItem} to help build a full entry for some
+ * mimetypes
* @return The {@link ExpandingEntryCardView.Entry}, or null if no visual elements are present.
*/
- private static Entry dataItemToEntry(DataItem dataItem,
+ private static Entry dataItemToEntry(DataItem dataItem, DataItem secondDataItem,
Context context, Contact contactData,
final MutableString aboutCardName) {
Drawable icon = null;
@@ -1493,26 +1497,57 @@
if (intent != null) {
final String mimetype = intent.getType();
- // Attempt to use known icons for known 3p types. Otherwise default to ResolveCache
+ // Build advanced entry for known 3p types. Otherwise default to ResolveCache icon.
switch (mimetype) {
case MIMETYPE_GPLUS_PROFILE:
- if (INTENT_DATA_GPLUS_PROFILE_ADD_TO_CIRCLE.equals(
- intent.getDataString())) {
- icon = res.getDrawable(
- R.drawable.ic_add_to_circles_black_24);
- iconResourceId = R.drawable.ic_add_to_circles_black_24;
- } else {
+ // If a secondDataItem is available, use it to build an entry with
+ // alternate actions
+ if (secondDataItem != null) {
icon = res.getDrawable(R.drawable.ic_google_plus_24dp);
- iconResourceId = R.drawable.ic_google_plus_24dp;
+ alternateIcon = res.getDrawable(R.drawable.ic_add_to_circles_black_24);
+ final GPlusOrHangoutsDataItemModel itemModel =
+ new GPlusOrHangoutsDataItemModel(intent, alternateIntent,
+ dataItem, secondDataItem, alternateContentDescription,
+ header, text, context);
+
+ populateGPlusOrHangoutsDataItemModel(itemModel);
+ intent = itemModel.intent;
+ alternateIntent = itemModel.alternateIntent;
+ alternateContentDescription = itemModel.alternateContentDescription;
+ header = itemModel.header;
+ text = itemModel.text;
+ } else {
+ if (GPLUS_PROFILE_DATA_5_ADD_TO_CIRCLE.equals(
+ intent.getDataString())) {
+ icon = res.getDrawable(R.drawable.ic_add_to_circles_black_24);
+ } else {
+ icon = res.getDrawable(R.drawable.ic_google_plus_24dp);
+ }
}
break;
case MIMETYPE_HANGOUTS:
- if (INTENT_DATA_HANGOUTS_VIDEO.equals(intent.getDataString())) {
- icon = res.getDrawable(R.drawable.ic_hangout_video_24dp);
- iconResourceId = R.drawable.ic_hangout_video_24dp;
- } else {
+ // If a secondDataItem is available, use it to build an entry with
+ // alternate actions
+ if (secondDataItem != null) {
icon = res.getDrawable(R.drawable.ic_hangout_24dp);
- iconResourceId = R.drawable.ic_hangout_24dp;
+ alternateIcon = res.getDrawable(R.drawable.ic_hangout_video_24dp);
+ final GPlusOrHangoutsDataItemModel itemModel =
+ new GPlusOrHangoutsDataItemModel(intent, alternateIntent,
+ dataItem, secondDataItem, alternateContentDescription,
+ header, text, context);
+
+ populateGPlusOrHangoutsDataItemModel(itemModel);
+ intent = itemModel.intent;
+ alternateIntent = itemModel.alternateIntent;
+ alternateContentDescription = itemModel.alternateContentDescription;
+ header = itemModel.header;
+ text = itemModel.text;
+ } else {
+ if (HANGOUTS_DATA_5_VIDEO.equals(intent.getDataString())) {
+ icon = res.getDrawable(R.drawable.ic_hangout_video_24dp);
+ } else {
+ icon = res.getDrawable(R.drawable.ic_hangout_24dp);
+ }
}
break;
default:
@@ -1566,16 +1601,124 @@
private List<Entry> dataItemsToEntries(List<DataItem> dataItems,
MutableString aboutCardTitleOut) {
+ // Hangouts and G+ use two data items to create one entry.
+ if (dataItems.get(0).getMimeType().equals(MIMETYPE_GPLUS_PROFILE) ||
+ dataItems.get(0).getMimeType().equals(MIMETYPE_HANGOUTS)) {
+ return gPlusOrHangoutsDataItemsToEntries(dataItems);
+ } else {
+ final List<Entry> entries = new ArrayList<>();
+ for (DataItem dataItem : dataItems) {
+ final Entry entry = dataItemToEntry(dataItem, /* secondDataItem = */ null,
+ this, mContactData, aboutCardTitleOut);
+ if (entry != null) {
+ entries.add(entry);
+ }
+ }
+ return entries;
+ }
+ }
+
+ /**
+ * G+ and Hangout entries are unique in that a single ExpandingEntryCardView.Entry consists
+ * of two data items. This method attempts to build each entry using the two data items if
+ * they are available. If there are more or less than two data items, a fall back is used
+ * and each data item gets its own entry.
+ */
+ private List<Entry> gPlusOrHangoutsDataItemsToEntries(List<DataItem> dataItems) {
final List<Entry> entries = new ArrayList<>();
+ final Map<Long, List<DataItem>> buckets = new HashMap<>();
+ // Put the data items into buckets based on the raw contact id
for (DataItem dataItem : dataItems) {
- final Entry entry = dataItemToEntry(dataItem, this, mContactData, aboutCardTitleOut);
- if (entry != null) {
- entries.add(entry);
+ List<DataItem> bucket = buckets.get(dataItem.getRawContactId());
+ if (bucket == null) {
+ bucket = new ArrayList<>();
+ buckets.put(dataItem.getRawContactId(), bucket);
+ }
+ bucket.add(dataItem);
+ }
+
+ // Use the buckets to build entries. If a bucket contains two data items, build the special
+ // entry, otherwise fall back to the normal entry.
+ for (List<DataItem> bucket : buckets.values()) {
+ if (bucket.size() == 2) {
+ // Use the pair to build an entry
+ final Entry entry = dataItemToEntry(bucket.get(0),
+ /* secondDataItem = */ bucket.get(1), this, mContactData,
+ /* aboutCardName = */ null);
+ if (entry != null) {
+ entries.add(entry);
+ }
+ } else {
+ for (DataItem dataItem : bucket) {
+ final Entry entry = dataItemToEntry(dataItem, /* secondDataItem = */ null,
+ this, mContactData, /* aboutCardName = */ null);
+ if (entry != null) {
+ entries.add(entry);
+ }
+ }
}
}
return entries;
}
+ /**
+ * Used for statically passing around G+ or Hangouts data items and entry fields to
+ * populateGPlusOrHangoutsDataItemModel.
+ */
+ private static final class GPlusOrHangoutsDataItemModel {
+ public Intent intent;
+ public Intent alternateIntent;
+ public DataItem dataItem;
+ public DataItem secondDataItem;
+ public StringBuilder alternateContentDescription;
+ public String header;
+ public String text;
+ public Context context;
+
+ public GPlusOrHangoutsDataItemModel(Intent intent, Intent alternateIntent, DataItem dataItem,
+ DataItem secondDataItem, StringBuilder alternateContentDescription, String header,
+ String text, Context context) {
+ this.intent = intent;
+ this.alternateIntent = alternateIntent;
+ this.dataItem = dataItem;
+ this.secondDataItem = secondDataItem;
+ this.alternateContentDescription = alternateContentDescription;
+ this.header = header;
+ this.text = text;
+ this.context = context;
+ }
+ }
+
+ private static void populateGPlusOrHangoutsDataItemModel(
+ GPlusOrHangoutsDataItemModel dataModel) {
+ final Intent secondIntent = new Intent(Intent.ACTION_VIEW);
+ secondIntent.setDataAndType(ContentUris.withAppendedId(Data.CONTENT_URI,
+ dataModel.secondDataItem.getId()), dataModel.secondDataItem.getMimeType());
+ // There is no guarantee the order the data items come in. Second
+ // data item does not necessarily mean it's the alternate.
+ // Hangouts video and Add to circles should be alternate. Swap if needed
+ if (HANGOUTS_DATA_5_VIDEO.equals(
+ dataModel.dataItem.getContentValues().getAsString(Data.DATA5)) ||
+ GPLUS_PROFILE_DATA_5_ADD_TO_CIRCLE.equals(
+ dataModel.dataItem.getContentValues().getAsString(Data.DATA5))) {
+ dataModel.alternateIntent = dataModel.intent;
+ dataModel.alternateContentDescription = new StringBuilder(dataModel.header);
+
+ dataModel.intent = secondIntent;
+ dataModel.header = dataModel.secondDataItem.buildDataStringForDisplay(dataModel.context,
+ dataModel.secondDataItem.getDataKind());
+ dataModel.text = dataModel.secondDataItem.getDataKind().typeColumn;
+ } else if (HANGOUTS_DATA_5_MESSAGE.equals(
+ dataModel.dataItem.getContentValues().getAsString(Data.DATA5)) ||
+ GPLUS_PROFILE_DATA_5_VIEW_PROFILE.equals(
+ dataModel.dataItem.getContentValues().getAsString(Data.DATA5))) {
+ dataModel.alternateIntent = secondIntent;
+ dataModel.alternateContentDescription = new StringBuilder(
+ dataModel.secondDataItem.buildDataStringForDisplay(dataModel.context,
+ dataModel.secondDataItem.getDataKind()));
+ }
+ }
+
private static String getIntentResolveLabel(Intent intent, Context context) {
final List<ResolveInfo> matches = context.getPackageManager().queryIntentActivities(intent,
PackageManager.MATCH_DEFAULT_ONLY);
@@ -1822,18 +1965,15 @@
@Override
public Loader<List<ContactInteraction>> onCreateLoader(int id, Bundle args) {
- Log.v(TAG, "onCreateLoader");
Loader<List<ContactInteraction>> loader = null;
switch (id) {
case LOADER_SMS_ID:
- Log.v(TAG, "LOADER_SMS_ID");
loader = new SmsInteractionsLoader(
QuickContactActivity.this,
args.getStringArray(KEY_LOADER_EXTRA_PHONES),
MAX_SMS_RETRIEVE);
break;
case LOADER_CALENDAR_ID:
- Log.v(TAG, "LOADER_CALENDAR_ID");
final String[] emailsArray = args.getStringArray(KEY_LOADER_EXTRA_EMAILS);
List<String> emailsList = null;
if (emailsArray != null) {
@@ -1848,7 +1988,6 @@
PAST_MILLISECOND_TO_SEARCH_LOCAL_CALENDAR);
break;
case LOADER_CALL_LOG_ID:
- Log.v(TAG, "LOADER_CALL_LOG_ID");
loader = new CallLogInteractionsLoader(
QuickContactActivity.this,
args.getStringArray(KEY_LOADER_EXTRA_PHONES),
diff --git a/src/com/android/contacts/widget/MultiShrinkScroller.java b/src/com/android/contacts/widget/MultiShrinkScroller.java
index dfec204..cf32aa1 100644
--- a/src/com/android/contacts/widget/MultiShrinkScroller.java
+++ b/src/com/android/contacts/widget/MultiShrinkScroller.java
@@ -389,6 +389,11 @@
@Override
public boolean onInterceptTouchEvent(MotionEvent event) {
+ if (mVelocityTracker == null) {
+ mVelocityTracker = VelocityTracker.obtain();
+ }
+ mVelocityTracker.addMovement(event);
+
// The only time we want to intercept touch events is when we are being dragged.
return shouldStartDrag(event);
}
@@ -1157,11 +1162,8 @@
}
private boolean motionShouldStartDrag(MotionEvent event) {
- final float deltaX = event.getX() - mLastEventPosition[0];
final float deltaY = event.getY() - mLastEventPosition[1];
- final boolean draggedX = (deltaX > mTouchSlop || deltaX < -mTouchSlop);
- final boolean draggedY = (deltaY > mTouchSlop || deltaY < -mTouchSlop);
- return draggedY && !draggedX;
+ return deltaY > mTouchSlop || deltaY < -mTouchSlop;
}
private float updatePositionAndComputeDelta(MotionEvent event) {