From fc37b02f5d3381a7882770941e461b13b679b6ef Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Tue, 21 Mar 2017 10:11:17 -0700 Subject: Update AOSP Dialer source from internal google3 repository at cl/150756069 Test: make, treehugger This CL updates the AOSP Dialer source with all the changes that have gone into the private google3 repository. This includes all the changes from cl/150392808 (3/16/2017) to cl/150756069 (3/21/2017). This goal of these drops is to keep the AOSP source in sync with the internal google3 repository. Currently these sync are done by hand with very minor modifications to the internal source code. See the Android.mk file for list of modifications. Our current goal is to do frequent drops (daily if possible) and eventually switched to an automated process. Change-Id: I0888b5db52efb28eb8194600e0c7804592f975f3 --- .../contacts/common/ContactPhotoManager.java | 15 ++ .../contacts/common/dialog/CallSubjectDialog.java | 69 +---- .../res/drawable-hdpi/ic_person_add_24dp.png | Bin 289 -> 0 bytes .../res/drawable-mdpi/ic_person_add_24dp.png | Bin 204 -> 0 bytes .../res/drawable-xhdpi/ic_person_add_24dp.png | Bin 329 -> 0 bytes .../res/drawable-xxhdpi/ic_person_add_24dp.png | Bin 464 -> 0 bytes .../res/drawable-xxxhdpi/ic_person_add_24dp.png | Bin 610 -> 0 bytes .../res/drawable/ic_person_add_tinted_24dp.xml | 2 +- .../common/res/drawable/ic_search_add_contact.xml | 2 +- .../contacts/common/res/values-ky/strings.xml | 2 +- java/com/android/contacts/common/util/FabUtil.java | 71 ------ .../widget/FloatingActionButtonController.java | 79 ++---- java/com/android/dialer/app/DialtactsActivity.java | 39 ++- .../dialer/app/FloatingActionButtonBehavior.java | 50 ---- .../android/dialer/app/calllog/CallLogAdapter.java | 33 +-- .../app/calllog/CallLogListItemViewHolder.java | 28 ++- .../calllog/VisualVoicemailCallLogFragment.java | 2 + .../dialer/app/dialpad/DialpadFragment.java | 11 +- .../app/dialpad/PseudoEmergencyAnimator.java | 4 +- .../dialer/app/list/AllContactsFragment.java | 3 - .../com/android/dialer/app/list/ListsFragment.java | 3 +- .../android/dialer/app/list/SearchFragment.java | 15 +- .../dialer/app/res/drawable-hdpi/fab_ic_dial.png | Bin 1028 -> 0 bytes .../dialer/app/res/drawable-mdpi/fab_ic_dial.png | Bin 905 -> 0 bytes .../dialer/app/res/drawable-xhdpi/fab_ic_dial.png | Bin 1699 -> 0 bytes .../dialer/app/res/drawable-xxhdpi/fab_ic_dial.png | Bin 3042 -> 0 bytes .../app/res/drawable-xxxhdpi/fab_ic_dial.png | Bin 3800 -> 0 bytes .../app/res/drawable/floating_action_button.xml | 25 -- .../res/drawable/ic_call_detail_content_copy.xml | 20 -- .../app/res/drawable/ic_call_detail_edit.xml | 20 -- .../app/res/drawable/ic_call_detail_report.xml | 20 -- .../app/res/drawable/ic_call_detail_unblock.xml | 20 -- .../app/res/layout-land/dialpad_fragment.xml | 32 +-- .../app/res/layout/call_detail_history_item.xml | 55 ---- .../app/res/layout/call_log_list_item_actions.xml | 2 +- .../dialer/app/res/layout/dialpad_fragment.xml | 33 +-- .../dialer/app/res/layout/dialtacts_activity.xml | 25 +- .../android/dialer/app/res/values-af/strings.xml | 2 - .../android/dialer/app/res/values-am/strings.xml | 2 - .../android/dialer/app/res/values-ar/strings.xml | 2 - .../android/dialer/app/res/values-az/strings.xml | 2 - .../android/dialer/app/res/values-be/strings.xml | 2 - .../android/dialer/app/res/values-bg/strings.xml | 2 - .../android/dialer/app/res/values-bn/strings.xml | 2 - .../android/dialer/app/res/values-bs/strings.xml | 2 - .../android/dialer/app/res/values-ca/strings.xml | 2 - .../android/dialer/app/res/values-cs/strings.xml | 2 - .../android/dialer/app/res/values-da/strings.xml | 2 - .../android/dialer/app/res/values-de/strings.xml | 2 - .../android/dialer/app/res/values-el/strings.xml | 2 - .../dialer/app/res/values-en-rAU/strings.xml | 2 - .../dialer/app/res/values-en-rGB/strings.xml | 2 - .../dialer/app/res/values-en-rIN/strings.xml | 2 - .../dialer/app/res/values-es-rUS/strings.xml | 2 - .../android/dialer/app/res/values-es/strings.xml | 2 - .../android/dialer/app/res/values-et/strings.xml | 2 - .../android/dialer/app/res/values-eu/strings.xml | 2 - .../android/dialer/app/res/values-fa/strings.xml | 2 - .../android/dialer/app/res/values-fi/strings.xml | 2 - .../dialer/app/res/values-fr-rCA/strings.xml | 2 - .../android/dialer/app/res/values-fr/strings.xml | 2 - .../android/dialer/app/res/values-gl/strings.xml | 2 - .../android/dialer/app/res/values-gu/strings.xml | 2 - .../android/dialer/app/res/values-hi/strings.xml | 2 - .../android/dialer/app/res/values-hr/strings.xml | 2 - .../android/dialer/app/res/values-hu/strings.xml | 2 - .../android/dialer/app/res/values-hy/strings.xml | 2 - .../android/dialer/app/res/values-in/strings.xml | 2 - .../android/dialer/app/res/values-is/strings.xml | 2 - .../android/dialer/app/res/values-it/strings.xml | 2 - .../android/dialer/app/res/values-iw/strings.xml | 2 - .../android/dialer/app/res/values-ja/strings.xml | 2 - .../android/dialer/app/res/values-ka/strings.xml | 2 - .../android/dialer/app/res/values-kk/strings.xml | 2 - .../android/dialer/app/res/values-km/strings.xml | 2 - .../android/dialer/app/res/values-kn/strings.xml | 2 - .../android/dialer/app/res/values-ko/strings.xml | 2 - .../android/dialer/app/res/values-ky/strings.xml | 2 - .../android/dialer/app/res/values-lo/strings.xml | 2 - .../android/dialer/app/res/values-lt/strings.xml | 2 - .../android/dialer/app/res/values-lv/strings.xml | 2 - .../android/dialer/app/res/values-mk/strings.xml | 2 - .../android/dialer/app/res/values-ml/strings.xml | 2 - .../android/dialer/app/res/values-mn/strings.xml | 2 - .../android/dialer/app/res/values-mr/strings.xml | 2 - .../android/dialer/app/res/values-ms/strings.xml | 2 - .../android/dialer/app/res/values-my/strings.xml | 2 - .../android/dialer/app/res/values-nb/strings.xml | 2 - .../android/dialer/app/res/values-ne/strings.xml | 2 - .../android/dialer/app/res/values-nl/strings.xml | 2 - .../android/dialer/app/res/values-no/strings.xml | 2 - .../android/dialer/app/res/values-pa/strings.xml | 2 - .../android/dialer/app/res/values-pl/strings.xml | 2 - .../dialer/app/res/values-pt-rBR/strings.xml | 2 - .../dialer/app/res/values-pt-rPT/strings.xml | 2 - .../android/dialer/app/res/values-pt/strings.xml | 2 - .../android/dialer/app/res/values-ro/strings.xml | 2 - .../android/dialer/app/res/values-ru/strings.xml | 2 - .../android/dialer/app/res/values-si/strings.xml | 2 - .../android/dialer/app/res/values-sk/strings.xml | 2 - .../android/dialer/app/res/values-sl/strings.xml | 2 - .../android/dialer/app/res/values-sq/strings.xml | 2 - .../android/dialer/app/res/values-sr/strings.xml | 2 - .../android/dialer/app/res/values-sv/strings.xml | 2 - .../android/dialer/app/res/values-sw/strings.xml | 2 - .../android/dialer/app/res/values-ta/strings.xml | 2 - .../android/dialer/app/res/values-te/strings.xml | 2 - .../android/dialer/app/res/values-th/strings.xml | 2 - .../android/dialer/app/res/values-tl/strings.xml | 2 - .../android/dialer/app/res/values-tr/strings.xml | 2 - .../android/dialer/app/res/values-uk/strings.xml | 2 - .../android/dialer/app/res/values-ur/strings.xml | 2 - .../android/dialer/app/res/values-uz/strings.xml | 18 +- .../android/dialer/app/res/values-vi/strings.xml | 2 - .../dialer/app/res/values-zh-rCN/strings.xml | 2 - .../dialer/app/res/values-zh-rHK/strings.xml | 2 - .../dialer/app/res/values-zh-rTW/strings.xml | 2 - .../android/dialer/app/res/values-zu/strings.xml | 2 - java/com/android/dialer/app/res/values/strings.xml | 9 - .../error/OmtpVoicemailMessageCreator.java | 6 +- .../app/voicemail/error/VoicemailErrorMessage.java | 2 +- .../error/VoicemailErrorMessageCreator.java | 3 +- .../error/Vvm3VoicemailMessageCreator.java | 2 - .../app/voicemail/error/res/values-af/strings.xml | 12 +- .../app/voicemail/error/res/values-am/strings.xml | 12 +- .../app/voicemail/error/res/values-ar/strings.xml | 12 +- .../app/voicemail/error/res/values-az/strings.xml | 12 +- .../app/voicemail/error/res/values-be/strings.xml | 12 +- .../app/voicemail/error/res/values-bg/strings.xml | 12 +- .../app/voicemail/error/res/values-bn/strings.xml | 12 +- .../app/voicemail/error/res/values-bs/strings.xml | 12 +- .../app/voicemail/error/res/values-ca/strings.xml | 12 +- .../app/voicemail/error/res/values-cs/strings.xml | 12 +- .../app/voicemail/error/res/values-da/strings.xml | 12 +- .../app/voicemail/error/res/values-de/strings.xml | 12 +- .../app/voicemail/error/res/values-el/strings.xml | 12 +- .../voicemail/error/res/values-en-rAU/strings.xml | 12 +- .../voicemail/error/res/values-en-rGB/strings.xml | 12 +- .../voicemail/error/res/values-en-rIN/strings.xml | 12 +- .../voicemail/error/res/values-es-rUS/strings.xml | 12 +- .../app/voicemail/error/res/values-es/strings.xml | 12 +- .../app/voicemail/error/res/values-et/strings.xml | 12 +- .../app/voicemail/error/res/values-eu/strings.xml | 12 +- .../app/voicemail/error/res/values-fa/strings.xml | 12 +- .../app/voicemail/error/res/values-fi/strings.xml | 12 +- .../voicemail/error/res/values-fr-rCA/strings.xml | 12 +- .../app/voicemail/error/res/values-fr/strings.xml | 12 +- .../app/voicemail/error/res/values-gl/strings.xml | 12 +- .../app/voicemail/error/res/values-gu/strings.xml | 12 +- .../app/voicemail/error/res/values-hi/strings.xml | 12 +- .../app/voicemail/error/res/values-hr/strings.xml | 12 +- .../app/voicemail/error/res/values-hu/strings.xml | 12 +- .../app/voicemail/error/res/values-hy/strings.xml | 12 +- .../app/voicemail/error/res/values-in/strings.xml | 12 +- .../app/voicemail/error/res/values-is/strings.xml | 12 +- .../app/voicemail/error/res/values-it/strings.xml | 12 +- .../app/voicemail/error/res/values-iw/strings.xml | 12 +- .../app/voicemail/error/res/values-ja/strings.xml | 12 +- .../app/voicemail/error/res/values-ka/strings.xml | 12 +- .../app/voicemail/error/res/values-kk/strings.xml | 12 +- .../app/voicemail/error/res/values-km/strings.xml | 12 +- .../app/voicemail/error/res/values-kn/strings.xml | 12 +- .../app/voicemail/error/res/values-ko/strings.xml | 12 +- .../app/voicemail/error/res/values-ky/strings.xml | 12 +- .../app/voicemail/error/res/values-lo/strings.xml | 12 +- .../app/voicemail/error/res/values-lt/strings.xml | 12 +- .../app/voicemail/error/res/values-lv/strings.xml | 12 +- .../app/voicemail/error/res/values-mk/strings.xml | 12 +- .../app/voicemail/error/res/values-ml/strings.xml | 12 +- .../app/voicemail/error/res/values-mn/strings.xml | 12 +- .../app/voicemail/error/res/values-mr/strings.xml | 12 +- .../app/voicemail/error/res/values-ms/strings.xml | 12 +- .../app/voicemail/error/res/values-my/strings.xml | 12 +- .../app/voicemail/error/res/values-nb/strings.xml | 12 +- .../app/voicemail/error/res/values-ne/strings.xml | 12 +- .../app/voicemail/error/res/values-nl/strings.xml | 12 +- .../app/voicemail/error/res/values-no/strings.xml | 12 +- .../app/voicemail/error/res/values-pa/strings.xml | 12 +- .../app/voicemail/error/res/values-pl/strings.xml | 12 +- .../voicemail/error/res/values-pt-rBR/strings.xml | 12 +- .../voicemail/error/res/values-pt-rPT/strings.xml | 12 +- .../app/voicemail/error/res/values-pt/strings.xml | 12 +- .../app/voicemail/error/res/values-ro/strings.xml | 12 +- .../app/voicemail/error/res/values-ru/strings.xml | 12 +- .../app/voicemail/error/res/values-si/strings.xml | 12 +- .../app/voicemail/error/res/values-sk/strings.xml | 12 +- .../app/voicemail/error/res/values-sl/strings.xml | 12 +- .../app/voicemail/error/res/values-sq/strings.xml | 12 +- .../app/voicemail/error/res/values-sr/strings.xml | 12 +- .../app/voicemail/error/res/values-sv/strings.xml | 12 +- .../app/voicemail/error/res/values-sw/strings.xml | 12 +- .../app/voicemail/error/res/values-ta/strings.xml | 12 +- .../app/voicemail/error/res/values-te/strings.xml | 12 +- .../app/voicemail/error/res/values-th/strings.xml | 12 +- .../app/voicemail/error/res/values-tl/strings.xml | 12 +- .../app/voicemail/error/res/values-tr/strings.xml | 12 +- .../app/voicemail/error/res/values-uk/strings.xml | 12 +- .../app/voicemail/error/res/values-ur/strings.xml | 12 +- .../app/voicemail/error/res/values-uz/strings.xml | 12 +- .../app/voicemail/error/res/values-vi/strings.xml | 12 +- .../voicemail/error/res/values-zh-rCN/strings.xml | 12 +- .../voicemail/error/res/values-zh-rHK/strings.xml | 12 +- .../voicemail/error/res/values-zh-rTW/strings.xml | 12 +- .../app/voicemail/error/res/values-zu/strings.xml | 12 +- .../app/voicemail/error/res/values/strings.xml | 8 +- .../dialer/binary/aosp/AospDialerApplication.java | 7 +- .../binary/aosp/AospDialerRootComponent.java | 11 + .../dialer/binary/common/DialerApplication.java | 26 +- .../dialer/callcomposer/CallComposerActivity.java | 64 +---- .../callcomposer/CameraComposerFragment.java | 5 +- .../callcomposer/GalleryComposerFragment.java | 4 +- .../dialer/callcomposer/camera/CameraManager.java | 6 +- .../callcomposer/nano/CallComposerContact.java | 32 +-- .../calldetails/CallDetailsEntryViewHolder.java | 51 ++-- .../calldetails/CallDetailsHeaderViewHolder.java | 46 +--- .../calldetails/res/layout/call_details_entry.xml | 30 ++- .../dialer/calldetails/res/values/dimens.xml | 4 +- .../dialer/calllogutils/CallTypeIconsView.java | 89 ++++--- .../dialer/calllogutils/res/values-af/strings.xml | 6 +- .../dialer/calllogutils/res/values-am/strings.xml | 6 +- .../dialer/calllogutils/res/values-ar/strings.xml | 6 +- .../dialer/calllogutils/res/values-az/strings.xml | 6 +- .../dialer/calllogutils/res/values-be/strings.xml | 6 +- .../dialer/calllogutils/res/values-bg/strings.xml | 6 +- .../dialer/calllogutils/res/values-bn/strings.xml | 6 +- .../dialer/calllogutils/res/values-bs/strings.xml | 6 +- .../dialer/calllogutils/res/values-ca/strings.xml | 6 +- .../dialer/calllogutils/res/values-cs/strings.xml | 6 +- .../dialer/calllogutils/res/values-da/strings.xml | 6 +- .../dialer/calllogutils/res/values-de/strings.xml | 6 +- .../dialer/calllogutils/res/values-el/strings.xml | 6 +- .../calllogutils/res/values-en-rAU/strings.xml | 6 +- .../calllogutils/res/values-en-rGB/strings.xml | 6 +- .../calllogutils/res/values-en-rIN/strings.xml | 6 +- .../calllogutils/res/values-es-rUS/strings.xml | 6 +- .../dialer/calllogutils/res/values-es/strings.xml | 6 +- .../dialer/calllogutils/res/values-et/strings.xml | 6 +- .../dialer/calllogutils/res/values-eu/strings.xml | 6 +- .../dialer/calllogutils/res/values-fa/strings.xml | 6 +- .../dialer/calllogutils/res/values-fi/strings.xml | 6 +- .../calllogutils/res/values-fr-rCA/strings.xml | 6 +- .../dialer/calllogutils/res/values-fr/strings.xml | 6 +- .../dialer/calllogutils/res/values-gl/strings.xml | 6 +- .../dialer/calllogutils/res/values-gu/strings.xml | 6 +- .../dialer/calllogutils/res/values-hi/strings.xml | 6 +- .../dialer/calllogutils/res/values-hr/strings.xml | 6 +- .../dialer/calllogutils/res/values-hu/strings.xml | 6 +- .../dialer/calllogutils/res/values-hy/strings.xml | 6 +- .../dialer/calllogutils/res/values-in/strings.xml | 6 +- .../dialer/calllogutils/res/values-is/strings.xml | 6 +- .../dialer/calllogutils/res/values-it/strings.xml | 6 +- .../dialer/calllogutils/res/values-iw/strings.xml | 6 +- .../dialer/calllogutils/res/values-ja/strings.xml | 6 +- .../dialer/calllogutils/res/values-ka/strings.xml | 6 +- .../dialer/calllogutils/res/values-kk/strings.xml | 6 +- .../dialer/calllogutils/res/values-km/strings.xml | 6 +- .../dialer/calllogutils/res/values-kn/strings.xml | 6 +- .../dialer/calllogutils/res/values-ko/strings.xml | 6 +- .../dialer/calllogutils/res/values-ky/strings.xml | 6 +- .../dialer/calllogutils/res/values-lo/strings.xml | 6 +- .../dialer/calllogutils/res/values-lt/strings.xml | 6 +- .../dialer/calllogutils/res/values-lv/strings.xml | 6 +- .../dialer/calllogutils/res/values-mk/strings.xml | 6 +- .../dialer/calllogutils/res/values-ml/strings.xml | 6 +- .../dialer/calllogutils/res/values-mn/strings.xml | 6 +- .../dialer/calllogutils/res/values-mr/strings.xml | 6 +- .../dialer/calllogutils/res/values-ms/strings.xml | 6 +- .../dialer/calllogutils/res/values-my/strings.xml | 6 +- .../dialer/calllogutils/res/values-nb/strings.xml | 6 +- .../dialer/calllogutils/res/values-ne/strings.xml | 6 +- .../dialer/calllogutils/res/values-nl/strings.xml | 6 +- .../dialer/calllogutils/res/values-no/strings.xml | 6 +- .../dialer/calllogutils/res/values-pa/strings.xml | 6 +- .../dialer/calllogutils/res/values-pl/strings.xml | 6 +- .../calllogutils/res/values-pt-rBR/strings.xml | 6 +- .../calllogutils/res/values-pt-rPT/strings.xml | 6 +- .../dialer/calllogutils/res/values-pt/strings.xml | 6 +- .../dialer/calllogutils/res/values-ro/strings.xml | 6 +- .../dialer/calllogutils/res/values-ru/strings.xml | 6 +- .../dialer/calllogutils/res/values-si/strings.xml | 6 +- .../dialer/calllogutils/res/values-sk/strings.xml | 6 +- .../dialer/calllogutils/res/values-sl/strings.xml | 6 +- .../dialer/calllogutils/res/values-sq/strings.xml | 6 +- .../dialer/calllogutils/res/values-sr/strings.xml | 6 +- .../dialer/calllogutils/res/values-sv/strings.xml | 6 +- .../dialer/calllogutils/res/values-sw/strings.xml | 6 +- .../dialer/calllogutils/res/values-ta/strings.xml | 6 +- .../dialer/calllogutils/res/values-te/strings.xml | 6 +- .../dialer/calllogutils/res/values-th/strings.xml | 6 +- .../dialer/calllogutils/res/values-tl/strings.xml | 6 +- .../dialer/calllogutils/res/values-tr/strings.xml | 6 +- .../dialer/calllogutils/res/values-uk/strings.xml | 6 +- .../dialer/calllogutils/res/values-ur/strings.xml | 6 +- .../dialer/calllogutils/res/values-uz/strings.xml | 8 +- .../dialer/calllogutils/res/values-vi/strings.xml | 6 +- .../calllogutils/res/values-zh-rCN/strings.xml | 6 +- .../calllogutils/res/values-zh-rHK/strings.xml | 6 +- .../calllogutils/res/values-zh-rTW/strings.xml | 6 +- .../dialer/calllogutils/res/values-zu/strings.xml | 6 +- .../dialer/calllogutils/res/values/attrs.xml | 24 ++ .../dialer/database/CallLogQueryHandler.java | 20 +- .../dialpadview/res/drawable-hdpi/dialer_fab.png | Bin 3273 -> 0 bytes .../dialpadview/res/drawable-hdpi/fab_green.png | Bin 2798 -> 0 bytes .../dialpadview/res/drawable-hdpi/fab_ic_call.png | Bin 875 -> 0 bytes .../dialpadview/res/drawable-mdpi/dialer_fab.png | Bin 1945 -> 0 bytes .../dialpadview/res/drawable-mdpi/fab_green.png | Bin 1845 -> 0 bytes .../dialpadview/res/drawable-mdpi/fab_ic_call.png | Bin 698 -> 0 bytes .../dialpadview/res/drawable-xhdpi/dialer_fab.png | Bin 4872 -> 0 bytes .../dialpadview/res/drawable-xhdpi/fab_green.png | Bin 4092 -> 0 bytes .../dialpadview/res/drawable-xhdpi/fab_ic_call.png | Bin 1266 -> 0 bytes .../dialpadview/res/drawable-xxhdpi/dialer_fab.png | Bin 8621 -> 0 bytes .../dialpadview/res/drawable-xxhdpi/fab_green.png | Bin 7004 -> 0 bytes .../res/drawable-xxhdpi/fab_ic_call.png | Bin 2321 -> 0 bytes .../res/drawable-xxxhdpi/dialer_fab.png | Bin 12782 -> 0 bytes .../dialpadview/res/drawable-xxxhdpi/fab_green.png | Bin 9900 -> 0 bytes .../res/drawable-xxxhdpi/fab_ic_call.png | Bin 2921 -> 0 bytes .../dialer/enrichedcall/EnrichedCallComponent.java | 20 +- java/com/android/dialer/postcall/PostCall.java | 2 +- .../dialer/simulator/SimulatorComponent.java | 20 +- .../dialer/simulator/impl/SimulatorImpl.java | 2 +- .../com/android/dialer/theme/res/values/colors.xml | 4 +- .../VisualVoicemailEnabledChecker.java | 7 +- .../voicemailstatus/VoicemailStatusHelper.java | 84 +++---- .../voicemailstatus/VoicemailStatusHelperImpl.java | 278 --------------------- java/com/android/incallui/InCallActivity.java | 6 +- java/com/android/incallui/InCallPresenter.java | 6 +- .../incallui/answer/bindings/AnswerBindings.java | 8 +- .../incallui/answer/impl/AnswerFragment.java | 25 +- .../answer/impl/FixedAspectSurfaceView.java | 86 +++++++ .../impl/SelfManagedAnswerVideoCallScreen.java | 268 ++++++++++++++++++++ .../impl/res/layout/fragment_incoming_call.xml | 20 +- .../answer/impl/res/values-land/dimens.xml | 20 ++ .../incallui/answer/impl/res/values/attrs.xml | 26 ++ .../incallui/answer/impl/res/values/dimens.xml | 3 +- .../calllocation/CallLocationComponent.java | 20 +- .../incallui/calllocation/impl/HttpFetcher.java | 2 + .../calllocation/stub/StubCallLocationModule.java | 6 +- .../incallui/incall/impl/AndroidManifest.xml | 4 +- .../incallui/incall/impl/InCallFragment.java | 29 ++- .../incallui/incall/impl/InCallPaginator.java | 210 ++++++++++++++++ .../incallui/incall/impl/LockableViewPager.java | 46 ++++ .../incall/impl/res/layout/frag_incall_voice.xml | 20 +- .../incallui/incall/impl/res/values/dimens.xml | 5 + .../incallui/incall/impl/res/values/styles.xml | 3 + java/com/android/incallui/maps/MapsComponent.java | 21 +- .../android/incallui/maps/stub/StubMapsModule.java | 2 +- .../com/android/incallui/res/values-uz/strings.xml | 2 +- java/com/android/incallui/videotech/VideoTech.java | 6 + .../incallui/videotech/empty/EmptyVideoTech.java | 5 + .../incallui/videotech/ims/ImsVideoTech.java | 7 + .../incallui/videotech/rcs/RcsVideoShare.java | 5 + .../voicemail/VisualVoicemailTypeExtensions.java | 29 +++ java/com/android/voicemail/VoicemailClient.java | 12 + java/com/android/voicemail/VoicemailComponent.java | 20 +- .../com/android/voicemail/impl/AndroidManifest.xml | 8 +- java/com/android/voicemail/impl/OmtpReceiver.java | 87 +++++++ java/com/android/voicemail/impl/OmtpService.java | 69 ----- .../voicemail/impl/VoicemailClientImpl.java | 84 ++++++- .../protocol/VisualVoicemailProtocolFactory.java | 5 +- .../voicemail/impl/res/values-af/strings.xml | 58 +++++ .../voicemail/impl/res/values-am/strings.xml | 58 +++++ .../voicemail/impl/res/values-ar/strings.xml | 58 +++++ .../voicemail/impl/res/values-az/strings.xml | 58 +++++ .../voicemail/impl/res/values-be/strings.xml | 58 +++++ .../voicemail/impl/res/values-bg/strings.xml | 58 +++++ .../voicemail/impl/res/values-bn/strings.xml | 58 +++++ .../voicemail/impl/res/values-bs/strings.xml | 58 +++++ .../voicemail/impl/res/values-ca/strings.xml | 58 +++++ .../voicemail/impl/res/values-cs/strings.xml | 58 +++++ .../voicemail/impl/res/values-da/strings.xml | 58 +++++ .../voicemail/impl/res/values-de/strings.xml | 58 +++++ .../voicemail/impl/res/values-el/strings.xml | 58 +++++ .../voicemail/impl/res/values-en-rAU/strings.xml | 58 +++++ .../voicemail/impl/res/values-en-rGB/strings.xml | 58 +++++ .../voicemail/impl/res/values-en-rIN/strings.xml | 58 +++++ .../voicemail/impl/res/values-es-rUS/strings.xml | 58 +++++ .../voicemail/impl/res/values-es/strings.xml | 58 +++++ .../voicemail/impl/res/values-et/strings.xml | 58 +++++ .../voicemail/impl/res/values-eu/strings.xml | 58 +++++ .../voicemail/impl/res/values-fa/strings.xml | 58 +++++ .../voicemail/impl/res/values-fi/strings.xml | 58 +++++ .../voicemail/impl/res/values-fr-rCA/strings.xml | 58 +++++ .../voicemail/impl/res/values-fr/strings.xml | 58 +++++ .../voicemail/impl/res/values-gl/strings.xml | 58 +++++ .../voicemail/impl/res/values-gu/strings.xml | 58 +++++ .../voicemail/impl/res/values-hi/strings.xml | 58 +++++ .../voicemail/impl/res/values-hr/strings.xml | 58 +++++ .../voicemail/impl/res/values-hu/strings.xml | 58 +++++ .../voicemail/impl/res/values-hy/strings.xml | 58 +++++ .../voicemail/impl/res/values-in/strings.xml | 58 +++++ .../voicemail/impl/res/values-is/strings.xml | 58 +++++ .../voicemail/impl/res/values-it/strings.xml | 58 +++++ .../voicemail/impl/res/values-iw/strings.xml | 58 +++++ .../voicemail/impl/res/values-ja/strings.xml | 58 +++++ .../voicemail/impl/res/values-ka/strings.xml | 58 +++++ .../voicemail/impl/res/values-kk/strings.xml | 58 +++++ .../voicemail/impl/res/values-km/strings.xml | 58 +++++ .../voicemail/impl/res/values-kn/strings.xml | 58 +++++ .../voicemail/impl/res/values-ko/strings.xml | 58 +++++ .../voicemail/impl/res/values-ky/strings.xml | 58 +++++ .../voicemail/impl/res/values-lo/strings.xml | 58 +++++ .../voicemail/impl/res/values-lt/strings.xml | 58 +++++ .../voicemail/impl/res/values-lv/strings.xml | 58 +++++ .../voicemail/impl/res/values-mk/strings.xml | 58 +++++ .../voicemail/impl/res/values-ml/strings.xml | 58 +++++ .../voicemail/impl/res/values-mn/strings.xml | 58 +++++ .../voicemail/impl/res/values-mr/strings.xml | 58 +++++ .../voicemail/impl/res/values-ms/strings.xml | 58 +++++ .../voicemail/impl/res/values-my/strings.xml | 58 +++++ .../voicemail/impl/res/values-nb/strings.xml | 58 +++++ .../voicemail/impl/res/values-ne/strings.xml | 58 +++++ .../voicemail/impl/res/values-nl/strings.xml | 58 +++++ .../voicemail/impl/res/values-no/strings.xml | 58 +++++ .../voicemail/impl/res/values-pa/strings.xml | 58 +++++ .../voicemail/impl/res/values-pl/strings.xml | 58 +++++ .../voicemail/impl/res/values-pt-rBR/strings.xml | 58 +++++ .../voicemail/impl/res/values-pt-rPT/strings.xml | 58 +++++ .../voicemail/impl/res/values-pt/strings.xml | 58 +++++ .../voicemail/impl/res/values-ro/strings.xml | 58 +++++ .../voicemail/impl/res/values-ru/strings.xml | 58 +++++ .../voicemail/impl/res/values-si/strings.xml | 58 +++++ .../voicemail/impl/res/values-sk/strings.xml | 58 +++++ .../voicemail/impl/res/values-sl/strings.xml | 58 +++++ .../voicemail/impl/res/values-sq/strings.xml | 58 +++++ .../voicemail/impl/res/values-sr/strings.xml | 58 +++++ .../voicemail/impl/res/values-sv/strings.xml | 58 +++++ .../voicemail/impl/res/values-sw/strings.xml | 58 +++++ .../voicemail/impl/res/values-ta/strings.xml | 58 +++++ .../voicemail/impl/res/values-te/strings.xml | 58 +++++ .../voicemail/impl/res/values-th/strings.xml | 58 +++++ .../voicemail/impl/res/values-tl/strings.xml | 58 +++++ .../voicemail/impl/res/values-tr/strings.xml | 58 +++++ .../voicemail/impl/res/values-uk/strings.xml | 58 +++++ .../voicemail/impl/res/values-ur/strings.xml | 58 +++++ .../voicemail/impl/res/values-uz/strings.xml | 58 +++++ .../voicemail/impl/res/values-vi/strings.xml | 58 +++++ .../voicemail/impl/res/values-zh-rCN/strings.xml | 58 +++++ .../voicemail/impl/res/values-zh-rHK/strings.xml | 58 +++++ .../voicemail/impl/res/values-zh-rTW/strings.xml | 58 +++++ .../voicemail/impl/res/values-zu/strings.xml | 58 +++++ .../android/voicemail/impl/res/values/strings.xml | 75 +++--- .../impl/settings/VoicemailSettingsFragment.java | 11 +- .../voicemail/impl/sms/OmtpMessageReceiver.java | 4 +- .../voicemail/impl/sms/StatusSmsFetcher.java | 6 +- .../voicemail/stub/StubVoicemailClient.java | 4 + 445 files changed, 6998 insertions(+), 2159 deletions(-) delete mode 100644 java/com/android/contacts/common/res/drawable-hdpi/ic_person_add_24dp.png delete mode 100644 java/com/android/contacts/common/res/drawable-mdpi/ic_person_add_24dp.png delete mode 100644 java/com/android/contacts/common/res/drawable-xhdpi/ic_person_add_24dp.png delete mode 100644 java/com/android/contacts/common/res/drawable-xxhdpi/ic_person_add_24dp.png delete mode 100644 java/com/android/contacts/common/res/drawable-xxxhdpi/ic_person_add_24dp.png delete mode 100644 java/com/android/contacts/common/util/FabUtil.java delete mode 100644 java/com/android/dialer/app/FloatingActionButtonBehavior.java delete mode 100644 java/com/android/dialer/app/res/drawable-hdpi/fab_ic_dial.png delete mode 100644 java/com/android/dialer/app/res/drawable-mdpi/fab_ic_dial.png delete mode 100644 java/com/android/dialer/app/res/drawable-xhdpi/fab_ic_dial.png delete mode 100644 java/com/android/dialer/app/res/drawable-xxhdpi/fab_ic_dial.png delete mode 100644 java/com/android/dialer/app/res/drawable-xxxhdpi/fab_ic_dial.png delete mode 100644 java/com/android/dialer/app/res/drawable/floating_action_button.xml delete mode 100644 java/com/android/dialer/app/res/drawable/ic_call_detail_content_copy.xml delete mode 100644 java/com/android/dialer/app/res/drawable/ic_call_detail_edit.xml delete mode 100644 java/com/android/dialer/app/res/drawable/ic_call_detail_report.xml delete mode 100644 java/com/android/dialer/app/res/drawable/ic_call_detail_unblock.xml delete mode 100644 java/com/android/dialer/app/res/layout/call_detail_history_item.xml create mode 100644 java/com/android/dialer/calllogutils/res/values/attrs.xml delete mode 100644 java/com/android/dialer/dialpadview/res/drawable-hdpi/dialer_fab.png delete mode 100644 java/com/android/dialer/dialpadview/res/drawable-hdpi/fab_green.png delete mode 100644 java/com/android/dialer/dialpadview/res/drawable-hdpi/fab_ic_call.png delete mode 100644 java/com/android/dialer/dialpadview/res/drawable-mdpi/dialer_fab.png delete mode 100644 java/com/android/dialer/dialpadview/res/drawable-mdpi/fab_green.png delete mode 100644 java/com/android/dialer/dialpadview/res/drawable-mdpi/fab_ic_call.png delete mode 100644 java/com/android/dialer/dialpadview/res/drawable-xhdpi/dialer_fab.png delete mode 100644 java/com/android/dialer/dialpadview/res/drawable-xhdpi/fab_green.png delete mode 100644 java/com/android/dialer/dialpadview/res/drawable-xhdpi/fab_ic_call.png delete mode 100644 java/com/android/dialer/dialpadview/res/drawable-xxhdpi/dialer_fab.png delete mode 100644 java/com/android/dialer/dialpadview/res/drawable-xxhdpi/fab_green.png delete mode 100644 java/com/android/dialer/dialpadview/res/drawable-xxhdpi/fab_ic_call.png delete mode 100644 java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/dialer_fab.png delete mode 100644 java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/fab_green.png delete mode 100644 java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/fab_ic_call.png delete mode 100644 java/com/android/dialer/voicemailstatus/VoicemailStatusHelperImpl.java create mode 100644 java/com/android/incallui/answer/impl/FixedAspectSurfaceView.java create mode 100644 java/com/android/incallui/answer/impl/SelfManagedAnswerVideoCallScreen.java create mode 100644 java/com/android/incallui/answer/impl/res/values-land/dimens.xml create mode 100644 java/com/android/incallui/answer/impl/res/values/attrs.xml create mode 100644 java/com/android/incallui/incall/impl/InCallPaginator.java create mode 100644 java/com/android/incallui/incall/impl/LockableViewPager.java create mode 100644 java/com/android/voicemail/VisualVoicemailTypeExtensions.java create mode 100644 java/com/android/voicemail/impl/OmtpReceiver.java delete mode 100644 java/com/android/voicemail/impl/OmtpService.java (limited to 'java/com/android') diff --git a/java/com/android/contacts/common/ContactPhotoManager.java b/java/com/android/contacts/common/ContactPhotoManager.java index 0f65a6c56..9e627ae1f 100644 --- a/java/com/android/contacts/common/ContactPhotoManager.java +++ b/java/com/android/contacts/common/ContactPhotoManager.java @@ -27,7 +27,9 @@ import android.support.annotation.VisibleForTesting; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; +import android.widget.QuickContactBadge; import com.android.contacts.common.lettertiles.LetterTileDrawable; +import com.android.contacts.common.util.UriUtils; import com.android.dialer.common.LogUtil; import com.android.dialer.util.PermissionsUtil; @@ -233,6 +235,19 @@ public abstract class ContactPhotoManager implements ComponentCallbacks2 { loadThumbnail(view, photoId, darkTheme, isCircular, defaultImageRequest, DEFAULT_AVATAR); } + public final void loadDialerThumbnail( + QuickContactBadge badge, Uri contactUri, long photoId, String displayName, int contactType) { + badge.assignContactUri(contactUri); + badge.setOverlay(null); + + String lookupKey = contactUri == null ? null : UriUtils.getLookupKeyFromUri(contactUri); + ContactPhotoManager.DefaultImageRequest request = + new ContactPhotoManager.DefaultImageRequest( + displayName, lookupKey, contactType, true /* isCircular */); + loadThumbnail( + badge, photoId, false /* darkTheme */, true /* isCircular */, request, DEFAULT_AVATAR); + } + /** * Load photo into the supplied image view. If the photo is already cached, it is displayed * immediately. Otherwise a request is sent to load the photo from the location specified by the diff --git a/java/com/android/contacts/common/dialog/CallSubjectDialog.java b/java/com/android/contacts/common/dialog/CallSubjectDialog.java index d2e3a2357..5e0d6b58a 100644 --- a/java/com/android/contacts/common/dialog/CallSubjectDialog.java +++ b/java/com/android/contacts/common/dialog/CallSubjectDialog.java @@ -46,12 +46,10 @@ import android.widget.TextView; import com.android.contacts.common.ContactPhotoManager; import com.android.contacts.common.R; import com.android.contacts.common.compat.telecom.TelecomManagerCompat; -import com.android.contacts.common.util.UriUtils; import com.android.dialer.animation.AnimUtils; import com.android.dialer.callintent.CallIntentBuilder; import com.android.dialer.callintent.nano.CallInitiationType; import com.android.dialer.common.LogUtil; -import com.android.dialer.compat.CompatUtils; import com.android.dialer.util.ViewUtil; import java.nio.charset.Charset; import java.util.ArrayList; @@ -68,14 +66,13 @@ public class CallSubjectDialog extends Activity { /** Activity intent argument bundle keys: */ public static final String ARG_PHOTO_ID = "PHOTO_ID"; - public static final String ARG_PHOTO_URI = "PHOTO_URI"; public static final String ARG_CONTACT_URI = "CONTACT_URI"; public static final String ARG_NAME_OR_NUMBER = "NAME_OR_NUMBER"; - public static final String ARG_IS_BUSINESS = "IS_BUSINESS"; public static final String ARG_NUMBER = "NUMBER"; public static final String ARG_DISPLAY_NUMBER = "DISPLAY_NUMBER"; public static final String ARG_NUMBER_LABEL = "NUMBER_LABEL"; public static final String ARG_PHONE_ACCOUNT_HANDLE = "PHONE_ACCOUNT_HANDLE"; + public static final String ARG_CONTACT_TYPE = "CONTACT_TYPE"; private static final int CALL_SUBJECT_LIMIT = 16; private static final int CALL_SUBJECT_HISTORY_SIZE = 5; private int mAnimationDuration; @@ -111,7 +108,6 @@ public class CallSubjectDialog extends Activity { } }; - private int mPhotoSize; private SharedPreferences mPrefs; private List mSubjectHistory; /** Handles displaying the list of past call subjects. */ @@ -138,13 +134,12 @@ public class CallSubjectDialog extends Activity { }; private long mPhotoID; - private Uri mPhotoUri; private Uri mContactUri; private String mNameOrNumber; - private boolean mIsBusiness; private String mNumber; private String mDisplayNumber; private String mNumberLabel; + private int mContactType; private PhoneAccountHandle mPhoneAccountHandle; /** Handles starting a call with a call subject specified. */ private final View.OnClickListener mSendAndCallOnClickListener = @@ -200,13 +195,12 @@ public class CallSubjectDialog extends Activity { start( activity, -1 /* photoId */, - null /* photoUri */, null /* contactUri */, number /* nameOrNumber */, - false /* isBusiness */, number /* number */, null /* displayNumber */, null /* numberLabel */, + ContactPhotoManager.TYPE_DEFAULT, null /* phoneAccountHandle */); } @@ -215,35 +209,32 @@ public class CallSubjectDialog extends Activity { * * @param activity The current activity. * @param photoId The photo ID (used to populate contact photo). - * @param photoUri The photo Uri (used to populate contact photo). * @param contactUri The Contact URI (used so quick contact can be invoked from contact photo). * @param nameOrNumber The name or number of the callee. - * @param isBusiness {@code true} if a business is being called (used for contact photo). * @param number The raw number to dial. * @param displayNumber The number to dial, formatted for display. * @param numberLabel The label for the number (if from a contact). + * @param contactType The contact type according to {@link ContactPhotoManager}. * @param phoneAccountHandle The phone account handle. */ public static void start( Activity activity, long photoId, - Uri photoUri, Uri contactUri, String nameOrNumber, - boolean isBusiness, String number, String displayNumber, String numberLabel, + int contactType, PhoneAccountHandle phoneAccountHandle) { Bundle arguments = new Bundle(); arguments.putLong(ARG_PHOTO_ID, photoId); - arguments.putParcelable(ARG_PHOTO_URI, photoUri); arguments.putParcelable(ARG_CONTACT_URI, contactUri); arguments.putString(ARG_NAME_OR_NUMBER, nameOrNumber); - arguments.putBoolean(ARG_IS_BUSINESS, isBusiness); arguments.putString(ARG_NUMBER, number); arguments.putString(ARG_DISPLAY_NUMBER, displayNumber); arguments.putString(ARG_NUMBER_LABEL, numberLabel); + arguments.putInt(ARG_CONTACT_TYPE, contactType); arguments.putParcelable(ARG_PHONE_ACCOUNT_HANDLE, phoneAccountHandle); start(activity, arguments); } @@ -293,8 +284,6 @@ public class CallSubjectDialog extends Activity { super.onCreate(savedInstanceState); mAnimationDuration = getResources().getInteger(R.integer.call_subject_animation_duration); mPrefs = PreferenceManager.getDefaultSharedPreferences(this); - mPhotoSize = - getResources().getDimensionPixelSize(R.dimen.call_subject_dialog_contact_photo_size); readArguments(); loadConfiguration(); mSubjectHistory = loadSubjectHistory(mPrefs); @@ -330,7 +319,8 @@ public class CallSubjectDialog extends Activity { /** Populates the contact info fields based on the current contact information. */ private void updateContactInfo() { if (mContactUri != null) { - setPhoto(mPhotoID, mPhotoUri, mContactUri, mNameOrNumber, mIsBusiness); + ContactPhotoManager.getInstance(this) + .loadDialerThumbnail(mContactPhoto, mContactUri, mPhotoID, mNameOrNumber, mContactType); } else { mContactPhoto.setVisibility(View.GONE); } @@ -353,13 +343,12 @@ public class CallSubjectDialog extends Activity { return; } mPhotoID = arguments.getLong(ARG_PHOTO_ID); - mPhotoUri = arguments.getParcelable(ARG_PHOTO_URI); mContactUri = arguments.getParcelable(ARG_CONTACT_URI); mNameOrNumber = arguments.getString(ARG_NAME_OR_NUMBER); - mIsBusiness = arguments.getBoolean(ARG_IS_BUSINESS); mNumber = arguments.getString(ARG_NUMBER); mDisplayNumber = arguments.getString(ARG_DISPLAY_NUMBER); mNumberLabel = arguments.getString(ARG_NUMBER_LABEL); + mContactType = arguments.getInt(ARG_CONTACT_TYPE, ContactPhotoManager.TYPE_DEFAULT); mPhoneAccountHandle = arguments.getParcelable(ARG_PHONE_ACCOUNT_HANDLE); } @@ -389,46 +378,6 @@ public class CallSubjectDialog extends Activity { } } - /** Sets the photo on the quick contact photo. */ - private void setPhoto( - long photoId, Uri photoUri, Uri contactUri, String displayName, boolean isBusiness) { - mContactPhoto.assignContactUri(contactUri); - if (CompatUtils.isLollipopCompatible()) { - mContactPhoto.setOverlay(null); - } - - int contactType; - if (isBusiness) { - contactType = ContactPhotoManager.TYPE_BUSINESS; - } else { - contactType = ContactPhotoManager.TYPE_DEFAULT; - } - - String lookupKey = null; - if (contactUri != null) { - lookupKey = UriUtils.getLookupKeyFromUri(contactUri); - } - - ContactPhotoManager.DefaultImageRequest request = - new ContactPhotoManager.DefaultImageRequest( - displayName, lookupKey, contactType, true /* isCircular */); - - if (photoId == 0 && photoUri != null) { - ContactPhotoManager.getInstance(this) - .loadPhoto( - mContactPhoto, - photoUri, - mPhotoSize, - false /* darkTheme */, - true /* isCircular */, - request); - } else { - ContactPhotoManager.getInstance(this) - .loadThumbnail( - mContactPhoto, photoId, false /* darkTheme */, true /* isCircular */, request); - } - } - /** * Saves the subject history list to shared prefs, removing older items so that there are only * {@link #CALL_SUBJECT_HISTORY_SIZE} items at most. diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_person_add_24dp.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_person_add_24dp.png deleted file mode 100644 index 10ae5a70c..000000000 Binary files a/java/com/android/contacts/common/res/drawable-hdpi/ic_person_add_24dp.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/drawable-mdpi/ic_person_add_24dp.png b/java/com/android/contacts/common/res/drawable-mdpi/ic_person_add_24dp.png deleted file mode 100644 index 38e0a2882..000000000 Binary files a/java/com/android/contacts/common/res/drawable-mdpi/ic_person_add_24dp.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/drawable-xhdpi/ic_person_add_24dp.png b/java/com/android/contacts/common/res/drawable-xhdpi/ic_person_add_24dp.png deleted file mode 100644 index 7e7c289d4..000000000 Binary files a/java/com/android/contacts/common/res/drawable-xhdpi/ic_person_add_24dp.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/drawable-xxhdpi/ic_person_add_24dp.png b/java/com/android/contacts/common/res/drawable-xxhdpi/ic_person_add_24dp.png deleted file mode 100644 index 8f744f039..000000000 Binary files a/java/com/android/contacts/common/res/drawable-xxhdpi/ic_person_add_24dp.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_person_add_24dp.png b/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_person_add_24dp.png deleted file mode 100644 index 2fa2cca80..000000000 Binary files a/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_person_add_24dp.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/drawable/ic_person_add_tinted_24dp.xml b/java/com/android/contacts/common/res/drawable/ic_person_add_tinted_24dp.xml index 0af90edb3..c2538cfd1 100644 --- a/java/com/android/contacts/common/res/drawable/ic_person_add_tinted_24dp.xml +++ b/java/com/android/contacts/common/res/drawable/ic_person_add_tinted_24dp.xml @@ -16,5 +16,5 @@ --> diff --git a/java/com/android/contacts/common/res/drawable/ic_search_add_contact.xml b/java/com/android/contacts/common/res/drawable/ic_search_add_contact.xml index 801806044..476212d24 100644 --- a/java/com/android/contacts/common/res/drawable/ic_search_add_contact.xml +++ b/java/com/android/contacts/common/res/drawable/ic_search_add_contact.xml @@ -17,4 +17,4 @@ + android:src="@drawable/quantum_ic_person_add_white_24"/> diff --git a/java/com/android/contacts/common/res/values-ky/strings.xml b/java/com/android/contacts/common/res/values-ky/strings.xml index 55a210a0b..ed081ec60 100644 --- a/java/com/android/contacts/common/res/values-ky/strings.xml +++ b/java/com/android/contacts/common/res/values-ky/strings.xml @@ -122,7 +122,7 @@ "Мобилге эмейлдөө" "Жумушка эмейлдөө" "Электрондук кат жазуу" - "%s эмейл жөнөтүү" + "Кат жазуу (%s)" "Электрондук кат жазуу" "Көчөсү" "Абонент кутусу" diff --git a/java/com/android/contacts/common/util/FabUtil.java b/java/com/android/contacts/common/util/FabUtil.java deleted file mode 100644 index b1bb2e653..000000000 --- a/java/com/android/contacts/common/util/FabUtil.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) 2012 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. - */ - -package com.android.contacts.common.util; - -import android.content.res.Resources; -import android.graphics.Outline; -import android.view.View; -import android.view.ViewOutlineProvider; -import android.widget.ListView; -import com.android.contacts.common.R; -import com.android.dialer.compat.CompatUtils; - -/** Provides static functions to work with views */ -public class FabUtil { - - private static final ViewOutlineProvider OVAL_OUTLINE_PROVIDER = - new ViewOutlineProvider() { - @Override - public void getOutline(View view, Outline outline) { - outline.setOval(0, 0, view.getWidth(), view.getHeight()); - } - }; - - private FabUtil() {} - - /** - * Configures the floating action button, clipping it to a circle and setting its translation z - * - * @param fabView the float action button's view - * @param res the resources file - */ - public static void setupFloatingActionButton(View fabView, Resources res) { - if (CompatUtils.isLollipopCompatible()) { - fabView.setOutlineProvider(OVAL_OUTLINE_PROVIDER); - fabView.setTranslationZ( - res.getDimensionPixelSize(R.dimen.floating_action_button_translation_z)); - } - } - - /** - * Adds padding to the bottom of the given {@link ListView} so that the floating action button - * does not obscure any content. - * - * @param listView to add the padding to - * @param res valid resources object - */ - public static void addBottomPaddingToListViewForFab(ListView listView, Resources res) { - final int fabPadding = - res.getDimensionPixelSize(R.dimen.floating_action_button_list_bottom_padding); - listView.setPaddingRelative( - listView.getPaddingStart(), - listView.getPaddingTop(), - listView.getPaddingEnd(), - listView.getPaddingBottom() + fabPadding); - listView.setClipToPadding(false); - } -} diff --git a/java/com/android/contacts/common/widget/FloatingActionButtonController.java b/java/com/android/contacts/common/widget/FloatingActionButtonController.java index f03129779..368d09207 100644 --- a/java/com/android/contacts/common/widget/FloatingActionButtonController.java +++ b/java/com/android/contacts/common/widget/FloatingActionButtonController.java @@ -19,13 +19,13 @@ package com.android.contacts.common.widget; import android.app.Activity; import android.content.res.Resources; import android.graphics.drawable.Drawable; +import android.support.design.widget.FloatingActionButton; import android.view.View; import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; -import android.widget.ImageButton; import com.android.contacts.common.R; -import com.android.contacts.common.util.FabUtil; import com.android.dialer.animation.AnimUtils; +import com.android.dialer.common.Assert; /** Controls the movement and appearance of the FAB (Floating Action Button). */ public class FloatingActionButtonController { @@ -41,12 +41,11 @@ public class FloatingActionButtonController { private final int mAnimationDuration; private final int mFloatingActionButtonWidth; private final int mFloatingActionButtonMarginRight; - private final View mFloatingActionButtonContainer; - private final ImageButton mFloatingActionButton; + private final FloatingActionButton mFab; private final Interpolator mFabInterpolator; private int mScreenWidth; - public FloatingActionButtonController(Activity activity, View container, ImageButton button) { + public FloatingActionButtonController(Activity activity, FloatingActionButton fab) { Resources resources = activity.getResources(); mFabInterpolator = AnimationUtils.loadInterpolator(activity, android.R.interpolator.fast_out_slow_in); @@ -55,9 +54,7 @@ public class FloatingActionButtonController { mFloatingActionButtonMarginRight = resources.getDimensionPixelOffset(R.dimen.floating_action_button_margin_right); mAnimationDuration = resources.getInteger(R.integer.floating_action_button_animation_duration); - mFloatingActionButtonContainer = container; - mFloatingActionButton = button; - FabUtil.setupFloatingActionButton(mFloatingActionButtonContainer, resources); + mFab = fab; } /** @@ -71,7 +68,7 @@ public class FloatingActionButtonController { } public boolean isVisible() { - return mFloatingActionButtonContainer.getVisibility() == View.VISIBLE; + return mFab.getVisibility() == View.VISIBLE; } /** @@ -80,14 +77,13 @@ public class FloatingActionButtonController { * @param visible Whether or not to make the container visible. */ public void setVisible(boolean visible) { - mFloatingActionButtonContainer.setVisibility(visible ? View.VISIBLE : View.GONE); + mFab.setVisibility(visible ? View.VISIBLE : View.GONE); } public void changeIcon(Drawable icon, String description) { - if (mFloatingActionButton.getDrawable() != icon - || !mFloatingActionButton.getContentDescription().equals(description)) { - mFloatingActionButton.setImageDrawable(icon); - mFloatingActionButton.setContentDescription(description); + if (mFab.getDrawable() != icon || !mFab.getContentDescription().equals(description)) { + mFab.setImageDrawable(icon); + mFab.setContentDescription(description); } } @@ -99,8 +95,7 @@ public class FloatingActionButtonController { public void onPageScrolled(float positionOffset) { // As the page is scrolling, if we're on the first tab, update the FAB position so it // moves along with it. - mFloatingActionButtonContainer.setTranslationX( - (int) (positionOffset * getTranslationXForAlignment(ALIGN_END))); + mFab.setTranslationX(positionOffset * getTranslationXForAlignment(ALIGN_END)); } /** @@ -121,7 +116,7 @@ public class FloatingActionButtonController { * @param offsetY Additional offsetY to translate by. * @param animate Whether or not to animate the transition. */ - public void align(int align, int offsetX, int offsetY, boolean animate) { + private void align(int align, int offsetX, int offsetY, boolean animate) { if (mScreenWidth == 0) { return; } @@ -129,33 +124,16 @@ public class FloatingActionButtonController { int translationX = getTranslationXForAlignment(align); // Skip animation if container is not shown; animation causes container to show again. - if (animate && mFloatingActionButtonContainer.isShown()) { - mFloatingActionButtonContainer - .animate() + if (animate && mFab.isShown()) { + mFab.animate() .translationX(translationX + offsetX) .translationY(offsetY) .setInterpolator(mFabInterpolator) .setDuration(mAnimationDuration) .start(); } else { - mFloatingActionButtonContainer.setTranslationX(translationX + offsetX); - mFloatingActionButtonContainer.setTranslationY(offsetY); - } - } - - /** - * Resizes width and height of the floating action bar container. - * - * @param dimension The new dimensions for the width and height. - * @param animate Whether to animate this change. - */ - public void resize(int dimension, boolean animate) { - if (animate) { - AnimUtils.changeDimensions(mFloatingActionButtonContainer, dimension, dimension); - } else { - mFloatingActionButtonContainer.getLayoutParams().width = dimension; - mFloatingActionButtonContainer.getLayoutParams().height = dimension; - mFloatingActionButtonContainer.requestLayout(); + mFab.setTranslationX(translationX + offsetX); + mFab.setTranslationY(offsetY); } } @@ -167,17 +145,8 @@ public class FloatingActionButtonController { */ public void scaleIn(int delayMs) { setVisible(true); - AnimUtils.scaleIn(mFloatingActionButtonContainer, FAB_SCALE_IN_DURATION, delayMs); - AnimUtils.fadeIn( - mFloatingActionButton, FAB_SCALE_IN_DURATION, delayMs + FAB_SCALE_IN_FADE_IN_DELAY, null); - } - - /** Immediately remove the affects of the last call to {@link #scaleOut}. */ - public void resetIn() { - mFloatingActionButton.setAlpha(1f); - mFloatingActionButton.setVisibility(View.VISIBLE); - mFloatingActionButtonContainer.setScaleX(1); - mFloatingActionButtonContainer.setScaleY(1); + AnimUtils.scaleIn(mFab, FAB_SCALE_IN_DURATION, delayMs); + AnimUtils.fadeIn(mFab, FAB_SCALE_IN_DURATION, delayMs + FAB_SCALE_IN_FADE_IN_DELAY, null); } /** @@ -185,10 +154,10 @@ public class FloatingActionButtonController { * animation for hiding the floating action button. */ public void scaleOut() { - AnimUtils.scaleOut(mFloatingActionButtonContainer, mAnimationDuration); + AnimUtils.scaleOut(mFab, mAnimationDuration); // Fade out the icon faster than the scale out animation, so that the icon scaling is less // obvious. We don't want it to scale, but the resizing the container is not as performant. - AnimUtils.fadeOut(mFloatingActionButton, FAB_ICON_FADE_OUT_DURATION, null); + AnimUtils.fadeOut(mFab, FAB_ICON_FADE_OUT_DURATION, null); } /** @@ -198,8 +167,8 @@ public class FloatingActionButtonController { * @param align One of ALIGN_MIDDLE, ALIGN_QUARTER_RIGHT, or ALIGN_RIGHT. * @return The translationX for the given alignment. */ - public int getTranslationXForAlignment(int align) { - int result = 0; + private int getTranslationXForAlignment(int align) { + int result; switch (align) { case ALIGN_MIDDLE: // Moves the FAB to exactly center screen. @@ -213,6 +182,8 @@ public class FloatingActionButtonController { result = mScreenWidth / 2 - mFloatingActionButtonWidth / 2 - mFloatingActionButtonMarginRight; break; + default: + throw Assert.createIllegalStateFailException("Invalid alignment value: " + align); } if (isLayoutRtl()) { result *= -1; @@ -221,6 +192,6 @@ public class FloatingActionButtonController { } private boolean isLayoutRtl() { - return mFloatingActionButtonContainer.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL; + return mFab.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL; } } diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java index 96942a72c..09979ebf9 100644 --- a/java/com/android/dialer/app/DialtactsActivity.java +++ b/java/com/android/dialer/app/DialtactsActivity.java @@ -35,6 +35,7 @@ import android.support.annotation.MainThread; import android.support.annotation.NonNull; import android.support.annotation.VisibleForTesting; import android.support.design.widget.CoordinatorLayout; +import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; import android.support.v4.app.ActivityCompat; import android.support.v4.view.ViewPager; @@ -51,7 +52,6 @@ import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; import android.view.View.OnDragListener; -import android.view.ViewTreeObserver; import android.view.animation.Animation; import android.view.animation.AnimationUtils; import android.widget.AbsListView.OnScrollListener; @@ -392,12 +392,11 @@ public class DialtactsActivity extends TransactionSafeActivity mIsLandscape = getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE; mPreviouslySelectedTabIndex = ListsFragment.TAB_INDEX_SPEED_DIAL; - final View floatingActionButtonContainer = findViewById(R.id.floating_action_button_container); - ImageButton floatingActionButton = (ImageButton) findViewById(R.id.floating_action_button); + FloatingActionButton floatingActionButton = + (FloatingActionButton) findViewById(R.id.floating_action_button); floatingActionButton.setOnClickListener(this); mFloatingActionButtonController = - new FloatingActionButtonController( - this, floatingActionButtonContainer, floatingActionButton); + new FloatingActionButtonController(this, floatingActionButton); ImageButton optionsMenuButton = (ImageButton) searchEditTextLayout.findViewById(R.id.dialtacts_options_menu_button); @@ -443,23 +442,13 @@ public class DialtactsActivity extends TransactionSafeActivity mParentLayout = (CoordinatorLayout) findViewById(R.id.dialtacts_mainlayout); mParentLayout.setOnDragListener(new LayoutOnDragListener()); - floatingActionButtonContainer - .getViewTreeObserver() - .addOnGlobalLayoutListener( - new ViewTreeObserver.OnGlobalLayoutListener() { - @Override - public void onGlobalLayout() { - final ViewTreeObserver observer = - floatingActionButtonContainer.getViewTreeObserver(); - if (!observer.isAlive()) { - return; - } - observer.removeOnGlobalLayoutListener(this); - int screenWidth = mParentLayout.getWidth(); - mFloatingActionButtonController.setScreenWidth(screenWidth); - mFloatingActionButtonController.align(getFabAlignment(), false /* animate */); - } - }); + ViewUtil.doOnGlobalLayout( + floatingActionButton, + view -> { + int screenWidth = mParentLayout.getWidth(); + mFloatingActionButtonController.setScreenWidth(screenWidth); + mFloatingActionButtonController.align(getFabAlignment(), false /* animate */); + }); Trace.endSection(); @@ -1179,7 +1168,7 @@ public class DialtactsActivity extends TransactionSafeActivity private void showFabInSearchUi() { mFloatingActionButtonController.changeIcon( - getResources().getDrawable(R.drawable.fab_ic_dial, null), + getResources().getDrawable(R.drawable.quantum_ic_dialpad_white_24, null), getResources().getString(R.string.action_menu_dialpad_button)); mFloatingActionButtonController.align(getFabAlignment(), false /* animate */); mFloatingActionButtonController.scaleIn(FAB_SCALE_IN_DELAY_MS); @@ -1364,11 +1353,11 @@ public class DialtactsActivity extends TransactionSafeActivity && !mInRegularSearch && !mInDialpadSearch) { mFloatingActionButtonController.changeIcon( - getResources().getDrawable(R.drawable.ic_person_add_24dp, null), + getResources().getDrawable(R.drawable.quantum_ic_person_add_white_24, null), getResources().getString(R.string.search_shortcut_create_new_contact)); } else { mFloatingActionButtonController.changeIcon( - getResources().getDrawable(R.drawable.fab_ic_dial, null), + getResources().getDrawable(R.drawable.quantum_ic_dialpad_white_24, null), getResources().getString(R.string.action_menu_dialpad_button)); } } diff --git a/java/com/android/dialer/app/FloatingActionButtonBehavior.java b/java/com/android/dialer/app/FloatingActionButtonBehavior.java deleted file mode 100644 index d4a79ca19..000000000 --- a/java/com/android/dialer/app/FloatingActionButtonBehavior.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2015 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. - */ -package com.android.dialer.app; - -import android.content.Context; -import android.support.design.widget.CoordinatorLayout; -import android.support.design.widget.Snackbar.SnackbarLayout; -import android.util.AttributeSet; -import android.view.View; -import android.widget.FrameLayout; -import com.android.dialer.proguard.UsedByReflection; - -/** - * Implements custom behavior for the movement of the FAB in response to the Snackbar. Because we - * are not using the design framework FloatingActionButton widget, we need to manually implement the - * Material Design behavior of having the FAB translate upward and downward with the appearance and - * disappearance of a Snackbar. - */ -@UsedByReflection(value = "dialtacts_activity.xml") -public class FloatingActionButtonBehavior extends CoordinatorLayout.Behavior { - - @UsedByReflection(value = "dialtacts_activity.xml") - public FloatingActionButtonBehavior(Context context, AttributeSet attrs) {} - - @Override - public boolean layoutDependsOn(CoordinatorLayout parent, FrameLayout child, View dependency) { - return dependency instanceof SnackbarLayout; - } - - @Override - public boolean onDependentViewChanged( - CoordinatorLayout parent, FrameLayout child, View dependency) { - float translationY = Math.min(0, dependency.getTranslationY() - dependency.getHeight()); - child.setTranslationY(translationY); - return true; - } -} diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java index fc5ffbb29..8d84e8ea7 100644 --- a/java/com/android/dialer/app/calllog/CallLogAdapter.java +++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java @@ -65,7 +65,6 @@ import com.android.dialer.common.LogUtil; import com.android.dialer.enrichedcall.EnrichedCallCapabilities; import com.android.dialer.enrichedcall.EnrichedCallComponent; import com.android.dialer.enrichedcall.EnrichedCallManager; -import com.android.dialer.enrichedcall.EnrichedCallManager.CapabilitiesListener; import com.android.dialer.enrichedcall.historyquery.proto.nano.HistoryResult; import com.android.dialer.logging.Logger; import com.android.dialer.logging.nano.DialerImpression; @@ -81,7 +80,7 @@ import java.util.Set; /** Adapter class to fill in data for the Call Log. */ public class CallLogAdapter extends GroupingListAdapter - implements GroupCreator, OnVoicemailDeletedListener, CapabilitiesListener { + implements GroupCreator, OnVoicemailDeletedListener { // Types of activities the call log adapter is used for public static final int ACTIVITY_TYPE_CALL_LOG = 1; @@ -134,6 +133,14 @@ public class CallLogAdapter extends GroupingListAdapter mVoicemailPlaybackPresenter.resetAll(); } + // If enriched call capabilities were unknown on the initial load, + // viewHolder.isCallComposerCapable may be unset. Check here if we have the capabilities + // as a last attempt at getting them before showing the expanded view to the user + EnrichedCallCapabilities capabilities = + getEnrichedCallManager().getCapabilities(viewHolder.number); + viewHolder.isCallComposerCapable = + capabilities != null && capabilities.supportsCallComposer(); + if (viewHolder.rowId == mCurrentlyExpandedRowId) { // Hide actions, if the clicked item is the expanded item. viewHolder.showActions(false); @@ -300,7 +307,6 @@ public class CallLogAdapter extends GroupingListAdapter } mContactsPreferences.refreshValue(ContactsPreferences.DISPLAY_ORDER_KEY); mIsSpamEnabled = Spam.get(mActivity).isSpamEnabled(); - getEnrichedCallManager().registerCapabilitiesListener(this); notifyDataSetChanged(); } @@ -309,7 +315,6 @@ public class CallLogAdapter extends GroupingListAdapter for (Uri uri : mHiddenItemUris) { CallLogAsyncTaskUtil.deleteVoicemail(mActivity, uri, null); } - getEnrichedCallManager().unregisterCapabilitiesListener(this); } public void onStop() { @@ -451,8 +456,11 @@ public class CallLogAdapter extends GroupingListAdapter views.isSpam = false; views.blockId = null; views.isSpamFeatureEnabled = false; - views.isCallComposerCapable = - isCallComposerCapable(PhoneNumberUtils.formatNumberToE164(views.number, views.countryIso)); + + // Attempt to set the isCallComposerCapable field. If capabilities are unknown for this number, + // the value will be false while capabilities are requested. mExpandCollapseListener will + // attempt to set the field properly in that case + views.isCallComposerCapable = isCallComposerCapable(views.number); final AsyncTask loadDataTask = new AsyncTask() { @Override @@ -524,14 +532,14 @@ public class CallLogAdapter extends GroupingListAdapter } @MainThread - private boolean isCallComposerCapable(@Nullable String e164Number) { - if (e164Number == null) { + private boolean isCallComposerCapable(@Nullable String number) { + if (number == null) { return false; } - EnrichedCallCapabilities capabilities = getEnrichedCallManager().getCapabilities(e164Number); + EnrichedCallCapabilities capabilities = getEnrichedCallManager().getCapabilities(number); if (capabilities == null) { - getEnrichedCallManager().requestCapabilities(e164Number); + getEnrichedCallManager().requestCapabilities(number); return false; } return capabilities.supportsCallComposer(); @@ -953,11 +961,6 @@ public class CallLogAdapter extends GroupingListAdapter } } - @Override - public void onCapabilitiesUpdated() { - notifyDataSetChanged(); - } - @NonNull private EnrichedCallManager getEnrichedCallManager() { return EnrichedCallComponent.get(mActivity).getEnrichedCallManager(); diff --git a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java index 89ed95c0b..6a3187fa8 100644 --- a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java +++ b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java @@ -769,21 +769,12 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder quickContactView.setImageDrawable(mContext.getDrawable(R.drawable.blocked_contact)); return; } - final boolean isVoicemail = mCallLogCache.isVoicemailNumber(accountHandle, number); - int contactType = ContactPhotoManager.TYPE_DEFAULT; - if (isVoicemail) { - contactType = ContactPhotoManager.TYPE_VOICEMAIL; - } else if (isBusiness) { - contactType = ContactPhotoManager.TYPE_BUSINESS; - } else if (numberPresentation == TelecomManager.PRESENTATION_RESTRICTED) { - contactType = ContactPhotoManager.TYPE_GENERIC_AVATAR; - } final String lookupKey = info.lookupUri != null ? UriUtils.getLookupKeyFromUri(info.lookupUri) : null; final String displayName = TextUtils.isEmpty(info.name) ? displayNumber : info.name; final DefaultImageRequest request = - new DefaultImageRequest(displayName, lookupKey, contactType, true /* isCircular */); + new DefaultImageRequest(displayName, lookupKey, getContactType(), true /* isCircular */); if (info.photoId == 0 && info.photoUri != null) { ContactPhotoManager.getInstance(mContext) @@ -805,6 +796,18 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder } } + private int getContactType() { + int contactType = ContactPhotoManager.TYPE_DEFAULT; + if (mCallLogCache.isVoicemailNumber(accountHandle, number)) { + contactType = ContactPhotoManager.TYPE_VOICEMAIL; + } else if (isBusiness) { + contactType = ContactPhotoManager.TYPE_BUSINESS; + } else if (numberPresentation == TelecomManager.PRESENTATION_RESTRICTED) { + contactType = ContactPhotoManager.TYPE_GENERIC_AVATAR; + } + return contactType; + } + @Override public void onClick(View view) { if (view.getId() == R.id.primary_action_button && !TextUtils.isEmpty(voicemailUri)) { @@ -815,14 +818,13 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder CallSubjectDialog.start( (Activity) mContext, info.photoId, - info.photoUri, info.lookupUri, (String) nameOrNumber /* top line of contact view in call subject dialog */, - isBusiness, number, TextUtils.isEmpty(info.name) ? null : displayNumber, /* second line of contact view in dialog. */ numberType, /* phone number type (e.g. mobile) in second line of contact view */ + getContactType(), accountHandle); } else if (view.getId() == R.id.block_report_action) { Logger.get(mContext).logImpression(DialerImpression.Type.CALL_LOG_BLOCK_REPORT_SPAM); @@ -881,7 +883,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder contact.photoUri = info.photoUri == null ? null : info.photoUri.toString(); contact.contactUri = info.lookupUri == null ? null : info.lookupUri.toString(); contact.nameOrNumber = (String) nameOrNumber; - contact.isBusiness = isBusiness; + contact.contactType = getContactType(); contact.number = number; /* second line of contact view. */ contact.displayNumber = TextUtils.isEmpty(info.name) ? null : displayNumber; diff --git a/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java b/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java index cace57518..edbe5c6ed 100644 --- a/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java +++ b/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java @@ -17,6 +17,7 @@ package com.android.dialer.app.calllog; import android.app.Activity; +import android.content.Intent; import android.database.ContentObserver; import android.media.AudioManager; import android.os.Bundle; @@ -122,6 +123,7 @@ public class VisualVoicemailCallLogFragment extends CallLogFragment { LogUtil.d("VisualVoicemailCallLogFragment.onPageResume", null); super.onPageResume(activity); if (activity != null) { + activity.sendBroadcast(new Intent(VoicemailContract.ACTION_SYNC_VOICEMAIL)); Logger.get(activity).logImpression(DialerImpression.Type.VVM_TAB_VIEWED); activity.setVolumeControlStream(VoicemailAudioManager.PLAYBACK_STREAM); } diff --git a/java/com/android/dialer/app/dialpad/DialpadFragment.java b/java/com/android/dialer/app/dialpad/DialpadFragment.java index 4785ab16f..80be8fe05 100644 --- a/java/com/android/dialer/app/dialpad/DialpadFragment.java +++ b/java/com/android/dialer/app/dialpad/DialpadFragment.java @@ -42,6 +42,7 @@ import android.provider.Contacts.Phones; import android.provider.Contacts.PhonesColumns; import android.provider.Settings; import android.support.annotation.VisibleForTesting; +import android.support.design.widget.FloatingActionButton; import android.support.v4.content.ContextCompat; import android.telecom.PhoneAccount; import android.telecom.PhoneAccountHandle; @@ -63,7 +64,6 @@ import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.BaseAdapter; import android.widget.EditText; -import android.widget.ImageButton; import android.widget.ImageView; import android.widget.ListView; import android.widget.PopupMenu; @@ -405,14 +405,11 @@ public class DialpadFragment extends Fragment mDialpadChooser = (ListView) fragmentView.findViewById(R.id.dialpadChooser); mDialpadChooser.setOnItemClickListener(this); - final View floatingActionButtonContainer = - fragmentView.findViewById(R.id.dialpad_floating_action_button_container); - final ImageButton floatingActionButton = - (ImageButton) fragmentView.findViewById(R.id.dialpad_floating_action_button); + FloatingActionButton floatingActionButton = + (FloatingActionButton) fragmentView.findViewById(R.id.dialpad_floating_action_button); floatingActionButton.setOnClickListener(this); mFloatingActionButtonController = - new FloatingActionButtonController( - getActivity(), floatingActionButtonContainer, floatingActionButton); + new FloatingActionButtonController(getActivity(), floatingActionButton); Trace.endSection(); Trace.endSection(); return fragmentView; diff --git a/java/com/android/dialer/app/dialpad/PseudoEmergencyAnimator.java b/java/com/android/dialer/app/dialpad/PseudoEmergencyAnimator.java index 2ffacb6d8..be2964dfe 100644 --- a/java/com/android/dialer/app/dialpad/PseudoEmergencyAnimator.java +++ b/java/com/android/dialer/app/dialpad/PseudoEmergencyAnimator.java @@ -65,7 +65,7 @@ public class PseudoEmergencyAnimator { ColorFilter colorFilter = new LightingColorFilter(Color.BLACK, color); View floatingActionButtonContainer = - getView().findViewById(R.id.dialpad_floating_action_button_container); + getView().findViewById(R.id.floating_action_button); if (floatingActionButtonContainer != null) { floatingActionButtonContainer.getBackground().setColorFilter(colorFilter); } @@ -96,7 +96,7 @@ public class PseudoEmergencyAnimator { public void onAnimationEnd(Animator animation) { try { View floatingActionButtonContainer = - getView().findViewById(R.id.dialpad_floating_action_button_container); + getView().findViewById(R.id.floating_action_button); if (floatingActionButtonContainer != null) { floatingActionButtonContainer.getBackground().clearColorFilter(); } diff --git a/java/com/android/dialer/app/list/AllContactsFragment.java b/java/com/android/dialer/app/list/AllContactsFragment.java index 093e8f384..29c0ec47f 100644 --- a/java/com/android/dialer/app/list/AllContactsFragment.java +++ b/java/com/android/dialer/app/list/AllContactsFragment.java @@ -38,7 +38,6 @@ import com.android.contacts.common.list.ContactEntryListAdapter; import com.android.contacts.common.list.ContactEntryListFragment; import com.android.contacts.common.list.ContactListFilter; import com.android.contacts.common.list.DefaultContactListAdapter; -import com.android.contacts.common.util.FabUtil; import com.android.dialer.app.R; import com.android.dialer.app.list.ListsFragment.ListsPage; import com.android.dialer.app.widget.EmptyContentView; @@ -90,8 +89,6 @@ public class AllContactsFragment extends ContactEntryListFragment - - - - - - - - - \ No newline at end of file diff --git a/java/com/android/dialer/app/res/drawable/ic_call_detail_content_copy.xml b/java/com/android/dialer/app/res/drawable/ic_call_detail_content_copy.xml deleted file mode 100644 index 87e0fbc6f..000000000 --- a/java/com/android/dialer/app/res/drawable/ic_call_detail_content_copy.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - diff --git a/java/com/android/dialer/app/res/drawable/ic_call_detail_edit.xml b/java/com/android/dialer/app/res/drawable/ic_call_detail_edit.xml deleted file mode 100644 index e6d5c4776..000000000 --- a/java/com/android/dialer/app/res/drawable/ic_call_detail_edit.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - diff --git a/java/com/android/dialer/app/res/drawable/ic_call_detail_report.xml b/java/com/android/dialer/app/res/drawable/ic_call_detail_report.xml deleted file mode 100644 index e90e83e8b..000000000 --- a/java/com/android/dialer/app/res/drawable/ic_call_detail_report.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - diff --git a/java/com/android/dialer/app/res/drawable/ic_call_detail_unblock.xml b/java/com/android/dialer/app/res/drawable/ic_call_detail_unblock.xml deleted file mode 100644 index 3b614cf0d..000000000 --- a/java/com/android/dialer/app/res/drawable/ic_call_detail_unblock.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - diff --git a/java/com/android/dialer/app/res/layout-land/dialpad_fragment.xml b/java/com/android/dialer/app/res/layout-land/dialpad_fragment.xml index 8d8236a43..45ef933cb 100644 --- a/java/com/android/dialer/app/res/layout-land/dialpad_fragment.xml +++ b/java/com/android/dialer/app/res/layout-land/dialpad_fragment.xml @@ -14,9 +14,10 @@ limitations under the License. --> + xmlns:app="http://schemas.android.com/apk/res-auto" + class="com.android.dialer.app.dialpad.DialpadFragment$DialpadSlidingRelativeLayout" + android:layout_width="match_parent" + android:layout_height="wrap_content"> - - - - - - + app:elevation="@dimen/floating_action_button_translation_z" + app:backgroundTint="@color/dialpad_fab_green"/> - diff --git a/java/com/android/dialer/app/res/layout/call_detail_history_item.xml b/java/com/android/dialer/app/res/layout/call_detail_history_item.xml deleted file mode 100644 index 0184a42f2..000000000 --- a/java/com/android/dialer/app/res/layout/call_detail_history_item.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - diff --git a/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml b/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml index 5b857afa0..fe77ac613 100644 --- a/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml +++ b/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml @@ -79,7 +79,7 @@ + android:src="@drawable/quantum_ic_person_add_white_24"/> + xmlns:app="http://schemas.android.com/apk/res-auto" + class="com.android.dialer.app.dialpad.DialpadFragment$DialpadSlidingRelativeLayout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> - - - - - - + app:elevation="@dimen/floating_action_button_translation_z" + app:backgroundTint="@color/dialpad_fab_green"/> diff --git a/java/com/android/dialer/app/res/layout/dialtacts_activity.xml b/java/com/android/dialer/app/res/layout/dialtacts_activity.xml index 042b4a5e8..958b6944b 100644 --- a/java/com/android/dialer/app/res/layout/dialtacts_activity.xml +++ b/java/com/android/dialer/app/res/layout/dialtacts_activity.xml @@ -38,24 +38,17 @@ android:clipChildren="false"/> - - - - - + android:src="@drawable/quantum_ic_dialpad_white_24" + android:scaleType="center" + app:elevation="@dimen/floating_action_button_translation_z" + app:backgroundTint="@color/dialer_secondary_color"/> "Verwyder" "Video-oproep" "Stuur \'n boodskap" - "Deel en bel" "Oproepbesonderhede" "Stuur na …" "Bel ^1" @@ -155,7 +154,6 @@ "Oproep na ^1, ^2, ^3, ^4." "via %1$s" "%1$s via %2$s" - "Bel" "Bel ^1" "Maak video-oproep na ^1." "Luister na stemboodskap vanaf ^1" diff --git a/java/com/android/dialer/app/res/values-am/strings.xml b/java/com/android/dialer/app/res/values-am/strings.xml index 382a62b3b..228fe94c6 100644 --- a/java/com/android/dialer/app/res/values-am/strings.xml +++ b/java/com/android/dialer/app/res/values-am/strings.xml @@ -144,7 +144,6 @@ "አስወግድ" "የቪዲዮ ጥሪ" "መልእክት ላክ" - "ያጋሩ እና ይደውሉ" "የጥሪ ዝርዝሮች" "ላክ ወደ…" "^1 ይደውሉ" @@ -155,7 +154,6 @@ "ወደ ^1፣ ^2፣ ^3፣ ^4 ደውል።" "በ %1$s በኩል" "%1$s በ %2$s በኩል" - "ደውል" "ወደ ^1 ይደውሉ" "ቪዲዮ ጥሪ ^1።" "የ^1ን የድምጽ መልዕክት ያዳምጡ" diff --git a/java/com/android/dialer/app/res/values-ar/strings.xml b/java/com/android/dialer/app/res/values-ar/strings.xml index 6170f9ee9..2d9c7e8e0 100644 --- a/java/com/android/dialer/app/res/values-ar/strings.xml +++ b/java/com/android/dialer/app/res/values-ar/strings.xml @@ -148,7 +148,6 @@ "إزالة" "مكالمة فيديو" "إرسال رسالة" - "المشاركة والاتصال" "تفاصيل المكالمة" "إرسال إلى ..." "الاتصال بـ ^1" @@ -159,7 +158,6 @@ "اتصال بـ ^1، ^2، ^3، ^4." "من خلال %1$s" "%1$s من خلال %2$s" - "اتصال" "الاتصال بـ ^1" "إجراء مكالمة فيديو مع ^1." "استماع إلى بريد صوتي من ^1" diff --git a/java/com/android/dialer/app/res/values-az/strings.xml b/java/com/android/dialer/app/res/values-az/strings.xml index de64279ff..e2e9bea50 100644 --- a/java/com/android/dialer/app/res/values-az/strings.xml +++ b/java/com/android/dialer/app/res/values-az/strings.xml @@ -144,7 +144,6 @@ "Yığışdır" "Video zəng" "Mesaj göndərin" - "Paylaşın və zəng edin" "Zəng detalları" "Bu şəxsə göndərin:" "^1 nömrəsinə zəng edin" @@ -155,7 +154,6 @@ "Zəng et: ^1, ^2, ^3, ^4." "%1$s vasitəsilə" "%1$s %2$s vasitəsilə" - "Çağrı" "Çağrı ^1" "^1 video zəng edin." "^1 tərəfdən səsli mesajı dinləyin" diff --git a/java/com/android/dialer/app/res/values-be/strings.xml b/java/com/android/dialer/app/res/values-be/strings.xml index d31f6deed..337a62617 100644 --- a/java/com/android/dialer/app/res/values-be/strings.xml +++ b/java/com/android/dialer/app/res/values-be/strings.xml @@ -146,7 +146,6 @@ "Выдаліць" "Відэавыклік" "Адправiць паведамленне" - "Абагуліць і выклікаць" "Падрабязнасці выкліку" "Адпраўляецца да…" "Выклікаць ^1" @@ -157,7 +156,6 @@ "Выклік абаненту ^1, ^2, ^3, ^4." "праз %1$s" "%1$s праз %2$s" - "Выклікаць" "Выклікаць ^1" "Відэавыклік ад ^1." "Праслухаць галасавое паведамленне ад ^1" diff --git a/java/com/android/dialer/app/res/values-bg/strings.xml b/java/com/android/dialer/app/res/values-bg/strings.xml index 3dc56ce99..510b4a2d0 100644 --- a/java/com/android/dialer/app/res/values-bg/strings.xml +++ b/java/com/android/dialer/app/res/values-bg/strings.xml @@ -144,7 +144,6 @@ "Премахване" "Видеообаждане" "Изпращане на съобщение" - "Споделяне и обаждане" "Подробности за обаждането" "Изпращане до…" "Обаждане до ^1" @@ -155,7 +154,6 @@ "Обаждане до ^1, ^2, ^3, ^4." "през %1$s" "%1$s през %2$s" - "Обаждане" "Обаждане на ^1" "Видеообаждане до ^1." "Прослушване на гласовата поща от ^1" diff --git a/java/com/android/dialer/app/res/values-bn/strings.xml b/java/com/android/dialer/app/res/values-bn/strings.xml index b94b046dd..ece833ce7 100644 --- a/java/com/android/dialer/app/res/values-bn/strings.xml +++ b/java/com/android/dialer/app/res/values-bn/strings.xml @@ -144,7 +144,6 @@ "সরান" "ভিডিও কল" "একটি বার্তা পাঠান" - "শেয়ার এবং কল করুন" "কলের বিশদ বিবরণ" "এতে পাঠান ..." "^1 এর কল" @@ -155,7 +154,6 @@ "^1, ^2, ^3, ^4 এ কল করুন৷" "%1$s এর মাধ্যমে" "%2$s এর মাধ্যমে %1$s" - "কল করুন" "^1 এর কল" "^1-এ ভিডিও কল করুন।" "^1 এর থেকে আসা ভয়েসমেল শোনা হয়েছে" diff --git a/java/com/android/dialer/app/res/values-bs/strings.xml b/java/com/android/dialer/app/res/values-bs/strings.xml index c516f7b7c..98506dc45 100644 --- a/java/com/android/dialer/app/res/values-bs/strings.xml +++ b/java/com/android/dialer/app/res/values-bs/strings.xml @@ -145,7 +145,6 @@ "Ukloni" "Videopoziv" "Pošalji poruku" - "Podijeli i pozovi" "Detalji o pozivu" "Pošalji na …" "Pozovi kontakt ^1" @@ -156,7 +155,6 @@ "Pozovi kontakt ^1, ^2, ^3, ^4." "preko %1$s" "%1$s preko %2$s" - "Pozovi" "Pozovi kontakt ^1" "Uputi videopoziv kontaktu ^1." "Preslušaj govornu poštu od kontakta ^1" diff --git a/java/com/android/dialer/app/res/values-ca/strings.xml b/java/com/android/dialer/app/res/values-ca/strings.xml index 9f7174049..781c6064e 100644 --- a/java/com/android/dialer/app/res/values-ca/strings.xml +++ b/java/com/android/dialer/app/res/values-ca/strings.xml @@ -144,7 +144,6 @@ "Suprimeix" "Videotrucada" "Envia un missatge" - "Comparteix i truca" "Detalls de la trucada" "Envia a…" "Truca a ^1" @@ -155,7 +154,6 @@ "Trucada a ^1, ^2, ^3, ^4." "al número %1$s" "%1$s al número %2$s" - "Truca" "Truca a ^1" "Videotrucada amb ^1." "Escolta el missatge a la bústia de veu de: ^1" diff --git a/java/com/android/dialer/app/res/values-cs/strings.xml b/java/com/android/dialer/app/res/values-cs/strings.xml index 49fd3bbb7..4f35d9cff 100644 --- a/java/com/android/dialer/app/res/values-cs/strings.xml +++ b/java/com/android/dialer/app/res/values-cs/strings.xml @@ -146,7 +146,6 @@ "Odstranit" "Videohovor" "Odeslat zprávu" - "Sdílet a zavolat" "Podrobnosti hovoru" "Poslat přes aplikaci…" "Volat kontakt ^1" @@ -157,7 +156,6 @@ "Odchozí hovor: ^1, ^2, ^3, ^4." "z čísla %1$s" "na účet %1$s, z čísla %2$s" - "Volat" "Volat kontakt ^1" "Videohovor s kontaktem ^1" "Poslech hlasové schránky od ^1" diff --git a/java/com/android/dialer/app/res/values-da/strings.xml b/java/com/android/dialer/app/res/values-da/strings.xml index 65d27345f..c3d44c01f 100644 --- a/java/com/android/dialer/app/res/values-da/strings.xml +++ b/java/com/android/dialer/app/res/values-da/strings.xml @@ -144,7 +144,6 @@ "Fjern" "Videoopkald" "Send en sms-besked" - "Del og ring" "Opkaldsinfo" "Send til…" "Ring til ^1" @@ -155,7 +154,6 @@ "Ring til ^1, ^2, ^3, ^4." "via %1$s" "%1$s via %2$s" - "Ring op" "Ring til ^1" "Videoopkald ^1." "Lyt til indtalt besked fra ^1" diff --git a/java/com/android/dialer/app/res/values-de/strings.xml b/java/com/android/dialer/app/res/values-de/strings.xml index 8f18f0baa..d6195ba30 100644 --- a/java/com/android/dialer/app/res/values-de/strings.xml +++ b/java/com/android/dialer/app/res/values-de/strings.xml @@ -144,7 +144,6 @@ "Entfernen" "Videoanruf" "SMS senden" - "Teilen und anrufen" "Anrufdetails" "Senden an…" "^1 anrufen" @@ -155,7 +154,6 @@ "Ausgehender Anruf an ^1, ^2, ^3, ^4" "über %1$s" "%1$s über %2$s" - "Anrufen" "^1 anrufen" "^1 über Videoanruf anrufen" "Mailboxnachricht von ^1 anhören" diff --git a/java/com/android/dialer/app/res/values-el/strings.xml b/java/com/android/dialer/app/res/values-el/strings.xml index 974cf1ac6..620ae1130 100644 --- a/java/com/android/dialer/app/res/values-el/strings.xml +++ b/java/com/android/dialer/app/res/values-el/strings.xml @@ -144,7 +144,6 @@ "Κατάργηση" "Βιντεοκλήση" "Αποστολή μηνύματος" - "Κοινοποίηση και κλήση" "Λεπτομέρειες κλήσης" "Αποστολή προς …" "Κλήση ^1" @@ -155,7 +154,6 @@ "Κλήση προς ^1, ^2, ^3, ^4." "μέσω %1$s" "%1$s μέσω %2$s" - "Κλήση" "Κλήση ^1" "Βιντεοκλήση ^1." "Ακρόαση μηνύματος αυτόματου τηλεφωνητή από το χρήστη ^1" diff --git a/java/com/android/dialer/app/res/values-en-rAU/strings.xml b/java/com/android/dialer/app/res/values-en-rAU/strings.xml index 03e37bf53..e9a508510 100644 --- a/java/com/android/dialer/app/res/values-en-rAU/strings.xml +++ b/java/com/android/dialer/app/res/values-en-rAU/strings.xml @@ -144,7 +144,6 @@ "Remove" "Video call" "Send a message" - "Share and call" "Call details" "Send to…" "Call ^1" @@ -155,7 +154,6 @@ "Call to ^1, ^2, ^3, ^4." "via %1$s" "%1$s, via %2$s" - "Call" "Call ^1" "Video call ^1." "Listen to voicemail from ^1" diff --git a/java/com/android/dialer/app/res/values-en-rGB/strings.xml b/java/com/android/dialer/app/res/values-en-rGB/strings.xml index 03e37bf53..e9a508510 100644 --- a/java/com/android/dialer/app/res/values-en-rGB/strings.xml +++ b/java/com/android/dialer/app/res/values-en-rGB/strings.xml @@ -144,7 +144,6 @@ "Remove" "Video call" "Send a message" - "Share and call" "Call details" "Send to…" "Call ^1" @@ -155,7 +154,6 @@ "Call to ^1, ^2, ^3, ^4." "via %1$s" "%1$s, via %2$s" - "Call" "Call ^1" "Video call ^1." "Listen to voicemail from ^1" diff --git a/java/com/android/dialer/app/res/values-en-rIN/strings.xml b/java/com/android/dialer/app/res/values-en-rIN/strings.xml index 03e37bf53..e9a508510 100644 --- a/java/com/android/dialer/app/res/values-en-rIN/strings.xml +++ b/java/com/android/dialer/app/res/values-en-rIN/strings.xml @@ -144,7 +144,6 @@ "Remove" "Video call" "Send a message" - "Share and call" "Call details" "Send to…" "Call ^1" @@ -155,7 +154,6 @@ "Call to ^1, ^2, ^3, ^4." "via %1$s" "%1$s, via %2$s" - "Call" "Call ^1" "Video call ^1." "Listen to voicemail from ^1" diff --git a/java/com/android/dialer/app/res/values-es-rUS/strings.xml b/java/com/android/dialer/app/res/values-es-rUS/strings.xml index 69c5c0423..798742fb1 100644 --- a/java/com/android/dialer/app/res/values-es-rUS/strings.xml +++ b/java/com/android/dialer/app/res/values-es-rUS/strings.xml @@ -144,7 +144,6 @@ "Eliminar" "Videollamada" "Enviar un mensaje" - "Compartir y llamar" "Detalles de la llamada" "Enviar a…" "Llamar a ^1" @@ -155,7 +154,6 @@ "Llamar a ^1, ^2, ^3, ^4." "a través de %1$s" "%1$s a través de %2$s" - "Llamar" "Llamar a ^1" "Realizar una videollamada a ^1" "Escuchar buzón de voz de ^1" diff --git a/java/com/android/dialer/app/res/values-es/strings.xml b/java/com/android/dialer/app/res/values-es/strings.xml index 9c1292004..26ea210c7 100644 --- a/java/com/android/dialer/app/res/values-es/strings.xml +++ b/java/com/android/dialer/app/res/values-es/strings.xml @@ -144,7 +144,6 @@ "Eliminar" "Videollamada" "Enviar un mensaje" - "Compartir y llamar" "Detalles de la llamada" "Enviar a…" "Llamar a ^1" @@ -155,7 +154,6 @@ "Llamar a ^1, ^2, ^3, ^4." "a través del %1$s" "%1$s a través del %2$s" - "Llamar" "Llamar a ^1" "Videollamada a ^1." "Escuchar el buzón de voz de ^1" diff --git a/java/com/android/dialer/app/res/values-et/strings.xml b/java/com/android/dialer/app/res/values-et/strings.xml index 89bf2cb14..de64ecbb2 100644 --- a/java/com/android/dialer/app/res/values-et/strings.xml +++ b/java/com/android/dialer/app/res/values-et/strings.xml @@ -144,7 +144,6 @@ "Eemalda" "Videokõne" "Saada sõnum" - "Jaga ja helista" "Kõne üksikasjad" "Saada: …" "Helistamine: ^1" @@ -155,7 +154,6 @@ "Kõne: ^1, ^2, ^3, ^4." "numbri %1$s kaudu" "%1$s numbri %2$s kaudu" - "Helistamine" "Helistamine: ^1" "Videokõne kirjele ^1." "Kontakti ^1 kõneposti kuulamine" diff --git a/java/com/android/dialer/app/res/values-eu/strings.xml b/java/com/android/dialer/app/res/values-eu/strings.xml index 944a851f9..688de91dc 100644 --- a/java/com/android/dialer/app/res/values-eu/strings.xml +++ b/java/com/android/dialer/app/res/values-eu/strings.xml @@ -144,7 +144,6 @@ "Kendu" "Bideo-deia" "Bidali mezua" - "Partekatu eta deitu" "Deiaren xehetasunak" "Bidali hona…" "Deitu: ^1" @@ -155,7 +154,6 @@ "Egindako deiaren xehetasunak: ^1, ^2, ^3, ^4." "%1$s bidez" "%1$s, %2$s bidez" - "Deitu" "Deitu ^1 deitzaileari" "Egin bideo-deia (^1)." "Deitzaile honek erantzungailuan utzitako ahots-mezuak entzutea: ^1" diff --git a/java/com/android/dialer/app/res/values-fa/strings.xml b/java/com/android/dialer/app/res/values-fa/strings.xml index 065611fe7..6a2c1ce94 100644 --- a/java/com/android/dialer/app/res/values-fa/strings.xml +++ b/java/com/android/dialer/app/res/values-fa/strings.xml @@ -144,7 +144,6 @@ "حذف" "تماس ویدئویی" "ارسال پیام" - "اشتراک‌گذاری و تماس" "جزئیات تماس" "ارسال به..." "تماس با ^1" @@ -155,7 +154,6 @@ "تماس با ^1، ‏^2، ‏^3، ‏^4." "از طریق %1$s" "%1$s از طریق %2$s" - "تماس" "تماس با ^1" "تماس ویدئویی با ^1." "گوش دادن به پست صوتی از ^1" diff --git a/java/com/android/dialer/app/res/values-fi/strings.xml b/java/com/android/dialer/app/res/values-fi/strings.xml index 9e4ddeb7d..da70c087c 100644 --- a/java/com/android/dialer/app/res/values-fi/strings.xml +++ b/java/com/android/dialer/app/res/values-fi/strings.xml @@ -144,7 +144,6 @@ "Poista" "Videopuhelu" "Lähetä viesti" - "Jaa ja soita" "Puhelun tiedot" "Vastaanottaja: …" "Soita: ^1" @@ -155,7 +154,6 @@ "Soita vastaanottajalle ^1, ^2, ^3, ^4." "numerosta %1$s" "%1$s numerosta %2$s" - "Soita" "Soita: ^1" "Soita videopuhelu: ^1." "Kuuntele vastaajaviesti: ^1" diff --git a/java/com/android/dialer/app/res/values-fr-rCA/strings.xml b/java/com/android/dialer/app/res/values-fr-rCA/strings.xml index 2dc1412ec..84dcbc89d 100644 --- a/java/com/android/dialer/app/res/values-fr-rCA/strings.xml +++ b/java/com/android/dialer/app/res/values-fr-rCA/strings.xml @@ -144,7 +144,6 @@ "Supprimer" "Appel vidéo" "Envoyer un message" - "Partager et appeler" "Détails de l\'appel" "Envoyer à…" "Appeler ^1" @@ -155,7 +154,6 @@ "Appel effectué : ^1, ^2, ^3, ^4." "au %1$s" "%1$s, au %2$s" - "Appeler" "Appeler ^1" "Appel vidéo avec ^1" "Écouter le message vocal de ^1" diff --git a/java/com/android/dialer/app/res/values-fr/strings.xml b/java/com/android/dialer/app/res/values-fr/strings.xml index 4119eb6e9..6f03106c4 100644 --- a/java/com/android/dialer/app/res/values-fr/strings.xml +++ b/java/com/android/dialer/app/res/values-fr/strings.xml @@ -144,7 +144,6 @@ "Supprimer" "Appel vidéo" "Envoyer un message" - "Partager et appeler" "Informations sur l\'appel" "Envoyer à…" "Appeler ^1" @@ -155,7 +154,6 @@ "Appel émis ^3 (destinataire : ^1, ^2, ^4)" "au %1$s" "%1$s au %2$s" - "Appeler" "Appeler ^1" "Appel vidéo de \"^1\"" "Écouter le message vocal laissé par le numéro ou le contact \"^1\"" diff --git a/java/com/android/dialer/app/res/values-gl/strings.xml b/java/com/android/dialer/app/res/values-gl/strings.xml index 621b7044a..4d4e69377 100644 --- a/java/com/android/dialer/app/res/values-gl/strings.xml +++ b/java/com/android/dialer/app/res/values-gl/strings.xml @@ -144,7 +144,6 @@ "Eliminar" "Videochamada" "Enviar unha mensaxe" - "Compartir e chamar" "Detalles da chamada" "Enviar a…" "Chamar a ^1" @@ -155,7 +154,6 @@ "Chamada a ^1, ^2, ^3, ^4." "a través do %1$s" "%1$s a través do %2$s" - "Chamar" "Chamar a ^1" "Videochamada a ^1." "Escoitar o correo de voz de ^1" diff --git a/java/com/android/dialer/app/res/values-gu/strings.xml b/java/com/android/dialer/app/res/values-gu/strings.xml index cf756cd10..726d473a1 100644 --- a/java/com/android/dialer/app/res/values-gu/strings.xml +++ b/java/com/android/dialer/app/res/values-gu/strings.xml @@ -144,7 +144,6 @@ "દૂર કરો" "વિડિઓ કૉલ" "એક સંદેશ મોકલો" - "શેર કરો અને કૉલ કરો" "કૉલની વિગતો" "આને મોકલો ..." "^1 ને કૉલ કરો" @@ -155,7 +154,6 @@ "^1, ^2, ^3, ^4 પર કૉલ." "%1$s મારફતે" "%1$s પર, %2$s મારફતે" - "કૉલ કરો" "^1 ને કૉલ કરો" "^1 ને વિડિઓ કૉલ કરો." "^1 ના વૉઇસમેઇલને સાંભળો" diff --git a/java/com/android/dialer/app/res/values-hi/strings.xml b/java/com/android/dialer/app/res/values-hi/strings.xml index f9343a4ba..f44d45bcb 100644 --- a/java/com/android/dialer/app/res/values-hi/strings.xml +++ b/java/com/android/dialer/app/res/values-hi/strings.xml @@ -144,7 +144,6 @@ "निकालें" "वीडियो कॉल" "संदेश भेजें" - "साझा करें और कॉल करें" "कॉल विवरण" "इन्हें भेजें …" "^1 को कॉल करें" @@ -155,7 +154,6 @@ "^1, ^2, ^3, ^4 पर किया गया कॉल." "%1$s से" "%1$s %2$s से" - "कॉल करें" "^1 को कॉल करें" "^1 को वीडियो कॉल करें." "^1 की वॉयस मेल सुनें" diff --git a/java/com/android/dialer/app/res/values-hr/strings.xml b/java/com/android/dialer/app/res/values-hr/strings.xml index cec225a6f..0e5d0d0ec 100644 --- a/java/com/android/dialer/app/res/values-hr/strings.xml +++ b/java/com/android/dialer/app/res/values-hr/strings.xml @@ -145,7 +145,6 @@ "Ukloni" "Videopoziv" "Pošalji poruku" - "Dijeli i pozovi" "Pojedinosti poziva" "Pošalji na..." "Nazovi ^1" @@ -156,7 +155,6 @@ "Poziv: ^1, ^2, ^3, ^4." "putem %1$s" "%1$s putem %2$s" - "Poziv" "Pozovi ^1" "Videopoziv ^1." "Slušanje govorne pošte kontakta ^1" diff --git a/java/com/android/dialer/app/res/values-hu/strings.xml b/java/com/android/dialer/app/res/values-hu/strings.xml index b1698aa9d..fcc4454e2 100644 --- a/java/com/android/dialer/app/res/values-hu/strings.xml +++ b/java/com/android/dialer/app/res/values-hu/strings.xml @@ -144,7 +144,6 @@ "Eltávolítás" "Videohívás" "Üzenet küldése" - "Megosztás és hívás" "Hívás adatai" "Címzett…" "^1 hívása" @@ -155,7 +154,6 @@ "Kimenő hívás: ^1, ^2, ^3, ^4." "szám: %1$s" "%1$s, szám: %2$s" - "Telefonhívás" "^1 hívása" "A következő hívása videokapcsolattal: ^1." "^1 hangpostaüzenetének meghallgatása" diff --git a/java/com/android/dialer/app/res/values-hy/strings.xml b/java/com/android/dialer/app/res/values-hy/strings.xml index b9009aa1d..008d34f17 100644 --- a/java/com/android/dialer/app/res/values-hy/strings.xml +++ b/java/com/android/dialer/app/res/values-hy/strings.xml @@ -144,7 +144,6 @@ "Հեռացնել" "Տեսազանգ" "Ուղարկել հաղորդագրություն" - "Կիսվել և զանգել" "Զանգի մանրամասները" "Ուղարկել…" "Զանգել ^1-ին" @@ -155,7 +154,6 @@ "Զանգ ^1 կոնտակտին, ^2, ^3, ^4:" "%1$s համարի միջոցով" "%1$s-ին %2$s համարի միջոցով" - "Զանգել" "Զանգել ^1-ին" "Տեսազանգ ^1 կոնտակտին:" "Լսել ձայնային փոստը ^1-ից" diff --git a/java/com/android/dialer/app/res/values-in/strings.xml b/java/com/android/dialer/app/res/values-in/strings.xml index 18c775f1b..a133a6542 100644 --- a/java/com/android/dialer/app/res/values-in/strings.xml +++ b/java/com/android/dialer/app/res/values-in/strings.xml @@ -144,7 +144,6 @@ "Hapus" "Panggilan video" "Kirim pesan" - "Bagikan dan telepon" "Detail panggilan" "Kirim ke…" "Telepon ^1" @@ -155,7 +154,6 @@ "Panggilan ke ^1, ^2, ^3, ^4." "melalui %1$s" "%1$s melalui %2$s" - "Telepon" "Telepon ^1" "Lakukan panggilan video ke ^1." "Dengarkan kotak pesan dari ^1" diff --git a/java/com/android/dialer/app/res/values-is/strings.xml b/java/com/android/dialer/app/res/values-is/strings.xml index a6ca10068..c9dc4f371 100644 --- a/java/com/android/dialer/app/res/values-is/strings.xml +++ b/java/com/android/dialer/app/res/values-is/strings.xml @@ -144,7 +144,6 @@ "Fjarlægja" "Myndsímtal" "Senda skilaboð" - "Deila og hringja" "Símtalsupplýsingar" "Senda til …" "Hringja í ^1" @@ -155,7 +154,6 @@ "Símtal til ^1, ^2, ^3, ^4." "í gegnum %1$s" "%1$s í gegnum %2$s" - "Hringja" "Hringja í ^1" "Hringja myndsímtal í ^1." "Hlusta á talhólfsskilaboð frá ^1" diff --git a/java/com/android/dialer/app/res/values-it/strings.xml b/java/com/android/dialer/app/res/values-it/strings.xml index dda0dea77..1465c91e1 100644 --- a/java/com/android/dialer/app/res/values-it/strings.xml +++ b/java/com/android/dialer/app/res/values-it/strings.xml @@ -144,7 +144,6 @@ "Rimuovi" "Videochiamata" "Invia un messaggio" - "Condividi e chiama" "Dettagli chiamata" "Invia a…" "Chiama ^1" @@ -155,7 +154,6 @@ "Chiamata a ^1, ^2, ^3, ^4." "tramite %1$s" "%1$s tramite %2$s" - "Chiama" "Chiama ^1" "Videochiamata ^1." "Ascolta il messaggio vocale di: ^1" diff --git a/java/com/android/dialer/app/res/values-iw/strings.xml b/java/com/android/dialer/app/res/values-iw/strings.xml index fe85d9db8..efb655322 100644 --- a/java/com/android/dialer/app/res/values-iw/strings.xml +++ b/java/com/android/dialer/app/res/values-iw/strings.xml @@ -146,7 +146,6 @@ "הסר" "שיחת וידאו" "שלח הודעה" - "שתף והתקשר" "פרטי שיחה" "שלח אל..." "התקשר אל ^1" @@ -157,7 +156,6 @@ "שיחה אל ^1‏, ^2‏, ^3‏, ^4." "דרך %1$s" "%1$s דרך %2$s" - "התקשר" "התקשר אל ^1" "שיחת וידאו עם ^1." "האזן לדואר קולי מאת ^1" diff --git a/java/com/android/dialer/app/res/values-ja/strings.xml b/java/com/android/dialer/app/res/values-ja/strings.xml index 5503d4bfc..ccdf01759 100644 --- a/java/com/android/dialer/app/res/values-ja/strings.xml +++ b/java/com/android/dialer/app/res/values-ja/strings.xml @@ -144,7 +144,6 @@ "削除" "ビデオハングアウト" "メッセージを送信" - "共有して発信" "通話の詳細" "送信先…" "^1に発信" @@ -155,7 +154,6 @@ "^3の^2^1（^4）への発信。" "%1$s で受信" "%1$s（%2$s）で受信" - "発信" "^1に発信します" "^1にビデオハングアウト発信します。" "^1からのボイスメールを再生" diff --git a/java/com/android/dialer/app/res/values-ka/strings.xml b/java/com/android/dialer/app/res/values-ka/strings.xml index 561f1e799..bebf1c542 100644 --- a/java/com/android/dialer/app/res/values-ka/strings.xml +++ b/java/com/android/dialer/app/res/values-ka/strings.xml @@ -144,7 +144,6 @@ "ამოშლა" "ვიდეო ზარი" "შეტყობინების გაგზავნა" - "გაზიარება და დარეკვა" "ზარის მონაცემები" "გაგზავნა:" "^1-თან დარეკვა" @@ -155,7 +154,6 @@ "ზარი აბონენტთან ^1, ^2, ^3, ^4." "%1$s-ის მეშვეობით" "%1$s, %2$s-ის მეშვეობით" - "დარეკვა" "დარეკვა ^1" "ვიდეო ზარი ^1-თან." "^1-ის ხმოვანი ფოსტის მოსმენა" diff --git a/java/com/android/dialer/app/res/values-kk/strings.xml b/java/com/android/dialer/app/res/values-kk/strings.xml index b607c18c9..7fa5d33ec 100644 --- a/java/com/android/dialer/app/res/values-kk/strings.xml +++ b/java/com/android/dialer/app/res/values-kk/strings.xml @@ -144,7 +144,6 @@ "Алып тастау" "Бейне қоңырау" "Хабар жіберу" - "Бөлісу және қоңырау шалу" "Қоңырау мәліметтері" "Жіберу:" "^1 нөміріне қоңырау шалу" @@ -155,7 +154,6 @@ "^1 нөміріне қоңырау шалу, ^2, ^3, ^4." "Нөмірі: %1$s" "%1$s. Нөмірі: %2$s" - "Қоңырау шалу" "^1 нөміріне қоңырау шалу" "^1 бейне қоңырау шалу." "^1 дауыстық хабарын тыңдау" diff --git a/java/com/android/dialer/app/res/values-km/strings.xml b/java/com/android/dialer/app/res/values-km/strings.xml index 6cbae9804..3b6fe9e71 100644 --- a/java/com/android/dialer/app/res/values-km/strings.xml +++ b/java/com/android/dialer/app/res/values-km/strings.xml @@ -144,7 +144,6 @@ "លុបចេញ" "ហៅជាវីដេអូ" "ផ្ញើសារ" - "ចែករំលែក និង​ហៅ​ទូរសព្ទ" "ព័ត៌មានលម្អិតអំពីការហៅ" "ផ្ញើទៅ..." "ហៅ ^1" @@ -155,7 +154,6 @@ "ហៅទៅ ^1, ^2, ^3, ^4។" "តាមរយៈ %1$s" "%1$s តាមរយៈ %2$s" - "ហៅ" "ហៅ ^1" "ហៅទៅ ^1 ជាវីដេអូ។" "ស្ដាប់​សារ​ជា​សំឡេង​ពី ^1" diff --git a/java/com/android/dialer/app/res/values-kn/strings.xml b/java/com/android/dialer/app/res/values-kn/strings.xml index e99a2c64b..68280f1f3 100644 --- a/java/com/android/dialer/app/res/values-kn/strings.xml +++ b/java/com/android/dialer/app/res/values-kn/strings.xml @@ -144,7 +144,6 @@ "ತೆಗೆದುಹಾಕು" "ವೀಡಿಯೊ ಕರೆ" "ಸಂದೇಶ ಕಳುಹಿಸಿ" - "ಹಂಚಿಕೊಳ್ಳಿ ಮತ್ತು ಕರೆ ಮಾಡಿ" "ಕರೆಯ ವಿವರಗಳು" "ಇದಕ್ಕೆ ಕಳುಹಿಸಿ ..." "^1 ಕರೆ ಮಾಡಿ" @@ -155,7 +154,6 @@ "^1, ^2, ^3, ^4 ಗೆ ಕರೆ." "%1$s ಮೂಲಕ" "%2$s ಮೂಲಕ %1$s" - "ಕರೆಮಾಡಿ" "^1 ಕರೆ ಮಾಡಿ" "^1 ಗೆ ವೀಡಿಯೊ ಕರೆ ಮಾಡಿ." "^1 ರಿಂದ ಧ್ವನಿಮೇಲ್ ಆಲಿಸಿ" diff --git a/java/com/android/dialer/app/res/values-ko/strings.xml b/java/com/android/dialer/app/res/values-ko/strings.xml index 3f35ed420..f72a69139 100644 --- a/java/com/android/dialer/app/res/values-ko/strings.xml +++ b/java/com/android/dialer/app/res/values-ko/strings.xml @@ -144,7 +144,6 @@ "삭제" "화상 통화" "메시지 보내기" - "공유 및 전화 걸기" "통화 세부정보" "수신자" "^1에 전화 걸기" @@ -155,7 +154,6 @@ "^1에게 건 전화(^2, ^3, ^4)" "%1$s번으로 수신" "%1$s %2$s번으로 수신" - "통화" "^1에 전화 걸기" "^1에 화상 통화 걸기" "^1 음성사서함 듣기" diff --git a/java/com/android/dialer/app/res/values-ky/strings.xml b/java/com/android/dialer/app/res/values-ky/strings.xml index 117103088..34d87da09 100644 --- a/java/com/android/dialer/app/res/values-ky/strings.xml +++ b/java/com/android/dialer/app/res/values-ky/strings.xml @@ -144,7 +144,6 @@ "Алып салуу" "Видео чалуу" "Билдирүү жөнөтүү" - "Бөлүшүү жана чалуу" "Чалуунун чоо-жайы" "Төмөнкүгө жөнөтүү…" "^1 чалуу" @@ -155,7 +154,6 @@ "^1, ^2, ^3, ^4 дегенге чалуу." "%1$s аркылуу" "%2$s аркылуу %1$s" - "Чалуу" "^1 чалуу" "^1 видео чалуу." "^1 үн катын угуу" diff --git a/java/com/android/dialer/app/res/values-lo/strings.xml b/java/com/android/dialer/app/res/values-lo/strings.xml index 8b0ddef49..4bdb11338 100644 --- a/java/com/android/dialer/app/res/values-lo/strings.xml +++ b/java/com/android/dialer/app/res/values-lo/strings.xml @@ -144,7 +144,6 @@ "​ລຶບ​ອອກ" "​ໂທ​ດ້ວຍ​ວິ​ດີ​ໂອ" "ສົ່ງຂໍ້ຄວາມ" - "ແບ່ງປັນ ແລະ ໂທ" "ລາຍລະອຽດ​ການໂທ" "ສົ່ງໄປ ..." "ໂທຫາ ^1" @@ -155,7 +154,6 @@ "ໂທ​ຫາ ^1, ^2, ^3, ^4." "ຜ່ານ %1$s" "%1$s ຜ່ານ %2$s" - "ໂທ" "ໂທ​ຫາ ^1" "ການ​ໂທວິ​ດີ​ໂອ ^1." "​ຟັງ​ຂໍ້​ຄວາມ​ສຽງ​ຈາກ ^1" diff --git a/java/com/android/dialer/app/res/values-lt/strings.xml b/java/com/android/dialer/app/res/values-lt/strings.xml index 84c79169f..5266dd1b8 100644 --- a/java/com/android/dialer/app/res/values-lt/strings.xml +++ b/java/com/android/dialer/app/res/values-lt/strings.xml @@ -146,7 +146,6 @@ "Pašalinti" "Vaizdo skambutis" "Siųsti pranešimą" - "Bendrinti ir skambinti" "Išsami skambučio informacija" "Siųsti…" "Skambinti ^1" @@ -157,7 +156,6 @@ "Skambutis: ^1, ^2, ^3, ^4." "numeriu %1$s" "%1$s numeriu %2$s" - "Skambinti" "Skambinti ^1" "Vaizdo skambutis ^1." "Klausyti balso pašto nuo ^1" diff --git a/java/com/android/dialer/app/res/values-lv/strings.xml b/java/com/android/dialer/app/res/values-lv/strings.xml index 5aa0f562f..e36a47eae 100644 --- a/java/com/android/dialer/app/res/values-lv/strings.xml +++ b/java/com/android/dialer/app/res/values-lv/strings.xml @@ -145,7 +145,6 @@ "Noņemt" "Videozvans" "Sūtīt ziņojumu" - "Kopīgot un zvanīt" "Informācija par zvanu" "Nosūtīt uz…" "Zvanīt: ^1" @@ -156,7 +155,6 @@ "Izejošs zvans: ^1, ^2, ^3, ^4." "izmantojot numuru %1$s" "%1$s, izmantojot numuru %2$s" - "Zvanīt" "Zvanīt: ^1" "Zvaniet kontaktpersonai ^1, izmantojot videozvanu." "Klausīties balss pasta ziņojumu no: ^1" diff --git a/java/com/android/dialer/app/res/values-mk/strings.xml b/java/com/android/dialer/app/res/values-mk/strings.xml index 0178e77ef..742250d03 100644 --- a/java/com/android/dialer/app/res/values-mk/strings.xml +++ b/java/com/android/dialer/app/res/values-mk/strings.xml @@ -144,7 +144,6 @@ "Отстрани" "Видеоповик" "Испрати порака" - "Споделете и повикајте" "Детали на повик" "Испрати на…" "Повикај ^1" @@ -155,7 +154,6 @@ "Повик до ^1, ^2, ^3, ^4." "на %1$s" "%1$s на %2$s" - "Повикај" "Повикај ^1" "Видеоповик до ^1." "Слушајте говорна пошта од ^1" diff --git a/java/com/android/dialer/app/res/values-ml/strings.xml b/java/com/android/dialer/app/res/values-ml/strings.xml index b581db7d9..857973aaa 100644 --- a/java/com/android/dialer/app/res/values-ml/strings.xml +++ b/java/com/android/dialer/app/res/values-ml/strings.xml @@ -144,7 +144,6 @@ "നീക്കംചെയ്യുക" "വീഡിയോ കോള്‍" "ഒരു സന്ദേശം അയയ്‌ക്കുക" - "പങ്കിടുക, കോൾ ചെയ്യുക" "കോൾ വിശദാംശങ്ങൾ" "ഇതിലേക്ക് അയയ്‌ക്കുക ..." "^1 എന്ന നമ്പർ/വ്യക്തിയെ വിളിക്കൂ" @@ -155,7 +154,6 @@ "^1, ^2, ^3, ^4 എന്നതിലേക്കുള്ള കോൾ." "%1$s നമ്പർ വഴി" "%2$s നമ്പർ വഴി, %1$s" - "വിളിക്കുക" "^1 വിളിക്കുക" "^1 എന്നതുമായി വീഡിയോ കോൾ നടത്തുക." "^1 എന്നയാളിൽ നിന്നുള്ള വോയ്‌സ്മെയിൽ കേൾക്കുക" diff --git a/java/com/android/dialer/app/res/values-mn/strings.xml b/java/com/android/dialer/app/res/values-mn/strings.xml index 5f4440997..decd08116 100644 --- a/java/com/android/dialer/app/res/values-mn/strings.xml +++ b/java/com/android/dialer/app/res/values-mn/strings.xml @@ -144,7 +144,6 @@ "Хасах" "Видео дуудлага" "Зурвас илгээх" - "Хуваалцаад залгах" "Дуудлагын мэдээлэл" "Илгээх ..." "^1 руу дуудлага хийх" @@ -155,7 +154,6 @@ "Дараах дугаар луу залгасан ^1, ^2, ^3, ^4." "%1$s-р" "%2$s-р %1$s" - "Дуудлага" "^1 руу дуудлага хийх" "^1-ын видео дуудлага." "^1-н дуут шууданг сонсох" diff --git a/java/com/android/dialer/app/res/values-mr/strings.xml b/java/com/android/dialer/app/res/values-mr/strings.xml index 599c6c3e6..71233ac0e 100644 --- a/java/com/android/dialer/app/res/values-mr/strings.xml +++ b/java/com/android/dialer/app/res/values-mr/strings.xml @@ -144,7 +144,6 @@ "काढा" "व्हिडिओ कॉल" "एक संदेश पाठवा" - "सामायिक करा आणि कॉल करा" "कॉल तपशील" "यांना पाठवा ..." "^1 वर कॉल करा" @@ -155,7 +154,6 @@ "^1, ^2, ^3, ^4 वर कॉल करा." "%1$s द्वारे" "%2$s द्वारे %1$s" - "कॉल करा" "^1 वर कॉल करा" "व्हिडिओ कॉल ^1." "^1 कडील व्हॉइसमेल ऐका" diff --git a/java/com/android/dialer/app/res/values-ms/strings.xml b/java/com/android/dialer/app/res/values-ms/strings.xml index 34d997b44..4373c7ca6 100644 --- a/java/com/android/dialer/app/res/values-ms/strings.xml +++ b/java/com/android/dialer/app/res/values-ms/strings.xml @@ -144,7 +144,6 @@ "Alih keluar" "Panggilan video" "Hantar mesej" - "Kongsi dan hubungi" "Butiran panggilan" "Hantar ke ..." "Panggil ^1" @@ -155,7 +154,6 @@ "Buat panggilan kepada ^1, ^2, ^3, ^4." "melalui %1$s" "%1$s melalui %2$s" - "Panggil" "Panggil ^1" "Panggilan video ^1." "Dengar mel suara daripada ^1" diff --git a/java/com/android/dialer/app/res/values-my/strings.xml b/java/com/android/dialer/app/res/values-my/strings.xml index 818928ab6..fa317bce4 100644 --- a/java/com/android/dialer/app/res/values-my/strings.xml +++ b/java/com/android/dialer/app/res/values-my/strings.xml @@ -144,7 +144,6 @@ "ဖယ်ရှာခြင်း" "ဗီဒီယို ခေါ်ဆိုမှု" "စာ တစ်စောင် ပို့ပါ" - "မျှဝေပြီး ခေါ်ဆိုရန်" "ဖုန်းခေါ်မှု အသေးစိတ်အချက်အလက်" "... သို့ ပို့ပါ" "^1 အား ခေါ်ပါ" @@ -155,7 +154,6 @@ "^1၊ ^2၊ ^3၊ ^4 အား ခေါ်ခြင်း။" "%1$s မှတစ်ဆင့်" "%1$s %2$s မှတစ်ဆင့်" - "ခေါ်ဆိုမှု" "^1 အားခေါ်ရန်" "^1 ကိုဗီဒီယိုခေါ်ဆိုမည်။" "^1ထံမှ အသံစာကို နားထောင်ရန်" diff --git a/java/com/android/dialer/app/res/values-nb/strings.xml b/java/com/android/dialer/app/res/values-nb/strings.xml index 4a49a8d36..488864f3e 100644 --- a/java/com/android/dialer/app/res/values-nb/strings.xml +++ b/java/com/android/dialer/app/res/values-nb/strings.xml @@ -144,7 +144,6 @@ "Fjern" "Videoanrop" "Send en melding" - "Del og ring" "Samtaleinformasjon" "Send til …" "Ring ^1" @@ -155,7 +154,6 @@ "Ring til ^1, ^2, ^3, ^4." "via %1$s" "%1$s via %2$s" - "Ring" "Ring ^1" "Start videoanrop med ^1." "Lytt til talepostkasse fra ^1" diff --git a/java/com/android/dialer/app/res/values-ne/strings.xml b/java/com/android/dialer/app/res/values-ne/strings.xml index 7820e6726..29eaccdb5 100644 --- a/java/com/android/dialer/app/res/values-ne/strings.xml +++ b/java/com/android/dialer/app/res/values-ne/strings.xml @@ -144,7 +144,6 @@ "हटाउँनुहोस्" "भिडियो कल" "सन्देश पठाउनुहोस्" - "आदान-प्रदान र कल गर्नुहोस्" "कल विवरणहरु" "…मा पठाउनुहोस्" "^1 कल गर्नुहोस्" @@ -155,7 +154,6 @@ "^1, ^2, ^3, ^4 लाई कल गर्नुहोस्।" "%1$s मार्फत" "%2$s मार्फत %1$s" - "कल गर्नुहोस्" "^1 कल गर्नुहोस्" "^1 भिडियो कल गर्नुहोस्।" "^1 बाट भ्वाइसमेल सुन्नुहोस्" diff --git a/java/com/android/dialer/app/res/values-nl/strings.xml b/java/com/android/dialer/app/res/values-nl/strings.xml index 8ad8881b4..986236e4f 100644 --- a/java/com/android/dialer/app/res/values-nl/strings.xml +++ b/java/com/android/dialer/app/res/values-nl/strings.xml @@ -144,7 +144,6 @@ "Verwijderen" "Videogesprek" "Een bericht verzenden" - "Delen en bellen" "Oproepdetails" "Verzenden naar…" "^1 bellen" @@ -155,7 +154,6 @@ "Oproep naar ^1, ^2, ^3, ^4." "via %1$s" "%1$s via %2$s" - "Bellen" "^1 bellen" "Videogesprek ^1." "Voicemail beluisteren van ^1" diff --git a/java/com/android/dialer/app/res/values-no/strings.xml b/java/com/android/dialer/app/res/values-no/strings.xml index 4a49a8d36..488864f3e 100644 --- a/java/com/android/dialer/app/res/values-no/strings.xml +++ b/java/com/android/dialer/app/res/values-no/strings.xml @@ -144,7 +144,6 @@ "Fjern" "Videoanrop" "Send en melding" - "Del og ring" "Samtaleinformasjon" "Send til …" "Ring ^1" @@ -155,7 +154,6 @@ "Ring til ^1, ^2, ^3, ^4." "via %1$s" "%1$s via %2$s" - "Ring" "Ring ^1" "Start videoanrop med ^1." "Lytt til talepostkasse fra ^1" diff --git a/java/com/android/dialer/app/res/values-pa/strings.xml b/java/com/android/dialer/app/res/values-pa/strings.xml index 8dfd83876..6e9cc03a9 100644 --- a/java/com/android/dialer/app/res/values-pa/strings.xml +++ b/java/com/android/dialer/app/res/values-pa/strings.xml @@ -144,7 +144,6 @@ "ਹਟਾਓ" "ਵੀਡੀਓ ਕਾਲ" "ਇੱਕ ਸੁਨੇਹਾ ਭੇਜੋ" - "ਸਾਂਝਾ ਕਰੋ ਅਤੇ ਕਾਲ ਕਰੋ" "ਕਾਲ ਵੇਰਵੇ" "ਇਸ \'ਤੇ ਭੇਜੋ..." "^1 ਨੂੰ ਕਾਲ ਕਰੋ" @@ -155,7 +154,6 @@ "^1, ^2, ^3, ^4 ਨੂੰ ਕਾਲ ਕਰੋ।" "%1$s ਰਾਹੀਂ" "%1$s, %2$s ਰਾਹੀਂ" - "ਕਾਲ ਕਰੋ" "^1 ਨੂੰ ਕਾਲ ਕਰੋ" "ਵੀਡੀਓ ਕਾਲ ^1।" "^1 ਦੀ ਵੌਇਸਮੇਲ ਚੁਣੋ" diff --git a/java/com/android/dialer/app/res/values-pl/strings.xml b/java/com/android/dialer/app/res/values-pl/strings.xml index 56f4341ad..0c8f43ff6 100644 --- a/java/com/android/dialer/app/res/values-pl/strings.xml +++ b/java/com/android/dialer/app/res/values-pl/strings.xml @@ -146,7 +146,6 @@ "Usuń" "Rozmowa wideo" "Wyślij wiadomość" - "Udostępnij i zadzwoń" "Szczegóły połączenia" "Wyślij do…" "Zadzwoń: ^1" @@ -157,7 +156,6 @@ "Połączenie: ^1, ^2, ^3, ^4." "przez %1$s" "%1$s przez %2$s" - "Zadzwoń" "Zadzwoń: ^1" "Rozpocznij rozmowę wideo z: ^1." "Posłuchaj wiadomości głosowej od: ^1" diff --git a/java/com/android/dialer/app/res/values-pt-rBR/strings.xml b/java/com/android/dialer/app/res/values-pt-rBR/strings.xml index ba6cd5d91..4f090df6e 100644 --- a/java/com/android/dialer/app/res/values-pt-rBR/strings.xml +++ b/java/com/android/dialer/app/res/values-pt-rBR/strings.xml @@ -144,7 +144,6 @@ "Remover" "Videochamada" "Enviar uma mensagem" - "Compartilhar e ligar" "Detalhes da chamada" "Enviar para…" "Ligar para ^1" @@ -155,7 +154,6 @@ "Chamada para ^1, ^2, ^3, ^4." "por %1$s" "%1$s por %2$s" - "Ligar" "Ligar para ^1" "Videochamada ^1." "Ouvir mensagem de voz de ^1" diff --git a/java/com/android/dialer/app/res/values-pt-rPT/strings.xml b/java/com/android/dialer/app/res/values-pt-rPT/strings.xml index f5e851731..9cabdc4a5 100644 --- a/java/com/android/dialer/app/res/values-pt-rPT/strings.xml +++ b/java/com/android/dialer/app/res/values-pt-rPT/strings.xml @@ -144,7 +144,6 @@ "Remover" "Videochamada" "Enviar uma mensagem" - "Partilhar e ligar" "Detalhes da chamada" "Enviar para…" "Telefonar a ^1" @@ -155,7 +154,6 @@ "Telefonar para ^1, ^2, ^3, ^4." "através do número %1$s" "%1$s através do número %2$s" - "Telefonar" "Telefonar a ^1" "Fazer videochamada com ^1." "Ouvir o correio de voz de ^1" diff --git a/java/com/android/dialer/app/res/values-pt/strings.xml b/java/com/android/dialer/app/res/values-pt/strings.xml index ba6cd5d91..4f090df6e 100644 --- a/java/com/android/dialer/app/res/values-pt/strings.xml +++ b/java/com/android/dialer/app/res/values-pt/strings.xml @@ -144,7 +144,6 @@ "Remover" "Videochamada" "Enviar uma mensagem" - "Compartilhar e ligar" "Detalhes da chamada" "Enviar para…" "Ligar para ^1" @@ -155,7 +154,6 @@ "Chamada para ^1, ^2, ^3, ^4." "por %1$s" "%1$s por %2$s" - "Ligar" "Ligar para ^1" "Videochamada ^1." "Ouvir mensagem de voz de ^1" diff --git a/java/com/android/dialer/app/res/values-ro/strings.xml b/java/com/android/dialer/app/res/values-ro/strings.xml index 8c533e698..3a083ae74 100644 --- a/java/com/android/dialer/app/res/values-ro/strings.xml +++ b/java/com/android/dialer/app/res/values-ro/strings.xml @@ -145,7 +145,6 @@ "Eliminați" "Apel video" "Trimiteți un mesaj" - "Trimiteți și apelați" "Detaliile apelului" "Trimiteți către …" "Apelați ^1" @@ -156,7 +155,6 @@ "Apel către ^1, ^2, ^3, ^4." "prin %1$s" "%1$s prin %2$s" - "Apelați" "Apelați ^1" "Apelați video ^1." "Ascultați mesajul vocal de la ^1" diff --git a/java/com/android/dialer/app/res/values-ru/strings.xml b/java/com/android/dialer/app/res/values-ru/strings.xml index b592d772d..925d684a5 100644 --- a/java/com/android/dialer/app/res/values-ru/strings.xml +++ b/java/com/android/dialer/app/res/values-ru/strings.xml @@ -146,7 +146,6 @@ "Удалить" "Видеовстреча" "Отправить сообщение" - "Поделиться и позвонить" "Сведения о вызове" "Отправить" "Позвонить: ^1" @@ -157,7 +156,6 @@ "Вызов контакту ^1. ^2, ^3, ^4." "Номер: %1$s" "%1$s. Номер: %2$s." - "Вызов" "Позвонить: ^1" "Видеовстреча: ^1" "Прослушать сообщение от контакта ^1." diff --git a/java/com/android/dialer/app/res/values-si/strings.xml b/java/com/android/dialer/app/res/values-si/strings.xml index 4be616256..55ce37b81 100644 --- a/java/com/android/dialer/app/res/values-si/strings.xml +++ b/java/com/android/dialer/app/res/values-si/strings.xml @@ -144,7 +144,6 @@ "ඉවත් කරන්න" "වීඩියෝ ඇමතුම" "පණිවිඩයක් යවන්න" - "බෙදා ගන්න සහ අමතන්න" "ඇමතුම් විස්තර" "වෙත යවන්න …" "^1 අමතන්න" @@ -155,7 +154,6 @@ "^1, ^2, ^3, ^4 වෙත ඇමතුමක්." "%1$s හරහා" "%2$s හරහා %1$s" - "ඇමතුම" "^1 අමතන්න" "^1. වීඩියෝ ඇමතුම" "^1 වෙතින් හඬ තැපෑලට සවන් දෙන්න" diff --git a/java/com/android/dialer/app/res/values-sk/strings.xml b/java/com/android/dialer/app/res/values-sk/strings.xml index 0b1e50520..59f3d10f1 100644 --- a/java/com/android/dialer/app/res/values-sk/strings.xml +++ b/java/com/android/dialer/app/res/values-sk/strings.xml @@ -146,7 +146,6 @@ "Odstrániť" "Videohovor" "Odoslať správu" - "Zdieľať a volať" "Podrobnosti hovoru" "Poslať cez aplikáciu…" "Zavolať kontakt ^1" @@ -157,7 +156,6 @@ "Volanie – kontakt ^1, ^2, ^3, ^4." "prostredníctvom čísla %1$s" "%1$s prostredníctvom čísla %2$s" - "Volať" "Zavolať kontakt ^1" "Spustiť videohovor s kontaktom ^1" "Vypočuť si správu v hlasovej schránke od používateľa ^1" diff --git a/java/com/android/dialer/app/res/values-sl/strings.xml b/java/com/android/dialer/app/res/values-sl/strings.xml index 0cee65ca9..28f4ce021 100644 --- a/java/com/android/dialer/app/res/values-sl/strings.xml +++ b/java/com/android/dialer/app/res/values-sl/strings.xml @@ -146,7 +146,6 @@ "Odstrani" "Videoklic" "Pošljite sporočilo" - "Omogoči skupno rabo in pokliči" "Podrobnosti klica" "Pošlji …" "Kliči osebo/številko ^1" @@ -157,7 +156,6 @@ "Klic za: ^1, ^2, ^3, ^4." "prek številke %1$s" "%1$s prek številke %2$s" - "Klic" "Klicanje: ^1" "Videoklic: ^1." "Poslušajte sporočilo v odzivniku od: ^1" diff --git a/java/com/android/dialer/app/res/values-sq/strings.xml b/java/com/android/dialer/app/res/values-sq/strings.xml index 2b96ad566..48ec8fee8 100644 --- a/java/com/android/dialer/app/res/values-sq/strings.xml +++ b/java/com/android/dialer/app/res/values-sq/strings.xml @@ -144,7 +144,6 @@ "Hiq" "Telefonatë me video" "Dërgo një mesazh" - "Ndaj dhe telefono" "Detajet e telefonatës" "Dërgo te ..." "Telefono ^1" @@ -155,7 +154,6 @@ "Telefonatë për ^1, ^2, ^3, ^4." "nëpërmjet %1$s" "%1$s nëpërmjet %2$s" - "Telefono" "Telefono ^1" "Telefono me video ^1." "Dëgjo postën zanore nga ^1" diff --git a/java/com/android/dialer/app/res/values-sr/strings.xml b/java/com/android/dialer/app/res/values-sr/strings.xml index 52525ca49..fd4e2b9ba 100644 --- a/java/com/android/dialer/app/res/values-sr/strings.xml +++ b/java/com/android/dialer/app/res/values-sr/strings.xml @@ -145,7 +145,6 @@ "Уклони" "Видео позив" "Пошаљи поруку" - "Дели и позови" "Детаљи позива" "Пошаљи у…" "Позови ^1" @@ -156,7 +155,6 @@ "Позвали сте: ^1, ^2, ^3, ^4." "преко %1$s" "%1$s преко %2$s" - "Позови" "Позови ^1" "Упутите видео позив контакту ^1." "Пусти говорну пошту од ^1" diff --git a/java/com/android/dialer/app/res/values-sv/strings.xml b/java/com/android/dialer/app/res/values-sv/strings.xml index 10153f7ab..fc8920a38 100644 --- a/java/com/android/dialer/app/res/values-sv/strings.xml +++ b/java/com/android/dialer/app/res/values-sv/strings.xml @@ -144,7 +144,6 @@ "Ta bort" "Videosamtal" "Skicka ett meddelande" - "Dela och ring" "Samtalsinfo" "Skicka till …" "Ring ^1" @@ -155,7 +154,6 @@ "Ring till ^1, ^2, ^3, ^4." "med %1$s" "%1$s med %2$s" - "Samtal" "Ring ^1" "Ring videosamtal till ^1." "Lyssna på ett röstmeddelande från ^1" diff --git a/java/com/android/dialer/app/res/values-sw/strings.xml b/java/com/android/dialer/app/res/values-sw/strings.xml index fbca33741..4c469979a 100644 --- a/java/com/android/dialer/app/res/values-sw/strings.xml +++ b/java/com/android/dialer/app/res/values-sw/strings.xml @@ -144,7 +144,6 @@ "Ondoa" "Hangout ya Video" "Tuma SMS" - "Shiriki na upige simu" "Maelezo ya simu" "Tuma kwenye …" "Piga simu kwa ^1" @@ -155,7 +154,6 @@ "Simu iliyopigwa kwa ^1, ^2, ^3, ^4." "kupitia %1$s" "%1$s kupitia %2$s" - "Piga simu" "Piga simu kwa ^1" "Hangout ya video ^1." "Sikiliza ujumbe wa sauti kutoka kwa ^1" diff --git a/java/com/android/dialer/app/res/values-ta/strings.xml b/java/com/android/dialer/app/res/values-ta/strings.xml index 0deb23900..0b5a51d9f 100644 --- a/java/com/android/dialer/app/res/values-ta/strings.xml +++ b/java/com/android/dialer/app/res/values-ta/strings.xml @@ -144,7 +144,6 @@ "அகற்று" "வீடியோ அழைப்பு" "செய்தி அனுப்பவும்" - "பகிர்ந்து அழை" "அழைப்பு விவரங்கள்" "இதற்கு அனுப்பு …" "^1ஐ அழை" @@ -155,7 +154,6 @@ "அழைத்த அழைப்பு: ^1, ^2, ^3, ^4." "%1$s மூலமாக" "%2$s மூலமாக %1$s இல்" - "அழை" "^1ஐ அழை" "^1ஐ வீடியோவில் அழைக்கும்." "^1 இன் குரலஞ்சலைக் கேள்" diff --git a/java/com/android/dialer/app/res/values-te/strings.xml b/java/com/android/dialer/app/res/values-te/strings.xml index 88e81d254..512f7e276 100644 --- a/java/com/android/dialer/app/res/values-te/strings.xml +++ b/java/com/android/dialer/app/res/values-te/strings.xml @@ -144,7 +144,6 @@ "తీసివేయి" "వీడియో కాల్" "సందేశాన్ని పంపు" - "భాగస్వామ్యం చేసి, కాల్ చేయి" "కాల్ వివరాలు" "దీనికి/వీటికి పంపు …" "^1కి కాల్ చేయి" @@ -155,7 +154,6 @@ "^1, ^2కి ^3 ^4 నుండి కాల్ చేసారు." "%1$s ద్వారా" "%2$s ద్వారా %1$s" - "కాల్ చేయి" "^1కి కాల్ చేయి" "^1కి వీడియో కాల్." "^1 నుండి వచ్చిన వాయిస్ మెయిల్‌ను వినండి" diff --git a/java/com/android/dialer/app/res/values-th/strings.xml b/java/com/android/dialer/app/res/values-th/strings.xml index d434a83db..6817d51b8 100644 --- a/java/com/android/dialer/app/res/values-th/strings.xml +++ b/java/com/android/dialer/app/res/values-th/strings.xml @@ -144,7 +144,6 @@ "ลบ" "แฮงเอาท์วิดีโอ" "ส่งข้อความ" - "แชร์และโทร" "รายละเอียดการโทร" "ส่งไปที่…" "โทรไปที่ ^1" @@ -155,7 +154,6 @@ "โทรหา ^1, ^2, ^3, ^4" "ผ่าน %1$s" "%1$s ผ่าน %2$s" - "โทร" "โทรไปที่ ^1" "เรียกแฮงเอาท์วิดีโอไปยัง ^1" "ฟังข้อความเสียงจาก ^1" diff --git a/java/com/android/dialer/app/res/values-tl/strings.xml b/java/com/android/dialer/app/res/values-tl/strings.xml index e0c270d7d..c98a04633 100644 --- a/java/com/android/dialer/app/res/values-tl/strings.xml +++ b/java/com/android/dialer/app/res/values-tl/strings.xml @@ -144,7 +144,6 @@ "Alisin" "Mag-video call" "Magpadala ng mensahe" - "Ibahagi at tumawag" "Mga detalye ng tawag" "Ibahagi sa …" "Tawagan ang/si ^1" @@ -155,7 +154,6 @@ "Tawag kay/sa ^1, ^2, ^3, ^4." "sa pamamagitan ng %1$s" "%1$s sa pamamagitan ng %2$s" - "Tumawag" "Tawagan ang/si ^1" "I-video call si/ang ^1." "Makinig sa voicemail mula sa/kay ^1" diff --git a/java/com/android/dialer/app/res/values-tr/strings.xml b/java/com/android/dialer/app/res/values-tr/strings.xml index cd5e0695e..73b3cd729 100644 --- a/java/com/android/dialer/app/res/values-tr/strings.xml +++ b/java/com/android/dialer/app/res/values-tr/strings.xml @@ -144,7 +144,6 @@ "Kaldır" "Video görüşmesi" "İleti gönder" - "Paylaş ve telefon et" "Çağrı ayrıntıları" "Gönder…" "Telefon et: ^1" @@ -155,7 +154,6 @@ "Yapılan çağrı: ^1, ^2, ^3, ^4." "%1$s kullanılarak" "%2$s kullanılarak %1$s" - "Telefon et" "Telefon et: ^1" "^1 ile video görüşmesi yap." "Şu numaradan gelen sesli mesajı dinle: ^1" diff --git a/java/com/android/dialer/app/res/values-uk/strings.xml b/java/com/android/dialer/app/res/values-uk/strings.xml index cdf0dc8db..dd7689093 100644 --- a/java/com/android/dialer/app/res/values-uk/strings.xml +++ b/java/com/android/dialer/app/res/values-uk/strings.xml @@ -146,7 +146,6 @@ "Видалити" "Відеодзвінок" "Надіслати повідомлення" - "Поділитися й зателефонувати" "Деталі виклику" "Надіслати в…" "^1: телефонувати" @@ -157,7 +156,6 @@ "Вихідний дзвінок: ^1, ^2, ^3, ^4." "на номер %1$s" "%1$s на номер %2$s" - "Виклик" "Телефонувати: ^1" "Запросити контакт ^1 на відеодзвінок." "Слухати голосову пошту: ^1" diff --git a/java/com/android/dialer/app/res/values-ur/strings.xml b/java/com/android/dialer/app/res/values-ur/strings.xml index 1e6c0a392..534b915cc 100644 --- a/java/com/android/dialer/app/res/values-ur/strings.xml +++ b/java/com/android/dialer/app/res/values-ur/strings.xml @@ -144,7 +144,6 @@ "ہٹائیں" "ویڈیو کال" "پیغام بھیجیں" - "اشتراک کریں اور کال کریں" "کال کی تفصیلات" "بھیجیں بنام …" "^1 کو کال کریں" @@ -155,7 +154,6 @@ "^1، ^2، ^3، ^4 پر کال کریں۔" "بذریعہ %1$s" "%1$s بذریعہ %2$s" - "کال کریں" "^1 کو کال کریں" "^1 کو ویڈیو کال کریں۔" "^1 سے صوتی میل سنیں" diff --git a/java/com/android/dialer/app/res/values-uz/strings.xml b/java/com/android/dialer/app/res/values-uz/strings.xml index 9dcba7a11..d26c53cf4 100644 --- a/java/com/android/dialer/app/res/values-uz/strings.xml +++ b/java/com/android/dialer/app/res/values-uz/strings.xml @@ -35,10 +35,10 @@ "Barcha qo‘ng‘iroqlar tarixi o‘chib ketadi." "Qo‘ng‘iroqlar tarixi tozalanmoqda…" "Chaqiruv" - "Javobsiz qo‘ng‘iroq" - "Javobsiz ishchi qo‘ng‘irog‘i" - "Javobsiz qo‘ng‘iroqlar" - "%d ta javobsiz qo‘ng‘iroq" + "Javobsiz chaqiruv" + "Javobsiz chaqiruv (ish)" + "Javobsiz chaqiruvlar" + "%d ta javobsiz chaqiruv" "Telefon" "SMS yuborish" "%1$s: %2$s" @@ -56,7 +56,7 @@ "Faqat ovozli xabar qo‘ng‘iroqlari" "Faqat kiruvchi qo‘ng‘iroqlar" "Faqat chiquvchi qo‘ng‘iroqlar" - "Faqat javobsiz qo‘ng‘iroqlar" + "Faqat javobsiz chaqiruvlar" "(%1$d) %2$s" "qidiruv" "terish" @@ -116,7 +116,7 @@ "Raqam qo‘shish yoki kontaktlardan qidirish" "Qo‘ng‘iroqlar tarixi bo‘m-bo‘sh" "Qo‘ng‘iroq qilish" - "Sizda hech qanday javobsiz qo‘ng‘iroq yo‘q." + "Hech qanday javobsiz chaqiruv yo‘q." "Sizning ovozli pochta qutingiz bo‘m-bo‘sh." "Faqat saralar ko‘rsatilsin" "Chaqiruvlar tarixi" @@ -135,7 +135,7 @@ "SMS yuborish" "Videoqo‘ng‘iroq qilish" "Raqamni bloklash" - "%s ta javobsiz qo‘ng‘iroq" + "%s ta javobsiz chaqiruv" "Tezkor raqam terish ro‘yxatida hech kim yo‘q" "Tezkor raqam terishni sozlang" "Sizda hali hech qanday kontakt yo‘q" @@ -144,18 +144,16 @@ "O‘chirish" "Video qo‘ng‘iroq" "SMS yuborish" - "Ulashish va qo‘ng‘iroq qilish" "Chaqiruv tafsilotlari" "Yuborish:" "Qo‘ng‘iroq qilish: ^1" - "Qo‘ng‘iroq javobsiz qoldirildi: ^1, ^2, ^3, ^4." + "Javobsiz chaqiruv: ^1, ^2, ^3, ^4." "Qo‘ng‘iroqqa javob berildi: ^1, ^2, ^3, ^4." "O‘qilmagan ovozli xabar (^1, ^2, ^3, ^4)." "Ovozli xabar (^1, ^2, ^3, ^4)." "Chaqiruv: ^1. ^2, ^3, ^4." "%1$s raqami orqali" "%1$s, %2$s raqami orqali" - "Qo‘ng‘iroq qilish" "Qo‘ng‘iroq qilish: ^1" "Video qo‘ng‘iroq qilish: ^1." "^1 kontaktidan kelgan ovozli xabarni tinglash" diff --git a/java/com/android/dialer/app/res/values-vi/strings.xml b/java/com/android/dialer/app/res/values-vi/strings.xml index 2b1fc4f38..942f06768 100644 --- a/java/com/android/dialer/app/res/values-vi/strings.xml +++ b/java/com/android/dialer/app/res/values-vi/strings.xml @@ -144,7 +144,6 @@ "Xóa" "Cuộc gọi điện video" "Gửi tin nhắn" - "Chia sẻ và gọi" "Chi tiết cuộc gọi" "Gửi đến …" "Gọi ^1" @@ -155,7 +154,6 @@ "Gọi tới ^1, ^2, ^3, ^4." "qua %1$s" "%1$s qua %2$s" - "Gọi" "Gọi ^1" "Gọi điện video cho ^1." "Nghe thư thoại từ ^1" diff --git a/java/com/android/dialer/app/res/values-zh-rCN/strings.xml b/java/com/android/dialer/app/res/values-zh-rCN/strings.xml index cc66921d2..4b6f55a69 100644 --- a/java/com/android/dialer/app/res/values-zh-rCN/strings.xml +++ b/java/com/android/dialer/app/res/values-zh-rCN/strings.xml @@ -144,7 +144,6 @@ "移除" "视频通话" "发送短信" - "分享并拨打电话" "通话详情" "发送至…" "呼叫^1" @@ -155,7 +154,6 @@ "^3通过 ^4 拨打给^1（^2）的电话。" "通过 %1$s" "帐号：%1$s，通过 %2$s" - "拨打电话" "呼叫^1" "与^1进行视频通话。" "听取来自^1的语音邮件" diff --git a/java/com/android/dialer/app/res/values-zh-rHK/strings.xml b/java/com/android/dialer/app/res/values-zh-rHK/strings.xml index 46ca46caf..95dd23871 100644 --- a/java/com/android/dialer/app/res/values-zh-rHK/strings.xml +++ b/java/com/android/dialer/app/res/values-zh-rHK/strings.xml @@ -144,7 +144,6 @@ "移除" "視像通話" "傳送訊息" - "分享並通話" "通話詳情" "傳送至…" "致電 ^1" @@ -155,7 +154,6 @@ "致電：^1 (^3，^2^4)。" "透過 %1$s" "%1$s，透過 %2$s" - "撥號" "致電 ^1" "與^1進行視像通話。" "收聽來自「^1」的留言信箱" diff --git a/java/com/android/dialer/app/res/values-zh-rTW/strings.xml b/java/com/android/dialer/app/res/values-zh-rTW/strings.xml index c9c9194c9..66d986d8c 100644 --- a/java/com/android/dialer/app/res/values-zh-rTW/strings.xml +++ b/java/com/android/dialer/app/res/values-zh-rTW/strings.xml @@ -144,7 +144,6 @@ "移除" "視訊通話" "傳送簡訊" - "分享及撥號" "通話詳細資料" "傳送至…" "撥號給「^1」" @@ -155,7 +154,6 @@ "撥出通話：^1/^2/^3/^4" "透過 %1$s" "%1$s (透過 %2$s)" - "撥號" "撥號給「^1」" "與「^1」視訊通話。" "聽取「^1」的語音留言" diff --git a/java/com/android/dialer/app/res/values-zu/strings.xml b/java/com/android/dialer/app/res/values-zu/strings.xml index b73b25d9e..4cee09247 100644 --- a/java/com/android/dialer/app/res/values-zu/strings.xml +++ b/java/com/android/dialer/app/res/values-zu/strings.xml @@ -144,7 +144,6 @@ "Susa" "Ikholi yevidiyo" "Thumela umlayezo" - "Yabelana futhi ushaye" "Imininingwane yekholi" "Thumela ku ..." "Shayela ku-^1" @@ -155,7 +154,6 @@ "Ikholi eya ku-^1, ^2, ^3, ^4." "nge-%1$s" "%1$s nge-%2$s" - "Shaya" "Shayela ku-^1" "Ikholi yevidiyo ka-^1." "Lalela ivoyisimeyili esuka ku-^1" diff --git a/java/com/android/dialer/app/res/values/strings.xml b/java/com/android/dialer/app/res/values/strings.xml index 66bf70f1a..9944f9ff2 100644 --- a/java/com/android/dialer/app/res/values/strings.xml +++ b/java/com/android/dialer/app/res/values/strings.xml @@ -527,11 +527,6 @@ [CHAR LIMIT=30] --> Send a message - - Share and call - @@ -581,10 +576,6 @@ [CHAR LIMIT=NONE]--> %1$s via %2$s - - Call - + + + + + + + "Stel jou stemboodskap-PIN" "Jy sal \'n stemboodskap-PIN nodig hê wanneer jy ook al na jou stemboodskapdiens toe bel." "Onbekende fout" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-am/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-am/strings.xml index 502b87304..ca49a8ccd 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-am/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-am/strings.xml @@ -44,10 +44,14 @@ "የገቢ መልዕክት ሳጥንዎ ሙሉ ከሆነ አዲስ የድምጽ መልዕክት መቀበል አይችሉም።" "አዲስ የድምጽ መልዕክት መቀበል አይቻልም" "የመልዕክት ሳጥንዎ ሙሉ ነው። አዲስ የድምጽ መልዕክት ለመቀበል የተወሰኑ መልዕክቶችን ለመሰረዝ ይሞክሩ።" - "ትርፍ ማከማቻ እና ምትኬን ያብሩ" - "የእርስዎ የመልእክት ሳጥን ሙሉ ነው። ባዶ ቦታ ነጻ ለማድረግ፣ Google የእርስዎን የድምፅ መልእክቶች ማስተዳደር እና በምትኬ ማስቀመጥ እንዲችል ትርፍ ማከማቻን ያብሩ።" - "ትርፍ ማከማቻ እና ምትኬን ያብሩ" - "የእርስዎ የመልእክት ሳጥን ሙሉ ነው። ባዶ ቦታ ነጻ ለማድረግ፣ Google የእርስዎን የድምፅ መልእክቶች ማስተዳደር እና በምትኬ ማስቀመጥ እንዲችል ትርፍ ማከማቻን ያብሩ።" + + + + + + + + "የድምፅ መልዕክት ፒንዎን ያስገቡ" "በማንኛውም ጊዜ የድምፅ መልዕክትዎ ላይ ለመድረስ ሲደውሉ የድምፅ መልዕክት ፒን ያስፈልግዎታል።" "ያልታወቀ ስህተት" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ar/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ar/strings.xml index 6d462ef41..b46df86df 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-ar/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-ar/strings.xml @@ -44,10 +44,14 @@ "لن تتمكن من تلقي بريد صوتي جديد إذا امتلأ بريدك الوارد." "يتعذر تلقي رسائل بريد صوتي جديدة" "بريدك الوارد ممتلئ. حاول حذف بعض الرسائل لتلقي رسائل بريد صوتي جديدة." - "تشغيل سعة التخزين الإضافية والنسخ الاحتياطي" - "‏صندوق بريدك ممتلئ. للحصول على بعض المساحة، ينبغي تشغيل سعة التخزين الإضافية حتى يتمكن Google من إدارة رسائل البريد الصوتي ونسخها احتياطيًا." - "تشغيل سعة التخزين الإضافية والنسخ الاحتياطي" - "‏صندوق بريدك ممتلئ. للحصول على بعض المساحة، ينبغي تشغيل سعة التخزين الإضافية حتى يتمكن Google من إدارة رسائل البريد الصوتي ونسخها احتياطيًا." + + + + + + + + "إعداد رقم التعريف الشخصي للبريد الصوتي" "ستحتاج رقم تعريف شخصي للبريد الصوتي في كل مرة تتصل فيها للوصول إلى بريدك الصوتي." "حدث خطأ غير معروف" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-az/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-az/strings.xml index 33ddafa0a..556d549e6 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-az/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-az/strings.xml @@ -44,10 +44,14 @@ "Gələnlər qutusu dolu olduqda, yeni səsli mesaj almaq olmayacaq." "Yeni səsli mesaj almaq olmur" "Gələnlər qutusu doludur. Yeni səsli mesaj əldə etmək üçün bəzi mesajları silin." - "Əlavə yaddaş və yedəkləməni aktiv edin" - "E-poçt qutusu doludur. Boş yer yaratmaq üçün əlavə yaddaşı aktiv edin, beləliklə Google səsli e-məktub mesajlarını idarə edə və yedəkləyə bilər." - "Əlavə yaddaş və yedəkləməni aktiv edin" - "E-poçt qutusu artıq doludur. Boş yer yaratmaq üçün əlavə yaddaşı aktiv edin, beləliklə Google səsli e-məktub mesajlarını idarə edə və yedəkləyə bilər." + + + + + + + + "Səsli mesaj PIN kodunu ayarlayın" "Zəng etdiyiniz zaman səsli mesaja daxil olmaq üçün PIN koda ehtiyacınız olacaq." "Naməlum xəta" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-be/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-be/strings.xml index 50f32af4f..d5f582f06 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-be/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-be/strings.xml @@ -44,10 +44,14 @@ "Вы не зможаце атрымліваць новыя галасавыя паведамленні, калі ваша папка ўваходных поўная." "Немагчыма атрымліваць новыя галасавыя паведамленні" "Ваша папка ўваходных запоўнена. Паспрабуйце выдаліць некалькі паведамленняў, каб атрымаць новую галасавую пошту." - "Уключыць дадатковае сховішча і рэзервовае капіраванне" - "Ваша паштовая скрыня запоўнена. Каб вызваліць месца, уключыце дадатковае сховішча, каб Google мог кіраваць вашымі паведамленнямі галасавой пошты і рабіць іх рэзервовую копію." - "Уключыць дадатковае сховішча і рэзервовае капіраванне" - "Ваша паштовая скрыня амаль запоўнена. Каб вызваліць месца, уключыце дадатковае сховішча, каб Google мог кіраваць вашымі паведамленнямі галасавой пошты і рабіць іх рэзервовую копію." + + + + + + + + "Наладзьце PIN-код галасавой пошты" "Вам спатрэбіцца PIN-код галасавой пошты заўжды, калі вы тэлефануеце на сваю галасавую пошту." "Невядомая памылка" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-bg/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-bg/strings.xml index dbca19ea2..be1d3f048 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-bg/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-bg/strings.xml @@ -44,10 +44,14 @@ "Няма да можете да получавате нова гласова поща, ако входящата ви поща е пълна." "Не могат да се получават нови гласови съобщения" "Входящата ви поща е пълна. Опитайте да изтриете съобщения, за да получавате нова гласова поща." - "Включване на допълнително хранилище и създаване на резервно копие" - "Пощенската ви кутия е пълна. За да освободите място, включете допълнително хранилище, така че Google да може да управлява и създаде резервно копие на съобщенията в гласовата ви поща." - "Включване на допълнително хранилище и създаване на резервно копие" - "Пощенската ви кутия е почти пълна. За да освободите място, включете допълнително хранилище, така че Google да може да управлява и създаде резервно копие на съобщенията в гласовата ви поща." + + + + + + + + "Задайте ПИН за гласовата си поща" "Ще ви е необходим ПИН за гласовата поща при всяко обаждане за достъп до съобщенията ви в нея." "Неизвестна грешка" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-bn/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-bn/strings.xml index 5954448ee..3a6959578 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-bn/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-bn/strings.xml @@ -44,10 +44,14 @@ "যদি আপনার ইনবক্সে পূর্ণ থাকে তাহলে আপনি নতুন ভয়েসমেল পেতে সক্ষম হবেন না।" "নতুন ভয়েসমেলগুলি গ্রহণ করতে পারবেন না" "আপনার ইনবক্স পূর্ণ। নতুন ভয়েসমেল পেতে কিছু বার্তা মুছে ফেলার চেষ্টা করুন।" - "অতিরিক্ত সঞ্চয়স্থান এবং ব্যাক আপ চালু করুন" - "আপনার মেলবক্স পূর্ণ। স্থান খালি করতে, অতিরিক্ত সঞ্চয়স্থান চালু করুন যাতে Google আপনার ভয়েসমেল বার্তাগুলি পরিচালনা করতে এবং ব্যাক আপ নিতে পারে।" - "অতিরিক্ত সঞ্চয়স্থান এবং ব্যাক আপ চালু করুন" - "আপনার মেলবক্স প্রায় পূর্ণ। স্থান খালি করতে, অতিরিক্ত সঞ্চয়স্থান চালু করুন যাতে Google আপনার ভয়েসমেল বার্তাগুলি পরিচালনা করতে এবং ব্যাক আপ নিতে পারে।" + + + + + + + + "আপনার ভয়েসমেল পিন সেট করুন" "যে কোনো সময়ে আপনার ভয়েসমেল অ্যাক্সেস করার জন্য আপনার একটি ভয়েসমেল পিন প্রয়োজন৷" "অজানা ত্রুটি" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-bs/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-bs/strings.xml index 0352436c4..e3d01b0a7 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-bs/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-bs/strings.xml @@ -44,10 +44,14 @@ "Nećete moći primati novu govornu poštu ako je vam je pristigla pošta puna." "Ne možete primati novu govornu poštu" "Vaša pristigla pošta je puna. Pokušajte izbrisati neke poruke da primite novu govornu poštu." - "Uključite dodatnu pohranu i sigurnosnu kopiju" - "Poštanski pretinac je pun. Da oslobodite prostor, uključite dodatnu pohranu tako da Google može upravljati vašim porukama govorne pošte i praviti njihovu sigurnosnu kopiju." - "Uključite dodatnu pohranu i sigurnosnu kopiju" - "Poštanski pretinac je gotovo sasvim pun. Da oslobodite prostor, uključite dodatnu pohranu tako da Google može upravljati vašim porukama govorne pošte i praviti njihovu sigurnosnu kopiju." + + + + + + + + "Postavite PIN za govornu poštu" "PIN za govornu poštu trebat će vam svaki put kada zatražite pristup govornoj pošti." "Nepoznata greška" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ca/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ca/strings.xml index b6d844df8..c8c734d51 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-ca/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-ca/strings.xml @@ -44,10 +44,14 @@ "No podràs rebre missatges de veu nous si la safata d\'entrada està plena." "No es poden rebre missatges de veu nous" "La safata d\'entrada està plena. Per rebre missatges de veu nous, prova de suprimir alguns missatges." - "Activa l\'emmagatzematge addicional i la còpia de seguretat" - "Tens la bústia plena. Per alliberar espai, activa l\'emmagatzematge addicional perquè Google pugui gestionar els missatges de veu i crear-ne una còpia de seguretat." - "Activa l\'emmagatzematge addicional i la còpia de seguretat" - "Tens la bústia gairebé plena. Per alliberar espai, activa l\'emmagatzematge addicional perquè Google pugui gestionar els missatges de veu i crear-ne una còpia de seguretat." + + + + + + + + "Defineix el PIN per als missatges de veu" "Necessitaràs el PIN per als missatges de veu cada vegada que truquis per accedir-hi." "Error desconegut" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-cs/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-cs/strings.xml index c52f7b007..c082bd2f2 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-cs/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-cs/strings.xml @@ -44,10 +44,14 @@ "Pokud máte plnou schránku, nemůžete přijímat nové hlasové zprávy." "Nemůžete přijímat nové hlasové zprávy" "Vaše schránka je plná. Abyste mohli přijímat nové hlasové zprávy, zkuste nějaké zprávy smazat." - "Zapněte si další úložiště a zálohování" - "Vaše e-mailová schránka je plná. Pokud chcete uvolnit místo, zapněte si další úložiště, aby Google mohl spravovat a zálohovat vaše hlasové zprávy." - "Zapněte si další úložiště a zálohování" - "Vaše e-mailová schránka je téměř plná. Pokud chcete uvolnit místo, zapněte si další úložiště, aby Google mohl spravovat a zálohovat vaše hlasové zprávy." + + + + + + + + "Nastavit kód PIN hlasové schránky" "PIN hlasové schránky budete potřebovat, kdykoli do své hlasové schránky zavoláte." "Neznámá chyba" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-da/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-da/strings.xml index 26e5ede7c..cc1b40191 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-da/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-da/strings.xml @@ -44,10 +44,14 @@ "Du vil ikke kunne modtage nye telefonsvarerbeskeder, hvis din indbakke er fuld." "Du kan ikke modtage nye telefonsvarerbeskeder" "Din indbakke er fuld. Prøv at slette nogle beskeder for at modtage nye telefonsvarerbeskeder." - "Slå ekstra lagerplads og sikkerhedskopiering til" - "Din telefonsvarer er fuld. Du kan frigøre plads ved at slå ekstra lagerplads til, så Google kan administrere og sikkerhedskopiere dine talebeskeder." - "Slå ekstra lagerplads og sikkerhedskopiering til" - "Din telefonsvarer er næsten fuld. Du kan frigøre plads ved at slå ekstra lagerplads til, så Google kan administrere og sikkerhedskopiere dine talebeskeder." + + + + + + + + "Bestem pinkoden til din telefonsvarer" "Du skal bruge en pinkode til din telefonsvarer, når du ringer for at få adgang til den." "Ukendt fejl" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-de/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-de/strings.xml index d3bfdcd6f..1f0e7020c 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-de/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-de/strings.xml @@ -44,10 +44,14 @@ "Wenn deine Mailbox voll ist, kannst du keine neuen Sprachnachrichten empfangen." "Es können keine neuen Mailbox-Nachrichten empfangen werden" "Deine Mailbox ist voll. Lösche einige Nachrichten, um neue empfangen zu können." - "Zusätzlichen Speicher und Sicherung aktivieren" - "Dein Postfach ist voll. Aktivere zusätzlichen Speicher, um Speicherplatz freizugeben. So kann Google deine Mailbox-Nachrichten verwalten und sichern." - "Zusätzlichen Speicher und Sicherung aktivieren" - "Dein Postfach fast ist voll. Aktivere zusätzlichen Speicher, um Speicherplatz freizugeben. So kann Google deine Mailbox-Nachrichten verwalten und sichern." + + + + + + + + "Mailbox-PIN festlegen" "Bei jedem Anruf auf deiner Mailbox benötigst du eine Mailbox-PIN." "Unbekannter Fehler" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-el/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-el/strings.xml index acd1ca0e7..33a17fee5 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-el/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-el/strings.xml @@ -44,10 +44,14 @@ "Δεν θα είστε σε θέση να λάβετε νέα φωνητικά μηνύματα από τον αυτόματο τηλεφωνητή εάν τα εισερχόμενά σας είναι πλήρη." "Δεν μπορείτε να λάβετε νέα μηνύματα από τον αυτόματο τηλεφωνητή" "Τα εισερχόμενά σας είναι πλήρη. Δοκιμάστε να διαγράψετε μερικά μηνύματα, για να λάβετε νέα μηνύματα από τον αυτόματο τηλεφωνητή." - "Ενεργοποίηση επιπλέον αποθηκευτικού χώρου και αντιγράφων ασφαλείας" - "Το γραμματοκιβώτιό σας είναι πλήρες. Για να ελευθερώσετε χώρο, ενεργοποιήστε επιπλέον αποθηκευτικό χώρο, ώστε η Google μπορεί να διαχειριστεί και να δημιουργήσει αντίγραφα ασφαλείας των μηνυμάτων του αυτόματου τηλεφωνητή σας." - "Ενεργοποίηση επιπλέον αποθηκευτικού χώρου και αντιγράφων ασφαλείας" - "Το γραμματοκιβώτιό σας είναι σχεδόν πλήρες. Για να ελευθερώσετε χώρο, ενεργοποιήστε επιπλέον αποθηκευτικό χώρο, ώστε η Google μπορεί να διαχειριστεί και να δημιουργήσει αντίγραφα ασφαλείας των μηνυμάτων του αυτόματου τηλεφωνητή σας." + + + + + + + + "Ορίστε PIN για τον αυτόματο τηλεφωνητή σας" "Θα χρειάζεστε ένα PIN φωνητικού τηλεφωνητή κάθε φορά που καλείτε, για να έχετε πρόσβαση στον τηλεφωνητή σας." "Άγνωστο σφάλμα" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-en-rAU/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-en-rAU/strings.xml index a036950a6..28117ea47 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-en-rAU/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-en-rAU/strings.xml @@ -44,10 +44,14 @@ "You won\'t be able to receive new voicemail if your inbox is full." "Can\'t receive new voicemail" "Your inbox is full. Try deleting some messages to receive new voicemail." - "Turn on extra storage and backup" - "Your mailbox is full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages." - "Turn on extra storage and backup" - "Your mailbox is almost full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages." + + + + + + + + "Set your voicemail PIN" "You\'ll need a voicemail PIN whenever you call to access your voicemail." "Unknown error" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-en-rGB/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-en-rGB/strings.xml index a036950a6..28117ea47 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-en-rGB/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-en-rGB/strings.xml @@ -44,10 +44,14 @@ "You won\'t be able to receive new voicemail if your inbox is full." "Can\'t receive new voicemail" "Your inbox is full. Try deleting some messages to receive new voicemail." - "Turn on extra storage and backup" - "Your mailbox is full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages." - "Turn on extra storage and backup" - "Your mailbox is almost full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages." + + + + + + + + "Set your voicemail PIN" "You\'ll need a voicemail PIN whenever you call to access your voicemail." "Unknown error" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-en-rIN/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-en-rIN/strings.xml index a036950a6..28117ea47 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-en-rIN/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-en-rIN/strings.xml @@ -44,10 +44,14 @@ "You won\'t be able to receive new voicemail if your inbox is full." "Can\'t receive new voicemail" "Your inbox is full. Try deleting some messages to receive new voicemail." - "Turn on extra storage and backup" - "Your mailbox is full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages." - "Turn on extra storage and backup" - "Your mailbox is almost full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages." + + + + + + + + "Set your voicemail PIN" "You\'ll need a voicemail PIN whenever you call to access your voicemail." "Unknown error" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-es-rUS/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-es-rUS/strings.xml index 485a78b10..f7a51a866 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-es-rUS/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-es-rUS/strings.xml @@ -44,10 +44,14 @@ "Si la carpeta Recibidos está llena, no podrás recibir mensajes de voz nuevos." "No se pueden recibir mensajes de voz nuevos" "La carpeta Recibidos está llena. Intenta borrar algunos mensajes para recibir mensajes de voz nuevos." - "Activar la copia de seguridad y obtener almacenamiento adicional" - "Tu buzón está lleno. Para liberar espacio, obtén almacenamiento adicional para que Google pueda administrar tus mensajes de voz y hacer copias de seguridad de ellos." - "Activar la copia de seguridad y obtener almacenamiento adicional" - "Tu buzón está casi lleno. Para liberar espacio, obtén almacenamiento adicional para que Google pueda administrar tus mensajes de voz y hacer copias de seguridad de ellos." + + + + + + + + "Configura el PIN del buzón de voz" "Necesitas un PIN cada vez que llames para acceder al buzón de voz." "Error desconocido" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-es/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-es/strings.xml index d351f375c..5d799504a 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-es/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-es/strings.xml @@ -44,10 +44,14 @@ "Si la bandeja de entrada está llena, no podrás recibir los mensajes de voz nuevos." "No puedes recibir los mensajes de voz nuevos" "Tienes la bandeja de entrada llena. Para recibir nuevos mensajes de voz, prueba a eliminar algunos antiguos." - "Habilitar más espacio de almacenamiento y de copia de seguridad" - "Tu buzón de voz está lleno. Para desocupar espacio, habilita más almacenamiento para que Google pueda hacer una copia de seguridad de tus mensajes del buzón de buzón y gestionarlos." - "Habilitar más espacio de almacenamiento y de copia de seguridad" - "Tu buzón de voz está prácticamente lleno. Para desocupar espacio, habilita más almacenamiento para que Google pueda hacer una copia de seguridad de tus mensajes del buzón de buzón y gestionarlos." + + + + + + + + "Configura el PIN del buzón de voz" "Deberás introducir un PIN del buzón de voz siempre que llames para escuchar los mensajes de voz." "Error desconocido" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-et/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-et/strings.xml index e392f9067..2960acee6 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-et/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-et/strings.xml @@ -44,10 +44,14 @@ "Kui teie postkast on täis, ei saa te uusi kõnepostisõnumeid vastu võtta." "Uusi kõnepostisõnumeid ei saa vastu võtta" "Teie postkast on täis. Uute kõnepostisõnumite vastuvõtmiseks kustutage mõned sõnumid." - "Lisasalvestusruumi ja varundamise sisselülitamine" - "Teie postkast on täis. Ruumi vabastamiseks lülitage sisse lisasalvestusruum, et Google saaks teie kõnepostisõnumeid hallata ja varundada." - "Lisasalvestusruumi ja varundamise sisselülitamine" - "Teie postkast on peaaegu täis. Ruumi vabastamiseks lülitage sisse lisasalvestusruum, et Google saaks teie kõnepostisõnumeid hallata ja varundada." + + + + + + + + "Määrake kõneposti PIN-kood" "Vajate PIN-koodi juhul, kui helistate kõnepostile juurdepääsemiseks." "Tundmatu viga" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-eu/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-eu/strings.xml index af40192d2..055c40a64 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-eu/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-eu/strings.xml @@ -44,10 +44,14 @@ "Ezin izango duzu jaso ahots-mezu berririk sarrera-ontzia beteta badago." "Ezin da jaso ahots-mezu berririk" "Beteta dago sarrera-ontzia. Ezabatu mezu batzuk ahots-mezu berriak jasotzeko." - "Lortu biltegiratze-toki gehiago eta egin babeskopiak" - "Beteta dago postontzia. Tokia egiteko, lortu biltegiratze-toki gehiago, Google-k erantzungailuko mezuak kudeatu eta haien babeskopiak egin ahal izan ditzan." - "Lortu biltegiratze-toki gehiago eta egin babeskopiak" - "Ia beteta dago postontzia. Tokia egiteko, lortu biltegiratze-toki gehiago, Google-k erantzungailuko mezuak kudeatu eta haien babeskopiak egin ahal izan ditzan." + + + + + + + + "Ezarri erantzungailuko PIN kodea" "Erantzungailua atzitzeko deitzen duzunerako behar duzu PIN kodea." "Errore ezezagun bat gertatu da" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-fa/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-fa/strings.xml index af79322bb..1d3caa7de 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-fa/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-fa/strings.xml @@ -44,10 +44,14 @@ "اگر صندوق ورودی‌تان پر باشد نمی‌توانید پست صوتی جدیدی دریافت کنید." "پست‌های صوتی جدید دریافت نمی‌شود" "صندوق ورودی‌تان پر است. بعضی از پیام‌ها را حذف کنید تا پست صوتی جدید دریافت کنید." - "فعال‌سازی فضای ذخیره‌سازی اضافی و پشتیبان‌گیری" - "‏صندوق ورودی‌تان پر است. برای آزاد کردن فضا، فضای ذخیره‌سازی اضافی را فعال‌سازی کنید تا Google بتواند پیام‌های صندوق پستی‌تان را مدیریت و پشتیبان‌گیری کند." - "فعال‌سازی فضای ذخیره‌سازی اضافی و پشتیبان‌گیری" - "‏صندوق ورودی‌تان تقریباً پر است. برای آزاد کردن فضا، فضای ذخیره‌سازی اضافی را فعال‌سازی کنید تا Google بتواند پیام‌های صندوق پستی‌تان را مدیریت و پشتیبان‌گیری کند." + + + + + + + + "تنظیم پین پست صوتی" "هر بار که تماس می‌گیرید برای دسترسی به پست صوتی‌تان به پین پست صوتی نیاز دارید." "خطای ناشناس" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-fi/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-fi/strings.xml index 54167659b..4a994c80a 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-fi/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-fi/strings.xml @@ -44,10 +44,14 @@ "Uusia vastaajaviestejä ei voi vastaanottaa, jos postilaatikko on täynnä." "Uusien vastaajaviestien vastaanottaminen ei onnistu." "Postilaatikkosi on täynnä. Poista viestejä, jotta voit vastaanottaa uusia vastaajaviestejä." - "Ota käyttöön lisätallennustila ja ‑varmuuskopiointi" - "Postilaatikkosi on täynnä. Jos haluat vapauttaa tilaa, ota käyttöön lisätallennustila, niin Google voi hallinnoida ja varmuuskopioida vastaajaviestisi." - "Ota käyttöön lisätallennustila ja ‑varmuuskopiointi" - "Postilaatikkosi on lähes täynnä. Jos haluat vapauttaa tilaa, ota käyttöön lisätallennustila, niin Google voi hallinnoida ja varmuuskopioida vastaajaviestisi." + + + + + + + + "Aseta vastaajan PIN-koodi" "Vastaajan PIN-koodi on annettava aina, kun käytät vastaajaa." "Tuntematon virhe" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-fr-rCA/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-fr-rCA/strings.xml index ef88ecfa2..9d8259249 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-fr-rCA/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-fr-rCA/strings.xml @@ -44,10 +44,14 @@ "Vous ne pourrez pas recevoir de nouveaux messages vocaux si votre boîte de réception est pleine." "Impossible de recevoir de nouveaux messages vocaux" "Votre boîte de réception est pleine. Essayez de supprimer des messages pour pouvoir recevoir de nouveaux messages vocaux." - "Activer l\'espace supplémentaire de stockage et de sauvegarde" - "Votre boîte aux lettres est pleine. Pour libérer de l\'espace, activez l\'espace de stockage supplémentaire pour que Google puisse gérer et sauvegarder vos messages vocaux." - "Activer l\'espace supplémentaire de stockage et de sauvegarde" - "Votre boîte aux lettres est presque pleine. Pour libérer de l\'espace, activez l\'espace de stockage supplémentaire pour que Google puisse gérer et sauvegarder vos messages vocaux." + + + + + + + + "Définir votre NIP de messagerie vocale" "Vous devez saisir un NIP de messagerie vocale chaque fois que vous appelez pour accéder à vos messages vocaux." "Erreur inconnue" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-fr/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-fr/strings.xml index eefd5ad24..595979474 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-fr/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-fr/strings.xml @@ -44,10 +44,14 @@ "Vous ne pouvez pas recevoir de nouveaux messages vocaux si votre boîte de réception est pleine." "Impossible de recevoir de nouveaux messages vocaux" "Votre boîte de réception est pleine. Supprimez des messages vocaux pour pouvoir en recevoir de nouveaux." - "Activer l\'espace de stockage et de sauvegarde supplémentaire" - "Votre boîte aux lettres est pleine. Pour libérer de l\'espace, activez l\'espace de stockage supplémentaire. Google pourra ainsi gérer vos messages vocaux et les sauvegarder." - "Activer l\'espace de stockage et de sauvegarde supplémentaire" - "Votre boîte aux lettres est presque pleine. Pour libérer de l\'espace, activez l\'espace de stockage supplémentaire. Google pourra ainsi gérer vos messages vocaux et les sauvegarder." + + + + + + + + "Définir le code de votre messagerie vocale" "Vous devrez saisir ce code chaque fois que vous consulterez votre messagerie vocale." "Erreur inconnue" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-gl/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-gl/strings.xml index efd174ffb..27efdbe26 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-gl/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-gl/strings.xml @@ -44,10 +44,14 @@ "Non poderás recibir correo de voz novo se a caixa de entrada está chea." "Non se poden recibir correos de voz novos" "A caixa de entrada está chea. Proba a eliminar algunhas mensaxes para recibir correo de voz novo." - "Activa o almacenamento adicional e a copia de seguranza" - "A túa caixa de correo está chea. Para liberar espazo, activa o almacenamento adicional, de modo que Google poida xestionar as túas mensaxes do correo de voz e facer unha copia de seguranza." - "Activa o almacenamento adicional e a copia de seguranza" - "A túa caixa de correo está case chea. Para liberar espazo, activa o almacenamento adicional, de modo que Google poida xestionar as túas mensaxes do correo de voz e facer unha copia de seguranza." + + + + + + + + "Establece o PIN para o teu correo de voz" "Necesitarás o PIN cada vez que chames para acceder ao teu correo de voz." "Produciuse un erro descoñecido" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-gu/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-gu/strings.xml index 44634437a..b0fbdd752 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-gu/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-gu/strings.xml @@ -44,10 +44,14 @@ "જો તમારું ઇનબોક્સ ભરાઈ ગયું હોય તો તમે નવી વૉઇસમેઇલ પ્રાપ્ત કરી શકશો નહીં." "નવી વૉઇસમેઇલ્સ પ્રાપ્ત કરી શકતાંં નથી" "તમારું ઇનબોક્સ ભરાઈ ગયું છે. નવી વૉઇસમેઇલ પ્રાપ્ત કરવા માટે કેટલા સંદેશા કાઢી નાખવાનો પ્રયાસ કરો." - "અતિરિક્ત સ્ટોરેજ ચાલુ કરો અને બેકઅપ લો" - "તમારું મેઇલબોક્સ ભરાઇ ગયું છે. સ્થાન ખાલી કરવા માટે, અતિરિક્ત સ્ટોરેજ ખાલી કરો જેથી Google તમારા વૉઇસમેઇલ સંદેશા સંચાલિત કરી અને તેનું બેકઅપ લઈ શકે." - "અતિરિક્ત સ્ટોરેજ ચાલુ કરો અને બેકઅપ લો" - "તમારું મેઇલબોક્સ મોટાંભાગે ભરાઇ ગયું છે. સ્થાન ખાલી કરવા માટે, અતિરિક્ત સ્ટોરેજ ખાલી કરો જેથી Google તમારા વૉઇસમેઇલ સંદેશા સંચાલિત કરી અને તેનું બેકઅપ લઈ શકે." + + + + + + + + "તમારો વૉઇસમેઇલ PIN સેટ કરો" "તમારી વૉઇસમેઇલને ઍક્સેસ કરવા માટે તમે કોઈપણ સમયે કૉલ કરો છો, ત્યારે તમને વૉઇસમેઇલ PIN ની જરૂર પડશે." "અજાણી ભૂલ" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-hi/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-hi/strings.xml index bc9c46331..00246d9ca 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-hi/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-hi/strings.xml @@ -44,10 +44,14 @@ "यदि आपका इनबॉक्स भरा हुआ है, तो आप नया वॉइसमेल नहीं प्राप्त कर सकेंगे." "नए वॉइसमेल प्राप्त नहीं किए जा सकते" "आपका इनबॉक्स पूरा भर गया है. नया वॉइसमेल प्राप्त करने के लिए कुछ संदेश हटाने का प्रयास करें." - "अतिरिक्त जगह और बैकअप चालू करें" - "आपका मेलबॉक्स भर गया है. जगह खाली करने के लिए, अतिरिक्त जगह चालू करें ताकि Google आपके वॉइसमेल संदेशों को प्रबंधित कर सके और उनका बैकअप ले सके." - "अतिरिक्त जगह और बैकअप चालू करें" - "आपका मेलबॉक्स लगभग भर गया है. जगह खाली करने के लिए, अतिरिक्त जगह चालू करें ताकि Google आपके वॉइसमेल संदेशों को प्रबंधित कर सके और उनका बैकअप ले सके." + + + + + + + + "अपना वॉइसमेल पिन सेट करें" "आप जब भी अपना वॉइसमेल एक्सेस करने के लिए कॉल करते हैं, आपको वॉइसमेल पिन की आवश्यकता होगी." "अज्ञात गड़बड़ी" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-hr/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-hr/strings.xml index a310d597c..b3e12efec 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-hr/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-hr/strings.xml @@ -44,10 +44,14 @@ "Ako je vaša pristigla pošta puna, nećete moći primiti novu govornu poruku." "Primanje nove govorne pošte nije moguće" "Pristigla pošta je puna. Izbrišite neke poruke da biste primili novu govornu poštu." - "Uključivanje dodatne pohrane i sigurnosnog kopiranja" - "Vaš je poštanski pretinac pun. Da biste oslobodili prostor, uključite dodatnu pohranu tako da Google može upravljati porukama u govornoj pošti i sigurnosno ih kopirati." - "Uključivanje dodatne pohrane i sigurnosnog kopiranja" - "Vaš je poštanski pretinac gotovo pun. Da biste oslobodili prostor, uključite dodatnu pohranu tako da Google može upravljati porukama u govornoj pošti i sigurnosno ih kopirati." + + + + + + + + "Postavljanje PIN-a za govornu poštu" "PIN za govornu poštu trebat će vam svaki put kad zatražite pristup govornoj pošti." "Nepoznata pogreška" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-hu/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-hu/strings.xml index cc3eb7ecf..6d1961282 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-hu/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-hu/strings.xml @@ -44,10 +44,14 @@ "Ha a postaláda megtelt, nem fogadhat új hangpostaüzeneteket." "Nem tud új hangpostaüzeneteket fogadni" "A postaláda megtelt. Ha meg szeretné kapni az új hangpostaüzeneteket, töröljön néhány üzenetet." - "Az extra tárhely és biztonsági mentés bekapcsolása" - "A postaláda betelt. Ha szeretne helyet felszabadítani, kapcsolja be az extra tárhely funkciót, hogy a Google kezelhesse a hangpostaüzeneteket, és biztonsági mentést készíthessen róluk." - "Az extra tárhely és biztonsági mentés bekapcsolása" - "A postaláda majdnem betelt. Ha szeretne helyet felszabadítani, kapcsolja be az extra tárhely funkciót, hogy a Google kezelhesse a hangpostaüzeneteket, és biztonsági mentést készíthessen róluk." + + + + + + + + "A hangposta PIN-kódjának beállítása" "A hangpostafiók eléréséhez PIN-kódra van szüksége." "Ismeretlen hiba" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-hy/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-hy/strings.xml index 4a9c2ed21..4010b19b2 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-hy/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-hy/strings.xml @@ -44,10 +44,14 @@ "Եթե մուտքի արկղը լցվի, նոր ձայնային հաղորդագրություններ չեք կարողանա ստանալ:" "Հնարավոր չէ ստանալ նոր ձայնային հաղորդագրություններ" "Մուտքի արկղը լիքն է: Նոր հաղոդագրություններ ստանալու համար ջնջեք հները:" - "Պահանջվում է լրացուցիչ տարածք" - "Ձեր փոստարկղը լիքն է: Ակտիվացրեք լրացուցիչ տարածք, որպեսզի Google-ը կարողանա կառավարել և պահուստավորել ձեր ձայնային փոստի հաղորդագրությունները:" - "Պահանջվում է լրացուցիչ տարածք" - "Ձեր փոստարկղը գրեթե լիքն է: Ակտիվացրեք լրացուցիչ տարածք, որպեսզի Google-ը կարողանա կառավարել և պահուստավորել ձեր ձայնային փոստի հաղորդագրությունները:" + + + + + + + + "Ընտրել ձեր ձայնային փոստի PIN-ը" "Ամեն անգամ ձայնային փոստին զանգելիս ձեզանից կպահանջվի ձայնային փոստի PIN-ը:" "Անհայտ սխալ" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-in/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-in/strings.xml index 948afaed4..ae272f975 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-in/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-in/strings.xml @@ -44,10 +44,14 @@ "Pesan suara tidak dapat diterima jika kotak masuk Anda penuh." "Tidak dapat menerima pesan suara baru" "Kotak masuk Anda penuh. Coba hapus beberapa pesan untuk menerima pesan suara baru." - "Aktifkan penyimpanan dan backup ekstra" - "Kotak surat Anda sudah penuh. Untuk mengosongkan ruang, aktifkan penyimpanan ekstra sehingga Google dapat mengelola dan melakukan backup pada pesan suara Anda." - "Aktifkan penyimpanan dan backup ekstra" - "Kotak surat Anda hampir penuh. Untuk mengosongkan ruang, aktifkan penyimpanan ekstra sehingga Google dapat mengelola dan melakukan backup pada pesan suara Anda." + + + + + + + + "Setel PIN pesan suara Anda" "Anda akan memerlukan PIN pesan suara setiap kali menelepon untuk mengakses pesan suara." "Kesalahan tidak dikenal" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-is/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-is/strings.xml index ae0497ee3..06c249817 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-is/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-is/strings.xml @@ -44,10 +44,14 @@ "Þú getur ekki tekið á móti nýjum talhólfsskilaboðum ef pósthólfið er fullt." "Ekki hægt að taka á móti nýjum talhólfsskilaboðum" "Pósthólfið er fullt. Prófaðu að eyða skilaboðum til að taka á móti nýjum talhólfsskilaboðum." - "Kveikja á viðbótargeymslu og öryggisafritun" - "Pósthólfið þitt er fullt. Þú getur losað pláss með því að kveikja á viðbótargeymslu til að Google geti unnið með og tekið öryggisafrit af talhólfsskilaboðunum þínum." - "Kveikja á viðbótargeymslu og öryggisafritun" - "Pósthólfið þitt er næstum fullt. Þú getur losað pláss með því að kveikja á viðbótargeymslu til að Google geti unnið með og tekið öryggisafrit af talhólfsskilaboðunum þínum." + + + + + + + + "Stilla PIN-númer talhólfs" "Þú þarft að nota PIN-númer talhólfsins í hvert skipti sem þú hringir til að athuga það." "Óþekkt villa" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-it/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-it/strings.xml index 1df608aed..c66e6e456 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-it/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-it/strings.xml @@ -44,10 +44,14 @@ "Se la casella della segreteria è piena non potrai ricevere nuovi messaggi vocali." "Impossibile ricevere nuovi messaggi vocali" "La casella della segreteria è piena. Prova a eliminare alcuni messaggi per riceverne di nuovi." - "Attiva spazio di archiviazione supplementare e backup" - "La tua casella di posta e piena. Per liberare spazio, attiva lo spazio di archiviazione supplementare in modo che Google possa gestire i messaggi vocali ed eseguirne il backup." - "Attiva spazio di archiviazione supplementare e backup" - "La tua casella di posta e quasi piena. Per liberare spazio, attiva lo spazio di archiviazione supplementare in modo che Google possa gestire i messaggi vocali ed eseguirne il backup." + + + + + + + + "Imposta il PIN della segreteria" "Dovrai inserire il PIN della segreteria ogni volta che chiami per accedervi." "Errore sconosciuto" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-iw/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-iw/strings.xml index c05a02feb..f1a0ea2d1 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-iw/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-iw/strings.xml @@ -44,10 +44,14 @@ "אם תיבת הדואר הנכנס מלאה, לא תוכל לקבל דואר קולי חדש." "לא ניתן לקבל הודעות חדשות בדואר הקולי" "תיבת הדואר הנכנס מלאה. נסה למחוק חלק מההודעות כדי שתוכל לקבל דואר קולי חדש." - "הפעל את הגיבוי ופינוי המקום" - "‏תיבת הדואר שלך מלאה. הפעל את הגיבוי ופינוי המקום כדי ש-Google תוכל לנהל ולגבות את ההודעות הקוליות שלך." - "הפעל את הגיבוי ופינוי המקום" - "‏תיבת הדואר שלך כמעט מלאה. הפעל את הגיבוי ופינוי המקום כדי ש-Google תוכל לנהל ולגבות את ההודעות הקוליות שלך." + + + + + + + + "הגדר קוד גישה לדואר הקולי" "בכל פעם שתשתמש בדואר הקולי תצטרך את קוד הגישה." "שגיאה לא ידועה" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ja/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ja/strings.xml index 5d47a9cea..db40c9b91 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-ja/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-ja/strings.xml @@ -44,10 +44,14 @@ "新しいボイスメールを受信できません。受信トレイがいっぱいです。" "新しいボイスメールを受信できません" "受信トレイがいっぱいです。新しいボイスメールを受信するには、古いメッセージをいくつか削除してみてください。" - "追加の保存容量とバックアップを ON にしてください" - "メールボックスの保存容量が上限に達しました。空き容量を増やすには、追加の保存容量を ON にして、Google がボイスメールのメッセージの管理とバックアップを行えるようにしてください。" - "追加の保存容量とバックアップを ON にしてください" - "メールボックスの保存容量がもう少しで上限に達します。空き容量を増やすには、追加の保存容量を ON にして、Google がボイスメールのメッセージの管理とバックアップを行えるようにしてください。" + + + + + + + + "ボイスメール PIN を設定" "ボイスメールを呼び出すには、ボイスメール PIN が必要です。" "不明なエラー" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ka/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ka/strings.xml index c5f6a12ca..f05ca5ea2 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-ka/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-ka/strings.xml @@ -44,10 +44,14 @@ "თუ თქვენი შემოსულები სავსეა, ახალ ხმოვან ფოსტას ვერ მიიღებთ." "ახალი ხმოვანი ფოსტის მიღება შეუძლებელია" "თქვენი შემოსულები სავსეა. ახალი ხმოვანი ფოსტის მისაღებად სცადეთ რამდენიმე შეტყობინების წაშლა." - "დამატებითი მეხსიერების ჩართვა და სარეზერვო ასლების შექმნა" - "თქვენი საფოსტო ყუთი სავსეა. ადგილის გასათავისუფლებლად ჩართეთ დამატებითი მეხსიერება, რათა Google-მა შეძლოს თქვენი ხმოვანი ფოსტის შეტყობინებების მართვა და სარეზერვო ასლების შექმნა." - "დამატებითი მეხსიერების ჩართვა და სარეზერვო ასლების შექმნა" - "თქვენი საფოსტო ყუთი თითქმის სავსეა. ადგილის გასათავისუფლებლად ჩართეთ დამატებითი მეხსიერება, რათა Google-მა შეძლოს თქვენი ხმოვანი ფოსტის შეტყობინებების მართვა და სარეზერვო ასლების შექმნა." + + + + + + + + "დააყენეთ თქვენი ხმოვანი ფოსტის PIN-კოდი" "ნებისმიერ დროს, როდესაც დარეკავთ, რათა ხმოვან ფოსტაზე წვდომა იქონიოთ, ხმოვანი ფოსტის PIN-კოდი დაგჭირდებათ." "უცნობი შეცდომა" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-kk/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-kk/strings.xml index ad164c8fa..66b051f03 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-kk/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-kk/strings.xml @@ -44,10 +44,14 @@ "Кіріс қалтасы толы болса, жаңа дауыстық хабар ала алмайсыз." "Жаңа дауыстық хабарды алу мүмкін емес" "Кіріс қалтасы толы. Жаңа дауыстық хабарды алу үшін кейбір хабарларды жойып көріңіз." - "Қосымша жадты қосып, сақтық көшірме жасау" - "Кіріс жәшігі толы. Орын босату үшін, қосымша жад функциясын қосып, Google-ға дауыстық хабарларыңызды басқарып, сақтық көшірмесін жасауға рұқсат беріңіз." - "Қосымша жадты қосып, сақтық көшірме жасау" - "Кіріс жәшігі толы. Орын босату үшін, қосымша жад функциясын қосып, Google-ға дауыстық хабарларыңызды басқарып, сақтық көшірмесін жасауға рұқсат беріңіз." + + + + + + + + "Дауыстық пошта PIN кодын орнатыңыз" "Дауыстық поштаны тыңдау үшін кез келген уақытта қоңырау шалғанда, дауыстық пошта PIN коды сұралады." "Белгісіз қате" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-km/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-km/strings.xml index f0ebf043d..ae75e7ae4 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-km/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-km/strings.xml @@ -44,10 +44,14 @@ "អ្នក​នឹង​មិន​អាច​ទទួល​សារ​ជា​សំឡេង​ថ្មី​បាន​ទេ បើ​ប្រអប់​សំបុត្រ​របស់​អ្នក​ពេញ។" "មិនអាចទទួល​សារជា​សំឡេង​ថ្មី​បាន​ទេ" "ប្រអប់សំបុត្ររបស់អ្នកពេញ។ សូមព្យាយាមលុបសារមួយចំនួនដើម្បី​អាច​ទទួល​សារជាសំឡេងថ្មី​បាន។" - "បើក​ទំហំ​ផ្ទុក​បន្ថែម រួច​បម្រុងទុក" - "ប្រអប់​​សារ​​របស់​អ្នក​ពេញហើយ។ ដើម្បី​បង្កើន​ទំហំ​ផ្ទុក​ទំនេរ សូម​បើក​ទំហំផ្ទុក​បន្ថែម ដើម្បី​ឲ្យ Google អាច​គ្រប់គ្រង និង​បម្រុងទុក​សារ​សារ​ជា​សំឡេង​របស់​អ្នក​បាន។" - "បើក​ទំហំ​ផ្ទុក​បន្ថែម រួច​បម្រុងទុក" - "ប្រអប់​សារ​របស់​អ្នក​ពេញហើយ។ ដើម្បី​បង្កើន​ទំហំ​ផ្ទុក​ទំនេរ សូម​បើក​ទំហំផ្ទុក​បន្ថែម ដើម្បី​ឲ្យ Google អាច​គ្រប់គ្រង និង​បម្រុងទុក​សារ​សារ​ជា​សំឡេង​របស់​អ្នក​បាន។" + + + + + + + + "កំណត់កូដ PIN ​សារ​ជាសំឡេង​របស់​អ្នក" "អ្នក​នឹង​ត្រូវការកូដ PIN សារ​ជាសំឡេងមួយ ​គ្រប់​ពេល​ដែល​អ្នក​ហៅ ​​ដើម្បី​ចូល​ដំណើរការ​សារ​ជា​សំឡេង​របស់​អ្នក។" "បញ្ហាមិនស្គាល់" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-kn/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-kn/strings.xml index 7840fca9a..faa9187b1 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-kn/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-kn/strings.xml @@ -44,10 +44,14 @@ "ನಿಮ್ಮ ಇನ್‌ಬಾಕ್ಸ್ ಪೂರ್ಣವಾಗಿದ್ದಾಗ ಹೊಸ ಧ್ವನಿಮೇಲ್‌ ಅನ್ನು ಸ್ವೀಕರಿಸಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ." "ಹೊಸ ಧ್ವನಿಮೇಲ್‌‌ಗಳನ್ನು ಸ್ವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ" "ನಿಮ್ಮ ಇನ್‌ಬಾಕ್ಸ್‌ ಪೂರ್ಣವಾಗಿದೆ. ಹೊಸ ಧ್ವನಿಮೇಲ್‌ ಸ್ವೀಕರಿಸಲು ಕೆಲವು ಸಂದೇಶಗಳನ್ನು ಅಳಿಸಲು ಪ್ರಯತ್ನಿಸಿ." - "ಹೆಚ್ಚುವರಿ ಸಂಗ್ರಹಣೆ ಮತ್ತು ಬ್ಯಾಕಪ್ ಅನ್ನು ಆನ್ ಮಾಡಿ" - "ನಿಮ್ಮ ಮೇಲ್‌ಬಾಕ್ಸ್ ತುಂಬಿದೆ. ಸ್ಥಳಾವಕಾಶವನ್ನು ತೆರವುಗೊಳಿಸಲು, ಹೆಚ್ಚುವರಿ ಸಂಗ್ರಹವನ್ನು ಆನ್ ಮಾಡಿಕೊಳ್ಳುವ ಮೂಲಕ Google ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್ ಸಂದೇಶಗಳನ್ನು ನಿರ್ವಹಿಸಬಹುದು ಮತ್ತು ಬ್ಯಾಕಪ್ ಮಾಡಬಹುದು." - "ಹೆಚ್ಚುವರಿ ಸಂಗ್ರಹಣೆ ಮತ್ತು ಬ್ಯಾಕಪ್ ಅನ್ನು ಆನ್ ಮಾಡಿ" - "ನಿಮ್ಮ ಮೇಲ್‌ಬಾಕ್ಸ್ ಬಹುತೇಕ ತುಂಬಿದೆ. ಸ್ಥಳಾವಕಾಶವನ್ನು ತೆರವುಗೊಳಿಸಲು, ಹೆಚ್ಚುವರಿ ಸಂಗ್ರಹವನ್ನು ಆನ್ ಮಾಡಿಕೊಳ್ಳುವ ಮೂಲಕ Google ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್ ಸಂದೇಶಗಳನ್ನು ನಿರ್ವಹಿಸಬಹುದು ಮತ್ತು ಬ್ಯಾಕಪ್ ಮಾಡಬಹುದು." + + + + + + + + "ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್ ಪಿನ್ ಹೊಂದಿಸಿ" "ನೀವು ಕರೆ ಮಾಡಿದಾಗ ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್ ಪ್ರವೇಶಿಸಲು ನಿಮಗೆ ಯಾವಾಗಲೂ ಧ್ವನಿಮೇಲ್‌ ಪಿನ್ ಅಗತ್ಯವಿರುತ್ತದೆ." "ಅಪರಿಚಿತ ದೋಷ" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ko/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ko/strings.xml index 092214db1..1492211e5 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-ko/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-ko/strings.xml @@ -44,10 +44,14 @@ "받은편지함이 가득 차면 새로운 음성메시지를 받을 수 없습니다." "새로운 음성메시지를 받을 수 없음" "받은편지함이 가득 찼습니다. 새로운 음성메시지를 받으려면 일부 메시지를 삭제해 보세요." - "추가 저장용량 및 백업 사용" - "음성사서함이 가득 찼습니다. Google에서 음성사서함 메시지를 관리하고 백업할 수 있도록 추가 저장용량을 사용 설정하여 여유 공간을 확보하세요." - "추가 저장용량 및 백업 사용" - "음성사서함이 거의 가득 찼습니다. Google에서 음성사서함 메시지를 관리하고 백업할 수 있도록 추가 저장용량을 사용 설정하여 여유 공간을 확보하세요." + + + + + + + + "음성사서함 PIN 설정" "음성사서함에 액세스하도록 호출할 때마다 음성사서함 PIN이 필요합니다." "알 수 없는 오류" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ky/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ky/strings.xml index 0fffb06d0..4f5d2da92 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-ky/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-ky/strings.xml @@ -44,10 +44,14 @@ "Почтаңыз толуп калса, жаңы үн каттарын ала албай каласыз." "Жаңы үн каттары алынбай жатат" "\"Келген каттар\" кутуңуз толуп калды. Үн каттарын алуу үчүн айрым билдирүүлөрдү өчүрүңүз." - "Кошумча мейкиндик талап кылынат" - "Үн почтаңызда бош орун жок. Үн каттарыңызды башкаруу жана алардын камдык көчүрмөлөрүн сактоо үчүн кошумча мейкиндикти күйгүзүп коюңуз." - "Кошумча мейкиндик талап кылынат" - "Үн почтаңыз толуп калды. Үн каттарыңызды башкаруу жана алардын камдык көчүрмөлөрүн сактоо үчүн кошумча мейкиндикти күйгүзүп коюңуз." + + + + + + + + "Үн почтаңыздын PIN-кодун орнотуңуз" "PIN-код ар чалган сайын үн почтаңызды угуу үчүн керек." "Белгисиз ката" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-lo/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-lo/strings.xml index d6293d2e7..df3b9db45 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-lo/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-lo/strings.xml @@ -44,10 +44,14 @@ "ທ່ານຈະບໍ່ສາມາດຮັບຂໍ້ຄວາມສຽງໃໝ່ໄດ້ຫາກອິນບັອກຂອງທ່ານເຕັມ." "ບໍ່ສາມາດຮັບຂໍ້ຄວາມສຽງໃໝ່" "ອິນບັອກຂອງທ່ານເຕັມແລ້ວ. ໃຫ້ລອງລຶບບາງຂໍ້ຄວາມອອກເພື່ອຮັບຂໍ້ຄວາມສຽງໃໝ່." - "ເປີດໃຊ້ບ່ອນຈັດເກັບຂໍ້ມູນເພີ່ມເຕີມ ແລະ ການສຳຮອງຂໍ້ມູນ" - "ກ່ອງອີເມວຂອງທ່ານເຕັມແລ້ວ. ເພື່ອເພີ່ມບ່ອນຈັດເກັບຂໍ້ມູນ, ໃຫ້ເປີດໃຊ້ບ່ອນຈັດເກັບຂໍ້ມູນເພີ່າມເຕີມເພື່ອໃຫ້ Google ສາມາດຈັດການ ແລະ ສຳຮອງຂໍ້ມູນຂໍ້ຄວາມສຽງຂອງທ່ານໄດ້." - "ເປີດໃຊ້ບ່ອນຈັດເກັບຂໍ້ມູນເພີ່ມເຕີມ ແລະ ການສຳຮອງຂໍ້ມູນ" - "ກ່ອງອີເມວຂອງທ່ານໃກ້ເຕັມແລ້ວ. ເພື່ອເພີ່ມບ່ອນຈັດເກັບຂໍ້ມູນ, ໃຫ້ເປີດໃຊ້ບ່ອນຈັດເກັບຂໍ້ມູນເພີ່າມເຕີມເພື່ອໃຫ້ Google ສາມາດຈັດການ ແລະ ສຳຮອງຂໍ້ມູນຂໍ້ຄວາມສຽງຂອງທ່ານໄດ້." + + + + + + + + "ຕັ້ງລະຫັດ PIN ຂໍ້ຄວາມສຽງຂອງທ່ານ" "ທ່ານຈະຕ້ອງໃຊ້ລະຫັດ PIN ໃນຕອນໃດກໍຕາມທີ່ທ່ານໂທເພື່ອເຂົ້າຟັງຂໍ້ຄວາມສຽງຂອງທ່ານ." "ຄວາມຜິດພາດທີ່ບໍ່ຮູ້ຈັກ" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-lt/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-lt/strings.xml index 92f3316d4..99735bb91 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-lt/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-lt/strings.xml @@ -44,10 +44,14 @@ "Negalėsite gauti naujų balso pašto pranešimų, jei gautuosiuose nebeliks laisvos vietos." "Nepavyksta gauti naujų balso pašto pranešimų" "Gautuosiuose nebėra laisvos vietos. Kad galėtumėte gauti naujus balso pašto pranešimus, pabandykite ištrinti keletą pranešimų." - "Įjunkite papildomos saugyklos vietos ir atsarginės kopijos kūrimo parinktį" - "Jūsų pašto dėžutė pilna. Jei norite atlaisvinti vietos, įjunkite papildomos saugyklos vietos parinktį, kad „Google“ galėtų tvarkyti balso pašto pranešimus ir kurti atsargines jų kopijas." - "Įjunkite papildomos saugyklos vietos ir atsarginės kopijos kūrimo parinktį" - "Jūsų pašto dėžutė beveik pilna. Jei norite atlaisvinti vietos, įjunkite papildomos saugyklos vietos parinktį, kad „Google“ galėtų tvarkyti balso pašto pranešimus ir kurti atsargines jų kopijas." + + + + + + + + "Nustatyti balso pašto PIN kodą" "Jums reikės balso pašto PIN kodo visada, kai skambinsite norėdami pasiekti balso paštą." "Nežinoma klaida" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-lv/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-lv/strings.xml index e27de6f21..769c3b36c 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-lv/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-lv/strings.xml @@ -44,10 +44,14 @@ "Jūs nevarēsiet saņemt jaunus balss pasta ziņojumus, ja iesūtne ir pilna." "Nevar saņemt balss pasta ziņojumus." "Iesūtne ir pilna. Izdzēsiet dažus ziņojumus, lai saņemtu jaunus balss pasta ziņojumus." - "Papildu krātuves un dublēšanas aktivizēšana" - "Jūsu pastkaste ir pilna. Lai atbrīvotu vietu un Google varētu pārvaldīt un dublēt jūsu balss pasta ziņojumus, aktivizējiet papildu krātuvi." - "Papildu krātuves un dublēšanas aktivizēšana" - "Jūsu pastkaste ir gandrīz pilna. Lai atbrīvotu vietu un Google varētu pārvaldīt un dublēt jūsu balss pasta ziņojumus, aktivizējiet papildu krātuvi." + + + + + + + + "Balss pasta PIN iestatīšana" "Lai piekļūtu balss pastam zvanot, būs vajadzīgs balss pasta PIN." "Nezināma kļūda" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-mk/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-mk/strings.xml index 3ff8b8739..8f3cbd09c 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-mk/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-mk/strings.xml @@ -44,10 +44,14 @@ "Нема да може да добивате нова говорна пошта ако вашето приемно сандаче е полно." "Не може да добивате нова говорна пошта" "Вашето приемно сандаче е полно. Обидете се да избришете неколку пораки за да добиете нова говорна пошта." - "Вклучете дополнителен простор и бекап" - "Вашето поштенско сандаче е полно. За да ослободите простор, вклучете дополнителен простор за да може Google да управува и да прави бекап на пораките од вашата говорна пошта." - "Вклучете дополнителен простор и бекап" - "Вашето поштенско сандаче е речиси полно. За да ослободите простор, вклучете дополнителен простор за да може Google да управува и да прави бекап на пораките од вашата говорна пошта." + + + + + + + + "Поставете PIN за говорната пошта" "Секогаш кога ќе повикате за да пристапите до говорната пошта, ќе треба да внесете PIN за говорна пошта." "Непозната грешка" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ml/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ml/strings.xml index 84d221e3d..76de01665 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-ml/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-ml/strings.xml @@ -44,10 +44,14 @@ "ഇൻബോക്‌സ്‌ നിറഞ്ഞിരിക്കുകയാണെങ്കിൽ നിങ്ങൾക്ക് പുതിയ വോയ്‌സ്‌മെയിൽ സ്വീകരിക്കാനാവില്ല." "പുതിയ വോയ്‌സ്‌മെയിലുകൾ സ്വീകരിക്കാനാകുന്നില്ല" "നിങ്ങളുടെ ഇൻബോക്‌സ്‌ നിറഞ്ഞിരിക്കുകയാണ്. പുതിയ വോയ്‌സ്‌മെയിൽ സ്വീകരിക്കാൻ ചില സന്ദേശങ്ങൾ ഇല്ലാതാക്കുന്നത് പരീക്ഷിച്ചുനോക്കൂ." - "അധിക സ്‌റ്റോറേജും ബായ്‌ക്കപ്പും ഓണാക്കുക" - "നിങ്ങളുടെ മെയിൽബോക്‌സ് നിറഞ്ഞിരിക്കുന്നു. ഇടം സൃഷ്‌ടിക്കാൻ, അധിക സ്‌റ്റോറേജ് ഓണാക്കുക, തുടർന്ന് Google-ന് നിങ്ങളുടെ വോയ്‌സ്‌മെയിൽ സന്ദേശങ്ങൾ മാനേജുചെയ്യാനും ബായ്‌ക്കപ്പെടുക്കാനുമാകും." - "അധിക സ്‌റ്റോറേജും ബായ്‌ക്കപ്പും ഓണാക്കുക" - "നിങ്ങളുടെ മെയിൽബോക്‌സ്‌ ഏകദേശം നിറഞ്ഞിരിക്കുന്നു. ഇടം സൃഷ്‌ടിക്കാൻ അധിക സ്‌റ്റോറേജ് ഓണാക്കുക, തുടർന്ന് Google-ന് നിങ്ങളുടെ വോയ്‌സ്‌മെയിൽ സന്ദേശങ്ങൾ മാനേജുചെയ്യാനും ബായ്‌ക്കപ്പെടുക്കാനുമാകും." + + + + + + + + "നിങ്ങളുടെ വോയ്‌സ്മെയിൽ പിൻ സജ്ജമാക്കുക" "വോയ്‌സ്മെയിൽ ആക്‌സസ് ചെയ്യാൻ ശ്രമിക്കുമ്പോഴെല്ലാം നിങ്ങൾക്കൊരു വോയ്‌സ്‌മെയിൽ പിൻ ആവശ്യമാണ്." "തിരിച്ചറിയാനാകാത്ത പിശക്" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-mn/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-mn/strings.xml index 99fc29dc3..8ae1fa7d2 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-mn/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-mn/strings.xml @@ -44,10 +44,14 @@ "Ирсэн имэйл хайрцаг дүүрсэн бол та шинэ дуут шуудан хүлээж авах боломжгүй." "Шинэ дуут шуудан хүлээж авах боломжгүй" "Таны ирсэн имэйл хайрцаг дүүрэн байна. Шинэ дуут шуудан авахын тулд зарим зурвасыг устгаж үзнэ үү." - "Гадаад хадгалах сан болон нөөцлөлтийг асаана уу" - "Таны имэйл хайрцаг дүүрсэн байна. Сул зай гаргахын тулд гадаад хадгалах санг асааж өөрийн дуут шуудангийн зурвасуудыг удирдах, нөөцлөх боломжийг Google-д олгоно уу." - "Гадаад хадгалах сан болон нөөцлөлтийг асаана уу" - "Таны имэйл хайрцаг бараг дүүрсэн байна. Сул зай гаргахын тулд гадаад хадгалах санг асааж өөрийн дуут шуудангийн зурвасуудыг удирдах, нөөцлөх боломжийг Google-д олгоно уу." + + + + + + + + "Өөрийн дуут шуудангийн PIN-г тохируулна уу" "Та дуут шуудандаа хандахаар дуудлага хийх бүрт дуут шуудангийн PIN шаардлагатай болно." "Тодорхойгүй алдаа" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-mr/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-mr/strings.xml index 43c8bddbf..ddb43a4f2 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-mr/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-mr/strings.xml @@ -44,10 +44,14 @@ "आपला इनबॉक्स भरलेला असल्यास आपण नवीन व्हॉइसमेल प्राप्त करण्यात सक्षम असणार नाही." "नवीन व्हॉइसमेल प्राप्त करू शकत नाही" "आपला इनबॉक्स भरलेला आहे. नवीन व्हॉइसमेल प्राप्त करण्यासाठी काही संदेश हटविण्याचा प्रयत्न करा." - "अतिरिक्त संचय आणि बॅक अप चालू करा" - "आपला मेलबॉक्स पूर्ण भरला आहे. स्थान मोकळे करण्यासाठी, अतिरिक्त संचय चालू करा त्यामुळे Google आपले व्हॉइसमेल संदेश व्यवस्थापित करू शकते आणि त्यांचा बॅक अप घेऊ शकते." - "अतिरिक्त संचय आणि बॅक अप चालू करा" - "आपला मेलबॉक्स जवळजवळ पूर्ण भरला आहे. स्थान मोकळे करण्यासाठी, अतिरिक्त संचय चालू करा त्यामुळे Google आपले व्हॉइसमेल संदेश व्यवस्थापित करू शकते आणि त्यांचा बॅक अप घेऊ शकते." + + + + + + + + "आपला व्हॉइसमेल पिन सेट करा" "आपल्या व्हॉइसमेलमध्ये प्रवेश करण्यासाठी आपण कधीही कॉल करता तेव्हा आपल्याला व्हॉइसमेल पिन आवश्यक असेल." "अज्ञात त्रुटी" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ms/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ms/strings.xml index c8b70d55c..e104ab9bc 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-ms/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-ms/strings.xml @@ -44,10 +44,14 @@ "Anda tidak akan dapat menerima mel suara baharu jika peti masuk anda penuh." "Tidak dapat menerima mel suara baharu" "Peti masuk anda penuh. Cuba padamkan beberapa mesej untuk menerima mel suara baharu." - "Hidupkan storan tambahan dan sandaran" - "Peti mel anda penuh. Untuk mengosongkan ruang, hidupkan storan tambahan supaya Google boleh mengurus dan menyandarkan mesej mel suara anda." - "Hidupkan storan tambahan dan sandaran" - "Peti mel anda hampir penuh. Untuk mengosongkan ruang, hidupkan storan tambahan supaya Google boleh mengurus dan menyandarkan mesej mel suara anda." + + + + + + + + "Tetapkan PIN mel suara anda" "Anda memerlukan PIN mel suara setiap kali anda memanggil untuk mengakses mel suara anda." "Ralat tidak diketahui" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-my/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-my/strings.xml index 686d37d10..9c2c7ce1a 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-my/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-my/strings.xml @@ -44,10 +44,14 @@ "သင့်ဝင်စာပြည့်နေပါက အသံမေးလ်အသစ်များ လက်ခံရယူနိုင်မည်မဟုတ်ပါ။" "အသံမေးလ်အသစ် လက်ခံ၍မရပါ" "သင့်ဝင်စာပြည့်နေပါသည်။ အသံမေးလ်အသစ်များ လက်ခံရယူနိုင်ရန် မက်ဆေ့ဂျ်အချို့ဖျက်ကြည့်ပါ။" - "အပိုသိုလှောင်မှုနှင့် မိတ္တူ ဖွင့်ရန်" - "သင့်ဝင်စာ ပြည့်နေပါပြီ။ နေရာလွတ်ရရှိရန်အတွက် Google က သင်၏အသံမေးလ်မက်ဆေ့ဂျ်များကို စီမံခန့်ခွဲပြီး မိတ္တူကူးနိုင်ရန် အပိုသိုလှောင်မှုကို ဖွင့်ပါ။" - "အပိုသိုလှောင်မှုနှင့် မိတ္တူ ဖွင့်ရန်" - "သင့်ဝင်စာ ပြည့်လုပါပြီ။ နေရာလွတ်ရရှိရန်အတွက် Google က သင်၏အသံမေးလ်မက်ဆေ့ဂျ်များကို စီမံခန့်ခွဲပြီး မိတ္တူကူးနိုင်ရန် အပိုသိုလှောင်မှုကို ဖွင့်ပါ။" + + + + + + + + "သင်၏အသံမေးလ်ပင်နံပါတ် သတ်မှတ်ပါ" "သင်၏အသံမေးလ်ကို သုံးစွဲရန်အတွက် သင်ခေါ်ဆိုသည့်အခါတိုင်း အသံမေးလ်ပင်နံပါတ်တစ်ခု လိုအပ်ပါမည်။" "အမျိုးအမည်မသိမှားယွင်းမှု" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-nb/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-nb/strings.xml index 6fc75614a..7f620d942 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-nb/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-nb/strings.xml @@ -44,10 +44,14 @@ "Du kan ikke motta ny talepost hvis innboksen din er full." "Kan ikke motta ny talepost" "Innboksen din er full. Prøv å slette noen meldinger for å motta ny talepost." - "Slå på ekstra lagringsplass og sikkerhetskopiering" - "Talepostkassen din er full. Frigjør plass ved å slå på ekstra lagringsplass og la Google administrere og ta sikkerhetskopi av taleposten din." - "Slå på ekstra lagringsplass og sikkerhetskopiering" - "Talepostkassen din er nesten full. Frigjør plass ved å slå på ekstra lagringsplass og la Google administrere og ta sikkerhetskopi av taleposten din." + + + + + + + + "Angi PIN-koden din for talepost" "Du trenger PIN-koden hver gang du ringer for å sjekke taleposten din." "Ukjent feil" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ne/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ne/strings.xml index ff06fa06c..b84b5473e 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-ne/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-ne/strings.xml @@ -44,10 +44,14 @@ "तपाईंको इनबक्स भरिएको छ भने तपाईंले नयाँ भ्वाइस मेल प्राप्त गर्न सक्नुहुने छैन।" "नयाँ भ्वाइस मेलहरू प्राप्त गर्न सकिँदैन" "तपाईँको इनबक्स भरिएको छ। नयाँ भ्वाइस मेलहरू प्राप्त गर्न कृपया केही सन्देशहरू मेटी हेर्नुहोस्।" - "अतिरिक्त भण्डारण र ब्याकअप सेवा सक्रिय पार्नुहोस्" - "तपाईंको मेल बक्स भरिएको छ। ठाउँ खाली गर्न, Google ले तपाईंका भ्वाइस मेल सन्देशहरूको व्यवस्थापन र ब्याकअप गर्न सकोस् भन्नाका खातिर अतिरिक्त भण्डारणलाई सक्रिय पार्नुहोस्।" - "अतिरिक्त भण्डारण र ब्याकअप सेवा सक्रिय पार्नुहोस्" - "तपाईंको मेल बक्स लगभग भरिएको छ। ठाउँ खाली गर्न Google ले तपाईंका भ्वाइस मेल सन्देशहरूको व्यवस्थापन र ब्याकअप गर्न सकोस् भन्नाका खातिर अतिरिक्त भण्डारणलाई सक्रिय पार्नुहोस्।" + + + + + + + + "आफ्नो भ्वाइस मेलको PIN सेट गर्नुहोस्" "तपाईँलाई जुनसुकै समयमा आफ्नो भ्वाइस मेलमा पहुँच गर्न कल गर्दा भ्वाइस मेल PIN को आवश्यकता पर्दछ।" "अज्ञात त्रुटि" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-nl/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-nl/strings.xml index f74a37d8d..479ea1866 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-nl/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-nl/strings.xml @@ -44,10 +44,14 @@ "Je kunt geen nieuwe voicemails ontvangen als je inbox vol is." "Kan geen nieuwe voicemails ontvangen" "Je inbox is vol. Verwijder enkele berichten om nieuwe voicemails te ontvangen." - "Extra opslag en back-up inschakelen" - "Je mailbox is vol. Als je ruimte wilt vrijmaken, schakel je extra opslagruimte in zodat Google je voicemailberichten kan beheren en er back-ups van kan maken." - "Extra opslag en back-up inschakelen" - "Je mailbox is bijna vol. Als je ruimte wilt vrijmaken, schakel je extra opslagruimte in zodat Google je voicemailberichten kan beheren en er back-ups van kan maken." + + + + + + + + "Een pincode voor je voicemail instellen" "Je hebt een pincode voor de voicemail nodig wanneer je belt om toegang tot je voicemail te krijgen." "Onbekende fout" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-no/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-no/strings.xml index 6fc75614a..7f620d942 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-no/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-no/strings.xml @@ -44,10 +44,14 @@ "Du kan ikke motta ny talepost hvis innboksen din er full." "Kan ikke motta ny talepost" "Innboksen din er full. Prøv å slette noen meldinger for å motta ny talepost." - "Slå på ekstra lagringsplass og sikkerhetskopiering" - "Talepostkassen din er full. Frigjør plass ved å slå på ekstra lagringsplass og la Google administrere og ta sikkerhetskopi av taleposten din." - "Slå på ekstra lagringsplass og sikkerhetskopiering" - "Talepostkassen din er nesten full. Frigjør plass ved å slå på ekstra lagringsplass og la Google administrere og ta sikkerhetskopi av taleposten din." + + + + + + + + "Angi PIN-koden din for talepost" "Du trenger PIN-koden hver gang du ringer for å sjekke taleposten din." "Ukjent feil" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-pa/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-pa/strings.xml index 2a07b459d..f59063117 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-pa/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-pa/strings.xml @@ -44,10 +44,14 @@ "ਜੇਕਰ ਤੁਹਾਡਾ ਇਨਬਾਕਸ ਭਰਿਆ ਹੋਇਆ ਹੈ ਤਾਂ ਤੁਸੀਂ ਨਵੀਂ ਵੌਇਸਮੇਲ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕੋਂਗੇ।" "ਨਵੀਆਂ ਵੌਇਸਮੇਲਾਂ ਨੂੰ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ" "ਤੁਹਾਡਾ ਇਨਬਾਕਸ ਭਰਿਆ ਹੋਇਆ ਹੈ। ਨਵੀਂ ਵੌਇਸਮੇਲ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਕੁਝ ਸੁਨੇਹਿਆਂ ਨੂੰ ਮਿਟਾਉਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ।" - "ਵਾਧੂ ਸਟੋਰੇਜ ਨੂੰ ਚਾਲੂ ਕਰੋ ਅਤੇ ਬੈਕਅੱਪ ਲਓ" - "ਤੁਹਾਡਾ ਮੇਲਬਾਕਸ ਭਰਿਆ ਹੋਇਆ ਹੈ। ਜਗ੍ਹਾ ਖਾਲੀ ਕਰਨ ਲਈ, ਵਾਧੂ ਸਟੋਰੇਜ ਨੂੰ ਚਾਲੂ ਕਰੋ ਤਾਂ ਕਿ Google ਤੁਹਾਡੇ ਵੌਇਸਮੇਲ ਸੁਨੇਹਿਆਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰ ਸਕੇ ਅਤੇ ਬੈਕਅੱਪ ਲੈ ਸਕੇ।" - "ਵਾਧੂ ਸਟੋਰੇਜ ਨੂੰ ਚਾਲੂ ਕਰੋ ਅਤੇ ਬੈਕਅੱਪ ਲਓ" - "ਤੁਹਾਡਾ ਮੇਲਬਾਕਸ ਲਗਭਗ ਭਰਿਆ ਹੋਇਆ ਹੈ। ਜਗ੍ਹਾ ਖਾਲੀ ਕਰਨ ਲਈ, ਵਾਧੂ ਸਟੋਰੇਜ ਨੂੰ ਚਾਲੂ ਕਰੋ ਤਾਂ ਕਿ Google ਤੁਹਾਡੇ ਵੌਇਸਮੇਲ ਸੁਨੇਹਿਆਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰ ਸਕੇ ਅਤੇ ਬੈਕਅੱਪ ਲੈ ਸਕੇ।" + + + + + + + + "ਆਪਣਾ ਵੌਇਸਮੇਲ PIN ਸੈੱਟ ਕਰੋ" "ਜਦੋਂ ਵੀ ਤੁਸੀਂ ਆਪਣੀ ਵੌਇਸਮੇਲ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਲਈ ਕਾਲ ਕਰੋਂਗੇ ਤਾਂ ਤੁਹਾਨੂੰ ਇੱਕ ਵੌਇਸਮੇਲ PIN ਦੀ ਲੋੜ ਪਵੇਗੀ।" "ਅਗਿਆਤ ਗੜਬੜ" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-pl/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-pl/strings.xml index b12290821..0b3f1c2c3 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-pl/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-pl/strings.xml @@ -44,10 +44,14 @@ "Nie otrzymasz nowych wiadomości głosowych, gdy Twoja skrzynka odbiorcza jest pełna." "Nie udało się odebrać nowych wiadomości głosowych" "Twoja skrzynka odbiorcza jest pełna. Spróbuj usunąć kilka wiadomości głosowych, aby odebrać nowe." - "Włącz dodatkowe miejsce i kopię zapasową" - "Twoja skrzynka pocztowa jest pełna. Jeśli chcesz zwolnić miejsce, włącz dodatkowe miejsce, aby umożliwić Google zarządzanie Twoimi wiadomościami głosowymi i tworzenie ich kopii zapasowej." - "Włącz dodatkowe miejsce i kopię zapasową" - "Twoja skrzynka pocztowa jest prawie pełna. Jeśli chcesz zwolnić miejsce, włącz dodatkowe miejsce, aby umożliwić Google zarządzanie Twoimi wiadomościami głosowymi i tworzenie ich kopii zapasowej." + + + + + + + + "Ustaw kod PIN do poczty głosowej" "Za każdym razem, gdy zadzwonisz pod numer poczty głosowej, będzie konieczne wpisanie kodu PIN." "Nieznany błąd" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-pt-rBR/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-pt-rBR/strings.xml index bbe9340a6..424d52a44 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-pt-rBR/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-pt-rBR/strings.xml @@ -44,10 +44,14 @@ "Não será possível receber novos correios de voz se sua Caixa de entrada estiver cheia." "Não é possível receber novos correios de voz" "Sua Caixa de entrada está cheia. Exclua algumas mensagens para receber novos correios de voz." - "Ativar armazenamento extra e fazer backup" - "Sua caixa de correio está cheia. Para liberar espaço, ative o armazenamento extra para que o Google possa gerenciar e fazer o backup das suas mensagens do correio de voz." - "Ativar armazenamento extra e fazer backup" - "Sua caixa de correio está quase cheia. Para liberar espaço, ative o armazenamento extra para que o Google possa gerenciar e fazer o backup das suas mensagens do correio de voz." + + + + + + + + "Definir seu PIN do correio de voz" "Você precisará de um PIN do correio de voz sempre que ligar para acessar seu correio de voz." "Erro desconhecido" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-pt-rPT/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-pt-rPT/strings.xml index 364b2783d..a48929605 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-pt-rPT/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-pt-rPT/strings.xml @@ -44,10 +44,14 @@ "Se a sua caixa de entrada estiver cheia, não irá receber novas mensagens de correio de voz." "Não é possível receber novas mensagens de correio de voz" "A sua caixa de entrada está cheia. Tente eliminar algumas mensagens para receber novas mensagens de correio de voz." - "Ativar o armazenamento adicional e a cópia de segurança" - "A sua caixa de correio está cheia. Para libertar espaço, ative o armazenamento adicional para que a Google possa gerir e criar uma cópia de segurança das suas mensagens de correio de voz." - "Ativar o armazenamento adicional e a cópia de segurança" - "A sua caixa de correio está quase cheia. Para libertar espaço, ative o armazenamento adicional para que a Google possa gerir e criar uma cópia de segurança das suas mensagens de correio de voz." + + + + + + + + "Definir o seu PIN do correio de voz" "Irá precisar de um PIN do correio de voz sempre que efetuar uma chamada para aceder ao seu correio de voz." "Erro desconhecido" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-pt/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-pt/strings.xml index bbe9340a6..424d52a44 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-pt/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-pt/strings.xml @@ -44,10 +44,14 @@ "Não será possível receber novos correios de voz se sua Caixa de entrada estiver cheia." "Não é possível receber novos correios de voz" "Sua Caixa de entrada está cheia. Exclua algumas mensagens para receber novos correios de voz." - "Ativar armazenamento extra e fazer backup" - "Sua caixa de correio está cheia. Para liberar espaço, ative o armazenamento extra para que o Google possa gerenciar e fazer o backup das suas mensagens do correio de voz." - "Ativar armazenamento extra e fazer backup" - "Sua caixa de correio está quase cheia. Para liberar espaço, ative o armazenamento extra para que o Google possa gerenciar e fazer o backup das suas mensagens do correio de voz." + + + + + + + + "Definir seu PIN do correio de voz" "Você precisará de um PIN do correio de voz sempre que ligar para acessar seu correio de voz." "Erro desconhecido" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ro/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ro/strings.xml index 263ab003d..1c16e7041 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-ro/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-ro/strings.xml @@ -44,10 +44,14 @@ "Nu veți putea primi mesaje vocale noi dacă aveți căsuța de mesaje plină." "Nu puteți primi mesaje vocale noi" "Căsuța de mesaje este plină. Încercați să ștergeți câteva mesaje pentru a putea primi unele noi." - "Activați spațiul de stocare suplimentar și backupul" - "Căsuța dvs. de e-mail este plină. Pentru a elibera spațiu, activați spațiul de stocare suplimentar și astfel Google poate să vă gestioneze mesajele vocale și să facă backup pentru acestea." - "Activați spațiul de stocare suplimentar și backupul" - "Căsuța dvs. de e-mail este aproape plină. Pentru a elibera spațiu, activați spațiul de stocare suplimentar și astfel Google poate să vă gestioneze mesajele vocale și să facă backup pentru acestea." + + + + + + + + "Setați un cod PIN pentru mesageria vocală" "Aveți nevoie de un cod PIN pentru mesageria vocală când sunați pentru a o accesa." "Eroare necunoscută" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ru/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ru/strings.xml index 1989f269c..6e404b03e 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-ru/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-ru/strings.xml @@ -44,10 +44,14 @@ "Когда почтовый ящик будет заполнен, вы не сможете получать новые голосовые сообщения." "Нет свободного места" "Почтовый ящик заполнен. Чтобы получать новые голосовые сообщения, удалите старые." - "Требуется дополнительное пространство" - "Почтовый ящик заполнен. Чтобы освободить место, активируйте дополнительное пространство. После этого Google сможет управлять вашими голосовыми сообщениями и сохранять их резервные копии." - "Требуется дополнительное пространство" - "Почтовый ящик почти заполнен. Чтобы освободить место, активируйте дополнительное пространство. После этого Google сможет управлять вашими голосовыми сообщениями и сохранять их резервные копии." + + + + + + + + "Установите PIN-код голосовой почты" "Он будет нужен вам каждый раз, когда вы звоните, чтобы прослушать голосовую почту." "Неизвестная ошибка" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-si/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-si/strings.xml index 2a057facd..848b2b85f 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-si/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-si/strings.xml @@ -44,10 +44,14 @@ "ඔබේ එන ලිපි පිරී ඇති නම් ඔබට නව හඩ තැපැල් ලැබීමට නොහැකි වනු ඇත." "නව හඬ තැපැල් ලැබීමට නොහැකිය" "ඔබේ එන ලිපි පිරී ඇත. නව හඬ තැපැල් ලබා ගැනීමට පණිවිඩ සමහරක් මැකීම උත්සාහ කරන්න." - "අතිරේක ගබඩාව සහ උපස්ථය ක්‍රියාත්මක කරන්න" - "ඔබේ තැපැල් පෙට්ටිය පිරී ඇත. ඉඩ නිදහස් කර ගැනීමට, අතිරේක ගබඩාව ක්‍රියාත්මක කරන්න. එවිට Google හට ඔබේ හඬ තැපැල් පණිවිඩ කළමනාකරණය කිරීමට සහ උපස්ථ කිරීමට හැකිය." - "අතිරේක ගබඩාව සහ උපස්ථය ක්‍රියාත්මක කරන්න" - "ඔබේ තැපැල් පෙට්ටිය මුළුමනින්ම පාහේ පිරී ඇත. ඉඩ නිදහස් කර ගැනීමට, අතිරේක ගබඩාව ක්‍රියාත්මක කරන්න. එවිට Google හට ඔබේ හඬ තැපැල් පණිවිඩ කළමනාකරණය කිරීමට සහ උපස්ථ කිරීමට හැකිය." + + + + + + + + "ඔබේ හඬ තැපැල් PIN අංකය සකසන්න" "ඔබ ඔබේ හඬ තැපෑලට ප්‍රවේශ වීමට අමතන ඕනෑම අවස්ථාවක ඔබට හඬ තැපැල් PIN අංකයක් අවශ්‍ය වනු ඇත." "නොදන්නා දෝෂයකි" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-sk/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-sk/strings.xml index 165a9f58c..ed213a020 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-sk/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-sk/strings.xml @@ -44,10 +44,14 @@ "S plnou doručenou poštou nebudete môcť prijímať nové hlasové správy." "Nemôžete prijímať nové hlasové správy" "Máte plnú doručenú poštu. Skúste odstrániť niekoľko správ, aby ste mohli prijať novú hlasovú správu." - "Zapnite si ďalšie úložisko a zálohovanie" - "Poštovú schránku máte plnú. Ak chcete uvoľniť miesto, zapnite si ďalšie úložisko, aby mohol Google spravovať a zálohovať vaše hlasové správy." - "Zapnite si ďalšie úložisko a zálohovanie" - "Poštovú schránku máte takmer plnú. Ak chcete uvoľniť miesto, zapnite si ďalšie úložisko, aby mohol Google spravovať a zálohovať vaše hlasové správy." + + + + + + + + "Nastaviť kód PIN hlasovej schránky" "Kód PIN hlasovej schránky budete potrebovať vždy, keď zavoláte do svojej hlasovej schránky." "Neznáma chyba" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-sl/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-sl/strings.xml index d4f63c1e4..7a186508a 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-sl/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-sl/strings.xml @@ -44,10 +44,14 @@ "Če je nabiralnik poln, ne boste mogli prejemati novih sporočil v odzivniku." "Vizualnih sporočil v odzivniku ni mogoče prejemati" "Nabiralnik je poln. Poskusite izbrisati nekaj sporočil, da bo mogoče prejeti nova sporočila v odzivniku." - "Vklop dodatnega prostora za shranjevanje in varnostno kopiranje" - "Odzivnik je poln. Če želite sprostiti prostor, vklopite dodaten prostor za shranjevanje, da bo Google lahko upravljal vaša sporočila v odzivniku in jih varnostno kopiral." - "Vklop dodatnega prostora za shranjevanje in varnostno kopiranje" - "Odzivnik je skoraj poln. Če želite sprostiti prostor, vklopite dodaten prostor za shranjevanje, da bo Google lahko upravljal vaša sporočila v odzivniku in jih varnostno kopiral." + + + + + + + + "Nastavite kodo PIN za glasovno pošto" "Kodo PIN za glasovno pošto boste potrebovali ob vsakem klicu za dostop do glasovne pošte." "Neznana napaka" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-sq/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-sq/strings.xml index d400cd8ef..0b33e19c9 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-sq/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-sq/strings.xml @@ -44,10 +44,14 @@ "Nuk mund të marrësh postë zanore të re nëse kutia hyrëse është plot." "Posta zanore nuk mund të merret" "Kutia hyrëse është plot. Provo të fshish disa mesazhe për të marrë postë zanore të re." - "Aktivizo hapësirën ruajtëse shtesë dhe rezervimin" - "Kutia jote postare është plot. Për të liruar hapësirën, aktivizo hapësirën ruajtëse shtesë që Google të mund të menaxhojë dhe të rezervojë mesazhet e tua të postës zanore." - "Aktivizo hapësirën ruajtëse shtesë dhe rezervimin" - "Kutia jote postare është thuajse plot. Për të liruar hapësirën, aktivizo hapësirën ruajtëse shtesë që Google të mund të menaxhojë dhe të rezervojë mesazhet e tua të postës zanore." + + + + + + + + "Vendos kodin PIN të postës zanore" "Të duhet një kod PIN për postën zanore në çdo kohë që telefonon për të hyrë te posta zanore." "Gabim i panjohur" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-sr/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-sr/strings.xml index da1853a14..9ed087a78 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-sr/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-sr/strings.xml @@ -44,10 +44,14 @@ "Нећете моћи да примате нову говорну пошту ако је пријемно сандуче пуно." "Не можете да примате нове говорне поруке" "Пријемно сандуче је пуно. Избришите неке поруке да бисте примили нову говорну пошту." - "Укључите додатни меморијски простор и резервне копије" - "Поштанско сандуче је пуно. Да бисте ослободили простор, укључите додатни меморијски простор, па ће Google моћи да управља вашим говорним порукама и прави њихове резервне копије." - "Укључите додатни меморијски простор и резервне копије" - "Поштанско сандуче је скоро пуно. Да бисте ослободили простор, укључите додатни меморијски простор, па ће Google моћи да управља вашим говорним порукама и прави њихове резервне копије." + + + + + + + + "Подесите PIN говорне поште" "PIN говорне поште вам треба сваки пут кад упућујете позив да бисте приступили говорној пошти." "Непозната грешка" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-sv/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-sv/strings.xml index cfab8305a..0ea6dbe5b 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-sv/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-sv/strings.xml @@ -44,10 +44,14 @@ "Du kan inte ta emot nya röstmeddelanden om inkorgen är full." "Du kan inte ta emot nya röstmeddelanden." "Inkorgen är full. Testa att radera några meddelanden om du vill kunna ta emot nya röstmeddelanden." - "Aktivera extra lagring och säkerhetskopiering" - "Din postlåda är full. Frigör utrymme genom att aktivera extra lagringsutrymme så att Google kan hantera och säkerhetskopiera dina röstmeddelanden." - "Aktivera extra lagring och säkerhetskopiering" - "Din postlåda är nästan full. Frigör utrymme genom att aktivera extra lagringsutrymme så att Google kan hantera och säkerhetskopiera dina röstmeddelanden." + + + + + + + + "Ange PIN-kod till röstbrevlåda" "Du måste ha en PIN-kod till röstbrevlådan varje gång du ringer till den." "Okänt fel" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-sw/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-sw/strings.xml index 56aad211c..85a7165cc 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-sw/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-sw/strings.xml @@ -44,10 +44,14 @@ "Hutaweza kupokea ujumbe mpya wa sauti kama kikasha chako kimejaa." "Huwezi kupokea ujumbe mpya wa sauti" "Kikasha chako kimejaa. Jaribu kufuta baadhi ili uweze kupokea ujumbe mpya wa sauti." - "Washa nafasi ya ziada halafu uhifadhi nakala rudufu" - "Sanduku lako la ujumbe wa sauti limejaa. Ili upate nafasi, washa hifadhi ya ziada ili Google idhibiti na kuweka nakala rudufu ya ujumbe wako wa sauti." - "Washa nafasi ya ziada halafu uhifadhi nakala rudufu" - "Sanduku lako la ujumbe wa sauti linakaribia kujaa. Ili upate nafasi, washa hifadhi ya ziada ili Google idhibiti na kuweka nakala rudufu ya ujumbe wako wa sauti." + + + + + + + + "Weka PIN yako ya ujumbe wa sauti" "Utahitaji PIN ya ujumbe wa sauti wakati wowote unapopiga simu ili ufikie ujumbe wako wa sauti." "Hitilafu isiyojulikana" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ta/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ta/strings.xml index f2613f082..8cbaa8f69 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-ta/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-ta/strings.xml @@ -44,10 +44,14 @@ "இன்பாக்ஸ் நிரம்பியிருந்தால், புதிய குரலஞ்சலைப் பெற முடியாது." "புதிய குரலஞ்சல்களைப் பெற முடியவில்லை" "இன்பாக்ஸ் நிரம்பிவிட்டது. புதிய குரலஞ்சல்களைப் பெற, சில செய்திகளை நீக்கவும்." - "கூடுதல் சேமிப்பகத்தையும் காப்புப் பிரதியையும் இயக்கு" - "உங்கள் அஞ்சல்பெட்டி நிரம்பிவிட்டது. இடத்தைக் காலியாக்க, கூடுதல் சேமிப்பகத்தை இயக்கவும். இதன் மூலம் Google உங்கள் குரலஞ்சல் செய்திகளை நிர்வகித்து, காப்புப் பிரதி எடுக்கலாம்." - "கூடுதல் சேமிப்பகத்தையும் காப்புப் பிரதியையும் இயக்கு" - "உங்கள் அஞ்சல்பெட்டி கிட்டத்தட்ட நிரம்பிவிட்டது. இடத்தைக் காலியாக்க, கூடுதல் சேமிப்பகத்தை இயக்கவும். இதன் மூலம் Google உங்கள் குரலஞ்சல் செய்திகளை நிர்வகித்து, காப்புப் பிரதி எடுக்கலாம்." + + + + + + + + "உங்கள் குரலஞ்சல் பின்னை அமைக்கவும்" "உங்கள் குரலஞ்சலை அணுகுவதற்கு நீங்கள் எப்போது அழைத்தாலும் குரலஞ்சல் பின் அவசியம்." "அறியப்படாத பிழை" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-te/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-te/strings.xml index a881550e8..6608a0d35 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-te/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-te/strings.xml @@ -44,10 +44,14 @@ "మీ ఇన్‌బాక్స్ నిండిపోయి ఉంటే, కొత్త వాయిస్ మెయిల్‌ను స్వీకరించలేరు." "కొత్త వాయిస్ మెయిల్‌లను స్వీకరించలేరు" "మీ ఇన్‌బాక్స్ నిండింది. కొత్త వాయిస్ మెయిల్‌ను స్వీకరించడానికి కొన్ని సందేశాలను తొలగించడానికి ప్రయత్నించండి." - "అదనపు నిల్వ మరియు బ్యాకప్‌ను ఆన్ చేయండి" - "మీ మెయిల్‌బాక్స్ నిండింది. స్థలాన్ని ఖాళీ చేసేందుకు అదనపు నిల్వను ఆన్ చేయండి, దీని వలన Google మీ వాయిస్ మెయిల్ సందేశాలను నిర్వహించగలదు మరియు బ్యాకప్ చేయగలదు." - "అదనపు నిల్వ మరియు బ్యాకప్‌ను ఆన్ చేయండి" - "మీ మెయిల్‌బాక్స్ దాదాపు నిండిపోయింది. స్థలాన్ని ఖాళీ చేసేందుకు అదనపు నిల్వను ఆన్ చేయండి, దీని వలన Google మీ వాయిస్ మెయిల్ సందేశాలను నిర్వహించగలదు మరియు బ్యాకప్ చేయగలదు." + + + + + + + + "మీ వాయిస్ మెయిల్ PIN సెట్ చేయండి" "మీరు మీ వాయిస్ మెయిల్‌ను ప్రాప్యత చేయడానికి కాల్ చేసే ప్రతిసారి మీకు వాయిస్ మెయిల్ PIN అవసరమవుతుంది." "తెలియని లోపం" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-th/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-th/strings.xml index 31302cc65..317a11e80 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-th/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-th/strings.xml @@ -44,10 +44,14 @@ "คุณจะไม่สามารถรับข้อความเสียงใหม่ได้ ถ้ากล่องจดหมายเต็ม" "ไม่สามารถรับข้อความเสียงใหม่ได้" "กล่องจดหมายเต็ม ลองลบข้อความบางส่วนออกเพื่อรับข้อความเสียงใหม่" - "เปิดพื้นที่เก็บข้อมูลเพิ่มเติมและการสำรองข้อมูล" - "กล่องจดหมายของคุณเต็มแล้ว หากต้องการเพิ่มพื้นที่ว่าง โปรดเปิดพื้นที่เก็บข้อมูลเพิ่มเติมเพื่อให้ Google สามารถจัดการและเก็บสำรองข้อความเสียงได้" - "เปิดพื้นที่เก็บข้อมูลเพิ่มเติมและการสำรองข้อมูล" - "กล่องจดหมายของคุณใกล้เต็มแล้ว หากต้องการเพิ่มพื้นที่ว่าง โปรดเปิดพื้นที่เก็บข้อมูลเพิ่มเติมเพื่อให้ Google สามารถจัดการและเก็บสำรองข้อความเสียงได้" + + + + + + + + "ตั้งค่า PIN ข้อความเสียง" "คุณต้องใช้ PIN ข้อความเสียงทุกครั้งที่โทรหาบริการข้อความเสียง" "ข้อผิดพลาดที่ไม่ทราบสาเหตุ" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-tl/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-tl/strings.xml index b99d0c377..7da4bb956 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-tl/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-tl/strings.xml @@ -44,10 +44,14 @@ "Hindi ka makakatanggap ng bagong voicemail kung puno na ang inbox mo." "Hindi makatanggap ng mga bagong voicemail" "Puno na ang inbox mo. Subukang i-delete ang ilang mensahe upang makatanggap ng bagong voicemail." - "I-on ang karagdagang storage at backup" - "Puno na ang iyong mailbox. Upang magbakante ng space, i-on ang karagdagang storage para pamahalaan at i-back up ng Google ang iyong mga mensahe sa voicemail." - "I-on ang karagdagang storage at backup" - "Malapit nang mapuno ang iyong mailbox. Upang magbakante ng space, i-on ang karagdagang storage para pamahalaan at i-back up ng Google ang iyong mga mensahe sa voicemail." + + + + + + + + "Itakda ang iyong PIN sa voicemail" "Kakailanganin mo ng isang PIN sa voicemail sa tuwing tatawag ka upang ma-access ang iyong voicemail." "Hindi alam na error" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-tr/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-tr/strings.xml index be5cbb027..cbf863442 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-tr/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-tr/strings.xml @@ -44,10 +44,14 @@ "Gelen kutunuz dolarsa yeni sesli mesajları alamayacaksınız." "Yeni sesli mesajlar alınamıyor" "Gelen kutunuz doldu. Yeni sesli mesajları almak için bazı mesajları silmeyi deneyin." - "Ekstra depolama alanını ve yedeklemeyi etkinleştirin" - "Posta kutunuz dolu. Google\'ın sesli mesajlarınızı yönetebileceği ve yedekleyebileceği şekilde yer açmak için ekstra depolama alanını etkinleştirin." - "Ekstra depolama alanını ve yedeklemeyi etkinleştirin" - "Posta kutunuz dolmak üzere. Google\'ın sesli mesajlarınızı yönetebileceği ve yedekleyebileceği şekilde yer açmak için ekstra depolama alanını etkinleştirin." + + + + + + + + "Sesli mesaj PIN\'inizi ayarlayın" "Sesli mesajlarınıza erişmek için her aradığınızda bir sesli mesaj PIN\'i girmeniz gerekecek." "Bilinmeyen hata" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-uk/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-uk/strings.xml index 6adf49ab9..58ff67b07 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-uk/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-uk/strings.xml @@ -44,10 +44,14 @@ "Якщо папка вхідної голосової пошти заповнена, ви не зможете отримувати нові повідомлення." "Неможливо отримати нові голосові повідомлення" "Папка вхідної голосової пошти заповнена. Видаліть деякі повідомлення, щоб отримати нові." - "Увімкніть додаткову пам’ять і резервне копіювання" - "У поштовій скриньці не залишилося місця. Щоб звільнити його, увімкніть додаткову пам’ять, і тоді Google почне робити резервні копії вашої голосової пошти й керувати нею." - "Увімкніть додаткову пам’ять і резервне копіювання" - "У поштовій скриньці майже не залишилося місця. Щоб звільнити його, увімкніть додаткову пам’ять, і тоді Google почне робити резервні копії вашої голосової пошти й керувати нею." + + + + + + + + "Установіть PIN-код голосової пошти" "PIN-код буде потрібен під час кожного дзвінка на голосову пошту." "Невідома помилка" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ur/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ur/strings.xml index e6fd9f7a0..3b83e892d 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-ur/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-ur/strings.xml @@ -44,10 +44,14 @@ "اگر آپ کا ان باکس بھرا ہوا ہوگا تو آپ نئی صوتی میل موصول نہیں کر پائیں گے۔" "نئی صوتی میلز موصول نہیں ہو سکتی" "آپ کا ان باکس بھرا ہوا ہے۔ نئی صوتی میل موصول کرنے کیلئے کچھ پیغامات حذف کرنے کی کوشش کریں۔" - "اضافی اسٹوریج اور بیک اپ آن کریں" - "‏آپ کا میل باکس بھر گیا ہے۔ جگہ خالی کرنے کیلئے، اضافی اسٹوریج کو آن کریں تا کہ Google آپ کے صوتی میل پیغامات کا بیک اپ اور ان کا نظم کر سکے۔" - "اضافی اسٹوریج اور بیک اپ آن کریں" - "‏آپ کا میل باکس تقریباً بھر گیا ہے۔ جگہ خالی کرنے کیلئے، اضافی اسٹوریج کو آن کریں تا کہ Google آپ کے صوتی میل پیغامات کا بیک اپ اور ان کا نظم کر سکے۔" + + + + + + + + "‏اپنی صوتی میل PIN سیٹ کریں" "‏آپ جب بھی صوتی میل تک رسائی کیلئے کال کریں گے تو آپ کو صوتی میل PIN چاہئیے ہوگی۔" "نامعلوم خرابی" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-uz/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-uz/strings.xml index 5583e2778..d1fad1e51 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-uz/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-uz/strings.xml @@ -44,10 +44,14 @@ "Agar ovozli pochta qutisi to‘lib qolsa, yangi xabarlar qabul qilishning imkoni bo‘lmay qoladi." "Yangi ovozli pochta xabarlarini qabul qilib bo‘lmadi" "Ovozli pochta qutisi to‘lgan. Yangi xabarlar qabul qilish uchun eskilaridan bir nechtasini o‘chirib tashlang." - "Qo‘shimcha xotira va zaxiralash xususiyatini yoqish" - "Pochtangiz qutisi deyarli to‘lgan. Unda joy bo‘shatish uchun qo‘shimcha xotirani yoqing. Google esa, ovozli xabarlaringiz nusxasini zaxiralashni hamda ularni boshqarishni boshlaydi." - "Qo‘shimcha xotira va zaxiralash xususiyatini yoqish" - "Pochtangiz qutisi deyarli to‘lgan. Unda joy bo‘shatish uchun qo‘shimcha xotirani yoqing. Google esa, ovozli xabarlaringiz nusxasini zaxiralashni hamda ularni boshqarishni boshlaydi." + + + + + + + + "Ovozli pochta uchun PIN kod o‘rnatish" "Ovozli pochtaga har safar qo‘ng‘iroq qilinganda PIN kod so‘raladi." "Noma’lum xatolik" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-vi/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-vi/strings.xml index 029396e31..356d5f4b4 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-vi/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-vi/strings.xml @@ -44,10 +44,14 @@ "Bạn sẽ không thể nhận được thư thoại mới nếu hộp thư đến của bạn đã đầy." "Không nhận được thư thoại mới" "Hộp thư đến của bạn đã đầy. Hãy thử xóa một vài thư để nhận thư thoại mới." - "Bật sao lưu và bộ nhớ bổ sung" - "Hộp thư của bạn đã đầy. Để giải phóng dung lượng, hãy bật bộ nhớ bổ sung để Google có thể quản lý và sao lưu thư thoại của bạn." - "Bật sao lưu và bộ nhớ bổ sung" - "Hộp thư của bạn đã gần đầy. Để giải phóng dung lượng, hãy bật bộ nhớ bổ sung để Google có thể quản lý và sao lưu thư thoại của bạn." + + + + + + + + "Đặt mã PIN thư thoại của bạn" "Bạn cần có mã PIN thư thoại mỗi khi gọi để truy cập thư thoại của mình." "Lỗi không xác định" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-zh-rCN/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-zh-rCN/strings.xml index faa36dead..7826676f5 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-zh-rCN/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-zh-rCN/strings.xml @@ -44,10 +44,14 @@ "如果收件箱已满，您将无法接收新的语音邮件。" "无法接收新的语音邮件" "您的收件箱已满。请尝试删除部分邮件，以便接收新的语音邮件。" - "启用额外存储空间和备份功能" - "您的邮箱已满。要释放空间，请启用额外存储空间，以便 Google 管理和备份您的语音邮件。" - "启用额外存储空间和备份功能" - "您的邮箱快满了。要释放空间，请启用额外存储空间，以便 Google 管理和备份您的语音邮件。" + + + + + + + + "设置语音信箱 PIN 码" "您必须使用语音信箱 PIN 码，才能访问您的语音信箱。" "未知错误" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-zh-rHK/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-zh-rHK/strings.xml index e51a0a902..e3c31eb19 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-zh-rHK/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-zh-rHK/strings.xml @@ -44,10 +44,14 @@ "如果您的收件箱已滿，就無法接收新留言。" "無法接收新留言" "您的收件箱已滿。建議您刪除部分訊息以接收新留言。" - "啟用額外儲存裝置和備份功能" - "您的信箱已滿。若要騰出空間，請啟用額外儲存裝置，以便 Google 管理並備份您的留言訊息。" - "啟用額外儲存裝置和備份功能" - "您的信箱快要滿了。若要騰出空間，請啟用額外儲存裝置，以便 Google 管理並備份您的留言訊息。" + + + + + + + + "設定留言信箱 PIN" "您必須輸入留言信箱 PIN 才可收聽留言。" "不明錯誤" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-zh-rTW/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-zh-rTW/strings.xml index 7f2e1d61c..96d5f9543 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-zh-rTW/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-zh-rTW/strings.xml @@ -44,10 +44,14 @@ "收件匣已滿時無法接收新的語音留言。" "無法接收新的語音留言" "您的收件匣已滿。請刪除部分訊息，以便接收新的語音留言。" - "啟用額外的儲存空間和備份功能" - "你的信箱容量已滿。如要釋出空間，請啟用額外的儲存空間，方便 Google 管理及備份你的語音留言。" - "啟用額外的儲存空間和備份功能" - "你的信箱容量幾乎已滿。如要釋出空間，請啟用額外的儲存空間，方便 Google 管理及備份你的語音留言。" + + + + + + + + "設定您的語音信箱 PIN 碼" "您必須輸入語音信箱 PIN 碼才能存取您的語音信箱。" "不明錯誤" diff --git a/java/com/android/dialer/app/voicemail/error/res/values-zu/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-zu/strings.xml index 8d3cd79ea..20f7f1659 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-zu/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-zu/strings.xml @@ -44,10 +44,14 @@ "Ngeke uze ukwazi ukuthola ivoyisimeyili entsha uma ibhokisi lakho lokungenayo ligcwele." "Ayikwazi ukwamukela amavoyisimeyili amasha" "Ibhokisi lakho lokungenayo ligcwele. Zama ukususa eminye imilayezo ukuze uthole ivoyisimeyili entsha." - "Vula isitoreji esingeziwe nesipele" - "Ibhokisi lakho lemeyili ligcwele. Ukuze ukhulule isikhala, vula isitoreji esingeziwe ukuze i-Google ikwazi ukuphatha futhi yenze isipele imilTo free up space, turn on extra storage so Google can manage and backup your voicemail messages." - "Vula isitoreji esingeziwe nesipele" - "Ibhokisi lakho lemeyili cishe ligcwele. Ukuze ukhulule isikhala, vula isitoreji esingeziwe ukuze i-Google ikwazi ukuphatha nokwenza isipele imilayezo yakho yevoyisimeyili." + + + + + + + + "Setha iphini yakho yevoyisimeyili" "Udinga iphini yevoyisimeyili noma kunini uma wenza ikholi ukufinyelela ivoyisimeyili yakho." "Iphutha elingaziwa" diff --git a/java/com/android/dialer/app/voicemail/error/res/values/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values/strings.xml index 94d3dba11..d14652553 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values/strings.xml @@ -54,11 +54,11 @@ Can\'t receive new voicemails Your inbox is full. Try deleting some messages to receive new voicemail. - Turn on extra storage and backup - Your mailbox is full. To free up space, turn on extra storage so Google can manage and backup your voicemail messages. + [Experimental] Turn on extra storage and backup + Your mailbox is full. To free up space, turn on extra storage so Google can manage and backup your voicemail messages. This feature is currently being tested and will potentially delete voicemails from your voicemail server, and we do not promise to support this feature in the future. We would love your feedback though. - Turn on extra storage and backup - Your mailbox is almost full. To free up space, turn on extra storage so Google can manage and backup your voicemail messages. + [Experimental] Turn on extra storage and backup + Your mailbox is almost full. To free up space, turn on extra storage so Google can manage and backup your voicemail messages. This feature is currently being tested and will potentially delete voicemails from your voicemail server, and we do not promise to support this feature in the future. We would love your feedback though. Set your voicemail PIN You\'ll need a voicemail PIN anytime you call to access your voicemail. diff --git a/java/com/android/dialer/binary/aosp/AospDialerApplication.java b/java/com/android/dialer/binary/aosp/AospDialerApplication.java index f657a3987..4ca94e277 100644 --- a/java/com/android/dialer/binary/aosp/AospDialerApplication.java +++ b/java/com/android/dialer/binary/aosp/AospDialerApplication.java @@ -26,5 +26,10 @@ import com.android.dialer.inject.ContextModule; */ public class AospDialerApplication extends DialerApplication { - + /** Returns a new instance of the root component for the AOSP Dialer. */ + @Override + @NonNull + protected Object buildRootComponent() { + return DaggerAospDialerRootComponent.builder().contextModule(new ContextModule(this)).build(); + } } diff --git a/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java b/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java index 8628e90c2..54fedc2be 100644 --- a/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java +++ b/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java @@ -27,4 +27,15 @@ import dagger.Component; import javax.inject.Singleton; /** Root component for the AOSP Dialer application. */ +@Singleton +@Component( + modules = { + ContextModule.class, + SimulatorModule.class, + StubCallLocationModule.class, + StubEnrichedCallModule.class, + StubMapsModule.class, + VoicemailModule.class + } +) public interface AospDialerRootComponent extends BaseDialerRootComponent {} diff --git a/java/com/android/dialer/binary/common/DialerApplication.java b/java/com/android/dialer/binary/common/DialerApplication.java index c0be4328c..cc7befc90 100644 --- a/java/com/android/dialer/binary/common/DialerApplication.java +++ b/java/com/android/dialer/binary/common/DialerApplication.java @@ -22,9 +22,10 @@ import android.preference.PreferenceManager; import android.support.annotation.NonNull; import com.android.dialer.blocking.BlockedNumbersAutoMigrator; import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler; +import com.android.dialer.inject.HasRootComponent; /** A common application subclass for all Dialer build variants. */ -public abstract class DialerApplication extends Application { +public abstract class DialerApplication extends Application implements HasRootComponent { private volatile Object rootComponent; @@ -40,4 +41,27 @@ public abstract class DialerApplication extends Application { Trace.endSection(); } + /** + * Returns a new instance of the root component for the application. Sub classes should define a + * root component that extends all the sub components "HasComponent" intefaces. The component + * should specify all modules that the application supports and provide stubs for the remainder. + */ + @NonNull + protected abstract Object buildRootComponent(); + + /** Returns a cached instance of application's root component. */ + @Override + @NonNull + public final Object component() { + Object result = rootComponent; + if (result == null) { + synchronized (this) { + result = rootComponent; + if (result == null) { + rootComponent = result = buildRootComponent(); + } + } + } + return result; + } } diff --git a/java/com/android/dialer/callcomposer/CallComposerActivity.java b/java/com/android/dialer/callcomposer/CallComposerActivity.java index f73563ff8..9fb6c38f4 100644 --- a/java/com/android/dialer/callcomposer/CallComposerActivity.java +++ b/java/com/android/dialer/callcomposer/CallComposerActivity.java @@ -49,7 +49,6 @@ import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toolbar; import com.android.contacts.common.ContactPhotoManager; -import com.android.contacts.common.util.UriUtils; import com.android.dialer.callcomposer.CallComposerFragment.CallComposerListener; import com.android.dialer.callcomposer.nano.CallComposerContact; import com.android.dialer.callcomposer.util.CopyAndResizeImageTask; @@ -59,7 +58,6 @@ import com.android.dialer.callintent.nano.CallInitiationType; import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; import com.android.dialer.common.UiUtil; -import com.android.dialer.compat.CompatUtils; import com.android.dialer.constants.Constants; import com.android.dialer.enrichedcall.EnrichedCallComponent; import com.android.dialer.enrichedcall.EnrichedCallManager; @@ -305,7 +303,7 @@ public class CallComposerActivity extends AppCompatActivity @Override public void onCopyFailed(Throwable throwable) { - // TODO(b/33753902) + // TODO(b/34279096) - gracefully handle message failure LogUtil.e("CallComposerActivity.onCopyFailed", "copy Failed", throwable); } }) @@ -473,21 +471,16 @@ public class CallComposerActivity extends AppCompatActivity return getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE; } - /** - * Populates the contact info fields based on the current contact information. Copied from {@link - * com.android.contacts.common.dialog.CallSubjectDialog}. - */ + /** Populates the contact info fields based on the current contact information. */ private void updateContactInfo() { - if (contact.contactUri != null) { - setPhoto( - contact.photoId, - Uri.parse(contact.photoUri), - Uri.parse(contact.contactUri), - contact.nameOrNumber, - contact.isBusiness); - } else { - contactPhoto.setVisibility(View.GONE); - } + ContactPhotoManager.getInstance(this) + .loadDialerThumbnail( + contactPhoto, + contact.contactUri == null ? null : Uri.parse(contact.contactUri), + contact.photoId, + contact.nameOrNumber, + contact.contactType); + nameView.setText(contact.nameOrNumber); getActionBar().setTitle(contact.nameOrNumber); if (!TextUtils.isEmpty(contact.numberLabel) && !TextUtils.isEmpty(contact.displayNumber)) { @@ -505,43 +498,6 @@ public class CallComposerActivity extends AppCompatActivity } } - /** - * Sets the photo on the quick contact galleryIcon. Copied from {@link - * com.android.contacts.common.dialog.CallSubjectDialog}. - */ - private void setPhoto( - long photoId, Uri photoUri, Uri contactUri, String displayName, boolean isBusiness) { - contactPhoto.assignContactUri(contactUri); - if (CompatUtils.isLollipopCompatible()) { - contactPhoto.setOverlay(null); - } - - int contactType; - if (isBusiness) { - contactType = ContactPhotoManager.TYPE_BUSINESS; - } else { - contactType = ContactPhotoManager.TYPE_DEFAULT; - } - - String lookupKey = null; - if (contactUri != null) { - lookupKey = UriUtils.getLookupKeyFromUri(contactUri); - } - - ContactPhotoManager.DefaultImageRequest request = - new ContactPhotoManager.DefaultImageRequest( - displayName, lookupKey, contactType, true /* isCircular */); - - if (photoId == 0 && photoUri != null) { - contactPhoto.setImageDrawable( - getDrawable(R.drawable.product_logo_avatar_anonymous_color_120)); - } else { - ContactPhotoManager.getInstance(this) - .loadThumbnail( - contactPhoto, photoId, false /* darkTheme */, true /* isCircular */, request); - } - } - /** Animates compose UI into view */ private void runEntranceAnimation() { if (!shouldAnimateEntrance) { diff --git a/java/com/android/dialer/callcomposer/CameraComposerFragment.java b/java/com/android/dialer/callcomposer/CameraComposerFragment.java index 583fb5446..ebd032199 100644 --- a/java/com/android/dialer/callcomposer/CameraComposerFragment.java +++ b/java/com/android/dialer/callcomposer/CameraComposerFragment.java @@ -366,7 +366,10 @@ public class CameraComposerFragment extends CallComposerFragment @Override public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - outState.putInt(CAMERA_DIRECTION_KEY, CameraManager.get().getCameraInfo().facing); + + CameraInfo cameraInfo = CameraManager.get().getCameraInfo(); + int facing = cameraInfo == null ? CameraInfo.CAMERA_FACING_BACK : cameraInfo.facing; + outState.putInt(CAMERA_DIRECTION_KEY, facing); outState.putParcelable(CAMERA_URI_KEY, cameraUri); } diff --git a/java/com/android/dialer/callcomposer/GalleryComposerFragment.java b/java/com/android/dialer/callcomposer/GalleryComposerFragment.java index b53d6a9d6..1d684a2d3 100644 --- a/java/com/android/dialer/callcomposer/GalleryComposerFragment.java +++ b/java/com/android/dialer/callcomposer/GalleryComposerFragment.java @@ -277,14 +277,14 @@ public class GalleryComposerFragment extends CallComposerFragment @Override public void onCopyFailed(Throwable throwable) { - // TODO(b/33753902) + // TODO(b/34279096) - gracefully handle message failure LogUtil.e( "GalleryComposerFragment.onFailure", "Data preparation failed", throwable); } }) .execute(); } else { - // TODO(b/33753902) + // TODO(b/34279096) - gracefully handle message failure } } } diff --git a/java/com/android/dialer/callcomposer/camera/CameraManager.java b/java/com/android/dialer/callcomposer/camera/CameraManager.java index 87cd16a99..4cc08ba32 100644 --- a/java/com/android/dialer/callcomposer/camera/CameraManager.java +++ b/java/com/android/dialer/callcomposer/camera/CameraManager.java @@ -23,6 +23,7 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Looper; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; import android.text.TextUtils; import android.view.MotionEvent; @@ -305,6 +306,7 @@ public class CameraManager implements FocusOverlayManager.Listener { } } + @Nullable @VisibleForTesting public CameraInfo getCameraInfo() { if (mCameraIndex == NO_CAMERA_SELECTED) { @@ -516,7 +518,7 @@ public class CameraManager implements FocusOverlayManager.Listener { final WindowManager windowManager = (WindowManager) mCameraPreview.getContext().getSystemService(Context.WINDOW_SERVICE); - int degrees = 0; + int degrees; switch (windowManager.getDefaultDisplay().getRotation()) { case Surface.ROTATION_0: degrees = 0; @@ -530,6 +532,8 @@ public class CameraManager implements FocusOverlayManager.Listener { case Surface.ROTATION_270: degrees = 270; break; + default: + throw Assert.createAssertionFailException(""); } // The display orientation of the camera (this controls the preview image). diff --git a/java/com/android/dialer/callcomposer/nano/CallComposerContact.java b/java/com/android/dialer/callcomposer/nano/CallComposerContact.java index acb71a0aa..dcda571e2 100644 --- a/java/com/android/dialer/callcomposer/nano/CallComposerContact.java +++ b/java/com/android/dialer/callcomposer/nano/CallComposerContact.java @@ -48,9 +48,6 @@ public final class CallComposerContact // optional string name_or_number = 4; public java.lang.String nameOrNumber; - // optional bool is_business = 5; - public boolean isBusiness; - // optional string number = 6; public java.lang.String number; @@ -60,6 +57,9 @@ public final class CallComposerContact // optional string number_label = 8; public java.lang.String numberLabel; + // optional int32 contact_type = 9; + public int contactType; + // @@protoc_insertion_point(class_scope:com.android.dialer.callcomposer.CallComposerContact) public CallComposerContact() { @@ -71,10 +71,10 @@ public final class CallComposerContact photoUri = ""; contactUri = ""; nameOrNumber = ""; - isBusiness = false; number = ""; displayNumber = ""; numberLabel = ""; + contactType = 0; unknownFieldData = null; cachedSize = -1; return this; @@ -95,9 +95,6 @@ public final class CallComposerContact if (this.nameOrNumber != null && !this.nameOrNumber.equals("")) { output.writeString(4, this.nameOrNumber); } - if (this.isBusiness != false) { - output.writeBool(5, this.isBusiness); - } if (this.number != null && !this.number.equals("")) { output.writeString(6, this.number); } @@ -107,6 +104,9 @@ public final class CallComposerContact if (this.numberLabel != null && !this.numberLabel.equals("")) { output.writeString(8, this.numberLabel); } + if (this.contactType != 0) { + output.writeInt32(9, this.contactType); + } super.writeTo(output); } @@ -130,10 +130,6 @@ public final class CallComposerContact com.google.protobuf.nano.CodedOutputByteBufferNano.computeStringSize( 4, this.nameOrNumber); } - if (this.isBusiness != false) { - size += - com.google.protobuf.nano.CodedOutputByteBufferNano.computeBoolSize(5, this.isBusiness); - } if (this.number != null && !this.number.equals("")) { size += com.google.protobuf.nano.CodedOutputByteBufferNano.computeStringSize(6, this.number); } @@ -146,6 +142,10 @@ public final class CallComposerContact size += com.google.protobuf.nano.CodedOutputByteBufferNano.computeStringSize(8, this.numberLabel); } + if (this.contactType != 0) { + size += + com.google.protobuf.nano.CodedOutputByteBufferNano.computeInt32Size(9, this.contactType); + } return size; } @@ -184,11 +184,6 @@ public final class CallComposerContact this.nameOrNumber = input.readString(); break; } - case 40: - { - this.isBusiness = input.readBool(); - break; - } case 50: { this.number = input.readString(); @@ -204,6 +199,11 @@ public final class CallComposerContact this.numberLabel = input.readString(); break; } + case 72: + { + this.contactType = input.readInt32(); + break; + } } } } diff --git a/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java index b1a70af0c..55447f8ff 100644 --- a/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java +++ b/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java @@ -17,9 +17,6 @@ package com.android.dialer.calldetails; import android.content.Context; -import android.content.res.Resources; -import android.graphics.PorterDuff; -import android.graphics.drawable.Drawable; import android.net.Uri; import android.provider.CallLog.Calls; import android.support.annotation.ColorInt; @@ -33,10 +30,12 @@ import android.widget.TextView; import com.android.dialer.calldetails.nano.CallDetailsEntries.CallDetailsEntry; import com.android.dialer.calllogutils.CallEntryFormatter; import com.android.dialer.calllogutils.CallTypeHelper; +import com.android.dialer.calllogutils.CallTypeIconsView; import com.android.dialer.common.LogUtil; import com.android.dialer.compat.AppCompatConstants; import com.android.dialer.enrichedcall.historyquery.proto.nano.HistoryResult; import com.android.dialer.enrichedcall.historyquery.proto.nano.HistoryResult.Type; +import com.android.dialer.oem.MotorolaUtils; import com.android.dialer.util.CallUtil; import com.android.dialer.util.DialerUtils; import com.android.dialer.util.IntentUtil; @@ -44,7 +43,7 @@ import com.android.dialer.util.IntentUtil; /** ViewHolder for call entries in {@link CallDetailsActivity}. */ public class CallDetailsEntryViewHolder extends ViewHolder { - private final ImageView callTypeIcon; + private final CallTypeIconsView callTypeIcon; private final TextView callTypeText; private final TextView callTime; private final TextView callDuration; @@ -54,6 +53,7 @@ public class CallDetailsEntryViewHolder extends ViewHolder { private final View multimediaDivider; private final TextView multimediaDetails; + private final TextView postCallNote; private final ImageView multimediaImage; @@ -67,7 +67,7 @@ public class CallDetailsEntryViewHolder extends ViewHolder { super(container); context = container.getContext(); - callTypeIcon = (ImageView) container.findViewById(R.id.call_direction); + callTypeIcon = (CallTypeIconsView) container.findViewById(R.id.call_direction); callTypeText = (TextView) container.findViewById(R.id.call_type); callTime = (TextView) container.findViewById(R.id.call_time); callDuration = (TextView) container.findViewById(R.id.call_duration); @@ -76,6 +76,7 @@ public class CallDetailsEntryViewHolder extends ViewHolder { multimediaDetailsContainer = container.findViewById(R.id.ec_container); multimediaDivider = container.findViewById(R.id.divider); multimediaDetails = (TextView) container.findViewById(R.id.multimedia_details); + postCallNote = (TextView) container.findViewById(R.id.post_call_note); multimediaImage = (ImageView) container.findViewById(R.id.multimedia_image); multimediaAttachmentsNumber = (TextView) container.findViewById(R.id.multimedia_attachments_number); @@ -93,11 +94,10 @@ public class CallDetailsEntryViewHolder extends ViewHolder { boolean isPulledCall = (entry.features & Calls.FEATURES_PULLED_EXTERNALLY) == Calls.FEATURES_PULLED_EXTERNALLY; - Drawable callIcon = getIconForCallType(context.getResources(), callType); - int color = getColorForCallType(context, callType); - callIcon.setColorFilter(color, PorterDuff.Mode.MULTIPLY); - callTime.setTextColor(color); - callTypeIcon.setImageDrawable(callIcon); + callTime.setTextColor(getColorForCallType(context, callType)); + callTypeIcon.add(callType); + callTypeIcon.setShowVideo((entry.features & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO); + callTypeIcon.setShowHd(MotorolaUtils.shouldShowHdIconInCallLog(context, entry.features)); callTypeText.setText(callTypeHelper.getCallTypeText(callType, isVideoCall, isPulledCall)); callTime.setText(CallEntryFormatter.formatDate(context, entry.date)); @@ -118,8 +118,6 @@ public class CallDetailsEntryViewHolder extends ViewHolder { multimediaDetailsContainer.setVisibility(View.GONE); } else { - // TODO: b/36158891 Add room for 2 pieces of enriched call data. It's possible - // to have both call composer data and post call data for a single call. HistoryResult historyResult = entry.historyResults[0]; multimediaDetailsContainer.setVisibility(View.VISIBLE); multimediaDetailsContainer.setOnClickListener( @@ -146,6 +144,15 @@ public class CallDetailsEntryViewHolder extends ViewHolder { } else { LogUtil.i("CallDetailsEntryViewHolder.setMultimediaDetails", "no text"); } + + if (entry.historyResults.length > 1 && !TextUtils.isEmpty(entry.historyResults[1].text)) { + LogUtil.i("CallDetailsEntryViewHolder.setMultimediaDetails", "showing post call note"); + postCallNote.setVisibility(View.VISIBLE); + postCallNote.setText( + context.getString(R.string.message_in_quotes, entry.historyResults[1].text)); + } else { + LogUtil.i("CallDetailsEntryViewHolder.setMultimediaDetails", "no post call note"); + } } } @@ -154,26 +161,6 @@ public class CallDetailsEntryViewHolder extends ViewHolder { || historyResult.type == Type.INCOMING_CALL_COMPOSER; } - private static Drawable getIconForCallType(Resources resources, int callType) { - switch (callType) { - case AppCompatConstants.CALLS_OUTGOING_TYPE: - return resources.getDrawable(R.drawable.quantum_ic_call_made_white_24); - case AppCompatConstants.CALLS_BLOCKED_TYPE: - return resources.getDrawable(R.drawable.quantum_ic_block_white_24); - case AppCompatConstants.CALLS_INCOMING_TYPE: - case AppCompatConstants.CALLS_ANSWERED_EXTERNALLY_TYPE: - case AppCompatConstants.CALLS_REJECTED_TYPE: - return resources.getDrawable(R.drawable.quantum_ic_call_received_white_24); - case AppCompatConstants.CALLS_MISSED_TYPE: - default: - // It is possible for users to end up with calls with unknown call types in their - // call history, possibly due to 3rd party call log implementations (e.g. to - // distinguish between rejected and missed calls). Instead of crashing, just - // assume that all unknown call types are missed calls. - return resources.getDrawable(R.drawable.quantum_ic_call_missed_white_24); - } - } - private static @ColorInt int getColorForCallType(Context context, int callType) { switch (callType) { case AppCompatConstants.CALLS_OUTGOING_TYPE: diff --git a/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java index 1679c2baf..416c521a2 100644 --- a/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java +++ b/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java @@ -25,7 +25,6 @@ import android.view.View.OnClickListener; import android.widget.QuickContactBadge; import android.widget.TextView; import com.android.contacts.common.ContactPhotoManager; -import com.android.contacts.common.util.UriUtils; import com.android.dialer.callcomposer.nano.CallComposerContact; import com.android.dialer.callintent.CallIntentBuilder; import com.android.dialer.callintent.nano.CallInitiationType; @@ -56,18 +55,16 @@ public class CallDetailsHeaderViewHolder extends RecyclerView.ViewHolder callBackButton.setOnClickListener(this); } - /** - * Populates the contact info fields based on the current contact information. Copied from {@link - * com.android.contacts.common.dialog.CallSubjectDialog}. - */ + /** Populates the contact info fields based on the current contact information. */ public void updateContactInfo(CallComposerContact contact) { this.contact = contact; - setPhoto( - contact.photoId, - Uri.parse(contact.photoUri), - Uri.parse(contact.contactUri), - contact.nameOrNumber, - contact.isBusiness); + ContactPhotoManager.getInstance(context) + .loadDialerThumbnail( + contactPhoto, + contact.contactUri == null ? null : Uri.parse(contact.contactUri), + contact.photoId, + contact.nameOrNumber, + contact.contactType); nameView.setText(contact.nameOrNumber); if (!TextUtils.isEmpty(contact.numberLabel) && !TextUtils.isEmpty(contact.displayNumber)) { @@ -84,33 +81,6 @@ public class CallDetailsHeaderViewHolder extends RecyclerView.ViewHolder } } - /** - * Sets the photo on the quick contact galleryIcon. Copied from {@link - * com.android.contacts.common.dialog.CallSubjectDialog}. - */ - private void setPhoto( - long photoId, Uri photoUri, Uri contactUri, String displayName, boolean isBusiness) { - contactPhoto.assignContactUri(contactUri); - contactPhoto.setOverlay(null); - - int contactType = - isBusiness ? ContactPhotoManager.TYPE_BUSINESS : ContactPhotoManager.TYPE_DEFAULT; - String lookupKey = contactUri == null ? null : UriUtils.getLookupKeyFromUri(contactUri); - - ContactPhotoManager.DefaultImageRequest request = - new ContactPhotoManager.DefaultImageRequest( - displayName, lookupKey, contactType, true /* isCircular */); - - if (photoId == 0 && photoUri != null) { - contactPhoto.setImageDrawable( - context.getDrawable(R.drawable.product_logo_avatar_anonymous_color_120)); - } else { - ContactPhotoManager.getInstance(context) - .loadThumbnail( - contactPhoto, photoId, false /* darkTheme */, true /* isCircular */, request); - } - } - @Override public void onClick(View view) { if (view == callBackButton) { diff --git a/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml b/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml index 7f8bb8087..3f2ba7534 100644 --- a/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml +++ b/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml @@ -16,29 +16,30 @@ --> - + app:useLargeIcons="true"/> @@ -56,18 +57,29 @@ android:id="@+id/ec_container" android:layout_height="@dimen/ec_container_height" android:layout_width="match_parent" - android:layout_marginStart="@dimen/ec_text_left_margin" + android:layout_marginStart="@dimen/call_entry_text_left_margin" android:layout_below="@+id/call_time" android:visibility="gone"/> + + \ No newline at end of file diff --git a/java/com/android/dialer/calldetails/res/values/dimens.xml b/java/com/android/dialer/calldetails/res/values/dimens.xml index 59f237103..2ca7ea83a 100644 --- a/java/com/android/dialer/calldetails/res/values/dimens.xml +++ b/java/com/android/dialer/calldetails/res/values/dimens.xml @@ -29,12 +29,12 @@ 24dp 16dp 14dp - 32dp + 72dp 12sp 48dp - 72dp + 73dp 40dp 8dp \ No newline at end of file diff --git a/java/com/android/dialer/calllogutils/CallTypeIconsView.java b/java/com/android/dialer/calllogutils/CallTypeIconsView.java index 61208bc9a..5644dc865 100644 --- a/java/com/android/dialer/calllogutils/CallTypeIconsView.java +++ b/java/com/android/dialer/calllogutils/CallTypeIconsView.java @@ -17,6 +17,7 @@ package com.android.dialer.calllogutils; import android.content.Context; +import android.content.res.TypedArray; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; @@ -32,12 +33,18 @@ import java.util.List; /** * View that draws one or more symbols for different types of calls (missed calls, outgoing etc). - * The symbols are set up horizontally. As this view doesn't create subviews, it is better suited - * for ListView-recycling that a regular LinearLayout using ImageViews. + * The symbols are set up horizontally. If {@code useLargeIcons} is set in the xml attributes, + * alternatively this view will only render one icon (Call Type, HD or Video). + * + *

As this view doesn't create subviews, it is better suited for ListView-recycling than a + * regular LinearLayout using ImageViews. */ public class CallTypeIconsView extends View { + private final boolean useLargeIcons; + private static Resources sResources; + private static Resources sLargeResouces; private List mCallTypes = new ArrayList<>(3); private boolean mShowVideo = false; private boolean mShowHd = false; @@ -50,8 +57,15 @@ public class CallTypeIconsView extends View { public CallTypeIconsView(Context context, AttributeSet attrs) { super(context, attrs); + TypedArray typedArray = + context.getTheme().obtainStyledAttributes(attrs, R.styleable.CallTypeIconsView, 0, 0); + useLargeIcons = typedArray.getBoolean(R.styleable.CallTypeIconsView_useLargeIcons, false); + typedArray.recycle(); if (sResources == null) { - sResources = new Resources(context); + sResources = new Resources(context, false); + } + if (sLargeResouces == null && useLargeIcons) { + sLargeResouces = new Resources(context, true); } } @@ -67,7 +81,7 @@ public class CallTypeIconsView extends View { final Drawable drawable = getCallTypeDrawable(callType); mWidth += drawable.getIntrinsicWidth() + sResources.iconMargin; - mHeight = Math.max(mHeight, drawable.getIntrinsicHeight()); + mHeight = Math.max(mHeight, drawable.getIntrinsicWidth()); invalidate(); } @@ -112,24 +126,25 @@ public class CallTypeIconsView extends View { } private Drawable getCallTypeDrawable(int callType) { + Resources resources = useLargeIcons ? sLargeResouces : sResources; switch (callType) { case AppCompatConstants.CALLS_INCOMING_TYPE: case AppCompatConstants.CALLS_ANSWERED_EXTERNALLY_TYPE: - return sResources.incoming; + return resources.incoming; case AppCompatConstants.CALLS_OUTGOING_TYPE: - return sResources.outgoing; + return resources.outgoing; case AppCompatConstants.CALLS_MISSED_TYPE: - return sResources.missed; + return resources.missed; case AppCompatConstants.CALLS_VOICEMAIL_TYPE: - return sResources.voicemail; + return resources.voicemail; case AppCompatConstants.CALLS_BLOCKED_TYPE: - return sResources.blocked; + return resources.blocked; default: // It is possible for users to end up with calls with unknown call types in their // call history, possibly due to 3rd party call log implementations (e.g. to // distinguish between rejected and missed calls). Instead of crashing, just // assume that all unknown call types are missed calls. - return sResources.missed; + return resources.missed; } } @@ -140,27 +155,32 @@ public class CallTypeIconsView extends View { @Override protected void onDraw(Canvas canvas) { + Resources resources = useLargeIcons ? sLargeResouces : sResources; int left = 0; - for (Integer callType : mCallTypes) { - final Drawable drawable = getCallTypeDrawable(callType); - final int right = left + drawable.getIntrinsicWidth(); - drawable.setBounds(left, 0, right, drawable.getIntrinsicHeight()); - drawable.draw(canvas); - left = right + sResources.iconMargin; + // If we are using large icons, we should only show one icon (video, hd or call type) with + // priority give to HD or Video. So we skip the call type icon if we plan to show them. + if (!useLargeIcons || !(mShowHd || mShowVideo)) { + for (Integer callType : mCallTypes) { + final Drawable drawable = getCallTypeDrawable(callType); + final int right = left + drawable.getIntrinsicWidth(); + drawable.setBounds(left, 0, right, drawable.getIntrinsicHeight()); + drawable.draw(canvas); + left = right + resources.iconMargin; + } } // If showing the video call icon, draw it scaled appropriately. if (mShowVideo) { - final Drawable drawable = sResources.videoCall; - final int right = left + sResources.videoCall.getIntrinsicWidth(); - drawable.setBounds(left, 0, right, sResources.videoCall.getIntrinsicHeight()); + final Drawable drawable = resources.videoCall; + final int right = left + resources.videoCall.getIntrinsicWidth(); + drawable.setBounds(left, 0, right, resources.videoCall.getIntrinsicHeight()); drawable.draw(canvas); } // If showing HD call icon, draw it scaled appropriately. if (mShowHd) { - final Drawable drawable = sResources.hdCall; - final int right = left + sResources.hdCall.getIntrinsicWidth(); - drawable.setBounds(left, 0, right, sResources.hdCall.getIntrinsicHeight()); + final Drawable drawable = resources.hdCall; + final int right = left + resources.hdCall.getIntrinsicWidth(); + drawable.setBounds(left, 0, right, resources.hdCall.getIntrinsicHeight()); drawable.draw(canvas); } } @@ -197,37 +217,44 @@ public class CallTypeIconsView extends View { * * @param context The current context. */ - public Resources(Context context) { + public Resources(Context context, boolean largeIcons) { final android.content.res.Resources r = context.getResources(); - incoming = r.getDrawable(R.drawable.ic_call_arrow); + int iconId = + largeIcons ? R.drawable.quantum_ic_call_received_white_24 : R.drawable.ic_call_arrow; + incoming = r.getDrawable(iconId); incoming.setColorFilter(r.getColor(R.color.answered_call), PorterDuff.Mode.MULTIPLY); // Create a rotated instance of the call arrow for outgoing calls. - outgoing = BitmapUtil.getRotatedDrawable(r, R.drawable.ic_call_arrow, 180f); + outgoing = BitmapUtil.getRotatedDrawable(r, iconId, 180f); outgoing.setColorFilter(r.getColor(R.color.answered_call), PorterDuff.Mode.MULTIPLY); // Need to make a copy of the arrow drawable, otherwise the same instance colored // above will be recolored here. - missed = r.getDrawable(R.drawable.ic_call_arrow).mutate(); + iconId = largeIcons ? R.drawable.quantum_ic_call_missed_white_24 : R.drawable.ic_call_arrow; + missed = r.getDrawable(iconId).mutate(); missed.setColorFilter(r.getColor(R.color.missed_call), PorterDuff.Mode.MULTIPLY); - voicemail = r.getDrawable(R.drawable.quantum_ic_voicemail_white_18); + iconId = R.drawable.quantum_ic_voicemail_white_24; + voicemail = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); voicemail.setColorFilter( r.getColor(R.color.dialer_secondary_text_color), PorterDuff.Mode.MULTIPLY); - blocked = getScaledBitmap(context, R.drawable.ic_block_24dp); + iconId = R.drawable.quantum_ic_block_white_24; + blocked = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); blocked.setColorFilter(r.getColor(R.color.blocked_call), PorterDuff.Mode.MULTIPLY); - videoCall = getScaledBitmap(context, R.drawable.quantum_ic_videocam_white_24); + iconId = R.drawable.quantum_ic_videocam_white_24; + videoCall = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); videoCall.setColorFilter( r.getColor(R.color.dialer_secondary_text_color), PorterDuff.Mode.MULTIPLY); - hdCall = getScaledBitmap(context, R.drawable.quantum_ic_hd_white_24); + iconId = R.drawable.quantum_ic_hd_white_24; + hdCall = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); hdCall.setColorFilter( r.getColor(R.color.dialer_secondary_text_color), PorterDuff.Mode.MULTIPLY); - iconMargin = r.getDimensionPixelSize(R.dimen.call_log_icon_margin); + iconMargin = largeIcons ? 0 : r.getDimensionPixelSize(R.dimen.call_log_icon_margin); } // Gets the icon, scaled to the height of the call type icons. This helps display all the diff --git a/java/com/android/dialer/calllogutils/res/values-af/strings.xml b/java/com/android/dialer/calllogutils/res/values-af/strings.xml index 6c85ef2ad..d4d615e79 100644 --- a/java/com/android/dialer/calllogutils/res/values-af/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-af/strings.xml @@ -35,8 +35,6 @@ "via %1$s" "op %1$s, via %2$s" "Stemboodskap" - - - - + "%s m. %s s." + "%s s." diff --git a/java/com/android/dialer/calllogutils/res/values-am/strings.xml b/java/com/android/dialer/calllogutils/res/values-am/strings.xml index 725f3ecca..80a71c93f 100644 --- a/java/com/android/dialer/calllogutils/res/values-am/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-am/strings.xml @@ -35,8 +35,6 @@ "በ %1$s በኩል" "በ %1$s ላይ፣ በ %2$s በኩል" "የድምፅ መልእክት" - - - - + "%sደ %sሰ" + "%s ሰከንዶች" diff --git a/java/com/android/dialer/calllogutils/res/values-ar/strings.xml b/java/com/android/dialer/calllogutils/res/values-ar/strings.xml index 1093e3854..04cc6d9ac 100644 --- a/java/com/android/dialer/calllogutils/res/values-ar/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ar/strings.xml @@ -35,8 +35,6 @@ "من خلال %1$s" "على %1$s من خلال %2$s" "البريد الصوتي" - - - - + "%s د %s ث" + "%s ثانية" diff --git a/java/com/android/dialer/calllogutils/res/values-az/strings.xml b/java/com/android/dialer/calllogutils/res/values-az/strings.xml index c47892692..76726120c 100644 --- a/java/com/android/dialer/calllogutils/res/values-az/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-az/strings.xml @@ -35,8 +35,6 @@ "%1$s vasitəsilə" "%2$s vasitəsilə %1$s hesabında" "Səsli e-məktub" - - - - + "%s dəq %s san" + "%ssan" diff --git a/java/com/android/dialer/calllogutils/res/values-be/strings.xml b/java/com/android/dialer/calllogutils/res/values-be/strings.xml index 00ec0a7ba..fbb7bf24b 100644 --- a/java/com/android/dialer/calllogutils/res/values-be/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-be/strings.xml @@ -35,8 +35,6 @@ "праз %1$s" "на %1$s, праз %2$s" "Галасавая пошта" - - - - + "%s хв %s с" + "%s с" diff --git a/java/com/android/dialer/calllogutils/res/values-bg/strings.xml b/java/com/android/dialer/calllogutils/res/values-bg/strings.xml index afa60484c..4f21eb3f3 100644 --- a/java/com/android/dialer/calllogutils/res/values-bg/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-bg/strings.xml @@ -35,8 +35,6 @@ "през %1$s" "в/ъв %1$s, през %2$s" "Гласова поща" - - - - + "%s мин %s сек" + "%s сек" diff --git a/java/com/android/dialer/calllogutils/res/values-bn/strings.xml b/java/com/android/dialer/calllogutils/res/values-bn/strings.xml index be386d6b2..28b40b448 100644 --- a/java/com/android/dialer/calllogutils/res/values-bn/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-bn/strings.xml @@ -35,8 +35,6 @@ "%1$s এর মাধ্যমে" "%1$s এ, %2$s এর মাধ্যমে" "ভয়েসমেল" - - - - + "%sমিনিট %sসেকেন্ড" + "%sসেকেন্ড" diff --git a/java/com/android/dialer/calllogutils/res/values-bs/strings.xml b/java/com/android/dialer/calllogutils/res/values-bs/strings.xml index a6d8ec6b0..c6693d364 100644 --- a/java/com/android/dialer/calllogutils/res/values-bs/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-bs/strings.xml @@ -35,8 +35,6 @@ "preko %1$s" "na %1$s, preko %2$s" "Govorna pošta" - - - - + "%s min %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-ca/strings.xml b/java/com/android/dialer/calllogutils/res/values-ca/strings.xml index ff620ea14..45b581423 100644 --- a/java/com/android/dialer/calllogutils/res/values-ca/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ca/strings.xml @@ -35,8 +35,6 @@ "al número %1$s" "a %1$s, al número %2$s" "Bústia de veu" - - - - + "%s min %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-cs/strings.xml b/java/com/android/dialer/calllogutils/res/values-cs/strings.xml index 4fd66dab5..f2de1f887 100644 --- a/java/com/android/dialer/calllogutils/res/values-cs/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-cs/strings.xml @@ -35,8 +35,6 @@ "z čísla %1$s" "na účet %1$s, z čísla %2$s" "Hlasová schránka" - - - - + "%s min %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-da/strings.xml b/java/com/android/dialer/calllogutils/res/values-da/strings.xml index 0dc317f91..09f5b3d77 100644 --- a/java/com/android/dialer/calllogutils/res/values-da/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-da/strings.xml @@ -35,8 +35,6 @@ "via %1$s" "til %1$s, via %2$s" "Telefonsvarer" - - - - + "%s min. %s sek." + "%s sek." diff --git a/java/com/android/dialer/calllogutils/res/values-de/strings.xml b/java/com/android/dialer/calllogutils/res/values-de/strings.xml index 8b7edd81e..b71487432 100644 --- a/java/com/android/dialer/calllogutils/res/values-de/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-de/strings.xml @@ -35,8 +35,6 @@ "über %1$s" "mit %1$s, über %2$s" "Mailbox" - - - - + "%s min %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-el/strings.xml b/java/com/android/dialer/calllogutils/res/values-el/strings.xml index 58d146802..ab9b5e3ee 100644 --- a/java/com/android/dialer/calllogutils/res/values-el/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-el/strings.xml @@ -35,8 +35,6 @@ "μέσω %1$s" "στον λογαριασμό %1$s, μέσω %2$s" "Αυτόματος τηλεφωνητής" - - - - + "%sλ %sδ" + "%sδ" diff --git a/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml b/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml index c47d8d8c6..c1105afcc 100644 --- a/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml @@ -35,8 +35,6 @@ "via %1$s" "on %1$s, via %2$s" "Voicemail" - - - - + "%sm %ss" + "%ss" diff --git a/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml b/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml index c47d8d8c6..c1105afcc 100644 --- a/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml @@ -35,8 +35,6 @@ "via %1$s" "on %1$s, via %2$s" "Voicemail" - - - - + "%sm %ss" + "%ss" diff --git a/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml b/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml index c47d8d8c6..c1105afcc 100644 --- a/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml @@ -35,8 +35,6 @@ "via %1$s" "on %1$s, via %2$s" "Voicemail" - - - - + "%sm %ss" + "%ss" diff --git a/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml b/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml index 59a2f087b..003cc5430 100644 --- a/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml @@ -35,8 +35,6 @@ "por medio de %1$s" "en %1$s por medio de %2$s" "Buzón de voz" - - - - + "%s min. y %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-es/strings.xml b/java/com/android/dialer/calllogutils/res/values-es/strings.xml index 8243a49bc..9ed0b6472 100644 --- a/java/com/android/dialer/calllogutils/res/values-es/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-es/strings.xml @@ -35,8 +35,6 @@ "a través del %1$s" "en %1$s, a través del %2$s" "Buzón de voz" - - - - + "%s min %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-et/strings.xml b/java/com/android/dialer/calllogutils/res/values-et/strings.xml index b92821e37..a6a8b9115 100644 --- a/java/com/android/dialer/calllogutils/res/values-et/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-et/strings.xml @@ -35,8 +35,6 @@ "numbri %1$s kaudu" "kontol %1$s, numbri %2$s kaudu" "Kõnepost" - - - - + "%s min %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-eu/strings.xml b/java/com/android/dialer/calllogutils/res/values-eu/strings.xml index e80177743..8dfe88e09 100644 --- a/java/com/android/dialer/calllogutils/res/values-eu/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-eu/strings.xml @@ -35,8 +35,6 @@ "%1$s bidez" "%1$s kontuan, %2$s bidez" "Erantzungailua" - - - - + "%s min, %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-fa/strings.xml b/java/com/android/dialer/calllogutils/res/values-fa/strings.xml index 06f053492..adb3d9d21 100644 --- a/java/com/android/dialer/calllogutils/res/values-fa/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-fa/strings.xml @@ -35,8 +35,6 @@ "ازطریق %1$s" "در %1$s، ازطریق %2$s" "پست صوتی" - - - - + "%s دقیقه %s ثانیه" + "%s ثانیه" diff --git a/java/com/android/dialer/calllogutils/res/values-fi/strings.xml b/java/com/android/dialer/calllogutils/res/values-fi/strings.xml index 8a19e89c6..2838e0d0e 100644 --- a/java/com/android/dialer/calllogutils/res/values-fi/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-fi/strings.xml @@ -35,8 +35,6 @@ "numerosta %1$s" "tililtä %1$s numerosta %2$s" "Vastaaja" - - - - + "%s min %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml b/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml index 58fc07f59..bf4ba171c 100644 --- a/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml @@ -35,8 +35,6 @@ "au %1$s" "sur %1$s, au %2$s" "Messagerie vocale" - - - - + "%s min et %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-fr/strings.xml b/java/com/android/dialer/calllogutils/res/values-fr/strings.xml index 7050171b2..584c53ad4 100644 --- a/java/com/android/dialer/calllogutils/res/values-fr/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-fr/strings.xml @@ -35,8 +35,6 @@ "au %1$s" "sur %1$s, au %2$s" "Messagerie vocale" - - - - + "%s min et %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-gl/strings.xml b/java/com/android/dialer/calllogutils/res/values-gl/strings.xml index afc2ec544..ace85e49b 100644 --- a/java/com/android/dialer/calllogutils/res/values-gl/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-gl/strings.xml @@ -35,8 +35,6 @@ "a través do %1$s" "en %1$s, a través do %2$s" "Correo de voz" - - - - + "%s min %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-gu/strings.xml b/java/com/android/dialer/calllogutils/res/values-gu/strings.xml index 4435d61aa..0e8e0212c 100644 --- a/java/com/android/dialer/calllogutils/res/values-gu/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-gu/strings.xml @@ -35,8 +35,6 @@ "%1$s મારફતે" "%1$s પર, %2$s મારફતે" "વૉઇસમેઇલ" - - - - + "%sમિ %sસે" + "%sસે" diff --git a/java/com/android/dialer/calllogutils/res/values-hi/strings.xml b/java/com/android/dialer/calllogutils/res/values-hi/strings.xml index f8ddd23a7..59a6aff7b 100644 --- a/java/com/android/dialer/calllogutils/res/values-hi/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-hi/strings.xml @@ -35,8 +35,6 @@ "%1$s से" "%1$s पर, %2$s से" "वॉइसमेल" - - - - + "%s मि %s से" + "%s से" diff --git a/java/com/android/dialer/calllogutils/res/values-hr/strings.xml b/java/com/android/dialer/calllogutils/res/values-hr/strings.xml index 9bb60d6e5..38843f15b 100644 --- a/java/com/android/dialer/calllogutils/res/values-hr/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-hr/strings.xml @@ -35,8 +35,6 @@ "putem broja %1$s" "na računu %1$s, putem broja %2$s" "Govorna pošta" - - - - + "%s min %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-hu/strings.xml b/java/com/android/dialer/calllogutils/res/values-hu/strings.xml index 65eb6bd17..e2849b1de 100644 --- a/java/com/android/dialer/calllogutils/res/values-hu/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-hu/strings.xml @@ -35,8 +35,6 @@ "szám: %1$s" "fiók: %1$s, szám: %2$s" "Hangposta" - - - - + "%s p %s mp" + "%s mp" diff --git a/java/com/android/dialer/calllogutils/res/values-hy/strings.xml b/java/com/android/dialer/calllogutils/res/values-hy/strings.xml index f65fc11cc..58d51a6be 100644 --- a/java/com/android/dialer/calllogutils/res/values-hy/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-hy/strings.xml @@ -35,8 +35,6 @@ "%1$s համարից" "%1$s-ին %2$s համարից" "Ձայնային փոստ" - - - - + "%s ր %s վ" + "%s վ" diff --git a/java/com/android/dialer/calllogutils/res/values-in/strings.xml b/java/com/android/dialer/calllogutils/res/values-in/strings.xml index aaff08b49..faf93627c 100644 --- a/java/com/android/dialer/calllogutils/res/values-in/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-in/strings.xml @@ -35,8 +35,6 @@ "melalui %1$s" "di %1$s, melalui %2$s" "Pesan suara" - - - - + "%sm %sd" + "%sd" diff --git a/java/com/android/dialer/calllogutils/res/values-is/strings.xml b/java/com/android/dialer/calllogutils/res/values-is/strings.xml index 6e15b1ae5..e7bbbe10e 100644 --- a/java/com/android/dialer/calllogutils/res/values-is/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-is/strings.xml @@ -35,8 +35,6 @@ "í gegnum %1$s" "á %1$s, í gegnum %2$s" "Talhólf" - - - - + "%s mín. og %s sek." + "%s sek." diff --git a/java/com/android/dialer/calllogutils/res/values-it/strings.xml b/java/com/android/dialer/calllogutils/res/values-it/strings.xml index 8794911b7..04a0e1b39 100644 --- a/java/com/android/dialer/calllogutils/res/values-it/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-it/strings.xml @@ -35,8 +35,6 @@ "tramite %1$s" "su %1$s, tramite %2$s" "Messaggi vocali" - - - - + "%s m %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-iw/strings.xml b/java/com/android/dialer/calllogutils/res/values-iw/strings.xml index 10be3247f..1df6961c5 100644 --- a/java/com/android/dialer/calllogutils/res/values-iw/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-iw/strings.xml @@ -35,8 +35,6 @@ "דרך %1$s" "בחשבון %1$s, דרך %2$s" "דואר קולי" - - - - + "%s דקות ו-%s שניות" + "%s שניות" diff --git a/java/com/android/dialer/calllogutils/res/values-ja/strings.xml b/java/com/android/dialer/calllogutils/res/values-ja/strings.xml index 75eda0ca2..4baeecc5a 100644 --- a/java/com/android/dialer/calllogutils/res/values-ja/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ja/strings.xml @@ -35,8 +35,6 @@ "%1$s で受信" "%1$s（%2$s）で受信" "ボイスメール" - - - - + "%s 分 %s 秒" + "%s 秒" diff --git a/java/com/android/dialer/calllogutils/res/values-ka/strings.xml b/java/com/android/dialer/calllogutils/res/values-ka/strings.xml index 0e6fb128c..b1a4a4177 100644 --- a/java/com/android/dialer/calllogutils/res/values-ka/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ka/strings.xml @@ -35,8 +35,6 @@ "%1$s-ის მეშვეობით" "%1$s-ზე, %2$s-ის მეშვეობით" "ხმოვანი ფოსტა" - - - - + "%sწთ %sწმ" + "%sწმ" diff --git a/java/com/android/dialer/calllogutils/res/values-kk/strings.xml b/java/com/android/dialer/calllogutils/res/values-kk/strings.xml index 02b938f05..efaef2323 100644 --- a/java/com/android/dialer/calllogutils/res/values-kk/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-kk/strings.xml @@ -35,8 +35,6 @@ "%1$s арқылы" "%1$s, %2$s арқылы" "Дауыстық хабар" - - - - + "%sм %sс" + "%s с" diff --git a/java/com/android/dialer/calllogutils/res/values-km/strings.xml b/java/com/android/dialer/calllogutils/res/values-km/strings.xml index d53f7d70f..b5e6c5d8e 100644 --- a/java/com/android/dialer/calllogutils/res/values-km/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-km/strings.xml @@ -35,8 +35,6 @@ "តាមរយៈ %1$s" "នៅ​លើ %1$s តាមរយៈ %2$s" "សារ​ជា​សំឡេង" - - - - + "%sm %ss" + "%ss" diff --git a/java/com/android/dialer/calllogutils/res/values-kn/strings.xml b/java/com/android/dialer/calllogutils/res/values-kn/strings.xml index 60c29e809..44feee9e3 100644 --- a/java/com/android/dialer/calllogutils/res/values-kn/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-kn/strings.xml @@ -35,8 +35,6 @@ "%1$s ಮೂಲಕ" "%1$s ರಲ್ಲಿ, %2$s ಮೂಲಕ" "ಧ್ವನಿಮೇಲ್" - - - - + "%sನಿ %sಸೆ" + "%sಸೆ" diff --git a/java/com/android/dialer/calllogutils/res/values-ko/strings.xml b/java/com/android/dialer/calllogutils/res/values-ko/strings.xml index 2a4ef32af..76ba89b8a 100644 --- a/java/com/android/dialer/calllogutils/res/values-ko/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ko/strings.xml @@ -35,8 +35,6 @@ "%1$s번으로 수신" "%1$s에서 %2$s번으로 수신" "음성사서함" - - - - + "%s분 %s초" + "%s초" diff --git a/java/com/android/dialer/calllogutils/res/values-ky/strings.xml b/java/com/android/dialer/calllogutils/res/values-ky/strings.xml index 4ad92db5b..a91f0bd45 100644 --- a/java/com/android/dialer/calllogutils/res/values-ky/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ky/strings.xml @@ -35,8 +35,6 @@ "%1$s аркылуу" "%1$s боюнча %2$s аркылуу" "Үн почтасы" - - - - + "%sмүн. %sсек." + "%sсек." diff --git a/java/com/android/dialer/calllogutils/res/values-lo/strings.xml b/java/com/android/dialer/calllogutils/res/values-lo/strings.xml index 5e7a714fa..343fc60dd 100644 --- a/java/com/android/dialer/calllogutils/res/values-lo/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-lo/strings.xml @@ -35,8 +35,6 @@ "ຜ່ານ %1$s" "ຢູ່ %1$s, ຜ່ານ %2$s" "ຂໍ້ຄວາມສຽງ" - - - - + "%sນທ %sວິ" + "%sວິ" diff --git a/java/com/android/dialer/calllogutils/res/values-lt/strings.xml b/java/com/android/dialer/calllogutils/res/values-lt/strings.xml index 8e4597317..779e95267 100644 --- a/java/com/android/dialer/calllogutils/res/values-lt/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-lt/strings.xml @@ -35,8 +35,6 @@ "numeriu %1$s" "%1$s, numeriu %2$s" "Balso paštas" - - - - + "%s min. %s sek." + "%s sek." diff --git a/java/com/android/dialer/calllogutils/res/values-lv/strings.xml b/java/com/android/dialer/calllogutils/res/values-lv/strings.xml index 5e292e10e..d02d7ec3a 100644 --- a/java/com/android/dialer/calllogutils/res/values-lv/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-lv/strings.xml @@ -35,8 +35,6 @@ "izmantojot numuru %1$s" "kontā %1$s, izmantojot numuru %2$s" "Balss pasts" - - - - + "%s min %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-mk/strings.xml b/java/com/android/dialer/calllogutils/res/values-mk/strings.xml index 1ad4749a5..21872a817 100644 --- a/java/com/android/dialer/calllogutils/res/values-mk/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-mk/strings.xml @@ -35,8 +35,6 @@ "на %1$s" "на %1$s, на %2$s" "Говорна пошта" - - - - + "%s мин. %s сек." + "%s сек." diff --git a/java/com/android/dialer/calllogutils/res/values-ml/strings.xml b/java/com/android/dialer/calllogutils/res/values-ml/strings.xml index f09aacd4c..f6507ae16 100644 --- a/java/com/android/dialer/calllogutils/res/values-ml/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ml/strings.xml @@ -35,8 +35,6 @@ "%1$s നമ്പർ വഴി" "%2$s നമ്പർ വഴി, %1$s അക്കൗണ്ടിൽ" "വോയ്‌സ്‌മെയിൽ" - - - - + "%sമിനിറ്റ് %sസെക്കന്‍ഡ്" + "%sസെക്കൻഡ്" diff --git a/java/com/android/dialer/calllogutils/res/values-mn/strings.xml b/java/com/android/dialer/calllogutils/res/values-mn/strings.xml index ccc473eb4..3f5bbd3ea 100644 --- a/java/com/android/dialer/calllogutils/res/values-mn/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-mn/strings.xml @@ -35,8 +35,6 @@ "%1$s-р" "%1$s дээр, %2$s-р" "Дуут шуудан" - - - - + "%sм %sс" + "%sс" diff --git a/java/com/android/dialer/calllogutils/res/values-mr/strings.xml b/java/com/android/dialer/calllogutils/res/values-mr/strings.xml index 5d5d1bb6c..893851f69 100644 --- a/java/com/android/dialer/calllogutils/res/values-mr/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-mr/strings.xml @@ -35,8 +35,6 @@ "%1$s द्वारे" "%1$s वर, %2$s द्वारे" "व्हॉइसमेल" - - - - + "%sमि %sसे" + "%sसे" diff --git a/java/com/android/dialer/calllogutils/res/values-ms/strings.xml b/java/com/android/dialer/calllogutils/res/values-ms/strings.xml index a2f003617..1f7a22127 100644 --- a/java/com/android/dialer/calllogutils/res/values-ms/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ms/strings.xml @@ -35,8 +35,6 @@ "melalui %1$s" "pada %1$s, melalui %2$s" "Mel suara" - - - - + "%sm %ss" + "%ss" diff --git a/java/com/android/dialer/calllogutils/res/values-my/strings.xml b/java/com/android/dialer/calllogutils/res/values-my/strings.xml index c2022327e..8b1337e01 100644 --- a/java/com/android/dialer/calllogutils/res/values-my/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-my/strings.xml @@ -35,8 +35,6 @@ "%1$s မှတစ်ဆင့်" "%1$s တွင်၊ %2$s မှတစ်ဆင့်" "အသံမေးလ်" - - - - + "%sမိနစ် %sစက္ကန့်" + "%sစက္ကန့်" diff --git a/java/com/android/dialer/calllogutils/res/values-nb/strings.xml b/java/com/android/dialer/calllogutils/res/values-nb/strings.xml index e988e4f58..7d4622004 100644 --- a/java/com/android/dialer/calllogutils/res/values-nb/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-nb/strings.xml @@ -35,8 +35,6 @@ "via %1$s" "på %1$s via %2$s" "Talepost" - - - - + "%s m og %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-ne/strings.xml b/java/com/android/dialer/calllogutils/res/values-ne/strings.xml index a9ee59b11..d498395f0 100644 --- a/java/com/android/dialer/calllogutils/res/values-ne/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ne/strings.xml @@ -35,8 +35,6 @@ "%1$s मार्फत" "%1$s मा, %2$s मार्फत" "भ्वाइस मेल" - - - - + "%sमिनेट %sसेकेन्ड" + "%sसेकेन्ड" diff --git a/java/com/android/dialer/calllogutils/res/values-nl/strings.xml b/java/com/android/dialer/calllogutils/res/values-nl/strings.xml index 6c51676cf..0fcc6ca7f 100644 --- a/java/com/android/dialer/calllogutils/res/values-nl/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-nl/strings.xml @@ -35,8 +35,6 @@ "via %1$s" "op %1$s, via %2$s" "Voicemail" - - - - + "%s m %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-no/strings.xml b/java/com/android/dialer/calllogutils/res/values-no/strings.xml index e988e4f58..7d4622004 100644 --- a/java/com/android/dialer/calllogutils/res/values-no/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-no/strings.xml @@ -35,8 +35,6 @@ "via %1$s" "på %1$s via %2$s" "Talepost" - - - - + "%s m og %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-pa/strings.xml b/java/com/android/dialer/calllogutils/res/values-pa/strings.xml index ecb1998fb..f4cde52ff 100644 --- a/java/com/android/dialer/calllogutils/res/values-pa/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-pa/strings.xml @@ -35,8 +35,6 @@ "%1$s ਰਾਹੀਂ" "%1$s \'ਤੇ, %2$s ਰਾਹੀਂ" "ਵੌਇਸਮੇਲ" - - - - + "%sਮਿੰ %sਸਕਿੰ" + "%sਸਕਿੰ" diff --git a/java/com/android/dialer/calllogutils/res/values-pl/strings.xml b/java/com/android/dialer/calllogutils/res/values-pl/strings.xml index 7fcdd7511..f1396cd88 100644 --- a/java/com/android/dialer/calllogutils/res/values-pl/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-pl/strings.xml @@ -35,8 +35,6 @@ "przez %1$s" "na koncie %1$s, przez %2$s" "Poczta głosowa" - - - - + "%s min %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml b/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml index 127514b6d..1e8b733b9 100644 --- a/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml @@ -35,8 +35,6 @@ "pelo número %1$s" "em %1$s, pelo número %2$s" "Correio de voz" - - - - + "%s min %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml b/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml index 45c5a6003..1a2fa4c01 100644 --- a/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml @@ -35,8 +35,6 @@ "através do número %1$s" "em %1$s, através do número %2$s" "Correio de voz" - - - - + "%s min %s seg" + "%s seg" diff --git a/java/com/android/dialer/calllogutils/res/values-pt/strings.xml b/java/com/android/dialer/calllogutils/res/values-pt/strings.xml index 127514b6d..1e8b733b9 100644 --- a/java/com/android/dialer/calllogutils/res/values-pt/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-pt/strings.xml @@ -35,8 +35,6 @@ "pelo número %1$s" "em %1$s, pelo número %2$s" "Correio de voz" - - - - + "%s min %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-ro/strings.xml b/java/com/android/dialer/calllogutils/res/values-ro/strings.xml index 59cb76725..84497540b 100644 --- a/java/com/android/dialer/calllogutils/res/values-ro/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ro/strings.xml @@ -35,8 +35,6 @@ "prin %1$s" "pe %1$s, prin %2$s" "Mesagerie vocală" - - - - + "%s min. %s sec." + "%s sec." diff --git a/java/com/android/dialer/calllogutils/res/values-ru/strings.xml b/java/com/android/dialer/calllogutils/res/values-ru/strings.xml index 99a656803..8e6120ab1 100644 --- a/java/com/android/dialer/calllogutils/res/values-ru/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ru/strings.xml @@ -35,8 +35,6 @@ "Номер %1$s" "%1$s, номер %2$s" "Голосовая почта" - - - - + "%s мин. %s сек." + "%s сек." diff --git a/java/com/android/dialer/calllogutils/res/values-si/strings.xml b/java/com/android/dialer/calllogutils/res/values-si/strings.xml index 841f5caca..fa24c1c07 100644 --- a/java/com/android/dialer/calllogutils/res/values-si/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-si/strings.xml @@ -35,8 +35,6 @@ "%1$s හරහා" "%1$s මත, %2$s හරහා" "හඬ තැපෑල" - - - - + "මි%s ත%s" + "තත්%s" diff --git a/java/com/android/dialer/calllogutils/res/values-sk/strings.xml b/java/com/android/dialer/calllogutils/res/values-sk/strings.xml index 1e1b86811..ee32a0875 100644 --- a/java/com/android/dialer/calllogutils/res/values-sk/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sk/strings.xml @@ -35,8 +35,6 @@ "prostredníctvom čísla %1$s" "v účte %1$s, prostredníctvom čísla %2$s" "Hlasová schránka" - - - - + "%s min %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-sl/strings.xml b/java/com/android/dialer/calllogutils/res/values-sl/strings.xml index 945cecc9c..0cf0ab2ca 100644 --- a/java/com/android/dialer/calllogutils/res/values-sl/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sl/strings.xml @@ -35,8 +35,6 @@ "prek številke %1$s" "v računu %1$s, prek številke %2$s" "Odzivnik" - - - - + "%s min %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-sq/strings.xml b/java/com/android/dialer/calllogutils/res/values-sq/strings.xml index 229a3879f..b2a28357c 100644 --- a/java/com/android/dialer/calllogutils/res/values-sq/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sq/strings.xml @@ -35,8 +35,6 @@ "nëpërmjet %1$s" "në %1$s, nëpërmjet %2$s" "Posta zanore" - - - - + "%s minuta e %s sekonda" + "%s sekonda" diff --git a/java/com/android/dialer/calllogutils/res/values-sr/strings.xml b/java/com/android/dialer/calllogutils/res/values-sr/strings.xml index 696f3d31c..49f7473d4 100644 --- a/java/com/android/dialer/calllogutils/res/values-sr/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sr/strings.xml @@ -35,8 +35,6 @@ "преко %1$s" "на %1$s, преко %2$s" "Говорна пошта" - - - - + "%s м %s с" + "%s с" diff --git a/java/com/android/dialer/calllogutils/res/values-sv/strings.xml b/java/com/android/dialer/calllogutils/res/values-sv/strings.xml index 8fb59d115..eff7210ef 100644 --- a/java/com/android/dialer/calllogutils/res/values-sv/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sv/strings.xml @@ -35,8 +35,6 @@ "med %1$s" "på %1$s, med %2$s" "Röstbrevlåda" - - - - + "%s m %s s" + "%s s" diff --git a/java/com/android/dialer/calllogutils/res/values-sw/strings.xml b/java/com/android/dialer/calllogutils/res/values-sw/strings.xml index de161bcbc..7810fb14b 100644 --- a/java/com/android/dialer/calllogutils/res/values-sw/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sw/strings.xml @@ -35,8 +35,6 @@ "kupitia %1$s" "kwenye %1$s, kupitia %2$s" "Ujumbe wa sauti" - - - - + "Dakika %s sekunde %s" + "Sekunde %s" diff --git a/java/com/android/dialer/calllogutils/res/values-ta/strings.xml b/java/com/android/dialer/calllogutils/res/values-ta/strings.xml index 6ff5c525f..b3e60bbc8 100644 --- a/java/com/android/dialer/calllogutils/res/values-ta/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ta/strings.xml @@ -35,8 +35,6 @@ "%1$s மூலம்" "%1$s இல் %2$s மூலம்" "குரலஞ்சல்" - - - - + "%sநி %sவி" + "%sவி" diff --git a/java/com/android/dialer/calllogutils/res/values-te/strings.xml b/java/com/android/dialer/calllogutils/res/values-te/strings.xml index 05f9addee..4d6553765 100644 --- a/java/com/android/dialer/calllogutils/res/values-te/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-te/strings.xml @@ -35,8 +35,6 @@ "%1$s ద్వారా" "%1$sలో, %2$s ద్వారా" "వాయిస్ మెయిల్" - - - - + "%sని %sసె" + "%sసె" diff --git a/java/com/android/dialer/calllogutils/res/values-th/strings.xml b/java/com/android/dialer/calllogutils/res/values-th/strings.xml index 35ec52d62..46d9ec028 100644 --- a/java/com/android/dialer/calllogutils/res/values-th/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-th/strings.xml @@ -35,8 +35,6 @@ "ผ่าน %1$s" "ใน %1$s ผ่าน %2$s" "ข้อความเสียง" - - - - + "%s นาที %s วินาที" + "%s วินาที" diff --git a/java/com/android/dialer/calllogutils/res/values-tl/strings.xml b/java/com/android/dialer/calllogutils/res/values-tl/strings.xml index 62cda0d19..b4f4045e3 100644 --- a/java/com/android/dialer/calllogutils/res/values-tl/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-tl/strings.xml @@ -35,8 +35,6 @@ "sa pamamagitan ng %1$s" "sa %1$s, sa pamamagitan ng %2$s" "Voicemail" - - - - + "%s (na) min. %s (na) segundo" + "%s (na) segundo" diff --git a/java/com/android/dialer/calllogutils/res/values-tr/strings.xml b/java/com/android/dialer/calllogutils/res/values-tr/strings.xml index 490a8ed02..1a2e762f1 100644 --- a/java/com/android/dialer/calllogutils/res/values-tr/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-tr/strings.xml @@ -35,8 +35,6 @@ "%1$s kullanılarak" "%2$s kullanılarak %1$s hesabında" "Sesli mesaj" - - - - + "%s dk. %s sn." + "%s sn." diff --git a/java/com/android/dialer/calllogutils/res/values-uk/strings.xml b/java/com/android/dialer/calllogutils/res/values-uk/strings.xml index 03d9fb732..5f3e0aecf 100644 --- a/java/com/android/dialer/calllogutils/res/values-uk/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-uk/strings.xml @@ -35,8 +35,6 @@ "на номер %1$s" "на %1$s на номер %2$s" "Голосова пошта" - - - - + "%s хв %s с" + "%s с" diff --git a/java/com/android/dialer/calllogutils/res/values-ur/strings.xml b/java/com/android/dialer/calllogutils/res/values-ur/strings.xml index 914e7ac03..9872d4368 100644 --- a/java/com/android/dialer/calllogutils/res/values-ur/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ur/strings.xml @@ -35,8 +35,6 @@ "بذریعہ %1$s" "%1$s پر، بذریعہ %2$s" "صوتی میل" - - - - + "%sمنٹ %sسیکنڈ" + "%sسیکنڈ" diff --git a/java/com/android/dialer/calllogutils/res/values-uz/strings.xml b/java/com/android/dialer/calllogutils/res/values-uz/strings.xml index b41f62262..7917f4790 100644 --- a/java/com/android/dialer/calllogutils/res/values-uz/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-uz/strings.xml @@ -26,7 +26,7 @@ "Kiruvchi videochaqiruv boshqa qurilmaga o‘tkazildi" "Chiquvchi videochaqiruv" "Chiquvchi videochaqiruv boshqa qurilmaga o‘tkazildi" - "Javobsiz videochaqiruv" + "Javobsiz video chaqiruv" "Ovozli pochta" "Rad etilgan chaqiruv" "Bloklangan chaqiruv" @@ -35,8 +35,6 @@ "%1$s raqami orqali" "%1$s, %2$s raqami orqali" "Ovozli pochta" - - - - + "%s daq. %s son." + "%s son." diff --git a/java/com/android/dialer/calllogutils/res/values-vi/strings.xml b/java/com/android/dialer/calllogutils/res/values-vi/strings.xml index c20cd2710..b722dc234 100644 --- a/java/com/android/dialer/calllogutils/res/values-vi/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-vi/strings.xml @@ -35,8 +35,6 @@ "qua %1$s" "trên %1$s, qua %2$s" "Thư thoại" - - - - + "%s phút %s giây" + "%s giây" diff --git a/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml b/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml index 89ae77fa7..6f20642e3 100644 --- a/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml @@ -35,8 +35,6 @@ "通过 %1$s" "帐号：%1$s，通过 %2$s" "语音邮件" - - - - + "%s 分 %s 秒" + "%s 秒" diff --git a/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml b/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml index 23a9d6735..83b68acfb 100644 --- a/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml @@ -35,8 +35,6 @@ "透過 %1$s" "在 %1$s 上透過 %2$s" "留言" - - - - + "%s 分 %s 秒" + "%s 秒" diff --git a/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml b/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml index a67147047..1566f05d4 100644 --- a/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml @@ -35,8 +35,6 @@ "透過 %1$s" "%1$s，透過 %2$s" "語音留言" - - - - + "%s 分鐘 %s 秒" + "%s 秒" diff --git a/java/com/android/dialer/calllogutils/res/values-zu/strings.xml b/java/com/android/dialer/calllogutils/res/values-zu/strings.xml index 865cfce37..289ff34fe 100644 --- a/java/com/android/dialer/calllogutils/res/values-zu/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-zu/strings.xml @@ -35,8 +35,6 @@ "nge-%1$s" "ku-%1$s, nge-%2$s" "Ivoyisimeyili" - - - - + "%sm %ss" + "%ss" diff --git a/java/com/android/dialer/calllogutils/res/values/attrs.xml b/java/com/android/dialer/calllogutils/res/values/attrs.xml new file mode 100644 index 000000000..9c55e4c30 --- /dev/null +++ b/java/com/android/dialer/calllogutils/res/values/attrs.xml @@ -0,0 +1,24 @@ + + + + + + + + \ No newline at end of file diff --git a/java/com/android/dialer/database/CallLogQueryHandler.java b/java/com/android/dialer/database/CallLogQueryHandler.java index 1f6bd5fb3..35f7854ac 100644 --- a/java/com/android/dialer/database/CallLogQueryHandler.java +++ b/java/com/android/dialer/database/CallLogQueryHandler.java @@ -33,7 +33,6 @@ import android.os.Message; import android.provider.CallLog.Calls; import android.provider.VoicemailContract.Status; import android.provider.VoicemailContract.Voicemails; -import android.support.v4.os.BuildCompat; import com.android.contacts.common.database.NoNullCursorAsyncQueryHandler; import com.android.dialer.common.LogUtil; import com.android.dialer.compat.AppCompatConstants; @@ -113,14 +112,21 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler { } public void fetchVoicemailStatus() { + StringBuilder where = new StringBuilder(); + List selectionArgs = new ArrayList<>(); + + VoicemailComponent.get(mContext) + .getVoicemailClient() + .appendOmtpVoicemailStatusSelectionClause(mContext, where, selectionArgs); + if (TelecomUtil.hasReadWriteVoicemailPermissions(mContext)) { startQuery( QUERY_VOICEMAIL_STATUS_TOKEN, null, Status.CONTENT_URI, VoicemailStatusQuery.getProjection(), - null, - null, + where.toString(), + selectionArgs.toArray(new String[selectionArgs.size()]), null); } } @@ -132,11 +138,9 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler { new StringBuilder(Voicemails.IS_READ + "=0" + " AND " + Voicemails.DELETED + "=0 "); List selectionArgs = new ArrayList<>(); - if (BuildCompat.isAtLeastO()) { - VoicemailComponent.get(mContext) - .getVoicemailClient() - .appendOmtpVoicemailSelectionClause(mContext, where, selectionArgs); - } + VoicemailComponent.get(mContext) + .getVoicemailClient() + .appendOmtpVoicemailSelectionClause(mContext, where, selectionArgs); startQuery( QUERY_VOICEMAIL_UNREAD_COUNT_TOKEN, diff --git a/java/com/android/dialer/dialpadview/res/drawable-hdpi/dialer_fab.png b/java/com/android/dialer/dialpadview/res/drawable-hdpi/dialer_fab.png deleted file mode 100644 index 3380a899d..000000000 Binary files a/java/com/android/dialer/dialpadview/res/drawable-hdpi/dialer_fab.png and /dev/null differ diff --git a/java/com/android/dialer/dialpadview/res/drawable-hdpi/fab_green.png b/java/com/android/dialer/dialpadview/res/drawable-hdpi/fab_green.png deleted file mode 100644 index ff9753c18..000000000 Binary files a/java/com/android/dialer/dialpadview/res/drawable-hdpi/fab_green.png and /dev/null differ diff --git a/java/com/android/dialer/dialpadview/res/drawable-hdpi/fab_ic_call.png b/java/com/android/dialer/dialpadview/res/drawable-hdpi/fab_ic_call.png deleted file mode 100644 index 7bf83fa6a..000000000 Binary files a/java/com/android/dialer/dialpadview/res/drawable-hdpi/fab_ic_call.png and /dev/null differ diff --git a/java/com/android/dialer/dialpadview/res/drawable-mdpi/dialer_fab.png b/java/com/android/dialer/dialpadview/res/drawable-mdpi/dialer_fab.png deleted file mode 100644 index 46630d430..000000000 Binary files a/java/com/android/dialer/dialpadview/res/drawable-mdpi/dialer_fab.png and /dev/null differ diff --git a/java/com/android/dialer/dialpadview/res/drawable-mdpi/fab_green.png b/java/com/android/dialer/dialpadview/res/drawable-mdpi/fab_green.png deleted file mode 100644 index 947aac142..000000000 Binary files a/java/com/android/dialer/dialpadview/res/drawable-mdpi/fab_green.png and /dev/null differ diff --git a/java/com/android/dialer/dialpadview/res/drawable-mdpi/fab_ic_call.png b/java/com/android/dialer/dialpadview/res/drawable-mdpi/fab_ic_call.png deleted file mode 100644 index 790f93590..000000000 Binary files a/java/com/android/dialer/dialpadview/res/drawable-mdpi/fab_ic_call.png and /dev/null differ diff --git a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/dialer_fab.png b/java/com/android/dialer/dialpadview/res/drawable-xhdpi/dialer_fab.png deleted file mode 100644 index 5dafee092..000000000 Binary files a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/dialer_fab.png and /dev/null differ diff --git a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/fab_green.png b/java/com/android/dialer/dialpadview/res/drawable-xhdpi/fab_green.png deleted file mode 100644 index e8bab3fec..000000000 Binary files a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/fab_green.png and /dev/null differ diff --git a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/fab_ic_call.png b/java/com/android/dialer/dialpadview/res/drawable-xhdpi/fab_ic_call.png deleted file mode 100644 index 6bd53f5c5..000000000 Binary files a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/fab_ic_call.png and /dev/null differ diff --git a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/dialer_fab.png b/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/dialer_fab.png deleted file mode 100644 index 2b0dba7bc..000000000 Binary files a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/dialer_fab.png and /dev/null differ diff --git a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/fab_green.png b/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/fab_green.png deleted file mode 100644 index 7e4fd3e49..000000000 Binary files a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/fab_green.png and /dev/null differ diff --git a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/fab_ic_call.png b/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/fab_ic_call.png deleted file mode 100644 index 6866fa430..000000000 Binary files a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/fab_ic_call.png and /dev/null differ diff --git a/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/dialer_fab.png b/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/dialer_fab.png deleted file mode 100644 index 59d9b9506..000000000 Binary files a/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/dialer_fab.png and /dev/null differ diff --git a/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/fab_green.png b/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/fab_green.png deleted file mode 100644 index aa8849e86..000000000 Binary files a/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/fab_green.png and /dev/null differ diff --git a/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/fab_ic_call.png b/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/fab_ic_call.png deleted file mode 100644 index 7af3396b4..000000000 Binary files a/java/com/android/dialer/dialpadview/res/drawable-xxxhdpi/fab_ic_call.png and /dev/null differ diff --git a/java/com/android/dialer/enrichedcall/EnrichedCallComponent.java b/java/com/android/dialer/enrichedcall/EnrichedCallComponent.java index 5291e292f..c773a2dfa 100644 --- a/java/com/android/dialer/enrichedcall/EnrichedCallComponent.java +++ b/java/com/android/dialer/enrichedcall/EnrichedCallComponent.java @@ -18,27 +18,19 @@ package com.android.dialer.enrichedcall; import android.content.Context; import android.support.annotation.NonNull; +import com.android.dialer.inject.HasRootComponent; import dagger.Subcomponent; -import com.android.dialer.enrichedcall.stub.EnrichedCallManagerStub; /** Subcomponent that can be used to access the enriched call implementation. */ -public class EnrichedCallComponent { - private static EnrichedCallComponent instance; - private EnrichedCallManager enrichedCallManager; +@Subcomponent +public abstract class EnrichedCallComponent { @NonNull - public EnrichedCallManager getEnrichedCallManager() { - if (enrichedCallManager == null) { - enrichedCallManager = new EnrichedCallManagerStub(); - } - return enrichedCallManager; - } + public abstract EnrichedCallManager getEnrichedCallManager(); public static EnrichedCallComponent get(Context context) { - if (instance == null) { - instance = new EnrichedCallComponent(); - } - return instance; + return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component()) + .enrichedCallComponent(); } /** Used to refer to the root application component. */ diff --git a/java/com/android/dialer/postcall/PostCall.java b/java/com/android/dialer/postcall/PostCall.java index cfe7c867b..bd7f9c35f 100644 --- a/java/com/android/dialer/postcall/PostCall.java +++ b/java/com/android/dialer/postcall/PostCall.java @@ -151,7 +151,7 @@ public class PostCall { return disconnectTimeMillis != -1 && connectTimeMillis != -1 && binding.getLong("postcall_last_call_threshold", 30_000) > timeSinceDisconnect - && binding.getLong("postcall_call_duration_threshold", 60_000) > callDurationMillis; + && binding.getLong("postcall_call_duration_threshold", 35_000) > callDurationMillis; } private static boolean shouldPromptUserToViewSentMessage(Context context) { diff --git a/java/com/android/dialer/simulator/SimulatorComponent.java b/java/com/android/dialer/simulator/SimulatorComponent.java index a16592e34..f14496b80 100644 --- a/java/com/android/dialer/simulator/SimulatorComponent.java +++ b/java/com/android/dialer/simulator/SimulatorComponent.java @@ -17,26 +17,18 @@ package com.android.dialer.simulator; import android.content.Context; +import com.android.dialer.inject.HasRootComponent; import dagger.Subcomponent; -import com.android.dialer.simulator.impl.SimulatorImpl; /** Subcomponent that can be used to access the simulator implementation. */ -public class SimulatorComponent { - private static SimulatorComponent instance; - private Simulator simulator; +@Subcomponent +public abstract class SimulatorComponent { - public Simulator getSimulator() { - if (simulator == null) { - simulator = new SimulatorImpl(); - } - return simulator; - } + public abstract Simulator getSimulator(); public static SimulatorComponent get(Context context) { - if (instance == null) { - instance = new SimulatorComponent(); - } - return instance; + return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component()) + .simulatorComponent(); } /** Used to refer to the root application component. */ diff --git a/java/com/android/dialer/simulator/impl/SimulatorImpl.java b/java/com/android/dialer/simulator/impl/SimulatorImpl.java index 9c6826940..2dd180ef4 100644 --- a/java/com/android/dialer/simulator/impl/SimulatorImpl.java +++ b/java/com/android/dialer/simulator/impl/SimulatorImpl.java @@ -24,7 +24,7 @@ import com.android.dialer.simulator.Simulator; import javax.inject.Inject; /** The entry point for the simulator feature. */ -final public class SimulatorImpl implements Simulator { +final class SimulatorImpl implements Simulator { @Inject public SimulatorImpl() {} diff --git a/java/com/android/dialer/theme/res/values/colors.xml b/java/com/android/dialer/theme/res/values/colors.xml index bf43e01af..755c3dbe2 100644 --- a/java/com/android/dialer/theme/res/values/colors.xml +++ b/java/com/android/dialer/theme/res/values/colors.xml @@ -32,7 +32,9 @@ #4285F4 #332A56C6 - #e91e63 + #00C853 + + #F50057 #333333 diff --git a/java/com/android/dialer/voicemailstatus/VisualVoicemailEnabledChecker.java b/java/com/android/dialer/voicemailstatus/VisualVoicemailEnabledChecker.java index 142bb63ed..a1fc29edf 100644 --- a/java/com/android/dialer/voicemailstatus/VisualVoicemailEnabledChecker.java +++ b/java/com/android/dialer/voicemailstatus/VisualVoicemailEnabledChecker.java @@ -53,7 +53,7 @@ public class VisualVoicemailEnabledChecker implements CallLogQueryHandler.Listen mContext = context; mCallback = callback; mPrefs = PreferenceManager.getDefaultSharedPreferences(mContext); - mVoicemailStatusHelper = new VoicemailStatusHelperImpl(); + mVoicemailStatusHelper = new VoicemailStatusHelper(); mHasActiveVoicemailProvider = mPrefs.getBoolean(PREF_KEY_HAS_ACTIVE_VOICEMAIL_PROVIDER, false); } @@ -80,7 +80,10 @@ public class VisualVoicemailEnabledChecker implements CallLogQueryHandler.Listen mVoicemailStatusHelper.getNumberActivityVoicemailSources(statusCursor) > 0; if (hasActiveVoicemailProvider != mHasActiveVoicemailProvider) { mHasActiveVoicemailProvider = hasActiveVoicemailProvider; - mPrefs.edit().putBoolean(PREF_KEY_HAS_ACTIVE_VOICEMAIL_PROVIDER, mHasActiveVoicemailProvider); + mPrefs + .edit() + .putBoolean(PREF_KEY_HAS_ACTIVE_VOICEMAIL_PROVIDER, mHasActiveVoicemailProvider) + .apply(); if (mCallback != null) { mCallback.onVisualVoicemailEnabledStatusChanged(mHasActiveVoicemailProvider); } diff --git a/java/com/android/dialer/voicemailstatus/VoicemailStatusHelper.java b/java/com/android/dialer/voicemailstatus/VoicemailStatusHelper.java index 16bfe704d..9df45c211 100644 --- a/java/com/android/dialer/voicemailstatus/VoicemailStatusHelper.java +++ b/java/com/android/dialer/voicemailstatus/VoicemailStatusHelper.java @@ -17,10 +17,8 @@ package com.android.dialer.voicemailstatus; import android.database.Cursor; -import android.net.Uri; import android.provider.VoicemailContract.Status; -import android.support.annotation.VisibleForTesting; -import java.util.List; +import com.android.dialer.database.VoicemailStatusQuery; /** * Interface used by the call log UI to determine what user message, if any, related to voicemail @@ -31,66 +29,40 @@ import java.util.List; * shown. The user of this interface must observe/listen to provider changes and invoke this class * to check if any message needs to be shown. */ -public interface VoicemailStatusHelper { - - /** - * Returns a list of messages, in the order or priority that should be shown to the user. An empty - * list is returned if no message needs to be shown. - * - * @param cursor The cursor pointing to the query on {@link Status#CONTENT_URI}. The projection to - * be used is defined by the implementation class of this interface. - */ - @VisibleForTesting - List getStatusMessages(Cursor cursor); +public class VoicemailStatusHelper { /** * Returns the number of active voicemail sources installed. * *

The number of sources is counted by querying the voicemail status table. + * + * @param cursor The caller is responsible for the life cycle of the cursor and resetting the + * position */ - int getNumberActivityVoicemailSources(Cursor cursor); - - @VisibleForTesting - class StatusMessage { - - /** Package of the source on behalf of which this message has to be shown. */ - public final String sourcePackage; - /** - * The string resource id of the status message that should be shown in the call log page. Set - * to -1, if this message is not to be shown in call log. - */ - public final int callLogMessageId; - /** - * The string resource id of the status message that should be shown in the call details page. - * Set to -1, if this message is not to be shown in call details page. - */ - public final int callDetailsMessageId; - /** The string resource id of the action message that should be shown. */ - public final int actionMessageId; - /** URI for the corrective action, where applicable. Null if no action URI is available. */ - public final Uri actionUri; - - public StatusMessage( - String sourcePackage, - int callLogMessageId, - int callDetailsMessageId, - int actionMessageId, - Uri actionUri) { - this.sourcePackage = sourcePackage; - this.callLogMessageId = callLogMessageId; - this.callDetailsMessageId = callDetailsMessageId; - this.actionMessageId = actionMessageId; - this.actionUri = actionUri; - } - - /** Whether this message should be shown in the call log page. */ - public boolean showInCallLog() { - return callLogMessageId != -1; + public int getNumberActivityVoicemailSources(Cursor cursor) { + int count = 0; + if (!cursor.moveToFirst()) { + return 0; } + do { + if (isVoicemailSourceActive(cursor)) { + ++count; + } + } while (cursor.moveToNext()); + return count; + } - /** Whether this message should be shown in the call details page. */ - public boolean showInCallDetails() { - return callDetailsMessageId != -1; - } + /** + * Returns whether the source status in the cursor corresponds to an active source. A source is + * active if its' configuration state is not NOT_CONFIGURED. For most voicemail sources, only OK + * and NOT_CONFIGURED are used. The OMTP visual voicemail client has the same behavior pre-NMR1. + * NMR1 visual voicemail will only set it to NOT_CONFIGURED when it is deactivated. As soon as + * activation is attempted, it will transition into CONFIGURING then into OK or other error state, + * NOT_CONFIGURED is never set through an error. + */ + private boolean isVoicemailSourceActive(Cursor cursor) { + return cursor.getString(VoicemailStatusQuery.SOURCE_PACKAGE_INDEX) != null + && cursor.getInt(VoicemailStatusQuery.CONFIGURATION_STATE_INDEX) + != Status.CONFIGURATION_STATE_NOT_CONFIGURED; } } diff --git a/java/com/android/dialer/voicemailstatus/VoicemailStatusHelperImpl.java b/java/com/android/dialer/voicemailstatus/VoicemailStatusHelperImpl.java deleted file mode 100644 index 404897fde..000000000 --- a/java/com/android/dialer/voicemailstatus/VoicemailStatusHelperImpl.java +++ /dev/null @@ -1,278 +0,0 @@ -/* - * Copyright (C) 2011 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 - */ - -package com.android.dialer.voicemailstatus; - -import static android.provider.VoicemailContract.Status.CONFIGURATION_STATE_CAN_BE_CONFIGURED; -import static android.provider.VoicemailContract.Status.CONFIGURATION_STATE_OK; -import static android.provider.VoicemailContract.Status.DATA_CHANNEL_STATE_NO_CONNECTION; -import static android.provider.VoicemailContract.Status.DATA_CHANNEL_STATE_OK; -import static android.provider.VoicemailContract.Status.NOTIFICATION_CHANNEL_STATE_MESSAGE_WAITING; -import static android.provider.VoicemailContract.Status.NOTIFICATION_CHANNEL_STATE_NO_CONNECTION; -import static android.provider.VoicemailContract.Status.NOTIFICATION_CHANNEL_STATE_OK; - -import android.database.Cursor; -import android.net.Uri; -import android.provider.VoicemailContract.Status; -import com.android.contacts.common.util.UriUtils; -import com.android.dialer.database.VoicemailStatusQuery; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - -/** Implementation of {@link VoicemailStatusHelper}. */ -public class VoicemailStatusHelperImpl implements VoicemailStatusHelper { - - @Override - public List getStatusMessages(Cursor cursor) { - List messages = - new ArrayList(); - cursor.moveToPosition(-1); - while (cursor.moveToNext()) { - MessageStatusWithPriority message = getMessageForStatusEntry(cursor); - if (message != null) { - messages.add(message); - } - } - // Finally reorder the messages by their priority. - return reorderMessages(messages); - } - - @Override - public int getNumberActivityVoicemailSources(Cursor cursor) { - int count = 0; - cursor.moveToPosition(-1); - while (cursor.moveToNext()) { - if (isVoicemailSourceActive(cursor)) { - ++count; - } - } - return count; - } - - /** - * Returns whether the source status in the cursor corresponds to an active source. A source is - * active if its' configuration state is not NOT_CONFIGURED. For most voicemail sources, only OK - * and NOT_CONFIGURED are used. The OMTP visual voicemail client has the same behavior pre-NMR1. - * NMR1 visual voicemail will only set it to NOT_CONFIGURED when it is deactivated. As soon as - * activation is attempted, it will transition into CONFIGURING then into OK or other error state, - * NOT_CONFIGURED is never set through an error. - */ - private boolean isVoicemailSourceActive(Cursor cursor) { - return cursor.getString(VoicemailStatusQuery.SOURCE_PACKAGE_INDEX) != null - && cursor.getInt(VoicemailStatusQuery.CONFIGURATION_STATE_INDEX) - != Status.CONFIGURATION_STATE_NOT_CONFIGURED; - } - - private List reorderMessages(List messageWrappers) { - Collections.sort( - messageWrappers, - new Comparator() { - @Override - public int compare(MessageStatusWithPriority msg1, MessageStatusWithPriority msg2) { - return msg1.mPriority - msg2.mPriority; - } - }); - List reorderMessages = new ArrayList(); - // Copy the ordered message objects into the final list. - for (MessageStatusWithPriority messageWrapper : messageWrappers) { - reorderMessages.add(messageWrapper.mMessage); - } - return reorderMessages; - } - - /** Returns the message for the status entry pointed to by the cursor. */ - private MessageStatusWithPriority getMessageForStatusEntry(Cursor cursor) { - final String sourcePackage = cursor.getString(VoicemailStatusQuery.SOURCE_PACKAGE_INDEX); - if (sourcePackage == null) { - return null; - } - final OverallState overallState = - getOverallState( - cursor.getInt(VoicemailStatusQuery.CONFIGURATION_STATE_INDEX), - cursor.getInt(VoicemailStatusQuery.DATA_CHANNEL_STATE_INDEX), - cursor.getInt(VoicemailStatusQuery.NOTIFICATION_CHANNEL_STATE_INDEX)); - final Action action = overallState.getAction(); - - // No source package or no action, means no message shown. - if (action == Action.NONE) { - return null; - } - - Uri actionUri = null; - if (action == Action.CALL_VOICEMAIL) { - actionUri = - UriUtils.parseUriOrNull( - cursor.getString(VoicemailStatusQuery.VOICEMAIL_ACCESS_URI_INDEX)); - // Even if actionUri is null, it is still be useful to show the notification. - } else if (action == Action.CONFIGURE_VOICEMAIL) { - actionUri = - UriUtils.parseUriOrNull(cursor.getString(VoicemailStatusQuery.SETTINGS_URI_INDEX)); - // If there is no settings URI, there is no point in showing the notification. - if (actionUri == null) { - return null; - } - } - return new MessageStatusWithPriority( - new StatusMessage( - sourcePackage, - overallState.getCallLogMessageId(), - overallState.getCallDetailsMessageId(), - action.getMessageId(), - actionUri), - overallState.getPriority()); - } - - private OverallState getOverallState( - int configurationState, int dataChannelState, int notificationChannelState) { - if (configurationState == CONFIGURATION_STATE_OK) { - // Voicemail is configured. Let's see how is the data channel. - if (dataChannelState == DATA_CHANNEL_STATE_OK) { - // Data channel is fine. What about notification channel? - if (notificationChannelState == NOTIFICATION_CHANNEL_STATE_OK) { - return OverallState.OK; - } else if (notificationChannelState == NOTIFICATION_CHANNEL_STATE_MESSAGE_WAITING) { - return OverallState.NO_DETAILED_NOTIFICATION; - } else if (notificationChannelState == NOTIFICATION_CHANNEL_STATE_NO_CONNECTION) { - return OverallState.NO_NOTIFICATIONS; - } - } else if (dataChannelState == DATA_CHANNEL_STATE_NO_CONNECTION) { - // Data channel is not working. What about notification channel? - if (notificationChannelState == NOTIFICATION_CHANNEL_STATE_OK) { - return OverallState.NO_DATA; - } else if (notificationChannelState == NOTIFICATION_CHANNEL_STATE_MESSAGE_WAITING) { - return OverallState.MESSAGE_WAITING; - } else if (notificationChannelState == NOTIFICATION_CHANNEL_STATE_NO_CONNECTION) { - return OverallState.NO_CONNECTION; - } - } - } else if (configurationState == CONFIGURATION_STATE_CAN_BE_CONFIGURED) { - // Voicemail not configured. data/notification channel states are irrelevant. - return OverallState.INVITE_FOR_CONFIGURATION; - } else if (configurationState == Status.CONFIGURATION_STATE_NOT_CONFIGURED) { - // Voicemail not configured. data/notification channel states are irrelevant. - return OverallState.NOT_CONFIGURED; - } - // Will reach here only if the source has set an invalid value. - return OverallState.INVALID; - } - - /** Possible user actions. */ - public enum Action { - NONE(-1), - CALL_VOICEMAIL(R.string.voicemail_status_action_call_server), - CONFIGURE_VOICEMAIL(R.string.voicemail_status_action_configure); - - private final int mMessageId; - - Action(int messageId) { - mMessageId = messageId; - } - - public int getMessageId() { - return mMessageId; - } - } - - /** - * Overall state of the source status. Each state is associated with the corresponding display - * string and the corrective action. The states are also assigned a relative priority which is - * used to order the messages from different sources. - */ - private enum OverallState { - // TODO: Add separate string for call details and call log pages for the states that needs - // to be shown in both. - /** Both notification and data channel are not working. */ - NO_CONNECTION( - 0, - Action.CALL_VOICEMAIL, - R.string.voicemail_status_voicemail_not_available, - R.string.voicemail_status_audio_not_available), - /** Notifications working, but data channel is not working. Audio cannot be downloaded. */ - NO_DATA( - 1, - Action.CALL_VOICEMAIL, - R.string.voicemail_status_voicemail_not_available, - R.string.voicemail_status_audio_not_available), - /** Messages are known to be waiting but data channel is not working. */ - MESSAGE_WAITING( - 2, - Action.CALL_VOICEMAIL, - R.string.voicemail_status_messages_waiting, - R.string.voicemail_status_audio_not_available), - /** Notification channel not working, but data channel is. */ - NO_NOTIFICATIONS(3, Action.CALL_VOICEMAIL, R.string.voicemail_status_voicemail_not_available), - /** Invite user to set up voicemail. */ - INVITE_FOR_CONFIGURATION( - 4, Action.CONFIGURE_VOICEMAIL, R.string.voicemail_status_configure_voicemail), - /** - * No detailed notifications, but data channel is working. This is normal mode of operation for - * certain sources. No action needed. - */ - NO_DETAILED_NOTIFICATION(5, Action.NONE, -1), - /** Visual voicemail not yet set up. No local action needed. */ - NOT_CONFIGURED(6, Action.NONE, -1), - /** Everything is OK. */ - OK(7, Action.NONE, -1), - /** If one or more state value set by the source is not valid. */ - INVALID(8, Action.NONE, -1); - - private final int mPriority; - private final Action mAction; - private final int mCallLogMessageId; - private final int mCallDetailsMessageId; - - OverallState(int priority, Action action, int callLogMessageId) { - this(priority, action, callLogMessageId, -1); - } - - OverallState(int priority, Action action, int callLogMessageId, int callDetailsMessageId) { - mPriority = priority; - mAction = action; - mCallLogMessageId = callLogMessageId; - mCallDetailsMessageId = callDetailsMessageId; - } - - public Action getAction() { - return mAction; - } - - public int getPriority() { - return mPriority; - } - - public int getCallLogMessageId() { - return mCallLogMessageId; - } - - public int getCallDetailsMessageId() { - return mCallDetailsMessageId; - } - } - - /** A wrapper on {@link StatusMessage} which additionally stores the priority of the message. */ - private static class MessageStatusWithPriority { - - private final StatusMessage mMessage; - private final int mPriority; - - public MessageStatusWithPriority(StatusMessage message, int priority) { - mMessage = message; - mPriority = priority; - } - } -} diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java index 7c4394872..395829b80 100644 --- a/java/com/android/incallui/InCallActivity.java +++ b/java/com/android/incallui/InCallActivity.java @@ -625,7 +625,11 @@ public class InCallActivity extends TransactionSafeFragmentActivity // Show a new answer screen. AnswerScreen answerScreen = - AnswerBindings.createAnswerScreen(call.getId(), call.isVideoCall(), isVideoUpgradeRequest); + AnswerBindings.createAnswerScreen( + call.getId(), + call.isVideoCall(), + isVideoUpgradeRequest, + call.getVideoTech().isSelfManagedCamera()); transaction.add(R.id.main, answerScreen.getAnswerScreenFragment(), TAG_ANSWER_SCREEN); Logger.get(this).logScreenView(ScreenEvent.Type.INCOMING_CALL, this); diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java index 0f3982ce4..63dab792f 100644 --- a/java/com/android/incallui/InCallPresenter.java +++ b/java/com/android/incallui/InCallPresenter.java @@ -757,8 +757,10 @@ public class InCallPresenter implements CallList.Listener { FilteredNumbersUtil.recordLastEmergencyCallTime(mContext); } - if (!call.getLogState().isIncoming && !mCallList.hasLiveCall()) { - PostCall.onCallDisconnected(mContext, call.getNumber(), call.getConnectTimeMillis()); + if (!mCallList.hasLiveCall() + && !call.getLogState().isIncoming + && !CallerInfoUtils.isVoiceMailNumber(mContext, call)) { + PostCall.onCallDisconnected(mContext, call.getNumber(), call.getTimeAddedMs()); } } diff --git a/java/com/android/incallui/answer/bindings/AnswerBindings.java b/java/com/android/incallui/answer/bindings/AnswerBindings.java index 442e207a0..8be283990 100644 --- a/java/com/android/incallui/answer/bindings/AnswerBindings.java +++ b/java/com/android/incallui/answer/bindings/AnswerBindings.java @@ -23,7 +23,11 @@ import com.android.incallui.answer.protocol.AnswerScreen; public class AnswerBindings { public static AnswerScreen createAnswerScreen( - String callId, boolean isVideoCall, boolean isVideoUpgradeRequest) { - return AnswerFragment.newInstance(callId, isVideoCall, isVideoUpgradeRequest); + String callId, + boolean isVideoCall, + boolean isVideoUpgradeRequest, + boolean isSelfManagedCamera) { + return AnswerFragment.newInstance( + callId, isVideoCall, isVideoUpgradeRequest, isSelfManagedCamera); } } diff --git a/java/com/android/incallui/answer/impl/AnswerFragment.java b/java/com/android/incallui/answer/impl/AnswerFragment.java index 6874daea3..c6304c0fa 100644 --- a/java/com/android/incallui/answer/impl/AnswerFragment.java +++ b/java/com/android/incallui/answer/impl/AnswerFragment.java @@ -106,6 +106,9 @@ public class AnswerFragment extends Fragment @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) static final String ARG_IS_VIDEO_UPGRADE_REQUEST = "is_video_upgrade_request"; + @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) + static final String ARG_IS_SELF_MANAGED_CAMERA = "is_self_managed_camera"; + private static final String STATE_HAS_ANIMATED_ENTRY = "hasAnimated"; private static final int HINT_SECONDARY_SHOW_DURATION_MILLIS = 5000; @@ -288,11 +291,15 @@ public class AnswerFragment extends Fragment } public static AnswerFragment newInstance( - String callId, boolean isVideoCall, boolean isVideoUpgradeRequest) { + String callId, + boolean isVideoCall, + boolean isVideoUpgradeRequest, + boolean isSelfManagedCamera) { Bundle bundle = new Bundle(); bundle.putString(ARG_CALL_ID, Assert.isNotNull(callId)); bundle.putBoolean(ARG_IS_VIDEO_CALL, isVideoCall); bundle.putBoolean(ARG_IS_VIDEO_UPGRADE_REQUEST, isVideoUpgradeRequest); + bundle.putBoolean(ARG_IS_SELF_MANAGED_CAMERA, isSelfManagedCamera); AnswerFragment instance = new AnswerFragment(); instance.setArguments(bundle); @@ -347,10 +354,10 @@ public class AnswerFragment extends Fragment secondaryButton.setFocusable(AccessibilityUtil.isAccessibilityEnabled(getContext())); secondaryButton.setAccessibilityDelegate(accessibilityDelegate); - if (isVideoCall()) { - secondaryButton.setVisibility(View.VISIBLE); - } else { + if (isVideoUpgradeRequest()) { secondaryButton.setVisibility(View.INVISIBLE); + } else if (isVideoCall()) { + secondaryButton.setVisibility(View.VISIBLE); } } @@ -620,7 +627,11 @@ public class AnswerFragment extends Fragment view.setSystemUiVisibility(flags); if (isVideoCall() || isVideoUpgradeRequest()) { if (VideoUtils.hasCameraPermissionAndAllowedByUser(getContext())) { - answerVideoCallScreen = new AnswerVideoCallScreen(getCallId(), this, view); + if (isSelfManagedCamera()) { + answerVideoCallScreen = new SelfManagedAnswerVideoCallScreen(getCallId(), this, view); + } else { + answerVideoCallScreen = new AnswerVideoCallScreen(getCallId(), this, view); + } } else { view.findViewById(R.id.videocall_video_off).setVisibility(View.VISIBLE); } @@ -718,6 +729,10 @@ public class AnswerFragment extends Fragment return getArguments().getBoolean(ARG_IS_VIDEO_CALL); } + public boolean isSelfManagedCamera() { + return getArguments().getBoolean(ARG_IS_SELF_MANAGED_CAMERA); + } + @Override public void onAnswerProgressUpdate(@FloatRange(from = -1f, to = 1f) float answerProgress) { // Don't fade the window background for call waiting or video upgrades. Fading the background diff --git a/java/com/android/incallui/answer/impl/FixedAspectSurfaceView.java b/java/com/android/incallui/answer/impl/FixedAspectSurfaceView.java new file mode 100644 index 000000000..ad7d94d95 --- /dev/null +++ b/java/com/android/incallui/answer/impl/FixedAspectSurfaceView.java @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2017 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 + */ + +package com.android.incallui.answer.impl; + +import android.content.Context; +import android.content.res.TypedArray; +import android.util.AttributeSet; +import android.view.SurfaceView; +import android.view.View; +import com.android.dialer.common.Assert; + +/** + * A SurfaceView that maintains its aspect ratio to be a desired target value. + * + *

The FixedAspectSurfaceView will not be able to maintain the requested aspect ratio if both the + * width and the height are exactly determined by the layout. To avoid this, ensure that either the + * height or the width is adjustable by the view; for example, by setting the layout parameters to + * be WRAP_CONTENT for the dimension that is best adjusted to maintain the aspect ratio. + */ +public class FixedAspectSurfaceView extends SurfaceView { + + /** Desired width/height ratio */ + private float mAspectRatio; + + private final boolean scaleWidth; + private final boolean scaleHeight; + + public FixedAspectSurfaceView(Context context, AttributeSet attrs) { + super(context, attrs); + + // Get initial aspect ratio from custom attributes + TypedArray a = + context.getTheme().obtainStyledAttributes(attrs, R.styleable.FixedAspectSurfaceView, 0, 0); + scaleHeight = a.getBoolean(R.styleable.FixedAspectSurfaceView_scaleHeight, false); + scaleWidth = a.getBoolean(R.styleable.FixedAspectSurfaceView_scaleWidth, false); + Assert.checkArgument(scaleHeight != scaleWidth, "Must either scale width or height"); + setAspectRatio(a.getFloat(R.styleable.FixedAspectSurfaceView_aspectRatio, 1.f)); + a.recycle(); + } + + /** + * Set the desired aspect ratio for this view. + * + * @param aspect the desired width/height ratio in the current UI orientation. Must be a positive + * value. + */ + public void setAspectRatio(float aspect) { + Assert.checkArgument(aspect >= 0, "Aspect ratio must be positive"); + mAspectRatio = aspect; + requestLayout(); + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + int width = MeasureSpec.getSize(widthMeasureSpec); + int height = MeasureSpec.getSize(heightMeasureSpec); + + // Do the scaling + if (scaleWidth) { + width = (int) (height * mAspectRatio); + } else if (scaleHeight) { + height = (int) (width / mAspectRatio); + } + + // Override width/height if needed for EXACTLY and AT_MOST specs + width = View.resolveSizeAndState(width, widthMeasureSpec, 0); + height = View.resolveSizeAndState(height, heightMeasureSpec, 0); + + // Finally set the calculated dimensions + setMeasuredDimension(width, height); + } +} diff --git a/java/com/android/incallui/answer/impl/SelfManagedAnswerVideoCallScreen.java b/java/com/android/incallui/answer/impl/SelfManagedAnswerVideoCallScreen.java new file mode 100644 index 000000000..522d77235 --- /dev/null +++ b/java/com/android/incallui/answer/impl/SelfManagedAnswerVideoCallScreen.java @@ -0,0 +1,268 @@ +/* + * Copyright (C) 2017 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 + */ + +package com.android.incallui.answer.impl; + +import android.content.Context; +import android.hardware.camera2.CameraAccessException; +import android.hardware.camera2.CameraCaptureSession; +import android.hardware.camera2.CameraCharacteristics; +import android.hardware.camera2.CameraDevice; +import android.hardware.camera2.CameraDevice.StateCallback; +import android.hardware.camera2.CameraManager; +import android.hardware.camera2.CameraMetadata; +import android.hardware.camera2.CaptureRequest; +import android.hardware.camera2.params.StreamConfigurationMap; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.util.Size; +import android.view.Surface; +import android.view.SurfaceHolder; +import android.view.SurfaceView; +import android.view.View; +import com.android.dialer.common.Assert; +import com.android.dialer.common.LogUtil; +import com.android.incallui.video.protocol.VideoCallScreen; +import java.util.Arrays; + +/** + * Shows the local preview for the incoming video call or video upgrade request. This class is used + * for RCS Video Share where we need to open the camera preview ourselves. For IMS Video the camera + * is managed by the modem, see {@link AnswerVideoCallScreen}. + */ +public class SelfManagedAnswerVideoCallScreen extends StateCallback implements VideoCallScreen { + + private static final int MAX_WIDTH = 1920; + private static final float ASPECT_TOLERANCE = 0.1f; + private static final float TARGET_ASPECT = 16.f / 9.f; + + @NonNull private final String callId; + @NonNull private final Fragment fragment; + @NonNull private final FixedAspectSurfaceView surfaceView; + private final Context context; + + private String cameraId; + private CameraDevice camera; + private CaptureRequest.Builder captureRequestBuilder; + + public SelfManagedAnswerVideoCallScreen( + @NonNull String callId, @NonNull Fragment fragment, @NonNull View view) { + this.callId = Assert.isNotNull(callId); + this.fragment = Assert.isNotNull(fragment); + this.context = Assert.isNotNull(fragment.getContext()); + + surfaceView = + Assert.isNotNull( + (FixedAspectSurfaceView) view.findViewById(R.id.incoming_preview_surface_view)); + surfaceView.setVisibility(View.VISIBLE); + view.findViewById(R.id.incoming_preview_texture_view_overlay).setVisibility(View.VISIBLE); + view.setBackgroundColor(0xff000000); + } + + @Override + public void onVideoScreenStart() { + openCamera(); + } + + @Override + public void onVideoScreenStop() { + closeCamera(); + } + + @Override + public void showVideoViews( + boolean shouldShowPreview, boolean shouldShowRemote, boolean isRemotelyHeld) {} + + @Override + public void onLocalVideoDimensionsChanged() {} + + @Override + public void onLocalVideoOrientationChanged() {} + + @Override + public void onRemoteVideoDimensionsChanged() {} + + @Override + public void updateFullscreenAndGreenScreenMode( + boolean shouldShowFullscreen, boolean shouldShowGreenScreen) {} + + @Override + public Fragment getVideoCallScreenFragment() { + return fragment; + } + + @Override + public String getCallId() { + return callId; + } + + /** + * Opens the first front facing camera on the device into a {@link SurfaceView} while preserving + * aspect ratio. + */ + private void openCamera() { + CameraManager manager = context.getSystemService(CameraManager.class); + + StreamConfigurationMap configMap = getFrontFacingCameraSizes(manager); + if (configMap == null) { + return; + } + + Size previewSize = getOptimalSize(configMap.getOutputSizes(SurfaceHolder.class)); + LogUtil.i("SelfManagedAnswerVideoCallScreen.openCamera", "Optimal size: " + previewSize); + float outputAspect = (float) previewSize.getWidth() / previewSize.getHeight(); + surfaceView.setAspectRatio(outputAspect); + surfaceView.getHolder().setFixedSize(previewSize.getWidth(), previewSize.getHeight()); + + try { + manager.openCamera(cameraId, this, null); + } catch (CameraAccessException e) { + LogUtil.e("SelfManagedAnswerVideoCallScreen.openCamera", "failed to open camera", e); + } + } + + @Nullable + private StreamConfigurationMap getFrontFacingCameraSizes(CameraManager manager) { + String[] cameraIds; + try { + cameraIds = manager.getCameraIdList(); + } catch (CameraAccessException e) { + LogUtil.e( + "SelfManagedAnswerVideoCallScreen.getFrontFacingCameraSizes", + "failed to get camera ids", + e); + return null; + } + + for (String cameraId : cameraIds) { + CameraCharacteristics characteristics; + try { + characteristics = manager.getCameraCharacteristics(cameraId); + } catch (CameraAccessException e) { + LogUtil.e( + "SelfManagedAnswerVideoCallScreen.getFrontFacingCameraSizes", + "failed to get camera characteristics", + e); + continue; + } + + if (characteristics.get(CameraCharacteristics.LENS_FACING) + != CameraCharacteristics.LENS_FACING_FRONT) { + continue; + } + + StreamConfigurationMap configMap = + characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP); + if (configMap == null) { + continue; + } + + this.cameraId = cameraId; + return configMap; + } + LogUtil.e( + "SelfManagedAnswerVideoCallScreen.getFrontFacingCameraSizes", "No valid configurations."); + return null; + } + + /** + * Given an array of {@link Size}s, tries to find the largest Size such that the aspect ratio of + * the returned size is within {@code ASPECT_TOLERANCE} of {@code TARGET_ASPECT}. This is useful + * because it provides us with an adequate size/camera resolution that will experience the least + * stretching from our fullscreen UI that doesn't match any of the camera sizes. + */ + private static Size getOptimalSize(Size[] outputSizes) { + Size bestCandidateSize = outputSizes[0]; + float bestCandidateAspect = + (float) bestCandidateSize.getWidth() / bestCandidateSize.getHeight(); + + for (Size candidateSize : outputSizes) { + if (candidateSize.getWidth() < MAX_WIDTH) { + float candidateAspect = (float) candidateSize.getWidth() / candidateSize.getHeight(); + boolean isGoodCandidateAspect = + Math.abs(candidateAspect - TARGET_ASPECT) < ASPECT_TOLERANCE; + boolean isGoodOutputAspect = + Math.abs(bestCandidateAspect - TARGET_ASPECT) < ASPECT_TOLERANCE; + + if ((isGoodCandidateAspect && !isGoodOutputAspect) + || candidateSize.getWidth() > bestCandidateSize.getWidth()) { + bestCandidateSize = candidateSize; + bestCandidateAspect = candidateAspect; + } + } + } + return bestCandidateSize; + } + + @Override + public void onOpened(CameraDevice camera) { + LogUtil.i("SelfManagedAnswerVideoCallScreen.opOpened", "camera opened."); + this.camera = camera; + Surface surface = surfaceView.getHolder().getSurface(); + try { + captureRequestBuilder = camera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW); + captureRequestBuilder.addTarget(surface); + camera.createCaptureSession(Arrays.asList(surface), new CaptureSessionCallback(), null); + } catch (CameraAccessException e) { + LogUtil.e( + "SelfManagedAnswerVideoCallScreen.createCameraPreview", "failed to create preview", e); + } + } + + @Override + public void onDisconnected(CameraDevice camera) { + closeCamera(); + } + + @Override + public void onError(CameraDevice camera, int error) { + closeCamera(); + } + + private void closeCamera() { + if (camera != null) { + camera.close(); + camera = null; + } + } + + private class CaptureSessionCallback extends CameraCaptureSession.StateCallback { + + @Override + public void onConfigured(@NonNull CameraCaptureSession cameraCaptureSession) { + LogUtil.i( + "SelfManagedAnswerVideoCallScreen.onConfigured", "camera capture session configured."); + // The camera is already closed. + if (camera == null) { + return; + } + + // When the session is ready, we start displaying the preview. + captureRequestBuilder.set(CaptureRequest.CONTROL_MODE, CameraMetadata.CONTROL_MODE_AUTO); + try { + cameraCaptureSession.setRepeatingRequest(captureRequestBuilder.build(), null, null); + } catch (CameraAccessException e) { + LogUtil.e("CaptureSessionCallback.onConfigured", "failed to configure", e); + } + } + + @Override + public void onConfigureFailed(@NonNull CameraCaptureSession cameraCaptureSession) { + LogUtil.e("CaptureSessionCallback.onConfigureFailed", "failed to configure"); + } + } +} diff --git a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml b/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml index aa153dd4b..042e7b82f 100644 --- a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml +++ b/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml @@ -14,7 +14,6 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> - + android:id="@+id/incoming_preview_texture_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:importantForAccessibility="no" + android:visibility="gone"/> + + + + + false + true + diff --git a/java/com/android/incallui/answer/impl/res/values/attrs.xml b/java/com/android/incallui/answer/impl/res/values/attrs.xml new file mode 100644 index 000000000..1086e1ca5 --- /dev/null +++ b/java/com/android/incallui/answer/impl/res/values/attrs.xml @@ -0,0 +1,26 @@ + + + + + + + + + + -1 + -2 + \ No newline at end of file diff --git a/java/com/android/incallui/answer/impl/res/values/dimens.xml b/java/com/android/incallui/answer/impl/res/values/dimens.xml index 8329707a6..50aec0328 100644 --- a/java/com/android/incallui/answer/impl/res/values/dimens.xml +++ b/java/com/android/incallui/answer/impl/res/values/dimens.xml @@ -14,7 +14,6 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> - 24sp 24sp @@ -22,5 +21,7 @@ 0dp 0dp false + true + false 1000 diff --git a/java/com/android/incallui/calllocation/CallLocationComponent.java b/java/com/android/incallui/calllocation/CallLocationComponent.java index 6b1faf299..46ca669db 100644 --- a/java/com/android/incallui/calllocation/CallLocationComponent.java +++ b/java/com/android/incallui/calllocation/CallLocationComponent.java @@ -17,26 +17,18 @@ package com.android.incallui.calllocation; import android.content.Context; +import com.android.dialer.inject.HasRootComponent; import dagger.Subcomponent; -import com.android.incallui.calllocation.stub.StubCallLocationModule; /** Subcomponent that can be used to access the call location implementation. */ -public class CallLocationComponent { - private static CallLocationComponent instance; - private CallLocation callLocation; +@Subcomponent +public abstract class CallLocationComponent { - public CallLocation getCallLocation(){ - if (callLocation == null) { - callLocation = new StubCallLocationModule.StubCallLocation(); - } - return callLocation; - } + public abstract CallLocation getCallLocation(); public static CallLocationComponent get(Context context) { - if (instance == null) { - instance = new CallLocationComponent(); - } - return instance; + return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component()) + .callLocationComponent(); } /** Used to refer to the root application component. */ diff --git a/java/com/android/incallui/calllocation/impl/HttpFetcher.java b/java/com/android/incallui/calllocation/impl/HttpFetcher.java index c4aaa2257..7bfbaa6ef 100644 --- a/java/com/android/incallui/calllocation/impl/HttpFetcher.java +++ b/java/com/android/incallui/calllocation/impl/HttpFetcher.java @@ -223,6 +223,8 @@ public class HttpFetcher { /** * Lookup up url re-write rules from gServices and apply to the given url. * + *

https://wiki.corp.google.com/twiki/bin/view/Main/AndroidGservices#URL_Rewriting_Rules + * * @return The new url. */ private static URL reWriteUrl(Context context, String url) { diff --git a/java/com/android/incallui/calllocation/stub/StubCallLocationModule.java b/java/com/android/incallui/calllocation/stub/StubCallLocationModule.java index fc198c724..20460699a 100644 --- a/java/com/android/incallui/calllocation/stub/StubCallLocationModule.java +++ b/java/com/android/incallui/calllocation/stub/StubCallLocationModule.java @@ -32,9 +32,9 @@ public abstract class StubCallLocationModule { @Binds public abstract CallLocation bindCallLocation(StubCallLocation callLocation); - static public class StubCallLocation implements CallLocation { + static class StubCallLocation implements CallLocation { @Inject - public StubCallLocation() {} + StubCallLocation() {} @Override public boolean canGetLocation(@NonNull Context context) { @@ -44,7 +44,7 @@ public abstract class StubCallLocationModule { @Override @NonNull public Fragment getLocationFragment(@NonNull Context context) { - return null; + throw Assert.createUnsupportedOperationFailException(); } @Override diff --git a/java/com/android/incallui/incall/impl/AndroidManifest.xml b/java/com/android/incallui/incall/impl/AndroidManifest.xml index a0e3110d8..3d646506d 100644 --- a/java/com/android/incallui/incall/impl/AndroidManifest.xml +++ b/java/com/android/incallui/incall/impl/AndroidManifest.xml @@ -1,3 +1 @@ - - + diff --git a/java/com/android/incallui/incall/impl/InCallFragment.java b/java/com/android/incallui/incall/impl/InCallFragment.java index b6ae4902a..02e9b4add 100644 --- a/java/com/android/incallui/incall/impl/InCallFragment.java +++ b/java/com/android/incallui/incall/impl/InCallFragment.java @@ -25,11 +25,9 @@ import android.os.Bundle; import android.os.Handler; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.support.design.widget.TabLayout; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; import android.support.v4.content.ContextCompat; -import android.support.v4.view.ViewPager; import android.telecom.CallAudioState; import android.telephony.TelephonyManager; import android.view.LayoutInflater; @@ -74,8 +72,8 @@ public class InCallFragment extends Fragment private List buttonControllers = new ArrayList<>(); private View endCallButton; - private TabLayout tabLayout; - private ViewPager pager; + private InCallPaginator paginator; + private LockableViewPager pager; private InCallPagerAdapter adapter; private ContactGridManager contactGridManager; private InCallScreenDelegate inCallScreenDelegate; @@ -134,8 +132,8 @@ public class InCallFragment extends Fragment getResources().getDimensionPixelSize(R.dimen.incall_avatar_size), true /* showAnonymousAvatar */); - tabLayout = (TabLayout) view.findViewById(R.id.incall_tab_dots); - pager = (ViewPager) view.findViewById(R.id.incall_pager); + paginator = (InCallPaginator) view.findViewById(R.id.incall_paginator); + pager = (LockableViewPager) view.findViewById(R.id.incall_pager); endCallButton = view.findViewById(R.id.incall_end_call); endCallButton.setOnClickListener(this); @@ -248,8 +246,8 @@ public class InCallFragment extends Fragment } if (adapter.getCount() > 1) { - tabLayout.setVisibility(pager.getVisibility()); - tabLayout.setupWithViewPager(pager, true); + paginator.setVisibility(View.VISIBLE); + paginator.setupWithViewPager(pager); if (!stateRestored) { new Handler() .postDelayed( @@ -263,9 +261,9 @@ public class InCallFragment extends Fragment } }, 2000); + } else { + paginator.setVisibility(View.GONE); } - } else { - tabLayout.setVisibility(View.GONE); } } @@ -428,8 +426,15 @@ public class InCallFragment extends Fragment int visibility = numVisibleButtons == 0 ? View.GONE : View.VISIBLE; pager.setVisibility(visibility); - if (adapter != null && adapter.getCount() > 1) { - tabLayout.setVisibility(visibility); + if (adapter != null + && adapter.getCount() > 1 + && getResources().getInteger(R.integer.incall_num_rows) > 1) { + paginator.setVisibility(View.VISIBLE); + pager.setSwipingLocked(false); + } else { + paginator.setVisibility(View.GONE); + pager.setSwipingLocked(true); + pager.setCurrentItem(adapter.getButtonGridPosition()); } } diff --git a/java/com/android/incallui/incall/impl/InCallPaginator.java b/java/com/android/incallui/incall/impl/InCallPaginator.java new file mode 100644 index 000000000..8ebbd76a2 --- /dev/null +++ b/java/com/android/incallui/incall/impl/InCallPaginator.java @@ -0,0 +1,210 @@ +/* + * Copyright (C) 2017 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. + */ + +package com.android.incallui.incall.impl; + +import android.animation.ValueAnimator; +import android.content.Context; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.Path; +import android.support.annotation.VisibleForTesting; +import android.support.v4.view.ViewPager; +import android.support.v4.view.ViewPager.OnPageChangeListener; +import android.util.AttributeSet; +import android.view.View; +import com.android.dialer.common.Assert; + +/** + * This is the view class for incall paginator visible when a user has EC data attached to their + * call. It contains animation methods when the swipe gesture is performed. + */ +public class InCallPaginator extends View implements OnPageChangeListener { + + private int dotRadius; + private int dotsSeparation; + + private Paint activeDotPaintPortrait; + private Paint inactiveDotPaintPortrait; + + private Path inactiveDotPath; + private ValueAnimator transitionAnimator; + private boolean useModeSwitchTransition; + + private float progress; + private boolean toFirstPage; + private boolean pageChanged; + + public InCallPaginator(Context context) { + super(context); + init(context); + } + + public InCallPaginator(Context context, AttributeSet attrs) { + super(context, attrs); + init(context); + } + + private void init(Context context) { + dotRadius = getResources().getDimensionPixelSize(R.dimen.paginator_dot_radius); + dotsSeparation = getResources().getDimensionPixelSize(R.dimen.paginator_dots_separation); + + int activeDotColor = context.getColor(R.color.paginator_dot); + int inactiveDotColor = context.getColor(R.color.paginator_path); + activeDotPaintPortrait = new Paint(Paint.ANTI_ALIAS_FLAG); + activeDotPaintPortrait.setColor(activeDotColor); + inactiveDotPaintPortrait = new Paint(Paint.ANTI_ALIAS_FLAG); + inactiveDotPaintPortrait.setColor(inactiveDotColor); + + inactiveDotPath = new Path(); + transitionAnimator = ValueAnimator.ofFloat(0f, 1f); + transitionAnimator.setInterpolator(null); + transitionAnimator.setCurrentFraction(0f); + transitionAnimator.addUpdateListener(animation -> invalidate()); + } + + @VisibleForTesting + public void setProgress(float progress, boolean toFirstPage) { + this.progress = progress; + this.toFirstPage = toFirstPage; + + // Ensure the dot transition keeps up with the swipe progress. + if (transitionAnimator.isStarted() && progress > transitionAnimator.getAnimatedFraction()) { + transitionAnimator.setCurrentFraction(progress); + } + + invalidate(); + } + + private void startTransition() { + if (transitionAnimator.getAnimatedFraction() < 1f) { + transitionAnimator.setCurrentFraction(progress); + useModeSwitchTransition = false; + transitionAnimator.cancel(); + transitionAnimator.start(); + } + } + + private void endTransition(boolean snapBack) { + if (transitionAnimator.getAnimatedFraction() > 0f) { + useModeSwitchTransition = !snapBack; + transitionAnimator.cancel(); + transitionAnimator.reverse(); + } + } + + @Override + public void onDraw(Canvas canvas) { + super.onDraw(canvas); + + int centerX = getWidth() / 2; + int centerY = getHeight() / 2; + + float transitionFraction = (float) transitionAnimator.getAnimatedValue(); + + // Draw the inactive "dots". + inactiveDotPath.reset(); + if (useModeSwitchTransition) { + float trackWidth = 2 * dotRadius + transitionFraction * (2 * dotRadius + dotsSeparation); + float indicatorRadius = dotRadius * (1f - 2f * Math.min(transitionFraction, 0.5f)); + float indicatorOffset = dotRadius + dotsSeparation / 2; + if (toFirstPage) { + float trackLeft = centerX - indicatorOffset - dotRadius; + inactiveDotPath.addRoundRect( + trackLeft, + centerY - dotRadius, + trackLeft + trackWidth, + centerY + dotRadius, + dotRadius, + dotRadius, + Path.Direction.CW); + inactiveDotPath.addCircle( + centerX + indicatorOffset, centerY, indicatorRadius, Path.Direction.CW); + } else { + float trackRight = centerX + indicatorOffset + dotRadius; + inactiveDotPath.addRoundRect( + trackRight - trackWidth, + centerY - dotRadius, + trackRight, + centerY + dotRadius, + dotRadius, + dotRadius, + Path.Direction.CW); + inactiveDotPath.addCircle( + centerX - indicatorOffset, centerY, indicatorRadius, Path.Direction.CW); + } + } else { + float centerOffset = dotsSeparation / 2f; + float innerOffset = centerOffset - transitionFraction * (dotRadius + centerOffset); + float outerOffset = 2f * dotRadius + centerOffset; + inactiveDotPath.addRoundRect( + centerX - outerOffset, + centerY - dotRadius, + centerX - innerOffset, + centerY + dotRadius, + dotRadius, + dotRadius, + Path.Direction.CW); + inactiveDotPath.addRoundRect( + centerX + innerOffset, + centerY - dotRadius, + centerX + outerOffset, + centerY + dotRadius, + dotRadius, + dotRadius, + Path.Direction.CW); + } + Paint inactivePaint = inactiveDotPaintPortrait; + canvas.drawPath(inactiveDotPath, inactivePaint); + + // Draw the white active dot. + float activeDotOffset = + (toFirstPage ? 1f - 2f * progress : 2f * progress - 1f) * (dotRadius + dotsSeparation / 2); + Paint activePaint = activeDotPaintPortrait; + canvas.drawCircle(centerX + activeDotOffset, centerY, dotRadius, activePaint); + } + + public void setupWithViewPager(ViewPager pager) { + Assert.checkArgument(pager.getAdapter().getCount() == 2, "Invalid page count."); + pager.addOnPageChangeListener(this); + } + + @Override + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + setProgress(positionOffset, position != 0); + } + + @Override + public void onPageSelected(int position) { + pageChanged = true; + } + + @Override + public void onPageScrollStateChanged(int state) { + switch (state) { + case ViewPager.SCROLL_STATE_IDLE: + endTransition(!pageChanged); + pageChanged = false; + break; + case ViewPager.SCROLL_STATE_DRAGGING: + startTransition(); + break; + case ViewPager.SCROLL_STATE_SETTLING: + default: + break; + } + } +} diff --git a/java/com/android/incallui/incall/impl/LockableViewPager.java b/java/com/android/incallui/incall/impl/LockableViewPager.java new file mode 100644 index 000000000..5b8b12609 --- /dev/null +++ b/java/com/android/incallui/incall/impl/LockableViewPager.java @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2016 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. + */ + +package com.android.incallui.incall.impl; + +import android.content.Context; +import android.support.v4.view.ViewPager; +import android.util.AttributeSet; +import android.view.MotionEvent; + +/** {@link ViewPager} useful for disabled swiping between pages. */ +public class LockableViewPager extends ViewPager { + + private boolean swipingLocked; + + public LockableViewPager(Context context, AttributeSet attributeSet) { + super(context, attributeSet); + } + + public void setSwipingLocked(boolean swipingLocked) { + this.swipingLocked = swipingLocked; + } + + @Override + public boolean onInterceptTouchEvent(MotionEvent motionEvent) { + return !swipingLocked && super.onInterceptTouchEvent(motionEvent); + } + + @Override + public boolean onTouchEvent(MotionEvent motionEvent) { + return !swipingLocked && super.onTouchEvent(motionEvent); + } +} diff --git a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml b/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml index 9b950462c..e4bc942bb 100644 --- a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml +++ b/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml @@ -60,23 +60,21 @@ android:layout_height="match_parent"/> - - + false 0 + + 5dp + 8dp + 38dp + 72dp diff --git a/java/com/android/incallui/incall/impl/res/values/styles.xml b/java/com/android/incallui/incall/impl/res/values/styles.xml index 2392574a3..a8cf2ddf1 100644 --- a/java/com/android/incallui/incall/impl/res/values/styles.xml +++ b/java/com/android/incallui/incall/impl/res/values/styles.xml @@ -17,6 +17,9 @@ + #FFF + #66FFFFFF + diff --git a/java/com/android/incallui/maps/MapsComponent.java b/java/com/android/incallui/maps/MapsComponent.java index 1ca17b781..796abaa92 100644 --- a/java/com/android/incallui/maps/MapsComponent.java +++ b/java/com/android/incallui/maps/MapsComponent.java @@ -19,29 +19,18 @@ package com.android.incallui.maps; import android.content.Context; import com.android.dialer.inject.HasRootComponent; import dagger.Subcomponent; -import com.android.incallui.maps.stub.StubMapsModule; /** Subcomponent that can be used to access the maps implementation. */ -public class MapsComponent { +@Subcomponent +public abstract class MapsComponent { - private static MapsComponent instance; - private Maps maps; - - public Maps getMaps() { - if (maps == null) { - maps = new StubMapsModule.StubMaps(); - } - return maps; - } + public abstract Maps getMaps(); public static MapsComponent get(Context context) { - if (instance == null) { - instance = new MapsComponent(); - } - return instance; + return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component()) + .mapsComponent(); } - /** Used to refer to the root application component. */ public interface HasComponent { MapsComponent mapsComponent(); diff --git a/java/com/android/incallui/maps/stub/StubMapsModule.java b/java/com/android/incallui/maps/stub/StubMapsModule.java index 72678143c..3a193b15d 100644 --- a/java/com/android/incallui/maps/stub/StubMapsModule.java +++ b/java/com/android/incallui/maps/stub/StubMapsModule.java @@ -34,7 +34,7 @@ public abstract class StubMapsModule { @Singleton public abstract Maps bindMaps(StubMaps maps); - static public final class StubMaps implements Maps { + static final class StubMaps implements Maps { @Inject public StubMaps() {} diff --git a/java/com/android/incallui/res/values-uz/strings.xml b/java/com/android/incallui/res/values-uz/strings.xml index fcf221f38..585f983ac 100644 --- a/java/com/android/incallui/res/values-uz/strings.xml +++ b/java/com/android/incallui/res/values-uz/strings.xml @@ -30,7 +30,7 @@ "Konferensiya qo‘ng‘irog‘i %s" "Ovozli pochta raqami" "Raqam terilmoqda" - "%s qo‘ng‘irog‘i javobsiz qoldirildi" + "%s chaqiruvi javobsiz qoldi" "Joriy qo‘ng‘iroq" "Chiquvchi ishchi qo‘ng‘irog‘i" "Chiquvchi Wi-Fi qo‘ng‘irog‘i" diff --git a/java/com/android/incallui/videotech/VideoTech.java b/java/com/android/incallui/videotech/VideoTech.java index fb2641793..bd957b699 100644 --- a/java/com/android/incallui/videotech/VideoTech.java +++ b/java/com/android/incallui/videotech/VideoTech.java @@ -27,6 +27,12 @@ public interface VideoTech { boolean isTransmittingOrReceiving(); + /** + * Determines if the answer video UI should open the camera directly instead of letting the video + * tech manage the camera. + */ + boolean isSelfManagedCamera(); + void onCallStateChanged(int newState); @SessionModificationState diff --git a/java/com/android/incallui/videotech/empty/EmptyVideoTech.java b/java/com/android/incallui/videotech/empty/EmptyVideoTech.java index bc8db4c07..c76043540 100644 --- a/java/com/android/incallui/videotech/empty/EmptyVideoTech.java +++ b/java/com/android/incallui/videotech/empty/EmptyVideoTech.java @@ -31,6 +31,11 @@ public class EmptyVideoTech implements VideoTech { return false; } + @Override + public boolean isSelfManagedCamera() { + return false; + } + @Override public void onCallStateChanged(int newState) {} diff --git a/java/com/android/incallui/videotech/ims/ImsVideoTech.java b/java/com/android/incallui/videotech/ims/ImsVideoTech.java index 890e5c80c..a37500c3b 100644 --- a/java/com/android/incallui/videotech/ims/ImsVideoTech.java +++ b/java/com/android/incallui/videotech/ims/ImsVideoTech.java @@ -57,6 +57,13 @@ public class ImsVideoTech implements VideoTech { return VideoProfile.isVideo(call.getDetails().getVideoState()); } + @Override + public boolean isSelfManagedCamera() { + // Return false to indicate that the answer UI shouldn't open the camera itself. + // For IMS Video the modem is responsible for opening the camera. + return false; + } + @Override public void onCallStateChanged(int newState) { if (!isAvailable()) { diff --git a/java/com/android/incallui/videotech/rcs/RcsVideoShare.java b/java/com/android/incallui/videotech/rcs/RcsVideoShare.java index 2cb43036f..1e951408c 100644 --- a/java/com/android/incallui/videotech/rcs/RcsVideoShare.java +++ b/java/com/android/incallui/videotech/rcs/RcsVideoShare.java @@ -64,6 +64,11 @@ public class RcsVideoShare implements VideoTech, CapabilitiesListener, VideoShar || receivingSessionId != Session.NO_SESSION_ID; } + @Override + public boolean isSelfManagedCamera() { + return true; + } + @Override public void onCallStateChanged(int newState) { if (newState == Call.STATE_DISCONNECTING) { diff --git a/java/com/android/voicemail/VisualVoicemailTypeExtensions.java b/java/com/android/voicemail/VisualVoicemailTypeExtensions.java new file mode 100644 index 000000000..056481059 --- /dev/null +++ b/java/com/android/voicemail/VisualVoicemailTypeExtensions.java @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2017 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 + */ + +package com.android.voicemail; + +/** + * Extended types used by {@link android.provider.VoicemailContract.Status#SOURCE_TYPE} not defined + * in {@link android.telephony.TelephonyManager}. {@link + * android.telephony.TelephonyManager#VVM_TYPE_OMTP} and {@link + * android.telephony.TelephonyManager#VVM_TYPE_CVVM} are already defined. + */ +public class VisualVoicemailTypeExtensions { + + // Protocol used by Verizon wireless + public static final String VVM_TYPE_VVM3 = "vvm_type_vvm3"; +} diff --git a/java/com/android/voicemail/VoicemailClient.java b/java/com/android/voicemail/VoicemailClient.java index b237f65f6..54cffdac6 100644 --- a/java/com/android/voicemail/VoicemailClient.java +++ b/java/com/android/voicemail/VoicemailClient.java @@ -45,6 +45,18 @@ public interface VoicemailClient { */ void appendOmtpVoicemailSelectionClause( Context context, StringBuilder where, List selectionArgs); + + /** + * Appends the selection to ignore voicemail status from non-active OMTP voicemail package. The + * {@link android.provider.VoicemailContract.Status#SOURCE_TYPE} is checked against a list of + * known OMTP types. Voicemails from {@link #OMTP_VOICEMAIL_BLACKLIST} will also be ignored as + * they are voicemail source only valid pre-OC. + * + * @see #appendOmtpVoicemailSelectionClause(Context, StringBuilder, List) + */ + void appendOmtpVoicemailStatusSelectionClause( + Context context, StringBuilder where, List selectionArgs); + /** * @return the class name of the {@link android.preference.PreferenceFragment} for voicemail * settings, or {@code null} if dialer cannot control voicemail settings. Always return {@code diff --git a/java/com/android/voicemail/VoicemailComponent.java b/java/com/android/voicemail/VoicemailComponent.java index 6dd6f9d90..bed75f0ef 100644 --- a/java/com/android/voicemail/VoicemailComponent.java +++ b/java/com/android/voicemail/VoicemailComponent.java @@ -17,26 +17,18 @@ package com.android.voicemail; import android.content.Context; +import com.android.dialer.inject.HasRootComponent; import dagger.Subcomponent; -import com.android.voicemail.impl.VoicemailClientImpl; /** Subcomponent that can be used to access the voicemail implementation. */ -public class VoicemailComponent { - private static VoicemailComponent instance; - private VoicemailClientImpl voicemailClient; +@Subcomponent +public abstract class VoicemailComponent { - public VoicemailClient getVoicemailClient() { - if (voicemailClient == null) { - voicemailClient = new VoicemailClientImpl(); - } - return voicemailClient; - } + public abstract VoicemailClient getVoicemailClient(); public static VoicemailComponent get(Context context) { - if (instance == null) { - instance = new VoicemailComponent(); - } - return instance; + return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component()) + .voicemailComponent(); } /** Used to refer to the root application component. */ diff --git a/java/com/android/voicemail/impl/AndroidManifest.xml b/java/com/android/voicemail/impl/AndroidManifest.xml index 0d90d5932..8c0bd3599 100644 --- a/java/com/android/voicemail/impl/AndroidManifest.xml +++ b/java/com/android/voicemail/impl/AndroidManifest.xml @@ -85,14 +85,12 @@ android:name="com.android.voicemail.impl.scheduling.TaskSchedulerService" android:exported="false"/> - - + - + selectionArgs) { TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class); String omtpSource = TelephonyMangerCompat.getVisualVoicemailPackageName(telephonyManager); - where.append( - "AND (" - + "(" - + Voicemails.IS_OMTP_VOICEMAIL - + " != 1)" - + "OR " - + "(" - + Voicemails.SOURCE_PACKAGE - + " = ? )" - + ")"); - selectionArgs.add(omtpSource); + if (where.length() != 0) { + where.append(" AND "); + } + where.append("("); + { + where.append("("); + { + where.append(Voicemails.IS_OMTP_VOICEMAIL).append(" != 1"); + where.append(")"); + } + where.append(" OR "); + where.append("("); + { + where.append(Voicemails.SOURCE_PACKAGE).append(" = ?"); + selectionArgs.add(omtpSource); + where.append(")"); + } + where.append(")"); + } for (String blacklistedPackage : OMTP_VOICEMAIL_BLACKLIST) { - where.append("AND (" + Voicemails.SOURCE_PACKAGE + "!= ?)"); + where.append("AND (").append(Voicemails.SOURCE_PACKAGE).append("!= ?)"); selectionArgs.add(blacklistedPackage); } } + + @TargetApi(VERSION_CODES.O) + @Override + public void appendOmtpVoicemailStatusSelectionClause( + Context context, StringBuilder where, List selectionArgs) { + TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class); + String omtpSource = TelephonyMangerCompat.getVisualVoicemailPackageName(telephonyManager); + if (where.length() != 0) { + where.append(" AND "); + } + where.append("("); + { + where.append("("); + { + where.append(Status.SOURCE_PACKAGE).append(" = ? "); + selectionArgs.add(omtpSource); + where.append(")"); + } + where.append(" OR NOT ("); + { + for (int i = 0; i < OMTP_VOICEMAIL_TYPE.length; i++) { + if (i != 0) { + where.append(" OR "); + } + where.append(" ("); + { + where.append(Status.SOURCE_TYPE).append(" == ?"); + selectionArgs.add(OMTP_VOICEMAIL_TYPE[i]); + where.append(")"); + } + } + where.append(")"); + } + for (String blacklistedPackage : OMTP_VOICEMAIL_BLACKLIST) { + where.append("AND ("); + { + where.append(Voicemails.SOURCE_PACKAGE).append("!= ?"); + selectionArgs.add(blacklistedPackage); + where.append(")"); + } + } + where.append(")"); + } + } } diff --git a/java/com/android/voicemail/impl/protocol/VisualVoicemailProtocolFactory.java b/java/com/android/voicemail/impl/protocol/VisualVoicemailProtocolFactory.java index 056fb2eaf..ef27c2202 100644 --- a/java/com/android/voicemail/impl/protocol/VisualVoicemailProtocolFactory.java +++ b/java/com/android/voicemail/impl/protocol/VisualVoicemailProtocolFactory.java @@ -19,14 +19,13 @@ package com.android.voicemail.impl.protocol; import android.content.res.Resources; import android.support.annotation.Nullable; import android.telephony.TelephonyManager; +import com.android.voicemail.VisualVoicemailTypeExtensions; import com.android.voicemail.impl.VvmLog; public class VisualVoicemailProtocolFactory { private static final String TAG = "VvmProtocolFactory"; - private static final String VVM_TYPE_VVM3 = "vvm_type_vvm3"; - @Nullable public static VisualVoicemailProtocol create(Resources resources, String type) { if (type == null) { @@ -37,7 +36,7 @@ public class VisualVoicemailProtocolFactory { return new OmtpProtocol(); case TelephonyManager.VVM_TYPE_CVVM: return new CvvmProtocol(); - case VVM_TYPE_VVM3: + case VisualVoicemailTypeExtensions.VVM_TYPE_VVM3: return new Vvm3Protocol(); default: VvmLog.e(TAG, "Unexpected visual voicemail type: " + type); diff --git a/java/com/android/voicemail/impl/res/values-af/strings.xml b/java/com/android/voicemail/impl/res/values-af/strings.xml index f3697271e..d71e534e7 100644 --- a/java/com/android/voicemail/impl/res/values-af/strings.xml +++ b/java/com/android/voicemail/impl/res/values-af/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibreer" "Vibreer" "Klank" "Gevorderde instellings" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-am/strings.xml b/java/com/android/voicemail/impl/res/values-am/strings.xml index 5c371a912..8376fa1ae 100644 --- a/java/com/android/voicemail/impl/res/values-am/strings.xml +++ b/java/com/android/voicemail/impl/res/values-am/strings.xml @@ -16,8 +16,66 @@ + + + + "ንዘር" "ንዘር" "ድምፅ" "የላቁ ቅንብሮች" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-ar/strings.xml b/java/com/android/voicemail/impl/res/values-ar/strings.xml index c6d5ab822..e71245b57 100644 --- a/java/com/android/voicemail/impl/res/values-ar/strings.xml +++ b/java/com/android/voicemail/impl/res/values-ar/strings.xml @@ -16,8 +16,66 @@ + + + + "اهتزاز" "اهتزاز" "صوت" "الإعدادات المتقدمة" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-az/strings.xml b/java/com/android/voicemail/impl/res/values-az/strings.xml index 6376f06ff..e6439d49e 100644 --- a/java/com/android/voicemail/impl/res/values-az/strings.xml +++ b/java/com/android/voicemail/impl/res/values-az/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibrasiya" "Vibrasiya" "Səs" "Qabaqcıl Ayarlar" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-be/strings.xml b/java/com/android/voicemail/impl/res/values-be/strings.xml index fdbd93a60..af715c89a 100644 --- a/java/com/android/voicemail/impl/res/values-be/strings.xml +++ b/java/com/android/voicemail/impl/res/values-be/strings.xml @@ -16,8 +16,66 @@ + + + + "Вібрацыя" "Вібрацыя" "Гук" "Пашыраныя налады" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-bg/strings.xml b/java/com/android/voicemail/impl/res/values-bg/strings.xml index f9871b4b2..3f56075a9 100644 --- a/java/com/android/voicemail/impl/res/values-bg/strings.xml +++ b/java/com/android/voicemail/impl/res/values-bg/strings.xml @@ -16,8 +16,66 @@ + + + + "Вибриране" "Вибриране" "Звук" "Разширени настройки" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-bn/strings.xml b/java/com/android/voicemail/impl/res/values-bn/strings.xml index 99b2ec7cb..5907b5933 100644 --- a/java/com/android/voicemail/impl/res/values-bn/strings.xml +++ b/java/com/android/voicemail/impl/res/values-bn/strings.xml @@ -16,8 +16,66 @@ + + + + "কম্পন" "কম্পন" "শব্দ" "উন্নত সেটিংস" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-bs/strings.xml b/java/com/android/voicemail/impl/res/values-bs/strings.xml index 2e9102876..f8c09dd1c 100644 --- a/java/com/android/voicemail/impl/res/values-bs/strings.xml +++ b/java/com/android/voicemail/impl/res/values-bs/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibracija" "Vibracija" "Zvuk" "Napredne postavke" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-ca/strings.xml b/java/com/android/voicemail/impl/res/values-ca/strings.xml index 62b27a433..dab846582 100644 --- a/java/com/android/voicemail/impl/res/values-ca/strings.xml +++ b/java/com/android/voicemail/impl/res/values-ca/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibra" "Vibra" "So" "Configuració avançada" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-cs/strings.xml b/java/com/android/voicemail/impl/res/values-cs/strings.xml index 91bbbace9..b949266a3 100644 --- a/java/com/android/voicemail/impl/res/values-cs/strings.xml +++ b/java/com/android/voicemail/impl/res/values-cs/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibrace" "Vibrace" "Zvuk" "Pokročilá nastavení" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-da/strings.xml b/java/com/android/voicemail/impl/res/values-da/strings.xml index 4eb4c96c5..36a5a2442 100644 --- a/java/com/android/voicemail/impl/res/values-da/strings.xml +++ b/java/com/android/voicemail/impl/res/values-da/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibrer" "Vibrer" "Lyd" "Avancerede indstillinger" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-de/strings.xml b/java/com/android/voicemail/impl/res/values-de/strings.xml index 9f491546f..545682298 100644 --- a/java/com/android/voicemail/impl/res/values-de/strings.xml +++ b/java/com/android/voicemail/impl/res/values-de/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibrieren" "Vibrieren" "Ton" "Erweiterte Einstellungen" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-el/strings.xml b/java/com/android/voicemail/impl/res/values-el/strings.xml index 4d4b29493..d0049e247 100644 --- a/java/com/android/voicemail/impl/res/values-el/strings.xml +++ b/java/com/android/voicemail/impl/res/values-el/strings.xml @@ -16,8 +16,66 @@ + + + + "Δόνηση" "Δόνηση" "Ήχος" "Σύνθετες ρυθμίσεις" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-en-rAU/strings.xml b/java/com/android/voicemail/impl/res/values-en-rAU/strings.xml index 37e536536..ad30b2c93 100644 --- a/java/com/android/voicemail/impl/res/values-en-rAU/strings.xml +++ b/java/com/android/voicemail/impl/res/values-en-rAU/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibrate" "Vibrate" "Sound" "Advanced settings" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-en-rGB/strings.xml b/java/com/android/voicemail/impl/res/values-en-rGB/strings.xml index 37e536536..ad30b2c93 100644 --- a/java/com/android/voicemail/impl/res/values-en-rGB/strings.xml +++ b/java/com/android/voicemail/impl/res/values-en-rGB/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibrate" "Vibrate" "Sound" "Advanced settings" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-en-rIN/strings.xml b/java/com/android/voicemail/impl/res/values-en-rIN/strings.xml index 37e536536..ad30b2c93 100644 --- a/java/com/android/voicemail/impl/res/values-en-rIN/strings.xml +++ b/java/com/android/voicemail/impl/res/values-en-rIN/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibrate" "Vibrate" "Sound" "Advanced settings" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-es-rUS/strings.xml b/java/com/android/voicemail/impl/res/values-es-rUS/strings.xml index 1b606883e..037fb1bb8 100644 --- a/java/com/android/voicemail/impl/res/values-es-rUS/strings.xml +++ b/java/com/android/voicemail/impl/res/values-es-rUS/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibrar" "Vibrar" "Sonido" "Configuración avanzada" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-es/strings.xml b/java/com/android/voicemail/impl/res/values-es/strings.xml index 970eea8e9..7183201b9 100644 --- a/java/com/android/voicemail/impl/res/values-es/strings.xml +++ b/java/com/android/voicemail/impl/res/values-es/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibración" "Vibrar" "Sonido" "Configuración avanzada" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-et/strings.xml b/java/com/android/voicemail/impl/res/values-et/strings.xml index 21f6f0365..90ad8f088 100644 --- a/java/com/android/voicemail/impl/res/values-et/strings.xml +++ b/java/com/android/voicemail/impl/res/values-et/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibreerimine" "Vibreerimine" "Heli" "Täpsemad seaded" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-eu/strings.xml b/java/com/android/voicemail/impl/res/values-eu/strings.xml index a3a7ad882..719cd1974 100644 --- a/java/com/android/voicemail/impl/res/values-eu/strings.xml +++ b/java/com/android/voicemail/impl/res/values-eu/strings.xml @@ -16,8 +16,66 @@ + + + + "Dardara" "Dardara" "Soinua" "Ezarpen aurreratuak" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-fa/strings.xml b/java/com/android/voicemail/impl/res/values-fa/strings.xml index ff1febc76..f997f12fd 100644 --- a/java/com/android/voicemail/impl/res/values-fa/strings.xml +++ b/java/com/android/voicemail/impl/res/values-fa/strings.xml @@ -16,8 +16,66 @@ + + + + "لرزش" "لرزش" "صدا" "تنظیمات پیشرفته" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-fi/strings.xml b/java/com/android/voicemail/impl/res/values-fi/strings.xml index 7a452bcc8..58a162ca1 100644 --- a/java/com/android/voicemail/impl/res/values-fi/strings.xml +++ b/java/com/android/voicemail/impl/res/values-fi/strings.xml @@ -16,8 +16,66 @@ + + + + "Värinä" "Värinä" "Ääni" "Lisäasetukset" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-fr-rCA/strings.xml b/java/com/android/voicemail/impl/res/values-fr-rCA/strings.xml index 58afe5764..dcd96afc0 100644 --- a/java/com/android/voicemail/impl/res/values-fr-rCA/strings.xml +++ b/java/com/android/voicemail/impl/res/values-fr-rCA/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibreur" "Vibreur" "Son" "Paramètres avancés" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-fr/strings.xml b/java/com/android/voicemail/impl/res/values-fr/strings.xml index ed40a8a5c..8e7162e14 100644 --- a/java/com/android/voicemail/impl/res/values-fr/strings.xml +++ b/java/com/android/voicemail/impl/res/values-fr/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibreur" "Vibreur" "Sonnerie" "Paramètres avancés" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-gl/strings.xml b/java/com/android/voicemail/impl/res/values-gl/strings.xml index 206acfc57..25833bcbc 100644 --- a/java/com/android/voicemail/impl/res/values-gl/strings.xml +++ b/java/com/android/voicemail/impl/res/values-gl/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibración" "Vibración" "Son" "Configuración avanzada" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-gu/strings.xml b/java/com/android/voicemail/impl/res/values-gu/strings.xml index 114f01612..5ccc48fe0 100644 --- a/java/com/android/voicemail/impl/res/values-gu/strings.xml +++ b/java/com/android/voicemail/impl/res/values-gu/strings.xml @@ -16,8 +16,66 @@ + + + + "વાઇબ્રેટ" "વાઇબ્રેટ" "ધ્વનિ" "વિગતવાર સેટિંગ્સ" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-hi/strings.xml b/java/com/android/voicemail/impl/res/values-hi/strings.xml index 08a1ed848..58f793e73 100644 --- a/java/com/android/voicemail/impl/res/values-hi/strings.xml +++ b/java/com/android/voicemail/impl/res/values-hi/strings.xml @@ -16,8 +16,66 @@ + + + + "कंपन" "कंपन" "ध्वनि" "उन्नत सेटिंग" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-hr/strings.xml b/java/com/android/voicemail/impl/res/values-hr/strings.xml index 71c7511b0..53c496932 100644 --- a/java/com/android/voicemail/impl/res/values-hr/strings.xml +++ b/java/com/android/voicemail/impl/res/values-hr/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibriranje" "Vibriranje" "Zvuk" "Napredne postavke" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-hu/strings.xml b/java/com/android/voicemail/impl/res/values-hu/strings.xml index f7e670ccc..ce9376a46 100644 --- a/java/com/android/voicemail/impl/res/values-hu/strings.xml +++ b/java/com/android/voicemail/impl/res/values-hu/strings.xml @@ -16,8 +16,66 @@ + + + + "Rezgés" "Rezgés" "Hang" "Speciális beállítások" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-hy/strings.xml b/java/com/android/voicemail/impl/res/values-hy/strings.xml index a5dab4558..89b72eec1 100644 --- a/java/com/android/voicemail/impl/res/values-hy/strings.xml +++ b/java/com/android/voicemail/impl/res/values-hy/strings.xml @@ -16,8 +16,66 @@ + + + + "Թրթռոց" "Թրթռոց" "Ձայն" "Ընդլայնված կարգավորումներ" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-in/strings.xml b/java/com/android/voicemail/impl/res/values-in/strings.xml index 48b31bba8..318ae52d6 100644 --- a/java/com/android/voicemail/impl/res/values-in/strings.xml +++ b/java/com/android/voicemail/impl/res/values-in/strings.xml @@ -16,8 +16,66 @@ + + + + "Getar" "Getar" "Suara" "Setelan Lanjutan" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-is/strings.xml b/java/com/android/voicemail/impl/res/values-is/strings.xml index aa4622dd7..360058c5c 100644 --- a/java/com/android/voicemail/impl/res/values-is/strings.xml +++ b/java/com/android/voicemail/impl/res/values-is/strings.xml @@ -16,8 +16,66 @@ + + + + "Titringur" "Titringur" "Hljóð" "Ítarlegar stillingar" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-it/strings.xml b/java/com/android/voicemail/impl/res/values-it/strings.xml index 13f69c5f0..67cf21a89 100644 --- a/java/com/android/voicemail/impl/res/values-it/strings.xml +++ b/java/com/android/voicemail/impl/res/values-it/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibrazione" "Vibrazione" "Suono" "Impostazioni avanzate" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-iw/strings.xml b/java/com/android/voicemail/impl/res/values-iw/strings.xml index 874b5abe1..459345540 100644 --- a/java/com/android/voicemail/impl/res/values-iw/strings.xml +++ b/java/com/android/voicemail/impl/res/values-iw/strings.xml @@ -16,8 +16,66 @@ + + + + "רטט" "רטט" "צליל" "הגדרות מתקדמות" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-ja/strings.xml b/java/com/android/voicemail/impl/res/values-ja/strings.xml index 04c4675dc..1033630f5 100644 --- a/java/com/android/voicemail/impl/res/values-ja/strings.xml +++ b/java/com/android/voicemail/impl/res/values-ja/strings.xml @@ -16,8 +16,66 @@ + + + + "バイブレーション" "バイブレーション" "通知音" "詳細設定" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-ka/strings.xml b/java/com/android/voicemail/impl/res/values-ka/strings.xml index 68b51a3de..16677fac8 100644 --- a/java/com/android/voicemail/impl/res/values-ka/strings.xml +++ b/java/com/android/voicemail/impl/res/values-ka/strings.xml @@ -16,8 +16,66 @@ + + + + "ვიბრაცია" "ვიბრაცია" "ხმა" "გაფართოებული პარამეტრები" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-kk/strings.xml b/java/com/android/voicemail/impl/res/values-kk/strings.xml index 8f1ac972e..3e65922ff 100644 --- a/java/com/android/voicemail/impl/res/values-kk/strings.xml +++ b/java/com/android/voicemail/impl/res/values-kk/strings.xml @@ -16,8 +16,66 @@ + + + + "Діріл" "Діріл" "Дыбыс" "Қосымша параметрлер" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-km/strings.xml b/java/com/android/voicemail/impl/res/values-km/strings.xml index 6ddf1a73d..72a6f0456 100644 --- a/java/com/android/voicemail/impl/res/values-km/strings.xml +++ b/java/com/android/voicemail/impl/res/values-km/strings.xml @@ -16,8 +16,66 @@ + + + + "ញ័រ" "ញ័រ" "សំឡេង" "ការ​កំណត់​កម្រិត​ខ្ពស់" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-kn/strings.xml b/java/com/android/voicemail/impl/res/values-kn/strings.xml index 2cb811dca..66336cd60 100644 --- a/java/com/android/voicemail/impl/res/values-kn/strings.xml +++ b/java/com/android/voicemail/impl/res/values-kn/strings.xml @@ -16,8 +16,66 @@ + + + + "ವೈಬ್ರೇಟ್‌" "ವೈಬ್ರೇಟ್‌" "ಶಬ್ದ" "ಸುಧಾರಿತ ಸೆಟ್ಟಿಂಗ್‌ಗಳು" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-ko/strings.xml b/java/com/android/voicemail/impl/res/values-ko/strings.xml index 729ef9141..c9e2784cd 100644 --- a/java/com/android/voicemail/impl/res/values-ko/strings.xml +++ b/java/com/android/voicemail/impl/res/values-ko/strings.xml @@ -16,8 +16,66 @@ + + + + "진동" "진동" "소리" "고급 설정" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-ky/strings.xml b/java/com/android/voicemail/impl/res/values-ky/strings.xml index 922fbf6c9..35e70b017 100644 --- a/java/com/android/voicemail/impl/res/values-ky/strings.xml +++ b/java/com/android/voicemail/impl/res/values-ky/strings.xml @@ -16,8 +16,66 @@ + + + + "Дирилдөө" "Дирилдөө" "Үн" "Өркүндөтүлгөн жөндөөлөр" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-lo/strings.xml b/java/com/android/voicemail/impl/res/values-lo/strings.xml index b92d8d626..84abbe1b6 100644 --- a/java/com/android/voicemail/impl/res/values-lo/strings.xml +++ b/java/com/android/voicemail/impl/res/values-lo/strings.xml @@ -16,8 +16,66 @@ + + + + "ສັ່ນເຕືອນ" "ສັ່ນເຕືອນ" "ສຽງ" "ການຕັ້ງຄ່າຂັ້ນສູງ" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-lt/strings.xml b/java/com/android/voicemail/impl/res/values-lt/strings.xml index 6d298d333..ae3cd4cc6 100644 --- a/java/com/android/voicemail/impl/res/values-lt/strings.xml +++ b/java/com/android/voicemail/impl/res/values-lt/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibruoti" "Vibravimas" "Garsas" "Išplėstiniai nustatymai" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-lv/strings.xml b/java/com/android/voicemail/impl/res/values-lv/strings.xml index 4cde6a83a..c961ba8b4 100644 --- a/java/com/android/voicemail/impl/res/values-lv/strings.xml +++ b/java/com/android/voicemail/impl/res/values-lv/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibrācija" "Vibrācija" "Signāls" "Papildu iestatījumi" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-mk/strings.xml b/java/com/android/voicemail/impl/res/values-mk/strings.xml index fb4a465fd..6f2188ad8 100644 --- a/java/com/android/voicemail/impl/res/values-mk/strings.xml +++ b/java/com/android/voicemail/impl/res/values-mk/strings.xml @@ -16,8 +16,66 @@ + + + + "Вибрации" "Вибрации" "Звук" "Напредни поставки" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-ml/strings.xml b/java/com/android/voicemail/impl/res/values-ml/strings.xml index 9aff23146..0e912212d 100644 --- a/java/com/android/voicemail/impl/res/values-ml/strings.xml +++ b/java/com/android/voicemail/impl/res/values-ml/strings.xml @@ -16,8 +16,66 @@ + + + + "വൈബ്രേറ്റുചെയ്യുക" "വൈബ്രേറ്റുചെയ്യുക" "ശബ്‌ദം" "വിപുലമായ ക്രമീകരണം" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-mn/strings.xml b/java/com/android/voicemail/impl/res/values-mn/strings.xml index 68dc5bee0..aa9cbedd5 100644 --- a/java/com/android/voicemail/impl/res/values-mn/strings.xml +++ b/java/com/android/voicemail/impl/res/values-mn/strings.xml @@ -16,8 +16,66 @@ + + + + "Чичиргээ" "Чичиргээ" "Дуу" "Нарийвчилсан тохиргоо" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-mr/strings.xml b/java/com/android/voicemail/impl/res/values-mr/strings.xml index f0607282f..1c13e9dd6 100644 --- a/java/com/android/voicemail/impl/res/values-mr/strings.xml +++ b/java/com/android/voicemail/impl/res/values-mr/strings.xml @@ -16,8 +16,66 @@ + + + + "कंपन करा" "कंपन करा" "ध्वनी" "प्रगत सेटिंग्ज" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-ms/strings.xml b/java/com/android/voicemail/impl/res/values-ms/strings.xml index c84d99d12..12724d4a5 100644 --- a/java/com/android/voicemail/impl/res/values-ms/strings.xml +++ b/java/com/android/voicemail/impl/res/values-ms/strings.xml @@ -16,8 +16,66 @@ + + + + "Bergetar" "Bergetar" "Bunyi" "Tetapan Terperinci" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-my/strings.xml b/java/com/android/voicemail/impl/res/values-my/strings.xml index 010c42187..a7b96adf5 100644 --- a/java/com/android/voicemail/impl/res/values-my/strings.xml +++ b/java/com/android/voicemail/impl/res/values-my/strings.xml @@ -16,8 +16,66 @@ + + + + "တုန်ခါမှု" "တုန်ခါမှု" "အသံ" "အဆင့်မြင့် ဆက်တင်များ" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-nb/strings.xml b/java/com/android/voicemail/impl/res/values-nb/strings.xml index ccebb9350..2398de13f 100644 --- a/java/com/android/voicemail/impl/res/values-nb/strings.xml +++ b/java/com/android/voicemail/impl/res/values-nb/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibrering" "Vibrering" "Lyd" "Avanserte innstillinger" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-ne/strings.xml b/java/com/android/voicemail/impl/res/values-ne/strings.xml index 1165a5269..ecf5a46ac 100644 --- a/java/com/android/voicemail/impl/res/values-ne/strings.xml +++ b/java/com/android/voicemail/impl/res/values-ne/strings.xml @@ -16,8 +16,66 @@ + + + + "कम्पन" "कम्पन" "आवाज" "उन्नत सेटिङहरू" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-nl/strings.xml b/java/com/android/voicemail/impl/res/values-nl/strings.xml index 058ef4ba3..5078c0a91 100644 --- a/java/com/android/voicemail/impl/res/values-nl/strings.xml +++ b/java/com/android/voicemail/impl/res/values-nl/strings.xml @@ -16,8 +16,66 @@ + + + + "Trillen" "Trillen" "Geluid" "Geavanceerde instellingen" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-no/strings.xml b/java/com/android/voicemail/impl/res/values-no/strings.xml index ccebb9350..2398de13f 100644 --- a/java/com/android/voicemail/impl/res/values-no/strings.xml +++ b/java/com/android/voicemail/impl/res/values-no/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibrering" "Vibrering" "Lyd" "Avanserte innstillinger" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-pa/strings.xml b/java/com/android/voicemail/impl/res/values-pa/strings.xml index 9e1000f03..a754ce200 100644 --- a/java/com/android/voicemail/impl/res/values-pa/strings.xml +++ b/java/com/android/voicemail/impl/res/values-pa/strings.xml @@ -16,8 +16,66 @@ + + + + "ਵਾਈਬ੍ਰੇਟ ਕਰੋ" "ਵਾਈਬ੍ਰੇਟ ਕਰੋ" "ਧੁਨੀ" "ਉੱਨਤ ਸੈਟਿੰਗਾਂ" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-pl/strings.xml b/java/com/android/voicemail/impl/res/values-pl/strings.xml index 762bd6973..3453ede88 100644 --- a/java/com/android/voicemail/impl/res/values-pl/strings.xml +++ b/java/com/android/voicemail/impl/res/values-pl/strings.xml @@ -16,8 +16,66 @@ + + + + "Wibracje" "Wibracje" "Dźwięk" "Ustawienia zaawansowane" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-pt-rBR/strings.xml b/java/com/android/voicemail/impl/res/values-pt-rBR/strings.xml index 673f5f03f..4d7691bc9 100644 --- a/java/com/android/voicemail/impl/res/values-pt-rBR/strings.xml +++ b/java/com/android/voicemail/impl/res/values-pt-rBR/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibração" "Vibração" "Som" "Configurações avançadas" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-pt-rPT/strings.xml b/java/com/android/voicemail/impl/res/values-pt-rPT/strings.xml index 604449c88..18848e119 100644 --- a/java/com/android/voicemail/impl/res/values-pt-rPT/strings.xml +++ b/java/com/android/voicemail/impl/res/values-pt-rPT/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibrar" "Vibrar" "Som" "Definições avançadas" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-pt/strings.xml b/java/com/android/voicemail/impl/res/values-pt/strings.xml index 673f5f03f..4d7691bc9 100644 --- a/java/com/android/voicemail/impl/res/values-pt/strings.xml +++ b/java/com/android/voicemail/impl/res/values-pt/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibração" "Vibração" "Som" "Configurações avançadas" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-ro/strings.xml b/java/com/android/voicemail/impl/res/values-ro/strings.xml index 2c96319d4..d3a5cd7e0 100644 --- a/java/com/android/voicemail/impl/res/values-ro/strings.xml +++ b/java/com/android/voicemail/impl/res/values-ro/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibrații" "Vibrații" "Sunet" "Setări avansate" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-ru/strings.xml b/java/com/android/voicemail/impl/res/values-ru/strings.xml index 7d6682d9c..7a9692ead 100644 --- a/java/com/android/voicemail/impl/res/values-ru/strings.xml +++ b/java/com/android/voicemail/impl/res/values-ru/strings.xml @@ -16,8 +16,66 @@ + + + + "Вибросигнал" "Вибросигнал" "Звук" "Расширенные настройки" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-si/strings.xml b/java/com/android/voicemail/impl/res/values-si/strings.xml index 841344f84..9351ddc1d 100644 --- a/java/com/android/voicemail/impl/res/values-si/strings.xml +++ b/java/com/android/voicemail/impl/res/values-si/strings.xml @@ -16,8 +16,66 @@ + + + + "කම්පනය" "කම්පනය කරන්න" "හඬ" "උසස් සැකසීම්" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-sk/strings.xml b/java/com/android/voicemail/impl/res/values-sk/strings.xml index e0caaa554..afc6251d0 100644 --- a/java/com/android/voicemail/impl/res/values-sk/strings.xml +++ b/java/com/android/voicemail/impl/res/values-sk/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibrovať" "Vibrovať" "Zvuk" "Rozšírené nastavenia" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-sl/strings.xml b/java/com/android/voicemail/impl/res/values-sl/strings.xml index e8b0ed4a2..3fef50626 100644 --- a/java/com/android/voicemail/impl/res/values-sl/strings.xml +++ b/java/com/android/voicemail/impl/res/values-sl/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibriranje" "Vibriranje" "Zvok" "Dodatne nastavitve" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-sq/strings.xml b/java/com/android/voicemail/impl/res/values-sq/strings.xml index 6008696fd..de72b01d4 100644 --- a/java/com/android/voicemail/impl/res/values-sq/strings.xml +++ b/java/com/android/voicemail/impl/res/values-sq/strings.xml @@ -16,8 +16,66 @@ + + + + "Dridhje" "Dridhje" "Tingulli" "Cilësimet e përparuara" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-sr/strings.xml b/java/com/android/voicemail/impl/res/values-sr/strings.xml index 1fcb4d377..27fc4dd03 100644 --- a/java/com/android/voicemail/impl/res/values-sr/strings.xml +++ b/java/com/android/voicemail/impl/res/values-sr/strings.xml @@ -16,8 +16,66 @@ + + + + "Вибрација" "Вибрација" "Звук" "Напредна подешавања" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-sv/strings.xml b/java/com/android/voicemail/impl/res/values-sv/strings.xml index 75bf003bb..196e9ffc6 100644 --- a/java/com/android/voicemail/impl/res/values-sv/strings.xml +++ b/java/com/android/voicemail/impl/res/values-sv/strings.xml @@ -16,8 +16,66 @@ + + + + "Vibrera" "Vibrera" "Ljud" "Avancerade inställningar" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-sw/strings.xml b/java/com/android/voicemail/impl/res/values-sw/strings.xml index 70c5bd142..6c16d66ca 100644 --- a/java/com/android/voicemail/impl/res/values-sw/strings.xml +++ b/java/com/android/voicemail/impl/res/values-sw/strings.xml @@ -16,8 +16,66 @@ + + + + "Mtetemo" "Tetema" "Mlio" "Mipangilio ya Kina" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-ta/strings.xml b/java/com/android/voicemail/impl/res/values-ta/strings.xml index 55ca94399..353818a43 100644 --- a/java/com/android/voicemail/impl/res/values-ta/strings.xml +++ b/java/com/android/voicemail/impl/res/values-ta/strings.xml @@ -16,8 +16,66 @@ + + + + "அதிர்வுறுதல்" "அதிர்வுறு" "ஒலி" "மேம்பட்ட அமைப்புகள்" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-te/strings.xml b/java/com/android/voicemail/impl/res/values-te/strings.xml index 6ede48942..0b70bc146 100644 --- a/java/com/android/voicemail/impl/res/values-te/strings.xml +++ b/java/com/android/voicemail/impl/res/values-te/strings.xml @@ -16,8 +16,66 @@ + + + + "వైబ్రేషన్" "వైబ్రేషన్" "ధ్వని" "అధునాతన సెట్టింగ్‌లు" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-th/strings.xml b/java/com/android/voicemail/impl/res/values-th/strings.xml index d42a1fa18..87007741f 100644 --- a/java/com/android/voicemail/impl/res/values-th/strings.xml +++ b/java/com/android/voicemail/impl/res/values-th/strings.xml @@ -16,8 +16,66 @@ + + + + "สั่น" "สั่น" "เสียง" "การตั้งค่าขั้นสูง" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-tl/strings.xml b/java/com/android/voicemail/impl/res/values-tl/strings.xml index 20c7883cd..9d42fb0f1 100644 --- a/java/com/android/voicemail/impl/res/values-tl/strings.xml +++ b/java/com/android/voicemail/impl/res/values-tl/strings.xml @@ -16,8 +16,66 @@ + + + + "I-vibrate" "I-vibrate" "Tunog" "Mga Advanced na Setting" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-tr/strings.xml b/java/com/android/voicemail/impl/res/values-tr/strings.xml index 9826da9b1..05d5b5f0d 100644 --- a/java/com/android/voicemail/impl/res/values-tr/strings.xml +++ b/java/com/android/voicemail/impl/res/values-tr/strings.xml @@ -16,8 +16,66 @@ + + + + "Titreşim" "Titreşim" "Ses" "Gelişmiş Ayarlar" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-uk/strings.xml b/java/com/android/voicemail/impl/res/values-uk/strings.xml index a834b1aaa..d16e82f77 100644 --- a/java/com/android/voicemail/impl/res/values-uk/strings.xml +++ b/java/com/android/voicemail/impl/res/values-uk/strings.xml @@ -16,8 +16,66 @@ + + + + "Вібросигнал" "Вібросигнал" "Звук" "Розширені налаштування" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-ur/strings.xml b/java/com/android/voicemail/impl/res/values-ur/strings.xml index 172b9a0b6..625b0e490 100644 --- a/java/com/android/voicemail/impl/res/values-ur/strings.xml +++ b/java/com/android/voicemail/impl/res/values-ur/strings.xml @@ -16,8 +16,66 @@ + + + + "ارتعاش" "ارتعاش" "آواز" "اعلی ترتیبات" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-uz/strings.xml b/java/com/android/voicemail/impl/res/values-uz/strings.xml index 3eff81525..9d33bfff6 100644 --- a/java/com/android/voicemail/impl/res/values-uz/strings.xml +++ b/java/com/android/voicemail/impl/res/values-uz/strings.xml @@ -16,8 +16,66 @@ + + + + "Tebranish" "Tebranish" "Ovoz" "Kengaytirilgan sozlamalar" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-vi/strings.xml b/java/com/android/voicemail/impl/res/values-vi/strings.xml index 70c00add6..76aac53e5 100644 --- a/java/com/android/voicemail/impl/res/values-vi/strings.xml +++ b/java/com/android/voicemail/impl/res/values-vi/strings.xml @@ -16,8 +16,66 @@ + + + + "Rung" "Rung" "Âm báo" "Cài đặt nâng cao" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-zh-rCN/strings.xml b/java/com/android/voicemail/impl/res/values-zh-rCN/strings.xml index 5a97d46d2..5a02f0154 100644 --- a/java/com/android/voicemail/impl/res/values-zh-rCN/strings.xml +++ b/java/com/android/voicemail/impl/res/values-zh-rCN/strings.xml @@ -16,8 +16,66 @@ + + + + "振动" "振动" "提示音" "高级设置" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-zh-rHK/strings.xml b/java/com/android/voicemail/impl/res/values-zh-rHK/strings.xml index 6ea784ad0..59feff713 100644 --- a/java/com/android/voicemail/impl/res/values-zh-rHK/strings.xml +++ b/java/com/android/voicemail/impl/res/values-zh-rHK/strings.xml @@ -16,8 +16,66 @@ + + + + "震動" "震動" "音效" "進階設定" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-zh-rTW/strings.xml b/java/com/android/voicemail/impl/res/values-zh-rTW/strings.xml index 6ea784ad0..59feff713 100644 --- a/java/com/android/voicemail/impl/res/values-zh-rTW/strings.xml +++ b/java/com/android/voicemail/impl/res/values-zh-rTW/strings.xml @@ -16,8 +16,66 @@ + + + + "震動" "震動" "音效" "進階設定" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values-zu/strings.xml b/java/com/android/voicemail/impl/res/values-zu/strings.xml index 2138b672c..222b2030a 100644 --- a/java/com/android/voicemail/impl/res/values-zu/strings.xml +++ b/java/com/android/voicemail/impl/res/values-zu/strings.xml @@ -16,8 +16,66 @@ + + + + "Dlidlizela" "Dlidlizela" "Umsindo" "Izilungiselelo ezithuthukisiwe" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/impl/res/values/strings.xml b/java/com/android/voicemail/impl/res/values/strings.xml index 6c3d5527b..f18213b49 100644 --- a/java/com/android/voicemail/impl/res/values/strings.xml +++ b/java/com/android/voicemail/impl/res/values/strings.xml @@ -17,15 +17,15 @@ - Voicemail (%s) + Voicemail (%s) - Voicemail + Voicemail - voicemail_notification_ringtone_key + voicemail_notification_ringtone_key - voicemail_notification_vibrate_key + voicemail_notification_vibrate_key Vibrate @@ -36,79 +36,84 @@ which sound to play when a voicemail notification is received. [CHAR LIMIT=30] --> Sound - voicemail_advanced_settings_key + voicemail_advanced_settings_key Advanced Settings - + voicemail_visual_voicemail_key - + archive_is_enabled - voicemail_change_pin_key + voicemail_change_pin_key - Visual Voicemail + Visual Voicemail - - Voicemail Auto Archive + + Extra backup and storage + + + This is a experimental feature we are currently testing. This will potentially delete voicemails from your voicemail server. There are no guarantees of supporting this feature in the future. We would love feedback on the feature though." + + - Set PIN + Set PIN - Change PIN + Change PIN - Old PIN + Old PIN - New PIN + New PIN - Please wait. + Please wait. - The new PIN is too short. + The new PIN is too short. - The new PIN is too long. + The new PIN is too long. - The new PIN is too weak. A strong password should not have continuous sequence or repeated digits. + The new PIN is too weak. A strong password should not have continuous sequence or repeated digits. - The old PIN does not match. + The old PIN does not match. - The new PIN contains invalid characters. + The new PIN contains invalid characters. - Unable to change PIN + Unable to change PIN - Unsupported message type, call %s to listen. + Unsupported message type, call %s to listen. - Change Voicemail PIN + Change Voicemail PIN - Continue + Continue - Cancel + Cancel - Ok + Ok - Confirm your old PIN + Confirm your old PIN - Enter your voicemail PIN to continue. + Enter your voicemail PIN to continue. - Set a new PIN + Set a new PIN - PIN must be %1$d-%2$d digits. + PIN must be %1$d-%2$d digits. - Confirm your PIN + Confirm your PIN - PINs don\'t match + PINs don\'t match - Voicemail PIN updated + Voicemail PIN updated - Unable to set PIN + Unable to set PIN diff --git a/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java b/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java index 8041e5b75..2fc08f0ae 100644 --- a/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java +++ b/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java @@ -122,9 +122,6 @@ public class VoicemailSettingsFragment extends PreferenceFragment autoArchiveSwitchPreference = (SwitchPreference) findPreference(getString(R.string.voicemail_visual_voicemail_archive_key)); - autoArchiveSwitchPreference.setOnPreferenceChangeListener(this); - autoArchiveSwitchPreference.setChecked( - VisualVoicemailSettingsUtil.isArchiveEnabled(getContext(), phoneAccountHandle)); if (!ConfigProviderBindings.get(getContext()) .getBoolean(VisualVoicemailSettingsUtil.ALLOW_VOICEMAIL_ARCHIVE, true)) { @@ -156,11 +153,19 @@ public class VoicemailSettingsFragment extends PreferenceFragment voicemailVisualVoicemail.setOnPreferenceChangeListener(this); voicemailVisualVoicemail.setChecked( VisualVoicemailSettingsUtil.isEnabled(getContext(), phoneAccountHandle)); + + autoArchiveSwitchPreference.setOnPreferenceChangeListener(this); + autoArchiveSwitchPreference.setSummary( + getText(R.string.voicemail_visual_voicemail_auto_archive_temporary_disclaimer)); + autoArchiveSwitchPreference.setChecked( + VisualVoicemailSettingsUtil.isArchiveEnabled(getContext(), phoneAccountHandle)); + if (!isVisualVoicemailActivated()) { prefSet.removePreference(voicemailChangePinPreference); } } else { prefSet.removePreference(voicemailVisualVoicemail); + prefSet.removePreference(autoArchiveSwitchPreference); prefSet.removePreference(voicemailChangePinPreference); } diff --git a/java/com/android/voicemail/impl/sms/OmtpMessageReceiver.java b/java/com/android/voicemail/impl/sms/OmtpMessageReceiver.java index ef0bf10e9..43e2b85bd 100644 --- a/java/com/android/voicemail/impl/sms/OmtpMessageReceiver.java +++ b/java/com/android/voicemail/impl/sms/OmtpMessageReceiver.java @@ -28,7 +28,7 @@ import android.telecom.PhoneAccountHandle; import android.telephony.VisualVoicemailSms; import com.android.voicemail.impl.ActivationTask; import com.android.voicemail.impl.OmtpConstants; -import com.android.voicemail.impl.OmtpService; +import com.android.voicemail.impl.OmtpReceiver; import com.android.voicemail.impl.OmtpVvmCarrierConfigHelper; import com.android.voicemail.impl.Voicemail; import com.android.voicemail.impl.Voicemail.Builder; @@ -52,7 +52,7 @@ public class OmtpMessageReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { mContext = context; - VisualVoicemailSms sms = intent.getExtras().getParcelable(OmtpService.EXTRA_VOICEMAIL_SMS); + VisualVoicemailSms sms = intent.getExtras().getParcelable(OmtpReceiver.EXTRA_VOICEMAIL_SMS); PhoneAccountHandle phone = sms.getPhoneAccountHandle(); if (phone == null) { diff --git a/java/com/android/voicemail/impl/sms/StatusSmsFetcher.java b/java/com/android/voicemail/impl/sms/StatusSmsFetcher.java index d178628c6..dd9204d3e 100644 --- a/java/com/android/voicemail/impl/sms/StatusSmsFetcher.java +++ b/java/com/android/voicemail/impl/sms/StatusSmsFetcher.java @@ -33,7 +33,7 @@ import android.telephony.SmsManager; import android.telephony.VisualVoicemailSms; import com.android.voicemail.impl.Assert; import com.android.voicemail.impl.OmtpConstants; -import com.android.voicemail.impl.OmtpService; +import com.android.voicemail.impl.OmtpReceiver; import com.android.voicemail.impl.OmtpVvmCarrierConfigHelper; import com.android.voicemail.impl.VvmLog; import com.android.voicemail.impl.protocol.VisualVoicemailProtocol; @@ -67,7 +67,7 @@ public class StatusSmsFetcher extends BroadcastReceiver implements Closeable { mContext = context; mPhoneAccountHandle = phoneAccountHandle; IntentFilter filter = new IntentFilter(ACTION_REQUEST_SENT_INTENT); - filter.addAction(OmtpService.ACTION_SMS_RECEIVED); + filter.addAction(OmtpReceiver.ACTION_SMS_RECEIVED); context.registerReceiver(this, filter); } @@ -110,7 +110,7 @@ public class StatusSmsFetcher extends BroadcastReceiver implements Closeable { return; } - VisualVoicemailSms sms = intent.getExtras().getParcelable(OmtpService.EXTRA_VOICEMAIL_SMS); + VisualVoicemailSms sms = intent.getExtras().getParcelable(OmtpReceiver.EXTRA_VOICEMAIL_SMS); if (!mPhoneAccountHandle.equals(sms.getPhoneAccountHandle())) { return; diff --git a/java/com/android/voicemail/stub/StubVoicemailClient.java b/java/com/android/voicemail/stub/StubVoicemailClient.java index 9481a0e1a..6639292c1 100644 --- a/java/com/android/voicemail/stub/StubVoicemailClient.java +++ b/java/com/android/voicemail/stub/StubVoicemailClient.java @@ -33,6 +33,10 @@ public final class StubVoicemailClient implements VoicemailClient { public void appendOmtpVoicemailSelectionClause( Context context, StringBuilder where, List selectionArgs) {} + @Override + public void appendOmtpVoicemailStatusSelectionClause( + Context context, StringBuilder where, List selectionArgs) {} + @Override public String getSettingsFragment() { return null; -- cgit v1.2.3