Merge "Fix the reappearing fake action bar when returning to the Activity"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 31a5ef3..4c02c94 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -46,8 +46,7 @@
<string name="menu_removeStar" msgid="5844227078364227030">"Verwyder van gunstelinge"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Redigeer"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Vee uit"</string>
- <!-- no translation found for menu_copy (6108677035381940698) -->
- <skip />
+ <string name="menu_copy" msgid="6108677035381940698">"Kopieer"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Plaas op tuisskerm"</string>
<string name="menu_call" msgid="3992595586042260618">"Bel kontak"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Teks - kontak"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 451a8d3..2cedd03 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -46,8 +46,7 @@
<string name="menu_removeStar" msgid="5844227078364227030">"ከተወዳጆች አስወግድ"</string>
<string name="menu_editContact" msgid="9042415603857662633">"አርትዕ"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"ሰርዝ"</string>
- <!-- no translation found for menu_copy (6108677035381940698) -->
- <skip />
+ <string name="menu_copy" msgid="6108677035381940698">"ቅዳ"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"መነሻ የማያ ገጽ ላይ አስቀምጥ"</string>
<string name="menu_call" msgid="3992595586042260618">"የጥሪ ዕውቂያ"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"ዕውቂያ ፃፍ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index fe0ee38..bd6c46b 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -46,8 +46,7 @@
<string name="menu_removeStar" msgid="5844227078364227030">"إزالة من المفضلة"</string>
<string name="menu_editContact" msgid="9042415603857662633">"تعديل"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"حذف"</string>
- <!-- no translation found for menu_copy (6108677035381940698) -->
- <skip />
+ <string name="menu_copy" msgid="6108677035381940698">"نسخ"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"وضع على الشاشة الرئيسية"</string>
<string name="menu_call" msgid="3992595586042260618">"الاتصال بجهة الاتصال"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"إرسال رسالة لجهة الاتصال"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index bb41964..7f1983e 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -46,8 +46,7 @@
<string name="menu_removeStar" msgid="5844227078364227030">"Elimina dels preferits"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Edita"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Suprimeix"</string>
- <!-- no translation found for menu_copy (6108677035381940698) -->
- <skip />
+ <string name="menu_copy" msgid="6108677035381940698">"Copia"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Posa-ho a la pantalla d\'inici"</string>
<string name="menu_call" msgid="3992595586042260618">"Truca al contacte"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Envia un SMS al contacte"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 38c11da..a901937 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -46,8 +46,7 @@
<string name="menu_removeStar" msgid="5844227078364227030">"Fjern fra favoritter"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Rediger"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Slet"</string>
- <!-- no translation found for menu_copy (6108677035381940698) -->
- <skip />
+ <string name="menu_copy" msgid="6108677035381940698">"Kopiér"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Placer på startskærmen"</string>
<string name="menu_call" msgid="3992595586042260618">"Ring til kontakt"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Send sms til kontakt"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 371a237..36adf42 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -46,8 +46,7 @@
<string name="menu_removeStar" msgid="5844227078364227030">"Aus Favoriten entfernen"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Bearbeiten"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Löschen"</string>
- <!-- no translation found for menu_copy (6108677035381940698) -->
- <skip />
+ <string name="menu_copy" msgid="6108677035381940698">"Kopieren"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Auf Startbildschirm platzieren"</string>
<string name="menu_call" msgid="3992595586042260618">"Kontakt anrufen"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"SMS an Kontakt"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 136daee..620de1c 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -46,8 +46,7 @@
<string name="menu_removeStar" msgid="5844227078364227030">"Κατάργηση από τα αγαπημένα"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Επεξεργασία"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Διαγραφή"</string>
- <!-- no translation found for menu_copy (6108677035381940698) -->
- <skip />
+ <string name="menu_copy" msgid="6108677035381940698">"Αντιγραφή"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Τοποθέτηση στην αρχική οθόνη"</string>
<string name="menu_call" msgid="3992595586042260618">"Κλήση επαφής"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Αποστολή μηνύματος κειμένου σε επαφή"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index d0cf129..ae1e793 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -46,8 +46,7 @@
<string name="menu_removeStar" msgid="5844227078364227030">"Remove from favourites"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Edit"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Delete"</string>
- <!-- no translation found for menu_copy (6108677035381940698) -->
- <skip />
+ <string name="menu_copy" msgid="6108677035381940698">"Copy"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Place on Home screen"</string>
<string name="menu_call" msgid="3992595586042260618">"Call contact"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Text contact"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 0471ba6..8bdecf7 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -46,8 +46,7 @@
<string name="menu_removeStar" msgid="5844227078364227030">"Eliminar de favoritos"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Editar"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Eliminar"</string>
- <!-- no translation found for menu_copy (6108677035381940698) -->
- <skip />
+ <string name="menu_copy" msgid="6108677035381940698">"Copiar"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Colocar en pantalla principal"</string>
<string name="menu_call" msgid="3992595586042260618">"Llamar al contacto"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Enviar texto al contacto"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 00bb0e6..695f5cb 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -46,8 +46,7 @@
<string name="menu_removeStar" msgid="5844227078364227030">"Eliminar de \"Favoritos\""</string>
<string name="menu_editContact" msgid="9042415603857662633">"Editar"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Eliminar"</string>
- <!-- no translation found for menu_copy (6108677035381940698) -->
- <skip />
+ <string name="menu_copy" msgid="6108677035381940698">"Copiar"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Añadir al escritorio"</string>
<string name="menu_call" msgid="3992595586042260618">"Llamar al contacto"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Enviar SMS al contacto"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 0e56b42..bf0978e 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -46,8 +46,7 @@
<string name="menu_removeStar" msgid="5844227078364227030">"Eemalda lemmikutest"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Muuda"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Kustuta"</string>
- <!-- no translation found for menu_copy (6108677035381940698) -->
- <skip />
+ <string name="menu_copy" msgid="6108677035381940698">"Kopeeri"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Paiguta avalehele"</string>
<string name="menu_call" msgid="3992595586042260618">"Helista kontaktile"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Saada kontaktile SMS"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index dd246d3..6f3337f 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -46,8 +46,7 @@
<string name="menu_removeStar" msgid="5844227078364227030">"Supprimer des favoris"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Modifier"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Supprimer"</string>
- <!-- no translation found for menu_copy (6108677035381940698) -->
- <skip />
+ <string name="menu_copy" msgid="6108677035381940698">"Copier"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Placer sur l\'écran d\'accueil"</string>
<string name="menu_call" msgid="3992595586042260618">"Appeler le contact"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Envoyer un SMS au contact"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 34274b5..4da7367 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -46,8 +46,7 @@
<string name="menu_removeStar" msgid="5844227078364227030">"Eltávolítás a kedvencek közül"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Szerkesztés"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Törlés"</string>
- <!-- no translation found for menu_copy (6108677035381940698) -->
- <skip />
+ <string name="menu_copy" msgid="6108677035381940698">"Másolás"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Helyezze el a kezdőképernyőn"</string>
<string name="menu_call" msgid="3992595586042260618">"Ismerős hívása"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"SMS küldése ismerősnek"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index fb45614..61375de 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -46,8 +46,7 @@
<string name="menu_removeStar" msgid="5844227078364227030">"Rimuovi dai preferiti"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Modifica"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Elimina"</string>
- <!-- no translation found for menu_copy (6108677035381940698) -->
- <skip />
+ <string name="menu_copy" msgid="6108677035381940698">"Copia"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Aggiungi a schermata Home"</string>
<string name="menu_call" msgid="3992595586042260618">"Chiama"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Invia SMS"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 96f8a27..ada49ed 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -46,8 +46,7 @@
<string name="menu_removeStar" msgid="5844227078364227030">"הסר מהמועדפים"</string>
<string name="menu_editContact" msgid="9042415603857662633">"ערוך"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"מחק"</string>
- <!-- no translation found for menu_copy (6108677035381940698) -->
- <skip />
+ <string name="menu_copy" msgid="6108677035381940698">"העתק"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"הצב במסך הבית"</string>
<string name="menu_call" msgid="3992595586042260618">"התקשר לאיש קשר"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"שלח הודעת טקסט לאיש קשר"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 1406c15..bfd4aeb 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -46,8 +46,7 @@
<string name="menu_removeStar" msgid="5844227078364227030">"Pašalinti iš adresyno"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Redaguoti"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Ištrinti"</string>
- <!-- no translation found for menu_copy (6108677035381940698) -->
- <skip />
+ <string name="menu_copy" msgid="6108677035381940698">"Kopijuoti"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Padėti pagrindiniame ekrane"</string>
<string name="menu_call" msgid="3992595586042260618">"Skambinti adresatui"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Siųsti pranešimą adresatui"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 7482ee8..315a88b 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -46,8 +46,7 @@
<string name="menu_removeStar" msgid="5844227078364227030">"Noņemt no izlases"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Rediģēt"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Dzēst"</string>
- <!-- no translation found for menu_copy (6108677035381940698) -->
- <skip />
+ <string name="menu_copy" msgid="6108677035381940698">"Kopēt"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Novietot sākuma ekrānā"</string>
<string name="menu_call" msgid="3992595586042260618">"Zvanīt kontaktpersonai"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Sūtīt īsziņu kontaktpersonai"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index be36c51..d22dc0b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -46,8 +46,7 @@
<string name="menu_removeStar" msgid="5844227078364227030">"Fjern fra favoritter"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Rediger"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Slett"</string>
- <!-- no translation found for menu_copy (6108677035381940698) -->
- <skip />
+ <string name="menu_copy" msgid="6108677035381940698">"Kopiér"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Plassér på startsiden"</string>
<string name="menu_call" msgid="3992595586042260618">"Ring kontakt"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Send SMS til kontakt"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index a7cf2eb..16aa2d9 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -46,8 +46,7 @@
<string name="menu_removeStar" msgid="5844227078364227030">"Uit favorieten verwijderen"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Bewerken"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Verwijderen"</string>
- <!-- no translation found for menu_copy (6108677035381940698) -->
- <skip />
+ <string name="menu_copy" msgid="6108677035381940698">"Kopiëren"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Op startscherm plaatsen"</string>
<string name="menu_call" msgid="3992595586042260618">"Contact bellen"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Sms\'en naar contact"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 9de25b3..81c8de5 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -46,8 +46,7 @@
<string name="menu_removeStar" msgid="5844227078364227030">"Удалить из избранных"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Изменить"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Удалить"</string>
- <!-- no translation found for menu_copy (6108677035381940698) -->
- <skip />
+ <string name="menu_copy" msgid="6108677035381940698">"Копировать"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Поместить на главный экран"</string>
<string name="menu_call" msgid="3992595586042260618">"Позвонить"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Отправить SMS/MMS"</string>
@@ -159,7 +158,7 @@
<string name="private_num" msgid="6374339738119166953">"Скрытый номер"</string>
<string name="payphone" msgid="4864313342828942922">"Телефон-автомат"</string>
<string name="dialerKeyboardHintText" msgid="5401660096579787344">"Наберите номер с клавиатуры"</string>
- <string name="dialerDialpadHintText" msgid="5824490365898349041">"Наберите номер, чтобы добавить вызов"</string>
+ <string name="dialerDialpadHintText" msgid="5824490365898349041">"Наберите номер"</string>
<string name="simContacts_emptyLoading" msgid="6700035985448642408">"Загрузка с SIM-карты…"</string>
<string name="simContacts_title" msgid="27341688347689769">"Контакты на SIM-карте"</string>
<string name="noContactsHelpTextWithSyncForCreateShortcut" msgid="801504710275614594">"Отсутствуют контакты для отображения. (Если аккаунт был только что добавлен, потребуется несколько минут для синхронизации контактов.)"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 682bdc8..c0d5f8f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -46,8 +46,7 @@
<string name="menu_removeStar" msgid="5844227078364227030">"Ta bort från Favoriter"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Redigera"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Ta bort"</string>
- <!-- no translation found for menu_copy (6108677035381940698) -->
- <skip />
+ <string name="menu_copy" msgid="6108677035381940698">"Kopiera"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Placera på startsidan"</string>
<string name="menu_call" msgid="3992595586042260618">"Ring upp kontakt"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Skicka SMS till kontakt"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 5f2a18f..db88e7c 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -48,7 +48,7 @@
<string name="menu_deleteContact" msgid="6788644058868189393">"Futa"</string>
<!-- no translation found for menu_copy (6108677035381940698) -->
<skip />
- <string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Mahali kwenye skrini ya Nyumbani"</string>
+ <string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Weka kwenye skrini ya Nyumbani"</string>
<string name="menu_call" msgid="3992595586042260618">"Mpigie"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Tuma ujumbe kwa anwani"</string>
<string name="menu_splitAggregate" msgid="8368636463748691868">"Kando"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 2a18812..469f899 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -46,8 +46,7 @@
<string name="menu_removeStar" msgid="5844227078364227030">"Видалити з вибраного"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Редагувати"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Видалити"</string>
- <!-- no translation found for menu_copy (6108677035381940698) -->
- <skip />
+ <string name="menu_copy" msgid="6108677035381940698">"Копіювати"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Місце на головному екрані"</string>
<string name="menu_call" msgid="3992595586042260618">"Набрати конт."</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Повід. контакт"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 11fc663..0ceb87a 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -46,8 +46,7 @@
<string name="menu_removeStar" msgid="5844227078364227030">"Susa ezintandokazini"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Hlela"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Susa"</string>
- <!-- no translation found for menu_copy (6108677035381940698) -->
- <skip />
+ <string name="menu_copy" msgid="6108677035381940698">"Kopisha"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Indawo esikrinini sekhaya"</string>
<string name="menu_call" msgid="3992595586042260618">"Shayela othintana naye"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Bhalela othintana naye"</string>
diff --git a/tests/res/layout/fill_call_log_test.xml b/tests/res/layout/fill_call_log_test.xml
index a5f64f5..01ade3e 100644
--- a/tests/res/layout/fill_call_log_test.xml
+++ b/tests/res/layout/fill_call_log_test.xml
@@ -31,7 +31,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="number"
+ android:text="10"
/>
+ <CheckBox
+ android:id="@+id/use_random_numbers"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/useRandomNumbers"
+ />
<Button
android:id="@+id/add"
android:layout_width="match_parent"
diff --git a/tests/res/values/donottranslate_strings.xml b/tests/res/values/donottranslate_strings.xml
index c3cbc10..6db9e8b 100644
--- a/tests/res/values/donottranslate_strings.xml
+++ b/tests/res/values/donottranslate_strings.xml
@@ -96,8 +96,9 @@
<string name="fillCallLogTest">Fill call log test</string>
<string name="addToCallLogButton">Add</string>
<string name="numberOfCallLogEntries">Number of call log entries to add:</string>
+ <string name="useRandomNumbers">Use random numbers</string>
<string name="addedLogEntriesToast">Added %1$d call log entries.</string>
- <string name="noLogEntriesToast">No entries in the call log yet.</string>
+ <string name="noLogEntriesToast">No entries in the call log yet. Need at least one record for the template. Or use random numbers.</string>
<string name="chooseAContactButton">Choose a contact to add stream items to</string>
<string name="exitButton">Exit</string>
diff --git a/tests/src/com/android/contacts/tests/calllog/FillCallLogTestActivity.java b/tests/src/com/android/contacts/tests/calllog/FillCallLogTestActivity.java
index 189cd1f..3fc44cb 100644
--- a/tests/src/com/android/contacts/tests/calllog/FillCallLogTestActivity.java
+++ b/tests/src/com/android/contacts/tests/calllog/FillCallLogTestActivity.java
@@ -32,11 +32,12 @@
import android.util.Log;
import android.view.View;
import android.widget.Button;
+import android.widget.CheckBox;
import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
-import java.security.SecureRandom;
+import java.util.Random;
/**
* Activity to add entries to the call log for testing.
@@ -46,9 +47,15 @@
/** Identifier of the loader for querying the call log. */
private static final int CALLLOG_LOADER_ID = 1;
+ private static final Random RNG = new Random();
+ private static final int[] CALL_TYPES = new int[] {
+ Calls.INCOMING_TYPE, Calls.OUTGOING_TYPE, Calls.MISSED_TYPE,
+ };
+
private TextView mNumberTextView;
private Button mAddButton;
private ProgressBar mProgressBar;
+ private CheckBox mUseRandomNumbers;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -57,12 +64,23 @@
mNumberTextView = (TextView) findViewById(R.id.number);
mAddButton = (Button) findViewById(R.id.add);
mProgressBar = (ProgressBar) findViewById(R.id.progress);
+ mUseRandomNumbers = (CheckBox) findViewById(R.id.use_random_numbers);
mAddButton.setOnClickListener(new View.OnClickListener(){
@Override
public void onClick(View v) {
- int count = Integer.parseInt(mNumberTextView.getText().toString());
- addEntriesToCallLog(count);
+ int count;
+ try {
+ count = Integer.parseInt(mNumberTextView.getText().toString());
+ if (count > 100) {
+ throw new RuntimeException("Number too large. Max=100");
+ }
+ } catch (RuntimeException e) {
+ Toast.makeText(FillCallLogTestActivity.this, e.toString(), Toast.LENGTH_LONG)
+ .show();
+ return;
+ }
+ addEntriesToCallLog(count, mUseRandomNumbers.isChecked());
mNumberTextView.setEnabled(false);
mAddButton.setEnabled(false);
mProgressBar.setProgress(0);
@@ -78,8 +96,13 @@
*
* @param count the number of entries to add
*/
- private void addEntriesToCallLog(final int count) {
- getLoaderManager().initLoader(CALLLOG_LOADER_ID, null, new CallLogLoaderListener(count));
+ private void addEntriesToCallLog(final int count, boolean useRandomNumbers) {
+ if (useRandomNumbers) {
+ addRandomNumbers(count);
+ } else {
+ getLoaderManager().initLoader(CALLLOG_LOADER_ID, null,
+ new CallLogLoaderListener(count));
+ }
}
/**
@@ -133,6 +156,21 @@
return values;
}
+ private void addRandomNumbers(int count) {
+ ContentValues[] values = new ContentValues[count];
+ for (int i = 0; i < count; i++) {
+ values[i] = new ContentValues();
+ values[i].put(Calls.NUMBER, generateRandomNumber());
+ values[i].put(Calls.DATE, System.currentTimeMillis()); // Will be randomized later
+ values[i].put(Calls.DURATION, 1); // Will be overwritten later
+ }
+ new AsyncCallLogInserter(values).execute(new Void[0]);
+ }
+
+ private static String generateRandomNumber() {
+ return String.format("5%09d", RNG.nextInt(1000000000));
+ }
+
/** Invokes {@link AsyncCallLogInserter} when the call log has loaded. */
private final class CallLogLoaderListener implements LoaderManager.LoaderCallbacks<Cursor> {
/** The number of items to insert when done. */
@@ -151,31 +189,29 @@
@Override
public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
- Log.d(TAG, "onLoadFinished");
- // Stores the content values associated with the various entries in call log.
- // It needs at most as many entries as the number of entries in the templates, or the
- // number of entries to insert, whichever is smaller.
- int dataCount = Math.min(data.getCount(), mCount);
+ try {
+ Log.d(TAG, "onLoadFinished");
- if (dataCount == 0) {
- // If there are no entries in the call log, we cannot generate new ones.
- insertCompleted(getString(R.string.noLogEntriesToast));
- return;
- }
-
- ContentValues[] values = new ContentValues[dataCount];
- for (int index = 0; index < dataCount; ++index) {
- if (!data.moveToNext()) {
- throw new IllegalStateException("unexpected end of data");
+ if (data.getCount() == 0) {
+ // If there are no entries in the call log, we cannot generate new ones.
+ insertCompleted(getString(R.string.noLogEntriesToast));
+ return;
}
- if (values[index] == null) {
- // Create the content value at most once.
+
+ data.moveToPosition(-1);
+
+ ContentValues[] values = new ContentValues[mCount];
+ for (int index = 0; index < mCount; ++index) {
+ if (!data.moveToNext()) {
+ data.moveToFirst();
+ }
values[index] = createContentValuesFromCursor(data);
}
+ new AsyncCallLogInserter(values).execute(new Void[0]);
+ } finally {
+ // This is a one shot loader.
+ getLoaderManager().destroyLoader(CALLLOG_LOADER_ID);
}
- new AsyncCallLogInserter(mCount, values).execute(new Void[0]);
- // This is a one shot loader.
- getLoaderManager().destroyLoader(CALLLOG_LOADER_ID);
}
@Override
@@ -185,14 +221,10 @@
/** Inserts a given number of entries in the call log based on the values given. */
private final class AsyncCallLogInserter extends AsyncTask<Void, Integer, Integer> {
/** The number of items to insert. */
- private final int mCount;
private final ContentValues[] mValues;
- private final SecureRandom mRandom;
- public AsyncCallLogInserter(int count, ContentValues[] values) {
- mCount = count;
+ public AsyncCallLogInserter(ContentValues[] values) {
mValues = values;
- mRandom = new SecureRandom();
}
@Override
@@ -221,19 +253,33 @@
private Integer insertIntoCallLog() {
int inserted = 0;
- for (int index = 0; index < mCount; ++index) {
- ContentValues values = mValues[index % mValues.length];
+ for (int index = 0; index < mValues.length; ++index) {
+ ContentValues values = mValues[index];
// These should not be set.
values.putNull(Calls._ID);
// Add some randomness to the date. For each new entry being added, add an extra
// day to the maximum possible offset from the original.
values.put(Calls.DATE,
values.getAsLong(Calls.DATE)
- - mRandom.nextInt(24 * 60 * 60 * (index + 1)) * 1000L);
+ - RNG.nextInt(24 * 60 * 60 * (index + 1)) * 1000L);
// Add some randomness to the duration.
if (values.getAsLong(Calls.DURATION) > 0) {
- values.put(Calls.DURATION, mRandom.nextInt(30 * 60 * 60 * 1000));
+ values.put(Calls.DURATION, RNG.nextInt(30 * 60 * 60 * 1000));
}
+
+ // Overwrite type.
+ values.put(Calls.TYPE, CALL_TYPES[RNG.nextInt(CALL_TYPES.length)]);
+
+ // Clear cached columns.
+ values.putNull(Calls.CACHED_FORMATTED_NUMBER);
+ values.putNull(Calls.CACHED_LOOKUP_URI);
+ values.putNull(Calls.CACHED_MATCHED_NUMBER);
+ values.putNull(Calls.CACHED_NAME);
+ values.putNull(Calls.CACHED_NORMALIZED_NUMBER);
+ values.putNull(Calls.CACHED_NUMBER_LABEL);
+ values.putNull(Calls.CACHED_NUMBER_TYPE);
+ values.putNull(Calls.CACHED_PHOTO_ID);
+
// Insert into the call log the newly generated entry.
ContentProviderClient contentProvider =
getContentResolver().acquireContentProviderClient(