Merge "Prevent ProgressDialog from causing crash."
diff --git a/res/drawable/call_background.xml b/res/drawable/call_background.xml
deleted file mode 100644
index fbc9b3c..0000000
--- a/res/drawable/call_background.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item android:state_window_focused="false"
- android:drawable="@android:color/transparent" />
- <item android:state_focused="false" android:state_pressed="true"
- android:drawable="@*android:drawable/list_selector_background_transition" />
- <item android:state_focused="false" android:state_pressed="false"
- android:drawable="@android:drawable/screen_background_dark"/>
-
-</selector>
diff --git a/res/layout-sw580dp/contact_detail_container.xml b/res/layout-sw580dp/contact_detail_container.xml
index 6ddc98d..fc09dfb 100644
--- a/res/layout-sw580dp/contact_detail_container.xml
+++ b/res/layout-sw580dp/contact_detail_container.xml
@@ -16,10 +16,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingLeft="16dip"
- android:paddingTop="16dip"
- android:paddingRight="16dip">
+ android:layout_height="match_parent">
<android.support.v4.view.ViewPager
android:id="@+id/pager"
diff --git a/res/layout-sw580dp/people_activity.xml b/res/layout-sw580dp/people_activity.xml
index 80ede2d..f93e55e 100644
--- a/res/layout-sw580dp/people_activity.xml
+++ b/res/layout-sw580dp/people_activity.xml
@@ -53,18 +53,11 @@
<view
class="com.android.contacts.widget.TransitionAnimationView"
- android:id="@+id/details_view"
+ android:id="@+id/contact_details_view"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/background_primary"
- ex:clipMarginLeft="0dip"
- ex:clipMarginTop="3dip"
- ex:clipMarginRight="3dip"
- ex:clipMarginBottom="9dip"
- ex:enterAnimation="@android:animator/fade_in"
- ex:exitAnimation="@android:animator/fade_out"
- ex:animationDuration="200"
android:visibility="gone">
<!-- This layout includes all possible views needed for a contact detail page -->
@@ -72,7 +65,10 @@
android:id="@+id/contact_detail_container"
layout="@layout/contact_detail_container"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent"
+ android:layout_marginLeft="16dip"
+ android:layout_marginTop="16dip"
+ android:layout_marginRight="16dip" />
<!-- This invisible worker fragment loads the contact's details -->
<fragment
@@ -81,6 +77,16 @@
android:layout_height="0dip"
android:layout_width="0dip"
android:visibility="gone"/>
+ </view>
+
+ <view
+ class="com.android.contacts.widget.TransitionAnimationView"
+ android:id="@+id/group_details_view"
+ android:layout_width="0dip"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:background="@color/background_primary"
+ android:visibility="gone">
<!-- This is the group detail page -->
<fragment
diff --git a/res/layout-sw680dp-w1000dp/people_activity.xml b/res/layout-sw680dp-w1000dp/people_activity.xml
index f45324e..2dea4eb 100644
--- a/res/layout-sw680dp-w1000dp/people_activity.xml
+++ b/res/layout-sw680dp-w1000dp/people_activity.xml
@@ -55,7 +55,7 @@
<view
class="com.android.contacts.widget.TransitionAnimationView"
- android:id="@+id/details_view"
+ android:id="@+id/contact_details_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
ex:layout_narrowParentWidth="800dip"
@@ -64,13 +64,6 @@
ex:layout_wideParentWidth="1280dip"
ex:layout_wideMarginLeft="0dip"
ex:layout_wideMarginRight="0dip"
- ex:clipMarginLeft="0dip"
- ex:clipMarginTop="3dip"
- ex:clipMarginRight="3dip"
- ex:clipMarginBottom="9dip"
- ex:enterAnimation="@android:animator/fade_in"
- ex:exitAnimation="@android:animator/fade_out"
- ex:animationDuration="200"
android:visibility="gone">
<!-- This layout includes all possible views needed for a contact detail page -->
@@ -87,6 +80,20 @@
android:layout_height="0dip"
android:layout_width="0dip"
android:visibility="gone"/>
+ </view>
+
+ <view
+ class="com.android.contacts.widget.TransitionAnimationView"
+ android:id="@+id/group_details_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ ex:layout_narrowParentWidth="800dip"
+ ex:layout_narrowMarginLeft="0dip"
+ ex:layout_narrowMarginRight="0dip"
+ ex:layout_wideParentWidth="1280dip"
+ ex:layout_wideMarginLeft="0dip"
+ ex:layout_wideMarginRight="0dip"
+ android:visibility="gone">
<!-- This is the group detail page -->
<fragment
diff --git a/res/layout/dialpad_fragment.xml b/res/layout/dialpad_fragment.xml
index df13372..a95e4cb 100644
--- a/res/layout/dialpad_fragment.xml
+++ b/res/layout/dialpad_fragment.xml
@@ -98,7 +98,7 @@
android:layout_height="?android:attr/actionBarSize"
android:layout_gravity="bottom|center_horizontal"
android:src="@drawable/ic_menu_overflow"
- android:contentDescription="@*android:string/action_menu_overflow_description"
+ android:contentDescription="@string/action_menu_overflow_description"
android:nextFocusLeft="@id/digits"
android:background="?android:attr/selectableItemBackground"/>
</LinearLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index a4e3bc0..e225029 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -245,8 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> sal binnekort uitgevoer word."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"vCard-uitvoerversoek is verwerp. Probeer asseblief later."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kontak"</string>
- <!-- no translation found for percentage (1044592438199055502) -->
- <skip />
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Voer kontakte uit?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Jou kontaklys sal uitgevoer word na die lêer: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Kon nie uitvoer nie"</string>
@@ -486,8 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Vee verstek uit"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Teks gekopieer"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Verwerp jou veranderings?"</string>
- <!-- no translation found for call_type_and_date (747163730039311423) -->
- <skip />
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Stel my profiel op"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Voer persoon se naam in"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Sien opdaterings"</string>
@@ -552,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Oproep nie gestuur nie"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Om stemboodskapdiens op te stel, gaan na Kieslys > Instellings."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Om stemboodskapdiens te bel, skakel eers vliegtuigmodus af."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Meer opsies"</string>
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 07bc31a..65dfe5f 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -539,7 +539,7 @@
<string name="external_profile_title" msgid="8034998767621359438">"የእኔ የ<xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g> መገለጫ"</string>
<string name="toast_displaying_all_contacts" msgid="2737388783898593875">"ሁሉንም ዕውቂያዎች በማሳየት ላይ"</string>
<string name="no_account_prompt" msgid="7061052512446855192">"ሰዎች በGoogle መለያ የተሻለ ይሰራሉ።"\n\n"• ከማንኛውም የድረ ማሰሻ ላይ ይድረሱበት።"\n"• ዝግጅቶችዎን በደንብ ያስጠብቁ"</string>
- <string name="generic_no_account_prompt" msgid="7218827704367325460">"ስልክህ ቢጠፋብህ እንኳ ዕውቂያዎችህን ደህንነታቸው እንደተጠበቀ እንዲቆዩ አድርግ ከመስመር ላይ አገልገሎት ጋር አመሳስለው::"</string>
+ <string name="generic_no_account_prompt" msgid="7218827704367325460">"ስልክህ ቢጠፋብህ እንኳን ዕውቂያዎችህን ደህንነታቸው እንደተጠበቀ እንዲቆዩ አድርግ ከመስመር ላይ አገልገሎት ጋር አመሳስለው::"</string>
<string name="generic_no_account_prompt_title" msgid="753783911899054860">"መለያ አክል"</string>
<string name="contact_editor_prompt_zero_accounts" msgid="1785345895691886499">"አዲሱ ዕውቅያ ምትክ አይቀመጥለትም:: በመስመር ላይ ዕውቅያዎች በምትክ የሚያስቀምጥ መለያ አክል?"</string>
<string name="contact_editor_prompt_one_account" msgid="8669032699767375976">"አዲሱ ዕውቅያህ ከ <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g> ጋር ይመሳሰላል፡፡"</string>
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"ጥሪ አልተላከም"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"ድምጽ መልዕክትን ለማደራጀት ወደ ምናሌ > ቅንጅቶች ሂድ::"</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"የድምጽ መልዕክት ጥሪ ለማድረግ፣ በመጀመሪያ የአውሮፕላን ሁነታን አጥፋ።"</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"ተጨማሪ አማራጮች"</string>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index c44eb32..8536a36 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"لم يتم إرسال المكالمة"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"لإعداد البريد الصوتي، انتقل إلى القائمة > الإعدادات."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"للاتصال بالبريد الصوتي، يجب أولاً إيقاف وضع الطائرة."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"المزيد من الخيارات"</string>
</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index ebd12de..6bc2607 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Выклік не зроблены"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Каб наладзіць галасавую пошту, націсніце \"Меню\" i перайдзiце ў налады."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Каб зрабiць выклік галасавой пошты, спачатку адключыце рэжым палёту."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Больш налад"</string>
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 2156058..82b10ec 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -245,8 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> ще се експортира скоро."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Заявката за експортиране на vCard бе отхвърлена. Опитайте отново по-късно."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"контакт"</string>
- <!-- no translation found for percentage (1044592438199055502) -->
- <skip />
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Да се експортират ли контактите?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Списъкът ви с контакти ще се експортира във файла: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Не се експортира"</string>
@@ -486,8 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Изчистване на стандартната настройка"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Текстът бе копиран"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Да се отхвърлят ли направените от вас промени?"</string>
- <!-- no translation found for call_type_and_date (747163730039311423) -->
- <skip />
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Настройка на потребителския ми профил"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Въведете името на човека"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Актуализации"</string>
@@ -552,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Обаждането не е извършено"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"За да настроите гласовата поща, отворете „Меню“ > „Настройки“."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"За да чуете гласовата си поща, първо изключете самолетния режим."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Още опции"</string>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 033f9d3..7aff832 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"No s\'ha enviat la trucada"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Per configurar la bústia de veu, vés a Menú > Configuració."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Per trucar al correu de veu, primer has de desactivar el mode d\'avió."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Més opcions"</string>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 8e50695..48b2075 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Hovor nebyl odeslán"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Chcete-li nastavit hlasovou schránku, přejděte do části Menu > Nastavení."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Chcete-li volat hlasovou schránku, nejdříve vypněte režim V letadle."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Další možnosti"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index d481a9f..f4a6c6f 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Opkaldet blev ikke sendt"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Hvis du vil konfigurere telefonsvareren, skal du gå til Menu > Indstillinger."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Hvis du vil ringe til telefonsvareren, skal du først slå Flytilstand fra."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Flere valgmuligheder"</string>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 22af407..8ab99b4 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Anruf nicht verbunden"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Konfigurieren Sie Ihre Mailbox unter \"Menü\" > \"Einstellungen\"."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Deaktivieren Sie zunächst den Flugmodus, um die Mailbox anzurufen."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Weitere Optionen"</string>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 1d3def3..bfa940b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Η κλήση δεν πραγματοποιήθηκε"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Για τη r;yumish του αυτόματου τηλεφωνητή, μεταβείτε στο στοιχείο Μενού > Ρυθμίσεις."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Για κλήση αυτόματου τηλεφωνητή, πρώτα απενεργοποιήστε τη λειτουργία πτήσης."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Περισσότερες επιλογές"</string>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 6bede9f..9a603a4 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Call not sent"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"To set up voicemail, go to Menu > Settings."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"To call voicemail, first turn off Airplane mode."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"More options"</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index d7e15df..0b9eb4f 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> se exportará en breve."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Se rechazó la solicitud de exportación de la vCard. Vuelve a intentarlo más tarde."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"contacto"</string>
- <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"¿Exportar contactos?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Tu lista de contactos se exportará al archivo: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"No se pudo exportar"</string>
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"No se realizó la llamada."</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Para configurar el buzón de voz, ve a a Menú > Configuración."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Para escuchar los mensajes de tu buzón de voz, desactiva primero el modo de avión."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Más opciones"</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index a16e1ce..0ead203 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Llamada no enviada"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Para configurar el buzón de voz, toca la tecla de menú y, a continuación, toca Ajustes."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Para llamar al buzón de voz, debes desactivar el modo avión."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Más opciones"</string>
</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 0779700..0366d99 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Kõnet ei tehtud"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Kõneposti seadistamiseks minge valikusse Menüü > Seaded."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Kõneposti kuulamiseks lülitage lennurežiim välja."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Rohkem valikuid"</string>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 5bbb887..59849db 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"تماس ارسال نشد"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"برای راهاندازی پست صوتی به منو > تنظیمات بروید."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"برای تماس با پست صوتی، ابتدا حالت هواپیما را غیرفعال کنید."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"سایر گزینه ها"</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 21055e5..0ceaa96 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Puhelua ei soitettu"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Määritä puhelinvastaajan asetukset kohdassa Valikko > Asetukset."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Poista lentokonetila käytöstä ennen vastaajaan soittamista."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Lisää asetuksia"</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index cb74cf6..6a30a4a 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -182,7 +182,7 @@
<string name="callBack" msgid="5498224409038809224">"Rappeler"</string>
<string name="callAgain" msgid="3197312117049874778">"Renouveler l\'appel"</string>
<string name="returnCall" msgid="8171961914203617813">"Rappeler"</string>
- <string name="callDetailsDurationFormat" msgid="8157706382818184268">"<xliff:g id="MINUTES">%s</xliff:g> mn <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+ <string name="callDetailsDurationFormat" msgid="8157706382818184268">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
<string name="favoritesFrequentContacted" msgid="6184232487472425690">"Contacts fréquents"</string>
<string name="favoritesFrequentCalled" msgid="6128306889600696124">"Appels fréquents"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Ajouter \"<xliff:g id="EMAIL">%s</xliff:g>\" aux contacts ?"</string>
@@ -245,8 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"Exportation du fichier <xliff:g id="FILENAME">%s</xliff:g> imminente"</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"La demande d\'exportation du fichier vCard a été rejetée. Veuillez réessayer ultérieurement."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"contact"</string>
- <!-- no translation found for percentage (1044592438199055502) -->
- <skip />
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Exporter contacts ?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Votre liste de contacts va être exportée vers le fichier \"<xliff:g id="VCARD_FILENAME">%s</xliff:g>\"."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Échec exportation"</string>
@@ -486,8 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Effacer les valeurs par défaut"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Texte copié"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Annuler les modifications ?"</string>
- <!-- no translation found for call_type_and_date (747163730039311423) -->
- <skip />
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Configurer mon profil"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Saisissez le nom de la personne"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Afficher mises à jour"</string>
@@ -552,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Appel non effectué."</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Pour configurer la messagerie vocale, accédez à Menu > Paramètres."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Veuillez désactiver le mode Avion avant d\'appeler la messagerie vocale."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Plus d\'options"</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 121a56e..85b875a 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"कॉल नहीं भेजा गया"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"ध्वनिमेल सेट करने के लिए, मेनू > सेटिंग पर जाएं."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"ध्वनिमेल कॉल करने के लिए, पहले हवाई जहाज़ मोड बंद करें."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"अधिक विकल्प"</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 86c3131..0030898 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Poziv nije poslan"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Da biste postavili govornu poštu, idite na Izbornik > Postavke."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Da biste nazvali govornu poštu, najprije isključite način rada u zrakoplovu."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Više opcija"</string>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index db09620..ef666fb 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"A hívás nem indítható."</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"A hangposta beállításához válassza a Menü > Beállítások pontot."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Hangposta hívásához kapcsolja ki a Repülőgép üzemmódot."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"További lehetőségek"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 9424992..fdfe88b 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -213,24 +213,24 @@
<string name="import_from_sdcard" product="default" msgid="8668347930577565175">"Impor dari penyimpanan"</string>
<string name="export_to_sdcard" product="default" msgid="6092815580965201089">"Ekspor ke penyimpanan"</string>
<string name="share_visible_contacts" msgid="890150378880783797">"Bagikan kenalan yang terlihat"</string>
- <string name="import_one_vcard_string" msgid="9059163467020328433">"Impor satu berkas vCard"</string>
- <string name="import_multiple_vcard_string" msgid="3810226492811062392">"Impor beberapa berkas vCard"</string>
- <string name="import_all_vcard_string" msgid="5518136113853448474">"Impor semua berkas vCard"</string>
+ <string name="import_one_vcard_string" msgid="9059163467020328433">"Impor satu file vCard"</string>
+ <string name="import_multiple_vcard_string" msgid="3810226492811062392">"Impor beberapa file vCard"</string>
+ <string name="import_all_vcard_string" msgid="5518136113853448474">"Impor semua file vCard"</string>
<string name="searching_vcard_message" product="nosdcard" msgid="557077639409584945">"Menelusuri data vCard dalam penyimpanan..."</string>
<string name="searching_vcard_message" product="default" msgid="3962269894118092049">"Menelusuri data vCard pada kartu SD..."</string>
<string name="scanning_sdcard_failed_message" product="nosdcard" msgid="7221682312959229201">"Penyimpanan tidak dapat dipindai. (Alasan: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
<string name="scanning_sdcard_failed_message" product="default" msgid="189023067829510792">"Kartu SD tidak dapat dipindai. (Alasan: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
<string name="fail_reason_io_error" msgid="6748358842976073255">"Galat I/O"</string>
- <string name="fail_reason_low_memory_during_import" msgid="875222757734882898">"Memori tidak cukup. Berkas mungkin terlalu besar."</string>
+ <string name="fail_reason_low_memory_during_import" msgid="875222757734882898">"Memori tidak cukup. File mungkin terlalu besar."</string>
<string name="fail_reason_vcard_parse_error" msgid="888263542360355784">"Tidak dapat mengurai vCard karena alasan yang tak terduga."</string>
<string name="fail_reason_not_supported" msgid="8219562769267148825">"Format tidak didukung."</string>
<string name="vcard_import_failed" msgid="5223531255894842406">"Tidak dapat mengimpor vCard."</string>
- <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2071820850017305867">"Tidak ditemukan berkas vCard dalam penyimpanan."</string>
- <string name="import_failure_no_vcard_file" product="default" msgid="1754014167874286173">"Tidak ditemukan berkas vCard pada kartu SD."</string>
- <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="6427931733267328564">"Tidak dapat mengumpulkan informasi meta dari berkas vCard yang diberikan."</string>
- <string name="fail_reason_failed_to_read_files" msgid="5823434810622484922">"Satu berkas atau lebih tidak dapat diimpor (%s)."</string>
+ <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2071820850017305867">"Tidak ditemukan file vCard dalam penyimpanan."</string>
+ <string name="import_failure_no_vcard_file" product="default" msgid="1754014167874286173">"Tidak ditemukan file vCard pada kartu SD."</string>
+ <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="6427931733267328564">"Tidak dapat mengumpulkan informasi meta dari file vCard yang diberikan."</string>
+ <string name="fail_reason_failed_to_read_files" msgid="5823434810622484922">"Satu file atau lebih tidak dapat diimpor (%s)."</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Galat tidak dikenal."</string>
- <string name="select_vcard_title" msgid="7791371083694672861">"Pilih berkas vCard"</string>
+ <string name="select_vcard_title" msgid="7791371083694672861">"Pilih file vCard"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Menyimpan ke tembolok"</string>
<string name="caching_vcard_message" msgid="4926308675041506756">"Menyimpan vCard ke tembolok untuk penyimpanan lokal sementara. Impor yang sebenarnya akan segera dimulai."</string>
<string name="progress_notifier_message" msgid="2311011466908220528">"Mengimpor <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
@@ -240,20 +240,20 @@
<string name="importing_vcard_finished_title" msgid="3341541727268747967">"Selesai mengimpor vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
<string name="importing_vcard_canceled_title" msgid="2147475978165599336">"Mengimpor <xliff:g id="FILENAME">%s</xliff:g> dibatalkan"</string>
<string name="vcard_import_will_start_message" msgid="2804911199145873396">"<xliff:g id="FILENAME">%s</xliff:g> akan segera diimpor."</string>
- <string name="vcard_import_will_start_message_with_default_name" msgid="1022969530654129470">"Berkas akan diimpor segera."</string>
+ <string name="vcard_import_will_start_message_with_default_name" msgid="1022969530654129470">"File akan diimpor segera."</string>
<string name="vcard_import_request_rejected_message" msgid="2890471184508516011">"Permintaan impor vCard ditolak. Coba lagi nanti."</string>
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> akan segera diekspor."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Permintaan ekspor vCard ditolak. Coba lagi nanti."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kenalan"</string>
<string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Ekspor data kenalan?"</string>
- <string name="confirm_export_message" msgid="2423421354816428708">"Daftar data kenalan Anda akan diekspor ke berkas: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
+ <string name="confirm_export_message" msgid="2423421354816428708">"Daftar data kenalan Anda akan diekspor ke file: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Tak dapat mengekspor"</string>
<string name="exporting_contact_failed_message" msgid="4938527850142003141">"Data kenalan tidak diekspor."\n"Alasan: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Tidak ada data kenalan yang dapat diekspor."</string>
- <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="590645599157376285">"Terlalu banyak berkas vCard dalam penyimpanan."</string>
- <string name="fail_reason_too_many_vcard" product="default" msgid="4887177369627277474">"Terlalu banyak berkas vCard di kartu SD."</string>
- <string name="fail_reason_too_long_filename" msgid="3393764245254738333">"Nama berkas yang diperlukan terlalu panjang (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
+ <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="590645599157376285">"Terlalu banyak file vCard dalam penyimpanan."</string>
+ <string name="fail_reason_too_many_vcard" product="default" msgid="4887177369627277474">"Terlalu banyak file vCard di kartu SD."</string>
+ <string name="fail_reason_too_long_filename" msgid="3393764245254738333">"Nama file yang diperlukan terlalu panjang (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
<string name="exporting_vcard_finished_title" msgid="4767045779458185251">"Selesai mengekspor <xliff:g id="FILENAME">%s</xliff:g>."</string>
<string name="exporting_vcard_canceled_title" msgid="2652222370493306887">"Mengekspor <xliff:g id="FILENAME">%s</xliff:g> dibatalkan."</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Mengekspor data kenalan"</string>
@@ -273,7 +273,7 @@
<string name="add_2sec_pause" msgid="9214012315201040129">"Tambahkan jeda 2-det"</string>
<string name="add_wait" msgid="3360818652790319634">"Tambahkan tunggu"</string>
<string name="call_disambig_title" msgid="1911302597959335178">"Panggil menggunakan"</string>
- <string name="call_settings" msgid="7666474782093693667">"Setelan"</string>
+ <string name="call_settings" msgid="7666474782093693667">"Pengaturan"</string>
<string name="sms_disambig_title" msgid="4675399294513152364">"SMS menggunakan"</string>
<string name="make_primary" msgid="5829291915305113983">"Ingat pilihan ini"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Tidak ada apl yang ditemukan untuk menangani tindakan ini."</string>
@@ -447,9 +447,9 @@
<string name="list_filter_single" msgid="5871400283515893087">"Kenalan"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"Tentukan tampilan ubahsuaian"</string>
<string name="contact_list_loading" msgid="5488620820563977329">"Memuat..."</string>
- <string name="activity_title_settings" msgid="5464130076132770781">"Setelan"</string>
+ <string name="activity_title_settings" msgid="5464130076132770781">"Pengaturan"</string>
<string name="activity_title_contacts_filter" msgid="8275542497615516969">"Kenalan untuk ditampilkan"</string>
- <string name="menu_settings" msgid="377929915873428211">"Setelan"</string>
+ <string name="menu_settings" msgid="377929915873428211">"Pengaturan"</string>
<string name="preference_displayOptions" msgid="1341720270148252393">"Opsi tampilan"</string>
<string name="organization_company_and_title" msgid="6718207751363732025">"<xliff:g id="COMPANY_0">%2$s</xliff:g>, <xliff:g id="COMPANY_1">%1$s</xliff:g>"</string>
<string name="hint_findContacts" msgid="1808681193458772072">"Temukan kenalan"</string>
@@ -538,16 +538,17 @@
<string name="local_profile_title" msgid="2021416826991393684">"Profil lokal saya"</string>
<string name="external_profile_title" msgid="8034998767621359438">"Profil <xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g> saya"</string>
<string name="toast_displaying_all_contacts" msgid="2737388783898593875">"Menampilkan semua kenalan"</string>
- <string name="no_account_prompt" msgid="7061052512446855192">"Orang bekerja lebih baik dengan Akun Google."\n\n"• Akses dari peramban web mana pun."\n"• Cadangkan data kenalan Anda dengan aman."</string>
- <string name="generic_no_account_prompt" msgid="7218827704367325460">"Tetap amankan data kenalan Anda jika kehilangan ponsel: sinkronkan dengan layanan daring."</string>
+ <string name="no_account_prompt" msgid="7061052512446855192">"Orang bekerja lebih baik dengan Akun Google."\n\n"• Akses dari browser web mana pun."\n"• Cadangkan data kenalan Anda dengan aman."</string>
+ <string name="generic_no_account_prompt" msgid="7218827704367325460">"Tetap amankan data kenalan Anda jika kehilangan ponsel: sinkronkan dengan layanan online."</string>
<string name="generic_no_account_prompt_title" msgid="753783911899054860">"Tambahkan akun"</string>
- <string name="contact_editor_prompt_zero_accounts" msgid="1785345895691886499">"Data kenalan baru Anda tidak akan dicadangkan. Tambahkan akun yang mencadangkan data kenalan secara daring?"</string>
+ <string name="contact_editor_prompt_zero_accounts" msgid="1785345895691886499">"Data kenalan baru Anda tidak akan dicadangkan. Tambahkan akun yang mencadangkan data kenalan secara online?"</string>
<string name="contact_editor_prompt_one_account" msgid="8669032699767375976">"Data kenalan baru Anda akan disinkronkan dengan <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
<string name="contact_editor_prompt_multiple_accounts" msgid="611828200100438242">"Anda dapat menyinkronkan data kenalan baru dengan salah satu akun berikut. Akun mana yang ingin Anda gunakan?"</string>
<string name="keep_local" msgid="1258761699192993322">"Simpan secara lokal"</string>
<string name="add_account" msgid="8201790677994503186">"Tambahkan akun"</string>
<string name="add_new_account" msgid="5748627740680940264">"Tambahkan akun baru"</string>
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Panggilan tidak terkirim"</string>
- <string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Untuk menyiapkan kotak pesan, buka Menu > Setelan."</string>
+ <string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Untuk menyiapkan kotak pesan, buka Menu > Pengaturan."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Untuk memanggil pesan suara, pertama-tama matikan mode Pesawat."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Opsi lainnya"</string>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index da8554c..41562e7 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Chiamata non inviata"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Per configurare la segreteria, seleziona Menu > Impostazioni."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Per chiamare la segreteria, disattiva la modalità aereo."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Altre opzioni"</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index cf08ffa..9179752 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"השיחה לא נשלחה."</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"כדי להגדיר את הדואר הקולי, עבור אל \'תפריט\' > \'הגדרות\'."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"כדי להתקשר לדואר קולי, ראשית כבה את מצב הטיסה."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"אפשרויות נוספות"</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ba2246a..9015f5b 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -245,8 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g>はまもなくエクスポートされます。"</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"vCardのエクスポートリクエストは拒否されました。しばらくしてからもう一度お試しください。"</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"連絡先"</string>
- <!-- no translation found for percentage (1044592438199055502) -->
- <skip />
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"エクスポートしますか？"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"連絡先リストをファイル「<xliff:g id="VCARD_FILENAME">%s</xliff:g>」にエクスポートします。"</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"エクスポート失敗"</string>
@@ -486,8 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"デフォルトを解除"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"テキストをコピーしました"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"変更を破棄しますか？"</string>
- <!-- no translation found for call_type_and_date (747163730039311423) -->
- <skip />
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"プロフィールを設定"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"名前を入力"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"更新情報を表示"</string>
@@ -552,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"発信できません"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"ボイスメールをセットアップするには、MENUキー>[設定]をタップします。"</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"機内モードをOFFにしてからボイスメールを呼び出してください。"</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"その他のオプション"</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 9249fdf..cdefdfa 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"전화를 걸 수 없음"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"음성사서함을 설정하려면 메뉴 > 설정으로 이동하세요."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"음성사서함에 메시지를 남기려면 먼저 비행기 모드를 해제하세요."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"옵션 더보기"</string>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index b1fc4a0..d1a85b9 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Skambutis neišsiųstas"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Jei norite nustatyti balso paštą, eikite į „Meniu“ > „Nustatymai“."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Jei norite skambinti į balso paštą, išjunkite lėktuvo režimą."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Daugiau parinkčių"</string>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 9edc90e..58cba5a 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Nenosūtīts zvans"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Lai iestatītu balss pastu, atveriet sadaļu Izvēlne > Iestatījumi."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Lai piezvanītu balss pastam, vispirms izslēdziet lidojuma režīmu."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Vairāk opciju"</string>
</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 2d52f8d..014dde0 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -247,8 +247,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> akan dieksport sebentar lagi."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Permintaan eksport vCard telah ditolak. Cuba lagi nanti."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kenalan"</string>
- <!-- no translation found for percentage (1044592438199055502) -->
- <skip />
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Eksport kenalan?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Senarai kenalan anda akan dieksport ke: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Tidak boleh mengeksport"</string>
@@ -488,8 +487,7 @@
<string name="clear_default" msgid="7193185801596678067">"Kosongkan lalai"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Teks disalin"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Buang perubahan anda?"</string>
- <!-- no translation found for call_type_and_date (747163730039311423) -->
- <skip />
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Sediakan profil saya"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Taip nama orang"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Lihat kemas kini"</string>
@@ -554,4 +552,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Panggilan tidak dihantar"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Untuuk menyediakan mel suara, pergi ke Menu > Tetapan."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Untuk membuat panggilan ke mel suara, mula-mula matikan mod Pesawat."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Lagi pilihan"</string>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 2cf4799..364fb08 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Anrop ikke utført"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Du konfigurerer talepost ved å gå til Meny &gt Innstillinger"</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Du må slå av flymodus før du kan sjekke talepostkassen."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Flere alternativer"</string>
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index bc4d0fd..e4a82ed 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Oproep niet uitgevoerd"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Voor het instellen van voicemail, gaat u naar \'Menu\' > \'Instellingen\'."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Als u uw voicemail wilt bellen, moet u eerst de Vliegmodus uitschakelen."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Meer opties"</string>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index d5abdb6..5459e73 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -245,8 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"Plik <xliff:g id="FILENAME">%s</xliff:g> zostanie za chwilę wyeksportowany."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Żądanie eksportu danych vCard zostało odrzucone. Spróbuj ponownie później."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kontakt"</string>
- <!-- no translation found for percentage (1044592438199055502) -->
- <skip />
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Eksport kontaktów?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Lista kontaktów zostanie wyeksportowana do pliku: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Eksport nieudany"</string>
@@ -486,8 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Wyczyść wartość domyślną"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Tekst skopiowany"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Odrzucić zmiany?"</string>
- <!-- no translation found for call_type_and_date (747163730039311423) -->
- <skip />
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Konfiguruj profil"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Wpisz imię osoby"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Pokaż aktualizacje"</string>
@@ -552,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Połączenie nie zostało zrealizowane"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Aby skonfigurować pocztę głosową, przejdź do Menu > Ustawienia."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Aby połączyć się z pocztą głosową, najpierw wyłącz tryb samolotowy."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Więcej opcji"</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 2ddb7ff..7384d48 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Chamada não efetuada"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Para configurar o correio de voz, aceda a Menu > Definições."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Para efetuar uma chamada para o correio de voz, desative primeiro o Modo de avião."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Mais opções"</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 44bc223..b7f9471 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Chamada não realizada"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Para configurar o correio de voz, vá para Menu > Configurações."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Para chamar o correio de voz, primeiro desative o modo avião."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Mais opções"</string>
</resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 9a556e0..59edd16 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -801,4 +801,7 @@
<skip />
<!-- no translation found for dialog_voicemail_airplane_mode_message (530922773669546093) -->
<skip />
+ <!-- no translation found for action_menu_overflow_description (2303272250613084574) -->
+ <!-- no translation found for action_menu_overflow_description (2295659037509008453) -->
+ <skip />
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 6625ebe..69dc168 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -245,8 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> va fi exportat în curând."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Solicitarea de exportare a fişierului vCard a fost respinsă. Încercaţi din nou mai târziu."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"contact"</string>
- <!-- no translation found for percentage (1044592438199055502) -->
- <skip />
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Exportaţi Agenda?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Lista dvs. cu persoane de contact va fi exportată în fişierul: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Nu s-a putut exporta"</string>
@@ -486,8 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Ştergeţi datele prestabilite"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Text copiat"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Renunţaţi la modificări?"</string>
- <!-- no translation found for call_type_and_date (747163730039311423) -->
- <skip />
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Configuraţi profilul"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Introduceţi numele persoanei"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Afişaţi actualizări"</string>
@@ -552,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Apelul nu a fost trimis"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Pentru a configura mesageria vocală, accesaţi Meniu > Setări."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Pentru a apela mesageria vocală, mai întâi dezactivaţi modul Avion."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Mai multe opţiuni"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ec4b1e9..9926f4f 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -245,8 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"Экспорт <xliff:g id="FILENAME">%s</xliff:g> начнется в ближайшее время."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Запрос на экспорт данных vCard отклонен. Повторите попытку позже."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"контакт"</string>
- <!-- no translation found for percentage (1044592438199055502) -->
- <skip />
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Экспорт контактов"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Список контактов будет экспортирован в файл \"<xliff:g id="VCARD_FILENAME">%s</xliff:g>\"."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Сбой экспорта"</string>
@@ -486,8 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Удалить настройки по умолчанию"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Текст скопирован"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Отменить изменения?"</string>
- <!-- no translation found for call_type_and_date (747163730039311423) -->
- <skip />
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> (<xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>)"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Настроить профиль"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Имя контакта"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Обновления"</string>
@@ -552,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Вызов невозможен"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Чтобы настроить голосовую почту, выберите \"Меню > Настройки\"."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Сначала отключите режим полета."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Ещё"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 7801de8..71657bb 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -245,8 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"Vizitka <xliff:g id="FILENAME">%s</xliff:g> bude čoskoro exportovaná."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Žiadosť o exportovanie vizitky vCard bola odmietnutá. Skúste to znova neskôr."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kontakt"</string>
- <!-- no translation found for percentage (1044592438199055502) -->
- <skip />
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Exportovať kontakty?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Váš zoznam kontaktov bude exportovaný do súboru: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Export sa nepodaril"</string>
@@ -486,8 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Vymazať predvolené nastavenia"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Text bol skopírovaný"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Zahodiť zmeny?"</string>
- <!-- no translation found for call_type_and_date (747163730039311423) -->
- <skip />
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Nastaviť môj profil"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Zadajte meno osoby"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Zobraziť aktualizácie"</string>
@@ -552,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Hovor nebol spojený"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Ak chcete nastaviť hlasovú schránku, prejdite na položku Menu > Nastavenia."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Ak chcete volať hlasovú schránku, najprv vypnite režim V lietadle."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Viac možností"</string>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 4cbe938..03427c7 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Klic ni uspel"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Če želite nastaviti odzivnik, odprite Meni > Nastavitve."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Če želite poklicati odzivnik, najprej izklopite način za letalo."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Več možnosti"</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index c77bdb0..84a5bcf 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Позив није послат"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Да бисте подесили говорну пошту, идите у Мени > Подешавања."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Да бисте позвали говорну пошту, прво искључите режим авионa."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Још опција"</string>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 0dceb7a..49900ba 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Samtalet gick inte att koppla fram"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Välj Meny > Inställningar om du vill konfigurera röstbrevlådan."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Om du vill ringa röstbrevlådan måste du först inaktivera flygplansläget."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Fler alternativ"</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 7e5e3b4..4d577a0 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -247,8 +247,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> itahamishwa hivi karibuni."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Ombi la kuhamishwa kwa vCard limekataliwa. Jaribu tena baadaye."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"anwani"</string>
- <!-- no translation found for percentage (1044592438199055502) -->
- <skip />
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Hamisha anwani?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Orodha yako ya anwani itahamishwa kwa faili: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Imeshindwa kuhamisha"</string>
@@ -488,8 +487,7 @@
<string name="clear_default" msgid="7193185801596678067">"Ondoa chaguo-msingi"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Maandishi yamenakiliwa"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Tupa mabadiliko yako?"</string>
- <!-- no translation found for call_type_and_date (747163730039311423) -->
- <skip />
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Sanidi maelezo yangu mafupi"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Charaza jina la mtu"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Tazama visasisho"</string>
@@ -554,4 +552,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Simu haijatumwa"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Ili kusanidi ujumbe wa sauti, nenda kwa Menyu > Mipangilio."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Kupigia simu ujumbe wa sauti, kwanza lemaza hali ya ndege."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Chaguo zaidi"</string>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 91f7886..a1aeef7 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"ไม่สามารถโทรออก"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"หากต้องการตั้งค่าข้อความเสียง ให้ไปที่เมนู > การตั้งค่า"</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"หากต้องการฟังข้อความเสียง ให้ปิดโหมดใช้งานบนเครื่องบินก่อน"</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"ตัวเลือกเพิ่มเติม"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index c7c0480..b4c3f82 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Hindi naipadala ang tawag"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Upang mag-set up ng voicemail, pumunta sa Menu > Mga Setting."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Upang tumawag sa voicemail, i-off muna ang Airplane mode."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Higit pang mga pagpipilian"</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 13e2dce..cd7f727 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Çağrı yapılamadı"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Sesli mesajı yapılandırmak için Menü > Ayarlar\'a gidin."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Sesli mesaja çağrı yapmak için öncelikle Uçak modunu kapatın."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Diğer seçenekler"</string>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 82ccbca..a5e622c 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Виклик не здійснено"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Щоб налаштувати голосову пошту, перейдіть у Меню > Налаштування."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Щоб перевірити голосову пошту, спочатку вимкніть режим польоту."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Інші варіанти"</string>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 4e10839..55b92e5 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Không thể thực hiện cuộc gọi"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Để thiết lập thư thoại, đi tới Trình đơn > Cài đặt."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Để gọi thư thoại, trước tiên hãy tắt chế độ trên Máy bay."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Tùy chọn khác"</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 50a70ad..c26ef3c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -245,8 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> 将在稍后导出。"</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"vCard 导出请求遭拒，请稍后重试。"</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"联系人"</string>
- <!-- no translation found for percentage (1044592438199055502) -->
- <skip />
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"要导出联系人吗？"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"系统会将您的联系人列表导出到以下文件：<xliff:g id="VCARD_FILENAME">%s</xliff:g>。"</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"无法导出"</string>
@@ -486,8 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"清除默认值"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"文本已复制"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"要舍弃您所做的更改吗？"</string>
- <!-- no translation found for call_type_and_date (747163730039311423) -->
- <skip />
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"设置我的个人资料"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"键入联系人的姓名"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"查看更新"</string>
@@ -552,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"电话未拨出"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"要设置语音信箱，请转到“菜单”>“设置”。"</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"要呼叫语音信箱，请先关闭飞行模式。"</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"更多选项"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 2b24950..ddce304 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"無法撥號"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"如要設定語音信箱，請前往 [選單] > [設定]。"</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"如要聽語音留言，請先關閉飛行模式。"</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"更多選項"</string>
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 252e45d..6c5dd3b 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -550,4 +550,5 @@
<string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"ucingo aluthunyelwanga"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Ukuya emyalezweni wephimbo, yana ezisethweni > zemenyu."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Ukushayela i-voicemail, vala kuqala imodi Yendiza."</string>
+ <string name="action_menu_overflow_description" msgid="2303272250613084574">"Izinketho ezingaphezulu"</string>
</resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index b9a534c..4402d05 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -56,16 +56,6 @@
<attr name="ratio" format="float"/>
</declare-styleable>
- <declare-styleable name="TransitionAnimationView">
- <attr name="clipMarginLeft" format="dimension"/>
- <attr name="clipMarginRight" format="dimension"/>
- <attr name="clipMarginTop" format="dimension"/>
- <attr name="clipMarginBottom" format="dimension"/>
- <attr name="enterAnimation" format="reference"/>
- <attr name="exitAnimation" format="reference"/>
- <attr name="animationDuration" format="integer"/>
- </declare-styleable>
-
<declare-styleable name="ContactBrowser">
<attr name="contact_browser_list_padding_left" format="dimension"/>
<attr name="contact_browser_list_padding_right" format="dimension"/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 936f844..6fc84a9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1791,4 +1791,10 @@
voicemail service in Airplane mode. [CHAR LIMI=NONE] -->
<string name="dialog_voicemail_airplane_mode_message">To call voicemail, first turn off Airplane mode.</string>
+ <!-- Content description for the fake action menu overflow button.
+ This should be same as the description for the real action menu
+ overflow button available in ActionBar.
+ [CHAR LIMIT=NONE] -->
+ <string name="action_menu_overflow_description" msgid="2295659037509008453">More options</string>
+
</resources>
diff --git a/src/com/android/contacts/CallDetailActivity.java b/src/com/android/contacts/CallDetailActivity.java
index 428e2e8..8e58cd9 100644
--- a/src/com/android/contacts/CallDetailActivity.java
+++ b/src/com/android/contacts/CallDetailActivity.java
@@ -408,6 +408,10 @@
if (contactUri != null) {
mainActionIntent = new Intent(Intent.ACTION_VIEW, contactUri);
+ // This will launch People's detail contact screen, so we probably want to
+ // treat it as a separate People task.
+ mainActionIntent.setFlags(
+ Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
mainActionIcon = R.drawable.ic_contacts_holo_dark;
mainActionDescription =
getString(R.string.description_view_contact, nameOrNumber);
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index e41adad..0d226d8 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -56,6 +56,7 @@
import com.android.contacts.util.AccountFilterUtil;
import com.android.contacts.util.AccountPromptUtils;
import com.android.contacts.util.AccountsListAdapter;
+import com.android.contacts.util.UriUtils;
import com.android.contacts.util.AccountsListAdapter.AccountListFilter;
import com.android.contacts.util.Constants;
import com.android.contacts.util.DialogManager;
@@ -160,7 +161,8 @@
private View mFavoritesView;
private View mBrowserView;
- private TransitionAnimationView mDetailsView;
+ private TransitionAnimationView mContactDetailsView;
+ private TransitionAnimationView mGroupDetailsView;
private View mAddGroupImageView;
@@ -393,7 +395,8 @@
// Container views for fragments
mFavoritesView = getView(R.id.favorites_view);
- mDetailsView = getView(R.id.details_view);
+ mContactDetailsView = getView(R.id.contact_details_view);
+ mGroupDetailsView = getView(R.id.group_details_view);
mBrowserView = getView(R.id.browse_view);
// 2-pane only fragments
@@ -416,7 +419,8 @@
// Configure contact details
mContactDetailLayoutController = new ContactDetailLayoutController(this, savedState,
- getFragmentManager(), mDetailsView, findViewById(R.id.contact_detail_container),
+ getFragmentManager(), mContactDetailsView,
+ findViewById(R.id.contact_detail_container),
new ContactDetailFragmentListener());
}
transaction.commitAllowingStateLoss();
@@ -592,6 +596,11 @@
}
private void setupGroupDetailFragment(Uri groupUri) {
+ // If we are switching from one group to another, do a cross-fade
+ if (mGroupDetailFragment != null && mGroupDetailFragment.getGroupUri() != null &&
+ !UriUtils.areEqual(mGroupDetailFragment.getGroupUri(), groupUri)) {
+ mGroupDetailsView.startTransition(mGroupDetailFragment.getView(), false);
+ }
mGroupDetailFragment.loadGroup(groupUri);
invalidateOptionsMenuIfNeeded();
}
@@ -664,18 +673,21 @@
case FAVORITES:
mFavoritesView.setVisibility(View.VISIBLE);
mBrowserView.setVisibility(View.GONE);
- mDetailsView.setVisibility(View.GONE);
+ mGroupDetailsView.setVisibility(View.GONE);
+ mContactDetailsView.setVisibility(View.GONE);
break;
case GROUPS:
mFavoritesView.setVisibility(View.GONE);
mBrowserView.setVisibility(View.VISIBLE);
- mDetailsView.setVisibility(View.VISIBLE);
+ mGroupDetailsView.setVisibility(View.VISIBLE);
+ mContactDetailsView.setVisibility(View.GONE);
mGroupsFragment.setAddAccountsVisibility(!areGroupWritableAccountsAvailable());
break;
case ALL:
mFavoritesView.setVisibility(View.GONE);
mBrowserView.setVisibility(View.VISIBLE);
- mDetailsView.setVisibility(View.VISIBLE);
+ mContactDetailsView.setVisibility(View.VISIBLE);
+ mGroupDetailsView.setVisibility(View.GONE);
break;
}
FragmentManager fragmentManager = getFragmentManager();
diff --git a/src/com/android/contacts/detail/ContactDetailLayoutController.java b/src/com/android/contacts/detail/ContactDetailLayoutController.java
index b79ccc0..a87f97e 100644
--- a/src/com/android/contacts/detail/ContactDetailLayoutController.java
+++ b/src/com/android/contacts/detail/ContactDetailLayoutController.java
@@ -250,20 +250,25 @@
public void setContactData(ContactLoader.Result data) {
final boolean contactWasLoaded;
final boolean contactHadUpdates;
+ final boolean isDifferentContact;
if (mContactData == null) {
contactHadUpdates = false;
contactWasLoaded = false;
+ isDifferentContact = true;
} else {
contactHadUpdates = mContactHasUpdates;
contactWasLoaded = true;
+ isDifferentContact =
+ !UriUtils.areEqual(mContactData.getLookupUri(), data.getLookupUri());
}
mContactData = data;
mContactHasUpdates = !data.getStreamItems().isEmpty();
if (PhoneCapabilityTester.isUsingTwoPanes(mActivity)) {
// Tablet: If we already showed data before, we want to cross-fade from screen to screen
- if (contactWasLoaded && mTransitionAnimationView != null) {
- mTransitionAnimationView.startTransition(mViewContainer, mContactData == null);
+ if (contactWasLoaded && mTransitionAnimationView != null && isDifferentContact) {
+ mTransitionAnimationView.startTransition(
+ mViewContainer, mContactData == null);
}
} else {
// Small screen: We are on our own screen. Fade the data in, but only the first time
@@ -326,9 +331,12 @@
switch (mLayoutMode) {
case TWO_COLUMN: {
- // This is screen is very hard to animate properly, because there is such a hard
- // cut from the regular version. A proper animation would have to reflow text and
- // move things around. No animation for now
+ if (!isDifferentContact && animateStateChange) {
+ // This is screen is very hard to animate properly, because there is such a hard
+ // cut from the regular version. A proper animation would have to reflow text
+ // and move things around. Doing a simple cross-fade instead.
+ mTransitionAnimationView.startTransition(mViewContainer, false);
+ }
// Set the contact data (hide the static photo because the photo will already be in
// the header that scrolls with contact details).
diff --git a/src/com/android/contacts/group/GroupDetailFragment.java b/src/com/android/contacts/group/GroupDetailFragment.java
index 3a43e66..b4f642a 100644
--- a/src/com/android/contacts/group/GroupDetailFragment.java
+++ b/src/com/android/contacts/group/GroupDetailFragment.java
@@ -191,6 +191,10 @@
mShowGroupActionInActionBar = show;
}
+ public Uri getGroupUri() {
+ return mGroupUri;
+ }
+
/**
* Start the loader to retrieve the metadata for this group.
*/
diff --git a/src/com/android/contacts/list/ContactListItemView.java b/src/com/android/contacts/list/ContactListItemView.java
index 4390d78..f3de16c 100644
--- a/src/com/android/contacts/list/ContactListItemView.java
+++ b/src/com/android/contacts/list/ContactListItemView.java
@@ -904,31 +904,6 @@
}
/**
- * Adds a call button using the supplied arguments as an id and tag.
- */
- public void showCallButton(int id, int tag) {
- if (mCallButton == null) {
- mCallButton = new DontPressWithParentImageView(mContext, null);
- mCallButton.setId(id);
- mCallButton.setOnClickListener(mCallButtonClickListener);
- mCallButton.setBackgroundResource(R.drawable.call_background);
- mCallButton.setImageResource(android.R.drawable.sym_action_call);
- mCallButton.setPadding(mCallButtonPadding, 0, mCallButtonPadding, 0);
- mCallButton.setScaleType(ScaleType.CENTER);
- addView(mCallButton);
- }
-
- mCallButton.setTag(tag);
- mCallButton.setVisibility(View.VISIBLE);
- }
-
- public void hideCallButton() {
- if (mCallButton != null) {
- mCallButton.setVisibility(View.GONE);
- }
- }
-
- /**
* Adds or updates a text view for the phonetic name.
*/
public void setPhoneticName(char[] text, int size) {
diff --git a/src/com/android/contacts/list/ContactTileSecondaryTargetView.java b/src/com/android/contacts/list/ContactTileSecondaryTargetView.java
index c4ea212..25f353d 100644
--- a/src/com/android/contacts/list/ContactTileSecondaryTargetView.java
+++ b/src/com/android/contacts/list/ContactTileSecondaryTargetView.java
@@ -46,7 +46,11 @@
mSecondaryButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
- getContext().startActivity(new Intent(Intent.ACTION_VIEW, getLookupUri()));
+ Intent intent = new Intent(Intent.ACTION_VIEW, getLookupUri());
+ // Secondary target will be visible only from phone's favorite screen, then
+ // we want to launch it as a separate People task.
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+ getContext().startActivity(intent);
}
});
}
diff --git a/src/com/android/contacts/widget/TransitionAnimationView.java b/src/com/android/contacts/widget/TransitionAnimationView.java
index c70ca25..cefc82d 100644
--- a/src/com/android/contacts/widget/TransitionAnimationView.java
+++ b/src/com/android/contacts/widget/TransitionAnimationView.java
@@ -15,17 +15,13 @@
*/
package com.android.contacts.widget;
-import com.android.contacts.R;
-
import android.animation.Animator;
import android.animation.Animator.AnimatorListener;
-import android.animation.AnimatorInflater;
+import android.animation.ObjectAnimator;
import android.content.Context;
-import android.content.res.TypedArray;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
-import android.graphics.Rect;
import android.graphics.drawable.BitmapDrawable;
import android.util.AttributeSet;
import android.view.View;
@@ -33,23 +29,16 @@
/**
* A container for a view that needs to have exit/enter animations when rebinding data.
- * This layout should have a single child. Just before rebinding data that child
- * should make this call:
+ * After rebinding the contents, the following call should be made (where child is the only visible)
+ * child
* <pre>
- * TransitionAnimationView.startAnimation(this);
+ * TransitionAnimationView.startAnimation(child);
* </pre>
*/
public class TransitionAnimationView extends FrameLayout implements AnimatorListener {
-
private View mPreviousStateView;
private Bitmap mPreviousStateBitmap;
- private int mEnterAnimationId;
- private int mExitAnimationId;
- private int mAnimationDuration;
- private Rect mClipMargins = new Rect();
- private Rect mClipRect = new Rect();
- private Animator mEnterAnimation;
- private Animator mExitAnimation;
+ private ObjectAnimator mPreviousAnimator;
public TransitionAnimationView(Context context) {
this(context, null, 0);
@@ -61,67 +50,16 @@
public TransitionAnimationView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
-
- TypedArray a = getContext().obtainStyledAttributes(
- attrs, R.styleable.TransitionAnimationView);
-
- mEnterAnimationId = a.getResourceId(R.styleable.TransitionAnimationView_enterAnimation,
- android.R.animator.fade_in);
- mExitAnimationId = a.getResourceId(R.styleable.TransitionAnimationView_exitAnimation,
- android.R.animator.fade_out);
- mClipMargins.left = a.getDimensionPixelOffset(
- R.styleable.TransitionAnimationView_clipMarginLeft, 0);
- mClipMargins.top = a.getDimensionPixelOffset(
- R.styleable.TransitionAnimationView_clipMarginTop, 0);
- mClipMargins.right = a.getDimensionPixelOffset(
- R.styleable.TransitionAnimationView_clipMarginRight, 0);
- mClipMargins.bottom = a.getDimensionPixelOffset(
- R.styleable.TransitionAnimationView_clipMarginBottom, 0);
- mAnimationDuration = a.getInt(
- R.styleable.TransitionAnimationView_animationDuration, 100);
-
- a.recycle();
-
- mPreviousStateView = new View(context);
- mPreviousStateView.setVisibility(View.INVISIBLE);
- addView(mPreviousStateView);
-
- mEnterAnimation = AnimatorInflater.loadAnimator(getContext(), mEnterAnimationId);
- if (mEnterAnimation == null) {
- throw new IllegalArgumentException("Invalid enter animation: " + mEnterAnimationId);
- }
- mEnterAnimation.addListener(this);
- mEnterAnimation.setDuration(mAnimationDuration);
-
- mExitAnimation = AnimatorInflater.loadAnimator(getContext(), mExitAnimationId);
- if (mExitAnimation == null) {
- throw new IllegalArgumentException("Invalid exit animation: " + mExitAnimationId);
- }
- mExitAnimation.setDuration(mAnimationDuration);
}
@Override
- protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
- super.onLayout(changed, left, top, right, bottom);
- if (changed || mPreviousStateBitmap == null) {
- if (mPreviousStateBitmap != null) {
- mPreviousStateBitmap.recycle();
- mPreviousStateBitmap = null;
- }
- int width = right - left;
- int height = bottom - top;
- if (width > 0 && height > 0) {
- mPreviousStateBitmap = Bitmap.createBitmap(
- width, height, Bitmap.Config.ARGB_8888);
- mPreviousStateView.setBackgroundDrawable(
- new BitmapDrawable(getContext().getResources(), mPreviousStateBitmap));
- mClipRect.set(mClipMargins.left, mClipMargins.top,
- width - mClipMargins.right, height - mClipMargins.bottom);
- } else {
- mPreviousStateBitmap = null;
- mPreviousStateView.setBackgroundDrawable(null);
- }
- }
+ protected void onFinishInflate() {
+ super.onFinishInflate();
+ mPreviousStateView = new View(getContext());
+ mPreviousStateView.setVisibility(View.INVISIBLE);
+ mPreviousStateView.setLayoutParams(new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT,
+ LayoutParams.MATCH_PARENT));
+ addView(mPreviousStateView);
}
@Override
@@ -135,40 +73,46 @@
}
public void startTransition(View view, boolean closing) {
- if (mEnterAnimation.isRunning()) {
- mEnterAnimation.end();
- }
- if (mExitAnimation.isRunning()) {
- mExitAnimation.end();
+ if (mPreviousAnimator != null && mPreviousAnimator.isRunning()) {
+ mPreviousAnimator.end();
}
if (view.getVisibility() != View.VISIBLE) {
if (!closing) {
- mEnterAnimation.setTarget(view);
- mEnterAnimation.start();
+ mPreviousAnimator = ObjectAnimator.ofFloat(view, View.ALPHA, 0.0f, 1.0f);
+ mPreviousAnimator.start();
}
} else if (closing) {
- mExitAnimation.setTarget(view);
- mExitAnimation.start();
+ mPreviousAnimator = ObjectAnimator.ofFloat(view, View.ALPHA, 1.0f, 0.0f);
+ mPreviousAnimator.start();
} else {
- if (mPreviousStateBitmap == null) {
- return;
+ if (view.getWidth() > 0 && view.getHeight() > 0) {
+ // Take a "screenshot" of the current state of the screen and show that on top
+ // of the real content. Then, fade that out.
+ mPreviousStateBitmap = Bitmap.createBitmap(
+ view.getWidth(), view.getHeight(), Bitmap.Config.ARGB_8888);
+ mPreviousStateView.setBackgroundDrawable(
+ new BitmapDrawable(getContext().getResources(), mPreviousStateBitmap));
+ mPreviousStateView.setLayoutParams(view.getLayoutParams());
+ mPreviousStateBitmap.eraseColor(Color.WHITE);
+ Canvas canvas = new Canvas(mPreviousStateBitmap);
+ view.draw(canvas);
+ canvas.setBitmap(null);
+ mPreviousStateView.setVisibility(View.VISIBLE);
+
+ mPreviousAnimator =
+ ObjectAnimator.ofFloat(mPreviousStateView, View.ALPHA, 1.0f, 0.0f);
+ mPreviousAnimator.start();
}
-
- mPreviousStateBitmap.eraseColor(Color.TRANSPARENT);
- Canvas canvas = new Canvas(mPreviousStateBitmap);
- canvas.clipRect(mClipRect);
- view.draw(canvas);
- canvas.setBitmap(null);
- mPreviousStateView.setVisibility(View.VISIBLE);
-
- mEnterAnimation.setTarget(view);
- mEnterAnimation.start();
}
}
@Override
public void onAnimationEnd(Animator animation) {
mPreviousStateView.setVisibility(View.INVISIBLE);
+ mPreviousStateView.setBackgroundDrawable(null);
+ mPreviousStateBitmap.recycle();
+ mPreviousStateBitmap = null;
+ mPreviousAnimator = null;
}
@Override