diff options
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | res/values-af/strings.xml | 10 | ||||
| -rw-r--r-- | res/values-de/strings.xml | 12 | ||||
| -rw-r--r-- | res/values-es/strings.xml | 2 | ||||
| -rw-r--r-- | res/values-pt-rPT/strings.xml | 10 | ||||
| -rw-r--r-- | res/values-sw/strings.xml | 4 | ||||
| -rw-r--r-- | res/values-vi/strings.xml | 2 | ||||
| -rw-r--r-- | res/values-zu/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/contacts/calllog/CallLogFragment.java | 15 | ||||
| -rw-r--r-- | src/com/android/contacts/dialpad/DialpadFragment.java | 6 |
10 files changed, 38 insertions, 26 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 11b9cde22..d06fe1dd8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -190,6 +190,7 @@ <category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.BROWSABLE" /> + <category android:name="android.intent.category.APP_CONTACTS" /> </intent-filter> <intent-filter> <action android:name="com.android.contacts.action.LIST_DEFAULT" /> diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 91af1894e..359fc1fca 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -228,11 +228,11 @@ <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="7221682312959229201">"Die berging kon nie geskandeer word nie. (Rede: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string> <string name="scanning_sdcard_failed_message" product="default" msgid="189023067829510792">"Die SD-kaart kon nie geskandeer word nie. (Rede: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string> <string name="fail_reason_io_error" msgid="6748358842976073255">"T/A-fout"</string> - <string name="fail_reason_low_memory_during_import" msgid="875222757734882898">"Nie genoeg geheue nie. Die lêer is dalk te groot."</string> + <string name="fail_reason_low_memory_during_import" msgid="875222757734882898">"Nie genoeg berging nie. Die lêer is dalk te groot."</string> <string name="fail_reason_vcard_parse_error" msgid="888263542360355784">"Kon nie vCard ontleed nie weens onverwagte redes."</string> <string name="fail_reason_not_supported" msgid="8219562769267148825">"Die formaat word nie ondersteun nie."</string> <string name="vcard_import_failed" msgid="5223531255894842406">"Kon nie vCard invoer nie."</string> - <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2071820850017305867">"Geen vCard-lêer in geheue gevind nie."</string> + <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2071820850017305867">"Geen vCard-lêer in berging gevind nie."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1754014167874286173">"Geen vCard-lêer op die SD-kaart gevind nie"</string> <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="6427931733267328564">"Kon nie meta-inligting van gegewe vCard-lêer(s) versamel nie."</string> <string name="fail_reason_failed_to_read_files" msgid="5823434810622484922">"Een of meer lêers kon nie ingevoer word nie (%s)."</string> @@ -394,8 +394,8 @@ <string name="name_phonetic_middle" msgid="8643721493320405200">"Fonetiese middelnaam"</string> <string name="name_phonetic_family" msgid="462095502140180305">"Fonetiese van"</string> <string name="name_phonetic" msgid="4259595234312430484">"Fonetiese naam"</string> - <string name="connections" msgid="8098440723172028350">"Kennisse"</string> - <string name="add_connection_button" msgid="4861308615789601727">"Voeg kennis by"</string> + <string name="connections" msgid="8098440723172028350">"Skakelpunte"</string> + <string name="add_connection_button" msgid="4861308615789601727">"Voeg skakelpunt by"</string> <string name="recent" msgid="2659189233141493004">"Onlangs"</string> <string name="recent_updates" msgid="4267258535615860710">"Onlangse opdaterings"</string> <string name="account_type_format" msgid="718948015590343010">"<xliff:g id="SOURCE">%1$s</xliff:g> kontak"</string> @@ -418,7 +418,7 @@ <string name="pick_new_photo" msgid="7962368009197147617">"Kies nuwe foto uit galery"</string> <string name="locale_change_in_progress" msgid="7583992153091537467">"Kontaklys word tans opgedateer om die taalverandering te weerspieël."</string> <string name="upgrade_in_progress" msgid="474511436863451061">"Kontaklys word opgedateer."</string> - <string name="upgrade_out_of_memory" msgid="1209994418877625940">"Kontakte word tans opgradeer. "\n\n"Die opgraderingsproses benodig interne geheue van omtrent <xliff:g id="SIZE_IN_MEGABYTES">%s</xliff:g> MG. "\n\n"Kies een van die volgende opsies:"</string> + <string name="upgrade_out_of_memory" msgid="1209994418877625940">"Kontakte word tans opgradeer. "\n\n"Die opgraderingsproses benodig interne berging van omtrent <xliff:g id="SIZE_IN_MEGABYTES">%s</xliff:g> MG. "\n\n"Kies een van die volgende opsies:"</string> <string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"Deïnstalleer sekere programme"</string> <string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"Herprobeer opgradering"</string> <string name="search_results_searching" msgid="3984833028938569930">"Soek tans…"</string> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index e8e9deb4e..798ea1594 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -48,7 +48,7 @@ <string name="menu_deleteContact" msgid="6788644058868189393">"Löschen"</string> <string name="menu_call" msgid="3992595586042260618">"Kontakt anrufen"</string> <string name="menu_sendSMS" msgid="5535886767547006515">"SMS an Kontakt"</string> - <string name="menu_splitAggregate" msgid="8368636463748691868">"Aufteilen"</string> + <string name="menu_splitAggregate" msgid="8368636463748691868">"Trennen"</string> <string name="menu_editGroup" msgid="5062005185370983720">"Bearbeiten"</string> <string name="menu_deleteGroup" msgid="3486380004411482874">"Löschen"</string> <string name="menu_new_contact_action_bar" msgid="8887818026717394343">"Neu"</string> @@ -127,7 +127,7 @@ <item quantity="other" msgid="3852668542926965042">"<xliff:g id="COUNT">%d</xliff:g> gefunden"</item> </plurals> <string name="foundTooManyContacts" msgid="5163335650920020220">"Mehr als <xliff:g id="COUNT">%d</xliff:g> gefunden"</string> - <string name="listFoundAllContactsZero" msgid="7132202364587656501">"Keine gefunden"</string> + <string name="listFoundAllContactsZero" msgid="7132202364587656501">"Keine Kontakte gefunden"</string> <plurals name="searchFoundContacts"> <item quantity="one" msgid="4826918429708286628">"1 gefunden"</item> <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> gefunden"</item> @@ -218,9 +218,9 @@ <string name="import_from_sdcard" product="default" msgid="8668347930577565175">"Aus Speicher importieren"</string> <string name="export_to_sdcard" product="default" msgid="6092815580965201089">"In Speicher exportieren"</string> <string name="share_visible_contacts" msgid="890150378880783797">"Sichtbare Kontakte teilen"</string> - <string name="import_one_vcard_string" msgid="9059163467020328433">"Eine VCard-Datei importieren"</string> - <string name="import_multiple_vcard_string" msgid="3810226492811062392">"Mehrere VCard-Dateien importieren"</string> - <string name="import_all_vcard_string" msgid="5518136113853448474">"Alle VCard-Dateien importieren"</string> + <string name="import_one_vcard_string" msgid="9059163467020328433">"Eine vCard-Datei importieren"</string> + <string name="import_multiple_vcard_string" msgid="3810226492811062392">"Mehrere vCard-Dateien importieren"</string> + <string name="import_all_vcard_string" msgid="5518136113853448474">"Alle vCard-Dateien importieren"</string> <string name="searching_vcard_message" product="nosdcard" msgid="557077639409584945">"Suche nach vCard-Daten im Speicher..."</string> <string name="searching_vcard_message" product="default" msgid="3962269894118092049">"Suche nach vCard-Daten auf der SD-Karte..."</string> <string name="scanning_sdcard_failed_title" product="nosdcard" msgid="4944932641334764942">"Scannen des Speichers nicht möglich"</string> @@ -289,7 +289,7 @@ <string name="missing_name" msgid="8745511583852904385">"(Kein Name)"</string> <string name="menu_accounts" msgid="8499114602017077970">"Konten"</string> <string name="menu_contacts_filter" msgid="2165153460860262501">"Kontakte zum Anzeigen"</string> - <string name="menu_import_export" msgid="26217871113229507">"Import/Export"</string> + <string name="menu_import_export" msgid="26217871113229507">"Importieren/Exportieren"</string> <string name="dialog_import_export" msgid="4360648034889921624">"Import/Export von Kontakten"</string> <string name="menu_share" msgid="943789700636542260">"Teilen"</string> <string name="menu_all_contacts" msgid="5101735431586050711">"Alle Kontakte"</string> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 00038dfef..0f06f928e 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -215,7 +215,7 @@ <string name="no_sdcard_message" product="default" msgid="3357810406684913482">"No se ha detectado ninguna tarjeta SD."</string> <string name="searching_vcard_title" msgid="4970508055399376813">"Buscando vCard"</string> <string name="import_from_sim" msgid="3859272228033941659">"Importar contactos desde la tarjeta SIM"</string> - <string name="import_from_sdcard" product="default" msgid="8668347930577565175">"Importar de almacenamiento"</string> + <string name="import_from_sdcard" product="default" msgid="8668347930577565175">"Importar de USB"</string> <string name="export_to_sdcard" product="default" msgid="6092815580965201089">"Exportar a almacenamiento"</string> <string name="share_visible_contacts" msgid="890150378880783797">"Compartir contactos visibles"</string> <string name="import_one_vcard_string" msgid="9059163467020328433">"Importar un archivo de vCard"</string> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 1c6c78f60..72be05f7d 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -91,7 +91,7 @@ <string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"Não existem imagens disponíveis no telefone."</string> <string name="attach_photo_dialog_title" msgid="5599827035558557169">"Fotografia do contacto"</string> <string name="customLabelPickerTitle" msgid="1081475101983255212">"Nome da etiqueta personalizada"</string> - <string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Enviar as chamadas directamente para o correio de voz"</string> + <string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Enviar as chamadas diretamente para o correio de voz"</string> <string name="removePhoto" msgid="4898105274130284565">"Remover fotografia"</string> <string name="noContacts" msgid="8579310973261953559">"Sem contactos."</string> <string name="noGroups" msgid="8614664663561385253">"Nenhum grupo."</string> @@ -176,7 +176,7 @@ <string name="callDetailTitle" msgid="5340227785196217938">"Detalhes da chamada"</string> <string name="toast_call_detail_error" msgid="7200975244804730096">"Não foi possível ler os detalhes da chamada solicitada."</string> <string name="type_incoming" msgid="6502076603836088532">"Chamada recebida"</string> - <string name="type_outgoing" msgid="343108709599392641">"Chamada efectuada"</string> + <string name="type_outgoing" msgid="343108709599392641">"Chamada efetuada"</string> <string name="type_missed" msgid="2720502601640509542">"Chamada não atendida"</string> <string name="type_voicemail" msgid="5153139450668549908">"Correio de voz"</string> <string name="actionIncomingCall" msgid="6028930669817038600">"Chamadas recebidas"</string> @@ -426,7 +426,7 @@ <string name="menu_display_all" msgid="8887488642609786198">"Mostrar tudo"</string> <string name="menu_select_all" msgid="621719255150713545">"Seleccionar tudo"</string> <string name="menu_select_none" msgid="7093222469852132345">"Desmarcar tudo"</string> - <string name="no_contacts_selected" msgid="5877803471037324613">"Nenhum contacto seleccionado."</string> + <string name="no_contacts_selected" msgid="5877803471037324613">"Nenhum contacto selecionado."</string> <string name="add_field" msgid="2384260056674995230">"Adicionar outro campo"</string> <string name="add_new_entry_for_section" msgid="5223080690667565044">"Adicionar novo"</string> <string name="add_organization" msgid="7311893231158291197">"Adicionar entidade"</string> @@ -442,9 +442,9 @@ </plurals> <string name="local_invisible_directory" msgid="6046691709127661065">"Outro"</string> <string name="aggregation_suggestion_join_dialog_title" msgid="5276699501316246253">"Associar contactos"</string> - <string name="aggregation_suggestion_join_dialog_message" msgid="3842757977671434836">"Associar o contacto actual ao contacto seleccionado?"</string> + <string name="aggregation_suggestion_join_dialog_message" msgid="3842757977671434836">"Associar o contacto actual ao contacto selecionado?"</string> <string name="aggregation_suggestion_edit_dialog_title" msgid="1064042382692091314">"Editar contactos seleccionados"</string> - <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"Alternar para edição do contacto seleccionado? A informação introduzida até agora vai ser copiada."</string> + <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"Alternar para edição do contacto selecionado? A informação introduzida até agora vai ser copiada."</string> <string name="menu_copyContact" msgid="1573960845106822639">"Copiar para Os Meus Contactos"</string> <string name="add_to_my_contacts" msgid="1068274916793627723">"Adicionar aos Meus Contactos"</string> <string name="contact_directory_description" msgid="683398073603909119">"Directório <xliff:g id="TYPE">%1$s</xliff:g>"</string> diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index ecbb2f4dc..f36a99aa2 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -158,7 +158,7 @@ <string name="dialerKeyboardHintText" msgid="5401660096579787344">"Tumia kibodi kubonyeza"</string> <string name="dialerDialpadHintText" msgid="5824490365898349041">"Piga ili kuongeza simu"</string> <string name="simContacts_emptyLoading" msgid="6700035985448642408">"Inapakia kutoka SIM kadi..."</string> - <string name="simContacts_title" msgid="27341688347689769">"Anwani za kadi ya SIM"</string> + <string name="simContacts_title" msgid="27341688347689769">"Anwani za SIM kadi"</string> <string name="noContactsHelpTextWithSyncForCreateShortcut" msgid="801504710275614594">"Huna anwani zozote ya kuonyesha. (Ikiwa umeongeza tu akaunti, inaweza kuchukua dakika chache ili kusawazisha anwani.)"</string> <string name="noContactsHelpTextForCreateShortcut" msgid="3081286388667108335">"Hauna anwani zozote za kuonyesha."</string> <string name="noContactsHelpText" product="tablet" msgid="6226271923423236696">"Hauna anwani zozote za kuonyesha."\n\n"Kuongeza anwani, gusa "<font fgcolor="#ffffffff"><b>"Menyu "</b></font>", , kisha uguse: "\n" "\n<li><font fgcolor="#ffffffff"><b>"Akaunti "</b></font>" kuongeza au kuanzisha akaunti yenye anwani unazoweza kulandanisha kwa kompyuta ndogo "\n</li>" "\n<li><font fgcolor="#ffffffff"><b>" Anwani Mpya "</b></font>" ili kuanzisha anwani mpya kutoka mwanzo {"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Leta/Hamisha"</b></font>" ili kuhamisha anwani kutoka kwa kadi yako ya SD"\n</li></string> @@ -169,7 +169,7 @@ <string name="noContactsNoSimHelpText" product="default" msgid="6224952277619986841">"Hauna anwani zozote za kuonyesha."\n\n"Ili kuongeza anwani, gusa "<font fgcolor="#ffffffff"><b>" Menyu "</b></font>", kisha uguse: "\n" "\n<li><font fgcolor="#ffffffff"><b>"Akaunti"</b></font>" kuongeza au kusanidi akaunti yenye anwani unazoweza kulandanisha kwa simu "\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Anwani mpya"</b></font>" Ili kuunda anwani mpya kutoka mwanzo "\n</li>" "\n<li><font fgcolor="#ffffffff"><b>" Leta/Hamisha "</b></font>" ili kuhamisha anwani kutoka kwa kadi yako ya SD"\n</li></string> <string name="noContactsNoSimHelpTextWithSync" product="tablet" msgid="5415762667445638265">"Hauna anwani zozote za kuonyesha. (Kama umeongeza akaunti sasa hivi tu, inaweza kuchukua dakika chache kulandanisha anwani.)"\n\n"Ili kuongeza anwani, gusa "<font fgcolor="#ffffffff"><b>"Menyu"</b></font>",kisha uguse:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Akaunti"</b></font>" ili kuongeza au kusanidi akaunti na anwani unazoweza kulandanisha kwenye kompyuta ndogo"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Onyesha chaguo"</b></font>" ili kubadilisha anwani zinazoonekana"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Anwani mpya"</b></font>" ili kuunda anwani mpya kutoka mwanzo"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Leta/Hamisha"</b></font>" ili kuleta anwani kutoka kwa kadi yako ya SD"\n</li></string> <string name="noContactsNoSimHelpTextWithSync" product="default" msgid="7443705129830284440">"Hauna anwani zozote za kuonyesha. (Kama umeongeza akaunti sasa hivi, inaweza kuchukua dakika chache kulandanisha anwani.)"\n\n"Kuongeza anwani, gusa "<font fgcolor="#ffffffff"><b>"Menyu"</b></font>",kisha uguse:{"\n" "\n<li><font fgcolor="#ffffffff"><b>"Akaunti"</b></font>" ili kuongeza au kuanzisha akaunti yenye anwani unazoweza kulandanisha kwenye simu"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Onyesha uchaguzi"</b></font>" kwa kubadilisha anwani gani zinazoonekana"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Anwani mpya"</b></font>"ili kuunda anwani mpya kutoka mwanzo"\n</li>\n<li><font fgcolor="#ffffffff"><b>"Leta/Hamisha"</b></font>" ili kuleta anwani kutoka kwa kadi yako ya SD"\n</li></string> - <!-- syntax error in translation for noFavoritesHelpText (3744655776704833277) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:167 in java.io.StringReader@ae94e92) --> + <string name="noFavoritesHelpText" msgid="3744655776704833277">"Huna vipendwa vyovyote."\n\n" Ili kuongeza anwani kwenye orodha yako ya vipendwa:"\n\n" "<li>"Gusa kichupo cha "<b>"Anwani"</b>\n</li>\n<li>"2Gusa anwani unayotaka kuiongeza kwenye vipendwa vyako"\n</li>" "\n<li>"Gusa nyota iliyo kando ya jina la anwani hiyo"\n</li></string> <string name="dialer_useDtmfDialpad" msgid="1707548397435075040">"Tumia kibao cha kuchapa cha sauti na kugusa"</string> <string name="dialer_returnToInCallScreen" msgid="3719386377550913067">"Rudi kwa simu inayoendelea"</string> <string name="dialer_addAnotherCall" msgid="4205688819890074468">"Ongeza simu"</string> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index caf3b439b..74da6cd54 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -64,7 +64,7 @@ <string name="contactsJoinedMessage" msgid="7208148163607047389">"Danh bạ đã được kết hợp"</string> <string name="deleteConfirmation_title" msgid="1418215926447642260">"Xóa địa chỉ liên hệ?"</string> <string name="menu_set_ring_tone" msgid="8728345772068064946">"Đặt nhạc chuông"</string> - <string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Tất cả c.gọi tới th.thoại"</string> + <string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Các cuộc gọi tới thư thoại"</string> <string name="readOnlyContactWarning" msgid="7808825687289848259">"Bạn không thể xóa địa chỉ liên hệ từ tài khoản chỉ đọc, nhưng bạn có thể ẩn chúng trong danh sách địa chỉ liên hệ của mình."</string> <string name="readOnlyContactDeleteConfirmation" msgid="2137170726670196909">"Liên hệ này chứa thông tin từ nhiều tài khoản. Thông tin từ các tài khoản ở chế độ chỉ đọc sẽ bị ẩn trong danh sách liên hệ của bạn, chứ không bị xóa."</string> <string name="multipleContactDeleteConfirmation" msgid="938900978442960800">"Xóa liên hệ này sẽ xóa thông tin khỏi nhiều tài khoản."</string> diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 4f553f020..6c25e32d4 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -119,7 +119,7 @@ <string name="listTotalAllContactsZeroCustom" msgid="5004974705699445044">"Abekho othintana nabo ababonakalayo"</string> <string name="listTotalAllContactsZeroStarred" msgid="3173820905501592808">"Azikho izintandokazi"</string> <string name="listTotalAllContactsZeroGroup" msgid="5448979458248027615">"Abekho othintana nabo ku <xliff:g id="NAME">%s</xliff:g>"</string> - <string name="listAllContactsInAccount" msgid="7496143179265311758">"Oxhumana nabo kwi <xliff:g id="NAME">%s</xliff:g>"</string> + <string name="listAllContactsInAccount" msgid="7496143179265311758">"Oxhumana nabo ku-<xliff:g id="NAME">%s</xliff:g>"</string> <string name="listSingleContact" msgid="6067813698903535563">"Oxhumana naye oyedwa"</string> <string name="listCustomView" msgid="6950713892532194050">"Ohlu loxhumana nabo olubukwa kokulungiselwe lokhu"</string> <plurals name="listFoundAllContacts"> diff --git a/src/com/android/contacts/calllog/CallLogFragment.java b/src/com/android/contacts/calllog/CallLogFragment.java index f14f1697c..d9606cbf7 100644 --- a/src/com/android/contacts/calllog/CallLogFragment.java +++ b/src/com/android/contacts/calllog/CallLogFragment.java @@ -273,11 +273,16 @@ public class CallLogFragment extends ListFragment implements ViewPagerVisibility @Override public void onPrepareOptionsMenu(Menu menu) { if (mShowOptionsMenu) { - menu.findItem(R.id.delete_all).setEnabled(mAdapter != null && !mAdapter.isEmpty()); - menu.findItem(R.id.show_voicemails_only).setVisible( - mVoicemailSourcesAvailable && !mShowingVoicemailOnly); - menu.findItem(R.id.show_all_calls).setVisible( - mVoicemailSourcesAvailable && mShowingVoicemailOnly); + final MenuItem itemDeleteAll = menu.findItem(R.id.delete_all); + // Check if all the menu items are inflated correctly. As a shortcut, we assume all + // menu items are ready if the first item is non-null. + if (itemDeleteAll != null) { + itemDeleteAll.setEnabled(mAdapter != null && !mAdapter.isEmpty()); + menu.findItem(R.id.show_voicemails_only).setVisible( + mVoicemailSourcesAvailable && !mShowingVoicemailOnly); + menu.findItem(R.id.show_all_calls).setVisible( + mVoicemailSourcesAvailable && mShowingVoicemailOnly); + } } } diff --git a/src/com/android/contacts/dialpad/DialpadFragment.java b/src/com/android/contacts/dialpad/DialpadFragment.java index 064e0545b..793717d4f 100644 --- a/src/com/android/contacts/dialpad/DialpadFragment.java +++ b/src/com/android/contacts/dialpad/DialpadFragment.java @@ -583,6 +583,12 @@ public class DialpadFragment extends Fragment final MenuItem twoSecPauseMenuItem = menu.findItem(R.id.menu_2s_pause); final MenuItem waitMenuItem = menu.findItem(R.id.menu_add_wait); + // Check if all the menu items are inflated correctly. As a shortcut, we assume all menu + // items are ready if the first item is non-null. + if (callSettingsMenuItem == null) { + return; + } + final Activity activity = getActivity(); if (activity != null && ViewConfiguration.get(activity).hasPermanentMenuKey()) { // Call settings should be available via its parent Activity. |