From d538e0b42004524abe36ac17606d3915a14f5dae Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Fri, 30 Jun 2017 15:26:17 -0700 Subject: Update AOSP Dialer source from internal google3 repository at cl/160679286. 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/159771812 (6/22/2017) to 160679286 (6/30/2017). These changes track the dialer V11 release. 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. Change-Id: I7e7b41ce472b85a9d5a6728d5c8b3c045c09e095 Merged-In: Ie2eb735a92c577b5ae5a5e8b7efa2d699fc964bc --- Android.mk | 6 +- AndroidManifest.xml | 2 +- .../drawable-hdpi/quantum_ic_report_grey600_24.png | Bin 0 -> 197 bytes .../drawable-mdpi/quantum_ic_report_grey600_24.png | Bin 0 -> 150 bytes .../quantum_ic_report_grey600_24.png | Bin 0 -> 211 bytes .../quantum_ic_report_grey600_24.png | Bin 0 -> 276 bytes .../quantum_ic_report_grey600_24.png | Bin 0 -> 366 bytes .../contacts/common/list/ContactListItemView.java | 2 + .../contacts/common/res/values-zh-rHK/strings.xml | 2 +- .../android/dialer/app/calllog/CallLogAdapter.java | 17 +++ .../app/calllog/CallLogListItemViewHolder.java | 35 ++++- .../android/dialer/app/calllog/IntentProvider.java | 5 - .../app/calllog/calllogcache/CallLogCache.java | 17 +-- .../calllogcache/CallLogCacheLollipopMr1.java | 8 +- .../android/dialer/app/res/values-sq/strings.xml | 4 +- .../android/dialer/app/res/values-ur/strings.xml | 4 +- .../app/voicemail/error/VoicemailErrorAlert.java | 8 ++ .../app/voicemail/error/VoicemailErrorMessage.java | 11 ++ .../error/VoicemailTosMessageCreator.java | 37 ++++- .../app/voicemail/error/res/drawable/shadow.xml | 20 +++ .../error/res/drawable/voicemail_tos_image.png | Bin 0 -> 43527 bytes .../error/res/layout/voicemail_tos_fragment.xml | 23 +++- .../app/voicemail/error/res/values/dimens.xml | 20 ++- .../app/voicemail/error/res/values/strings.xml | 8 +- .../app/voicemail/error/res/values/styles.xml | 37 ++++- .../dialer/blocking/res/values-hu/strings.xml | 2 +- .../dialer/callcomposer/CallComposerActivity.java | 18 +-- .../res/layout/call_composer_activity.xml | 6 + .../dialer/callcomposer/res/values-af/strings.xml | 6 +- .../dialer/callcomposer/res/values-am/strings.xml | 6 +- .../dialer/callcomposer/res/values-ar/strings.xml | 6 +- .../dialer/callcomposer/res/values-az/strings.xml | 6 +- .../callcomposer/res/values-b+sr+Latn/strings.xml | 6 +- .../dialer/callcomposer/res/values-be/strings.xml | 6 +- .../dialer/callcomposer/res/values-bg/strings.xml | 6 +- .../dialer/callcomposer/res/values-bn/strings.xml | 6 +- .../dialer/callcomposer/res/values-bs/strings.xml | 6 +- .../dialer/callcomposer/res/values-ca/strings.xml | 6 +- .../dialer/callcomposer/res/values-cs/strings.xml | 6 +- .../dialer/callcomposer/res/values-da/strings.xml | 6 +- .../dialer/callcomposer/res/values-de/strings.xml | 6 +- .../dialer/callcomposer/res/values-el/strings.xml | 6 +- .../callcomposer/res/values-en-rAU/strings.xml | 6 +- .../callcomposer/res/values-en-rGB/strings.xml | 6 +- .../callcomposer/res/values-en-rIN/strings.xml | 6 +- .../callcomposer/res/values-es-rUS/strings.xml | 6 +- .../dialer/callcomposer/res/values-es/strings.xml | 6 +- .../dialer/callcomposer/res/values-et/strings.xml | 6 +- .../dialer/callcomposer/res/values-eu/strings.xml | 6 +- .../dialer/callcomposer/res/values-fa/strings.xml | 6 +- .../dialer/callcomposer/res/values-fi/strings.xml | 6 +- .../callcomposer/res/values-fr-rCA/strings.xml | 6 +- .../dialer/callcomposer/res/values-fr/strings.xml | 6 +- .../dialer/callcomposer/res/values-gl/strings.xml | 6 +- .../dialer/callcomposer/res/values-gu/strings.xml | 6 +- .../dialer/callcomposer/res/values-hi/strings.xml | 6 +- .../dialer/callcomposer/res/values-hr/strings.xml | 6 +- .../dialer/callcomposer/res/values-hu/strings.xml | 6 +- .../dialer/callcomposer/res/values-hy/strings.xml | 6 +- .../dialer/callcomposer/res/values-in/strings.xml | 6 +- .../dialer/callcomposer/res/values-is/strings.xml | 6 +- .../dialer/callcomposer/res/values-it/strings.xml | 6 +- .../dialer/callcomposer/res/values-iw/strings.xml | 6 +- .../dialer/callcomposer/res/values-ja/strings.xml | 6 +- .../dialer/callcomposer/res/values-ka/strings.xml | 6 +- .../dialer/callcomposer/res/values-kk/strings.xml | 6 +- .../dialer/callcomposer/res/values-km/strings.xml | 6 +- .../dialer/callcomposer/res/values-kn/strings.xml | 6 +- .../dialer/callcomposer/res/values-ko/strings.xml | 6 +- .../dialer/callcomposer/res/values-ky/strings.xml | 6 +- .../dialer/callcomposer/res/values-lo/strings.xml | 6 +- .../dialer/callcomposer/res/values-lt/strings.xml | 6 +- .../dialer/callcomposer/res/values-lv/strings.xml | 6 +- .../dialer/callcomposer/res/values-mk/strings.xml | 6 +- .../dialer/callcomposer/res/values-ml/strings.xml | 6 +- .../dialer/callcomposer/res/values-mn/strings.xml | 6 +- .../dialer/callcomposer/res/values-mr/strings.xml | 6 +- .../dialer/callcomposer/res/values-ms/strings.xml | 6 +- .../dialer/callcomposer/res/values-my/strings.xml | 6 +- .../dialer/callcomposer/res/values-nb/strings.xml | 6 +- .../dialer/callcomposer/res/values-ne/strings.xml | 6 +- .../dialer/callcomposer/res/values-nl/strings.xml | 6 +- .../dialer/callcomposer/res/values-no/strings.xml | 6 +- .../dialer/callcomposer/res/values-pa/strings.xml | 6 +- .../dialer/callcomposer/res/values-pl/strings.xml | 6 +- .../callcomposer/res/values-pt-rBR/strings.xml | 6 +- .../callcomposer/res/values-pt-rPT/strings.xml | 6 +- .../dialer/callcomposer/res/values-pt/strings.xml | 6 +- .../dialer/callcomposer/res/values-ro/strings.xml | 6 +- .../dialer/callcomposer/res/values-ru/strings.xml | 6 +- .../dialer/callcomposer/res/values-si/strings.xml | 6 +- .../dialer/callcomposer/res/values-sk/strings.xml | 6 +- .../dialer/callcomposer/res/values-sl/strings.xml | 6 +- .../dialer/callcomposer/res/values-sq/strings.xml | 6 +- .../dialer/callcomposer/res/values-sr/strings.xml | 6 +- .../dialer/callcomposer/res/values-sv/strings.xml | 6 +- .../dialer/callcomposer/res/values-sw/strings.xml | 6 +- .../dialer/callcomposer/res/values-ta/strings.xml | 6 +- .../dialer/callcomposer/res/values-te/strings.xml | 6 +- .../dialer/callcomposer/res/values-th/strings.xml | 6 +- .../dialer/callcomposer/res/values-tl/strings.xml | 6 +- .../dialer/callcomposer/res/values-tr/strings.xml | 6 +- .../dialer/callcomposer/res/values-uk/strings.xml | 6 +- .../dialer/callcomposer/res/values-ur/strings.xml | 6 +- .../dialer/callcomposer/res/values-uz/strings.xml | 6 +- .../dialer/callcomposer/res/values-vi/strings.xml | 6 +- .../callcomposer/res/values-zh-rCN/strings.xml | 6 +- .../callcomposer/res/values-zh-rHK/strings.xml | 6 +- .../callcomposer/res/values-zh-rTW/strings.xml | 6 +- .../dialer/callcomposer/res/values-zu/strings.xml | 6 +- .../calldetails/CallDetailsEntryViewHolder.java | 7 +- .../dialer/calldetails/res/values-uz/strings.xml | 2 +- .../dialer/callintent/CallIntentBuilder.java | 61 +++++++-- .../dialer/callintent/call_initiation_type.proto | 2 + .../dialer/callintent/call_specific_app_data.proto | 9 +- .../dialer/calllogutils/res/values-ar/strings.xml | 4 +- .../dialer/calllogutils/res/values-az/strings.xml | 4 +- .../dialer/calllogutils/res/values-da/strings.xml | 4 +- .../dialer/calllogutils/res/values-de/strings.xml | 4 +- .../dialer/calllogutils/res/values-eu/strings.xml | 2 +- .../dialer/calllogutils/res/values-hi/strings.xml | 4 +- .../dialer/calllogutils/res/values-iw/strings.xml | 2 +- .../dialer/calllogutils/res/values-ky/strings.xml | 2 +- .../dialer/calllogutils/res/values-mr/strings.xml | 4 +- .../dialer/calllogutils/res/values-nb/strings.xml | 4 +- .../dialer/calllogutils/res/values-nl/strings.xml | 4 +- .../dialer/calllogutils/res/values-no/strings.xml | 4 +- .../calllogutils/res/values-pt-rBR/strings.xml | 4 +- .../calllogutils/res/values-pt-rPT/strings.xml | 4 +- .../dialer/calllogutils/res/values-pt/strings.xml | 4 +- .../dialer/calllogutils/res/values-sw/strings.xml | 4 +- .../dialer/calllogutils/res/values-tr/strings.xml | 4 +- .../android/dialer/constants/TrafficStatsTags.java | 1 + .../dialer/enrichedcall/EnrichedCallManager.java | 26 +--- java/com/android/dialer/enrichedcall/Session.java | 25 +++- .../enrichedcall/extensions/StateExtension.java | 18 +-- .../android/dialer/logging/dialer_impression.proto | 19 ++- java/com/android/dialer/shortcuts/IconFactory.java | 37 +++++ .../ic_shortcut_add_contact.xml | 21 +++ .../res/drawable/ic_add_contact_foreground.xml | 23 ++++ .../android/dialer/shortcuts/res/values/dimens.xml | 1 + .../dialer/simulator/impl/SimulatorContacts.java | 4 +- .../dialershared/bubble/ChangeOnScreenBounds.java | 19 ++- java/com/android/incallui/InCallActivity.java | 6 +- .../com/android/incallui/InCallActivityCommon.java | 38 +----- java/com/android/incallui/InCallPresenter.java | 150 +++++++++++++-------- .../android/incallui/ReturnToCallController.java | 1 - .../com/android/incallui/VideoPauseController.java | 7 +- .../incallui/contactgrid/res/values-uz/strings.xml | 2 +- .../incallui/disconnectdialog/AndroidManifest.xml | 19 +++ .../disconnectdialog/DefaultErrorDialog.java | 50 +++++++ .../disconnectdialog/DisconnectDialog.java | 32 +++++ .../disconnectdialog/DisconnectMessage.java | 66 +++++++++ .../disconnectdialog/EnableWifiCallingPrompt.java | 75 +++++++++++ .../VideoCallNotAvailablePrompt.java | 77 +++++++++++ .../disconnectdialog/res/values-af/strings.xml | 28 ++++ .../disconnectdialog/res/values-am/strings.xml | 28 ++++ .../disconnectdialog/res/values-ar/strings.xml | 28 ++++ .../disconnectdialog/res/values-az/strings.xml | 24 ++++ .../res/values-b+sr+Latn/strings.xml | 24 ++++ .../disconnectdialog/res/values-be/strings.xml | 28 ++++ .../disconnectdialog/res/values-bg/strings.xml | 28 ++++ .../disconnectdialog/res/values-bn/strings.xml | 24 ++++ .../disconnectdialog/res/values-bs/strings.xml | 24 ++++ .../disconnectdialog/res/values-ca/strings.xml | 24 ++++ .../disconnectdialog/res/values-cs/strings.xml | 28 ++++ .../disconnectdialog/res/values-da/strings.xml | 28 ++++ .../disconnectdialog/res/values-de/strings.xml | 28 ++++ .../disconnectdialog/res/values-el/strings.xml | 24 ++++ .../disconnectdialog/res/values-en-rAU/strings.xml | 24 ++++ .../disconnectdialog/res/values-en-rGB/strings.xml | 24 ++++ .../disconnectdialog/res/values-en-rIN/strings.xml | 24 ++++ .../disconnectdialog/res/values-es-rUS/strings.xml | 28 ++++ .../disconnectdialog/res/values-es/strings.xml | 28 ++++ .../disconnectdialog/res/values-et/strings.xml | 24 ++++ .../disconnectdialog/res/values-eu/strings.xml | 28 ++++ .../disconnectdialog/res/values-fa/strings.xml | 28 ++++ .../disconnectdialog/res/values-fi/strings.xml | 28 ++++ .../disconnectdialog/res/values-fr-rCA/strings.xml | 24 ++++ .../disconnectdialog/res/values-fr/strings.xml | 28 ++++ .../disconnectdialog/res/values-gl/strings.xml | 28 ++++ .../disconnectdialog/res/values-gu/strings.xml | 24 ++++ .../disconnectdialog/res/values-hi/strings.xml | 28 ++++ .../disconnectdialog/res/values-hr/strings.xml | 28 ++++ .../disconnectdialog/res/values-hu/strings.xml | 28 ++++ .../disconnectdialog/res/values-hy/strings.xml | 28 ++++ .../disconnectdialog/res/values-in/strings.xml | 28 ++++ .../disconnectdialog/res/values-is/strings.xml | 24 ++++ .../disconnectdialog/res/values-it/strings.xml | 28 ++++ .../disconnectdialog/res/values-iw/strings.xml | 28 ++++ .../disconnectdialog/res/values-ja/strings.xml | 24 ++++ .../disconnectdialog/res/values-ka/strings.xml | 28 ++++ .../disconnectdialog/res/values-kk/strings.xml | 28 ++++ .../disconnectdialog/res/values-km/strings.xml | 28 ++++ .../disconnectdialog/res/values-kn/strings.xml | 24 ++++ .../disconnectdialog/res/values-ko/strings.xml | 24 ++++ .../disconnectdialog/res/values-ky/strings.xml | 28 ++++ .../disconnectdialog/res/values-lo/strings.xml | 24 ++++ .../disconnectdialog/res/values-lt/strings.xml | 24 ++++ .../disconnectdialog/res/values-lv/strings.xml | 24 ++++ .../disconnectdialog/res/values-mk/strings.xml | 28 ++++ .../disconnectdialog/res/values-ml/strings.xml | 24 ++++ .../disconnectdialog/res/values-mn/strings.xml | 24 ++++ .../disconnectdialog/res/values-mr/strings.xml | 24 ++++ .../disconnectdialog/res/values-ms/strings.xml | 28 ++++ .../disconnectdialog/res/values-my/strings.xml | 28 ++++ .../disconnectdialog/res/values-nb/strings.xml | 24 ++++ .../disconnectdialog/res/values-ne/strings.xml | 24 ++++ .../disconnectdialog/res/values-nl/strings.xml | 24 ++++ .../disconnectdialog/res/values-no/strings.xml | 24 ++++ .../disconnectdialog/res/values-pa/strings.xml | 24 ++++ .../disconnectdialog/res/values-pl/strings.xml | 24 ++++ .../disconnectdialog/res/values-pt-rBR/strings.xml | 24 ++++ .../disconnectdialog/res/values-pt-rPT/strings.xml | 24 ++++ .../disconnectdialog/res/values-pt/strings.xml | 24 ++++ .../disconnectdialog/res/values-ro/strings.xml | 28 ++++ .../disconnectdialog/res/values-ru/strings.xml | 28 ++++ .../disconnectdialog/res/values-si/strings.xml | 28 ++++ .../disconnectdialog/res/values-sk/strings.xml | 28 ++++ .../disconnectdialog/res/values-sl/strings.xml | 24 ++++ .../disconnectdialog/res/values-sq/strings.xml | 28 ++++ .../disconnectdialog/res/values-sr/strings.xml | 24 ++++ .../disconnectdialog/res/values-sv/strings.xml | 28 ++++ .../disconnectdialog/res/values-sw/strings.xml | 28 ++++ .../disconnectdialog/res/values-ta/strings.xml | 24 ++++ .../disconnectdialog/res/values-te/strings.xml | 24 ++++ .../disconnectdialog/res/values-th/strings.xml | 24 ++++ .../disconnectdialog/res/values-tl/strings.xml | 28 ++++ .../disconnectdialog/res/values-tr/strings.xml | 28 ++++ .../disconnectdialog/res/values-uk/strings.xml | 24 ++++ .../disconnectdialog/res/values-ur/strings.xml | 28 ++++ .../disconnectdialog/res/values-uz/strings.xml | 28 ++++ .../disconnectdialog/res/values-vi/strings.xml | 28 ++++ .../disconnectdialog/res/values-zh-rCN/strings.xml | 28 ++++ .../disconnectdialog/res/values-zh-rHK/strings.xml | 24 ++++ .../disconnectdialog/res/values-zh-rTW/strings.xml | 28 ++++ .../disconnectdialog/res/values-zu/strings.xml | 24 ++++ .../disconnectdialog/res/values/strings.xml | 32 +++++ .../incallui/incall/impl/InCallFragment.java | 6 + .../com/android/incallui/res/values-pl/strings.xml | 2 +- .../com/android/incallui/res/values-uz/strings.xml | 8 +- .../res/layout/fragment_composer_text.xml | 23 ++-- .../videotech/ims/ImsVideoCallCallback.java | 2 - .../incallui/videotech/ims/ImsVideoTech.java | 68 ++++++---- java/com/android/incallui/wifi/AndroidManifest.xml | 3 - .../incallui/wifi/EnableWifiCallingPrompt.java | 82 ----------- .../incallui/wifi/res/values-af/strings.xml | 5 - .../incallui/wifi/res/values-am/strings.xml | 5 - .../incallui/wifi/res/values-ar/strings.xml | 5 - .../incallui/wifi/res/values-az/strings.xml | 5 - .../incallui/wifi/res/values-b+sr+Latn/strings.xml | 5 - .../incallui/wifi/res/values-be/strings.xml | 5 - .../incallui/wifi/res/values-bg/strings.xml | 5 - .../incallui/wifi/res/values-bn/strings.xml | 5 - .../incallui/wifi/res/values-bs/strings.xml | 5 - .../incallui/wifi/res/values-ca/strings.xml | 5 - .../incallui/wifi/res/values-cs/strings.xml | 5 - .../incallui/wifi/res/values-da/strings.xml | 5 - .../incallui/wifi/res/values-de/strings.xml | 5 - .../incallui/wifi/res/values-el/strings.xml | 5 - .../incallui/wifi/res/values-en-rAU/strings.xml | 5 - .../incallui/wifi/res/values-en-rGB/strings.xml | 5 - .../incallui/wifi/res/values-en-rIN/strings.xml | 5 - .../incallui/wifi/res/values-es-rUS/strings.xml | 5 - .../incallui/wifi/res/values-es/strings.xml | 5 - .../incallui/wifi/res/values-et/strings.xml | 5 - .../incallui/wifi/res/values-eu/strings.xml | 5 - .../incallui/wifi/res/values-fa/strings.xml | 5 - .../incallui/wifi/res/values-fi/strings.xml | 5 - .../incallui/wifi/res/values-fr-rCA/strings.xml | 5 - .../incallui/wifi/res/values-fr/strings.xml | 5 - .../incallui/wifi/res/values-gl/strings.xml | 5 - .../incallui/wifi/res/values-gu/strings.xml | 5 - .../incallui/wifi/res/values-hi/strings.xml | 5 - .../incallui/wifi/res/values-hr/strings.xml | 5 - .../incallui/wifi/res/values-hu/strings.xml | 5 - .../incallui/wifi/res/values-hy/strings.xml | 5 - .../incallui/wifi/res/values-in/strings.xml | 5 - .../incallui/wifi/res/values-is/strings.xml | 5 - .../incallui/wifi/res/values-it/strings.xml | 5 - .../incallui/wifi/res/values-iw/strings.xml | 5 - .../incallui/wifi/res/values-ja/strings.xml | 5 - .../incallui/wifi/res/values-ka/strings.xml | 5 - .../incallui/wifi/res/values-kk/strings.xml | 5 - .../incallui/wifi/res/values-km/strings.xml | 5 - .../incallui/wifi/res/values-kn/strings.xml | 5 - .../incallui/wifi/res/values-ko/strings.xml | 5 - .../incallui/wifi/res/values-ky/strings.xml | 5 - .../incallui/wifi/res/values-lo/strings.xml | 5 - .../incallui/wifi/res/values-lt/strings.xml | 5 - .../incallui/wifi/res/values-lv/strings.xml | 5 - .../incallui/wifi/res/values-mk/strings.xml | 5 - .../incallui/wifi/res/values-ml/strings.xml | 5 - .../incallui/wifi/res/values-mn/strings.xml | 5 - .../incallui/wifi/res/values-mr/strings.xml | 5 - .../incallui/wifi/res/values-ms/strings.xml | 5 - .../incallui/wifi/res/values-my/strings.xml | 5 - .../incallui/wifi/res/values-nb/strings.xml | 5 - .../incallui/wifi/res/values-ne/strings.xml | 5 - .../incallui/wifi/res/values-nl/strings.xml | 5 - .../incallui/wifi/res/values-no/strings.xml | 5 - .../incallui/wifi/res/values-pa/strings.xml | 5 - .../incallui/wifi/res/values-pl/strings.xml | 5 - .../incallui/wifi/res/values-pt-rBR/strings.xml | 5 - .../incallui/wifi/res/values-pt-rPT/strings.xml | 5 - .../incallui/wifi/res/values-pt/strings.xml | 5 - .../incallui/wifi/res/values-ro/strings.xml | 5 - .../incallui/wifi/res/values-ru/strings.xml | 5 - .../incallui/wifi/res/values-si/strings.xml | 5 - .../incallui/wifi/res/values-sk/strings.xml | 5 - .../incallui/wifi/res/values-sl/strings.xml | 5 - .../incallui/wifi/res/values-sq/strings.xml | 5 - .../incallui/wifi/res/values-sr/strings.xml | 5 - .../incallui/wifi/res/values-sv/strings.xml | 5 - .../incallui/wifi/res/values-sw/strings.xml | 5 - .../incallui/wifi/res/values-ta/strings.xml | 5 - .../incallui/wifi/res/values-te/strings.xml | 5 - .../incallui/wifi/res/values-th/strings.xml | 5 - .../incallui/wifi/res/values-tl/strings.xml | 5 - .../incallui/wifi/res/values-tr/strings.xml | 5 - .../incallui/wifi/res/values-uk/strings.xml | 5 - .../incallui/wifi/res/values-ur/strings.xml | 5 - .../incallui/wifi/res/values-uz/strings.xml | 5 - .../incallui/wifi/res/values-vi/strings.xml | 5 - .../incallui/wifi/res/values-zh-rCN/strings.xml | 5 - .../incallui/wifi/res/values-zh-rHK/strings.xml | 5 - .../incallui/wifi/res/values-zh-rTW/strings.xml | 5 - .../incallui/wifi/res/values-zu/strings.xml | 5 - .../android/incallui/wifi/res/values/strings.xml | 9 -- java/com/android/voicemail/impl/OmtpConstants.java | 37 ++++- .../voicemail/impl/protocol/OmtpProtocol.java | 2 +- .../impl/transcribe/TranscriptionTask.java | 15 +++ 332 files changed, 3351 insertions(+), 1132 deletions(-) create mode 100644 assets/quantum/res/drawable-hdpi/quantum_ic_report_grey600_24.png create mode 100644 assets/quantum/res/drawable-mdpi/quantum_ic_report_grey600_24.png create mode 100644 assets/quantum/res/drawable-xhdpi/quantum_ic_report_grey600_24.png create mode 100644 assets/quantum/res/drawable-xxhdpi/quantum_ic_report_grey600_24.png create mode 100644 assets/quantum/res/drawable-xxxhdpi/quantum_ic_report_grey600_24.png create mode 100644 java/com/android/dialer/app/voicemail/error/res/drawable/shadow.xml create mode 100644 java/com/android/dialer/app/voicemail/error/res/drawable/voicemail_tos_image.png create mode 100644 java/com/android/dialer/shortcuts/res/drawable-anydpi-v26/ic_shortcut_add_contact.xml create mode 100644 java/com/android/dialer/shortcuts/res/drawable/ic_add_contact_foreground.xml create mode 100644 java/com/android/incallui/disconnectdialog/AndroidManifest.xml create mode 100644 java/com/android/incallui/disconnectdialog/DefaultErrorDialog.java create mode 100644 java/com/android/incallui/disconnectdialog/DisconnectDialog.java create mode 100644 java/com/android/incallui/disconnectdialog/DisconnectMessage.java create mode 100644 java/com/android/incallui/disconnectdialog/EnableWifiCallingPrompt.java create mode 100644 java/com/android/incallui/disconnectdialog/VideoCallNotAvailablePrompt.java create mode 100644 java/com/android/incallui/disconnectdialog/res/values-af/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-am/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-ar/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-az/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-b+sr+Latn/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-be/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-bg/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-bn/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-bs/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-ca/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-cs/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-da/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-de/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-el/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-en-rAU/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-en-rGB/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-en-rIN/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-es-rUS/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-es/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-et/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-eu/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-fa/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-fi/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-fr-rCA/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-fr/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-gl/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-gu/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-hi/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-hr/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-hu/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-hy/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-in/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-is/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-it/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-iw/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-ja/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-ka/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-kk/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-km/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-kn/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-ko/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-ky/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-lo/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-lt/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-lv/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-mk/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-ml/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-mn/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-mr/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-ms/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-my/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-nb/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-ne/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-nl/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-no/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-pa/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-pl/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-pt-rBR/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-pt-rPT/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-pt/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-ro/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-ru/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-si/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-sk/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-sl/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-sq/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-sr/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-sv/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-sw/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-ta/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-te/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-th/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-tl/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-tr/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-uk/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-ur/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-uz/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-vi/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-zh-rCN/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-zh-rHK/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-zh-rTW/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values-zu/strings.xml create mode 100644 java/com/android/incallui/disconnectdialog/res/values/strings.xml delete mode 100644 java/com/android/incallui/wifi/AndroidManifest.xml delete mode 100644 java/com/android/incallui/wifi/EnableWifiCallingPrompt.java delete mode 100644 java/com/android/incallui/wifi/res/values-af/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-am/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ar/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-az/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-b+sr+Latn/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-be/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-bg/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-bn/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-bs/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ca/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-cs/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-da/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-de/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-el/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-en-rAU/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-en-rGB/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-en-rIN/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-es-rUS/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-es/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-et/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-eu/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-fa/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-fi/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-fr-rCA/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-fr/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-gl/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-gu/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-hi/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-hr/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-hu/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-hy/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-in/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-is/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-it/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-iw/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ja/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ka/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-kk/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-km/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-kn/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ko/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ky/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-lo/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-lt/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-lv/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-mk/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ml/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-mn/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-mr/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ms/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-my/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-nb/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ne/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-nl/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-no/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-pa/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-pl/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-pt-rBR/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-pt-rPT/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-pt/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ro/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ru/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-si/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-sk/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-sl/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-sq/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-sr/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-sv/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-sw/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ta/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-te/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-th/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-tl/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-tr/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-uk/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ur/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-uz/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-vi/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-zh-rCN/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-zh-rHK/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-zh-rTW/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-zu/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values/strings.xml diff --git a/Android.mk b/Android.mk index 009e878e2..cf543aa59 100644 --- a/Android.mk +++ b/Android.mk @@ -109,6 +109,7 @@ RES_DIRS := \ $(BASE_DIR)/incallui/calllocation/impl/res \ $(BASE_DIR)/incallui/commontheme/res \ $(BASE_DIR)/incallui/contactgrid/res \ + $(BASE_DIR)/incallui/disconnectdialog/res \ $(BASE_DIR)/incallui/hold/res \ $(BASE_DIR)/incallui/incall/impl/res \ $(BASE_DIR)/incallui/res \ @@ -117,7 +118,6 @@ RES_DIRS := \ $(BASE_DIR)/incallui/telecomeventui/res \ $(BASE_DIR)/incallui/video/impl/res \ $(BASE_DIR)/incallui/video/protocol/res \ - $(BASE_DIR)/incallui/wifi/res \ $(BASE_DIR)/voicemail/impl/res \ @@ -169,6 +169,7 @@ DIALER_MANIFEST_FILES += \ $(BASE_DIR)/incallui/autoresizetext/AndroidManifest.xml \ $(BASE_DIR)/incallui/commontheme/AndroidManifest.xml \ $(BASE_DIR)/incallui/contactgrid/AndroidManifest.xml \ + $(BASE_DIR)/incallui/disconnectdialog/AndroidManifest.xml \ $(BASE_DIR)/incallui/hold/AndroidManifest.xml \ $(BASE_DIR)/incallui/incall/impl/AndroidManifest.xml \ $(BASE_DIR)/incallui/sessiondata/AndroidManifest.xml \ @@ -176,7 +177,6 @@ DIALER_MANIFEST_FILES += \ $(BASE_DIR)/incallui/telecomeventui/AndroidManifest.xml \ $(BASE_DIR)/incallui/video/impl/AndroidManifest.xml \ $(BASE_DIR)/incallui/video/protocol/AndroidManifest.xml \ - $(BASE_DIR)/incallui/wifi/AndroidManifest.xml \ $(BASE_DIR)/voicemail/AndroidManifest.xml \ $(BASE_DIR)/voicemail/impl/AndroidManifest.xml \ @@ -246,6 +246,7 @@ LOCAL_AAPT_FLAGS := \ --extra-packages com.android.incallui.calllocation.impl \ --extra-packages com.android.incallui.commontheme \ --extra-packages com.android.incallui.contactgrid \ + --extra-packages com.android.incallui.disconnectdialog \ --extra-packages com.android.incallui.hold \ --extra-packages com.android.incallui.incall.impl \ --extra-packages com.android.incallui.maps.impl \ @@ -254,7 +255,6 @@ LOCAL_AAPT_FLAGS := \ --extra-packages com.android.incallui.telecomeventui \ --extra-packages com.android.incallui.video \ --extra-packages com.android.incallui.video.impl \ - --extra-packages com.android.incallui.wifi \ --extra-packages com.android.phone.common \ --extra-packages com.android.voicemail \ --extra-packages com.android.voicemail.impl \ diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8dc9f6bb9..5420ec05c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -16,7 +16,7 @@ listener.onVideoCallIconClicked(position); } else if (action == LIGHTBRINGER) { + CallIntentBuilder.increaseLightbringerCallButtonAppearInSearchCount(); drawable = ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_videocam_vd_theme_24); drawable.setAutoMirrored(true); diff --git a/java/com/android/contacts/common/res/values-zh-rHK/strings.xml b/java/com/android/contacts/common/res/values-zh-rHK/strings.xml index 122d0febc..842ac873a 100644 --- a/java/com/android/contacts/common/res/values-zh-rHK/strings.xml +++ b/java/com/android/contacts/common/res/values-zh-rHK/strings.xml @@ -64,7 +64,7 @@ "傳送短訊至 MMS 電話號碼" "%s (訊息)" "清除常用聯絡人？" - "您將清除「通訊錄」應用程式和「電話」應用程式中的常用聯絡人名單，並強制電子郵件應用程式重新取得您的寄件喜好設定。" + "您將清除「通訊錄」應用程式和「電話」應用程式中的常用聯絡人名單，並強制電子郵件應用程式重新取得您的寄件偏好設定。" "正在清除常用聯絡人…" "在線" "離開" diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java index 5241d9c80..f4c8c90f8 100644 --- a/java/com/android/dialer/app/calllog/CallLogAdapter.java +++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java @@ -63,6 +63,7 @@ import com.android.dialer.app.voicemail.VoicemailPlaybackPresenter.OnVoicemailDe import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler; import com.android.dialer.calldetails.CallDetailsEntries; import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry; +import com.android.dialer.callintent.CallIntentBuilder; import com.android.dialer.calllogutils.PhoneAccountUtils; import com.android.dialer.calllogutils.PhoneCallDetails; import com.android.dialer.common.Assert; @@ -293,6 +294,11 @@ public class CallLogAdapter extends GroupingListAdapter } }; + @VisibleForTesting + public View.OnClickListener getExpandCollapseListener() { + return mExpandCollapseListener; + } + /** The OnClickListener used to expand or collapse the action buttons of a call log entry. */ private final View.OnClickListener mExpandCollapseListener = new View.OnClickListener() { @@ -361,6 +367,17 @@ public class CallLogAdapter extends GroupingListAdapter } } expandViewHolderActions(viewHolder); + + if (viewHolder.videoCallButtonView.getVisibility() == View.VISIBLE + && LightbringerComponent.get(mActivity) + .getLightbringer() + .getPackageName() + .equals( + ((IntentProvider) viewHolder.videoCallButtonView.getTag()) + .getIntent(mActivity) + .getPackage())) { + CallIntentBuilder.increaseLightbringerCallButtonAppearInExpandedCallLogItemCount(); + } } } }; diff --git a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java index b8b029f7b..27aa82577 100644 --- a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java +++ b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java @@ -34,6 +34,8 @@ import android.support.v7.widget.CardView; import android.support.v7.widget.RecyclerView; import android.telecom.PhoneAccount; import android.telecom.PhoneAccountHandle; +import android.telecom.TelecomManager; +import android.telecom.VideoProfile; import android.telephony.PhoneNumberUtils; import android.text.BidiFormatter; import android.text.TextDirectionHeuristics; @@ -66,6 +68,7 @@ import com.android.dialer.blocking.FilteredNumbersUtil; import com.android.dialer.callcomposer.CallComposerActivity; import com.android.dialer.calldetails.CallDetailsActivity; import com.android.dialer.calldetails.CallDetailsEntries; +import com.android.dialer.callintent.CallIntentBuilder; import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; import com.android.dialer.compat.CompatUtils; @@ -85,6 +88,7 @@ import com.android.dialer.phonenumbercache.CachedNumberLookupService; import com.android.dialer.phonenumbercache.ContactInfo; import com.android.dialer.phonenumbercache.PhoneNumberCache; import com.android.dialer.phonenumberutil.PhoneNumberHelper; +import com.android.dialer.telecom.TelecomUtil; import com.android.dialer.util.CallUtil; import com.android.dialer.util.DialerUtils; import java.lang.annotation.Retention; @@ -117,6 +121,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder public final ImageView primaryActionButtonView; private final Context mContext; + @Nullable private final PhoneAccountHandle mDefaultPhoneAccountHandle; private final CallLogCache mCallLogCache; private final CallLogListItemHelper mCallLogListItemHelper; private final CachedNumberLookupService mCachedNumberLookupService; @@ -255,6 +260,10 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder mBlockReportListener = blockReportListener; mCachedNumberLookupService = PhoneNumberCache.get(mContext).getCachedNumberLookupService(); + // Cache this to avoid having to look it up each time we bind to a call log entry + mDefaultPhoneAccountHandle = + TelecomUtil.getDefaultOutgoingPhoneAccount(context, PhoneAccount.SCHEME_TEL); + this.rootView = rootView; this.quickContactView = dialerQuickContactView; this.primaryActionView = primaryActionView; @@ -336,11 +345,13 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder } public static CallLogListItemViewHolder createForTest(Context context) { - return createForTest(context, null); + return createForTest(context, null, null); } - static CallLogListItemViewHolder createForTest( - Context context, VoicemailPlaybackPresenter voicemailPlaybackPresenter) { + public static CallLogListItemViewHolder createForTest( + Context context, + View.OnClickListener expandCollapseListener, + VoicemailPlaybackPresenter voicemailPlaybackPresenter) { Resources resources = context.getResources(); CallLogCache callLogCache = CallLogCache.getCallLogCache(context); PhoneCallDetailsHelper phoneCallDetailsHelper = @@ -350,7 +361,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder new CallLogListItemViewHolder( context, null, - null /* expandCollapseListener */, + expandCollapseListener /* expandCollapseListener */, null, null, callLogCache, @@ -503,6 +514,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder boolean isVoicemailNumber = mCallLogCache.isVoicemailNumber(accountHandle, number); if (!isVoicemailNumber && showLightbringerPrimaryButton()) { + CallIntentBuilder.increaseLightbringerCallButtonAppearInCollapsedCallLogItemCount(); primaryActionButtonView.setTag(IntentProvider.getLightbringerIntentProvider(number)); primaryActionButtonView.setContentDescription( TextUtils.expandTemplate( @@ -594,7 +606,8 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder callButtonView.setVisibility(View.VISIBLE); } - if (hasPlacedCarrierVideoCall() || canSupportCarrierVideoCall()) { + if (CallUtil.isVideoEnabled(mContext) + && (hasPlacedCarrierVideoCall() || canSupportCarrierVideoCall())) { videoCallButtonView.setTag(IntentProvider.getReturnVideoCallIntentProvider(number)); videoCallButtonView.setVisibility(View.VISIBLE); } else if (showLightbringerPrimaryButton()) { @@ -709,10 +722,10 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder if (accountHandle == null) { return false; } - if (accountHandle.getComponentName().equals(getLightbringer().getPhoneAccountComponentName())) { + if (mDefaultPhoneAccountHandle == null) { return false; } - return true; + return accountHandle.getComponentName().equals(mDefaultPhoneAccountHandle.getComponentName()); } private boolean canSupportCarrierVideoCall() { @@ -878,12 +891,20 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder // intents need to be started using startActivityForResult instead of the usual startActivity String packageName = intent.getPackage(); if (packageName != null && packageName.equals(getLightbringer().getPackageName())) { + Logger.get(mContext) + .logImpression(DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FROM_CALL_LOG); startLightbringerActivity(intent); } else if (CallDetailsActivity.isLaunchIntent(intent)) { PerformanceReport.recordClick(UiAction.Type.OPEN_CALL_DETAIL); ((Activity) mContext) .startActivityForResult(intent, DialtactsActivity.ACTIVITY_REQUEST_CODE_CALL_DETAILS); } else { + if (Intent.ACTION_CALL.equals(intent.getAction()) + && intent.getIntExtra(TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE, -1) + == VideoProfile.STATE_BIDIRECTIONAL) { + Logger.get(mContext) + .logImpression(DialerImpression.Type.IMS_VIDEO_REQUESTED_FROM_CALL_LOG); + } DialerUtils.startActivityWithErrorToast(mContext, intent); } } diff --git a/java/com/android/dialer/app/calllog/IntentProvider.java b/java/com/android/dialer/app/calllog/IntentProvider.java index e1ec9f509..55fdbbace 100644 --- a/java/com/android/dialer/app/calllog/IntentProvider.java +++ b/java/com/android/dialer/app/calllog/IntentProvider.java @@ -30,8 +30,6 @@ import com.android.dialer.callintent.CallInitiationType; import com.android.dialer.callintent.CallIntentBuilder; import com.android.dialer.dialercontact.DialerContact; import com.android.dialer.lightbringer.LightbringerComponent; -import com.android.dialer.logging.DialerImpression; -import com.android.dialer.logging.Logger; import com.android.dialer.util.CallUtil; import com.android.dialer.util.IntentUtil; import java.util.ArrayList; @@ -70,7 +68,6 @@ public abstract class IntentProvider { return new IntentProvider() { @Override public Intent getIntent(Context context) { - Logger.get(context).logImpression(DialerImpression.Type.IMS_VIDEO_REQUESTED_FROM_CALL_LOG); return new CallIntentBuilder(number, CallInitiationType.Type.CALL_LOG) .setPhoneAccountHandle(accountHandle) .setIsVideoCall(true) @@ -83,8 +80,6 @@ public abstract class IntentProvider { return new IntentProvider() { @Override public Intent getIntent(Context context) { - Logger.get(context) - .logImpression(DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FROM_CALL_LOG); return LightbringerComponent.get(context).getLightbringer().getIntent(context, number); } }; diff --git a/java/com/android/dialer/app/calllog/calllogcache/CallLogCache.java b/java/com/android/dialer/app/calllog/calllogcache/CallLogCache.java index 6728dfb38..2e7c9339a 100644 --- a/java/com/android/dialer/app/calllog/calllogcache/CallLogCache.java +++ b/java/com/android/dialer/app/calllog/calllogcache/CallLogCache.java @@ -17,6 +17,7 @@ package com.android.dialer.app.calllog.calllogcache; import android.content.Context; +import android.support.annotation.Nullable; import android.telecom.PhoneAccountHandle; import com.android.dialer.app.calllog.CallLogAdapter; import com.android.dialer.util.CallUtil; @@ -57,20 +58,8 @@ public abstract class CallLogCache { * Returns true if the given number is the number of the configured voicemail. To be able to * mock-out this, it is not a static method. */ - public abstract boolean isVoicemailNumber(PhoneAccountHandle accountHandle, CharSequence number); - - /** - * Returns {@code true} when the current sim supports video calls, regardless of the value in a - * contact's {@link android.provider.ContactsContract.CommonDataKinds.Phone#CARRIER_PRESENCE} - * column. - */ - public boolean isVideoEnabled() { - if (!mHasCheckedForVideoAvailability) { - mVideoAvailability = CallUtil.getVideoCallingAvailability(mContext); - mHasCheckedForVideoAvailability = true; - } - return (mVideoAvailability & CallUtil.VIDEO_CALLING_ENABLED) != 0; - } + public abstract boolean isVoicemailNumber( + PhoneAccountHandle accountHandle, @Nullable CharSequence number); /** * Returns {@code true} when the current sim supports checking video calling capabilities via the diff --git a/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java b/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java index f85680649..2424b6dbd 100644 --- a/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java +++ b/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java @@ -17,7 +17,9 @@ package com.android.dialer.app.calllog.calllogcache; import android.content.Context; +import android.support.annotation.Nullable; import android.telecom.PhoneAccountHandle; +import android.text.TextUtils; import android.util.ArrayMap; import com.android.dialer.calllogutils.PhoneAccountUtils; import com.android.dialer.telecom.TelecomUtil; @@ -50,7 +52,11 @@ class CallLogCacheLollipopMr1 extends CallLogCache { } @Override - public boolean isVoicemailNumber(PhoneAccountHandle accountHandle, CharSequence number) { + public boolean isVoicemailNumber( + PhoneAccountHandle accountHandle, @Nullable CharSequence number) { + if (TextUtils.isEmpty(number)) { + return false; + } return TelecomUtil.isVoicemailNumber(mContext, accountHandle, number.toString()); } 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 ca3d52236..8f43ba72c 100644 --- a/java/com/android/dialer/app/res/values-sq/strings.xml +++ b/java/com/android/dialer/app/res/values-sq/strings.xml @@ -236,6 +236,6 @@ "%1$s është jashtë linje dhe nuk mund të kontaktohet" "Rreth" "Shiko" - "Telefonata u fshi. Shiko dhe fshi bashkëngjitjet e ndara gjatë kësaj telefonate te \"Mesazhet\"." - "Telefonatat u fshinë. Shiko dhe fshi bashkëngjitjet e ndara gjatë telefonatave te \"Mesazhet\"." + "Telefonata u fshi. Shiko dhe fshi bashkëngjitjet e ndara gjatë kësaj telefonate te Messages." + "Telefonatat u fshinë. Shiko dhe fshi bashkëngjitjet e ndara gjatë telefonatave te Messages." 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 2b6a3eb07..f713f4c56 100644 --- a/java/com/android/dialer/app/res/values-ur/strings.xml +++ b/java/com/android/dialer/app/res/values-ur/strings.xml @@ -236,6 +236,6 @@ "%1$s آف لائن ہے اور اس تک پہنچا نہیں جا سکتا" "تفصیل" "دیکھیں" - "کال حذف ہو گئی۔ اس کال کے دوران پیغامات کے اندر اشتراک کردہ منسلکہ جات ملاحظہ کریں اور حذف کریں۔" - "کالیں حذف ہو گئیں۔ کالوں کے دوران پیغامات کے اندر اشتراک کردہ منسلکہ جات ملاحظہ کریں اور حذف کریں۔" + "کال حذف ہو گئی۔ اس کال کے دوران اشتراک کردہ منسلکہ جات کو \'پیغامات \' میں ملاحظہ کریں اور حذف کریں۔" + "کالیں حذف ہو گئیں۔ کالوں کے دوران اشتراک کردہ منسلکہ جات کو \'پیغامات \' میں ملاحظہ کریں اور حذف کریں۔" diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailErrorAlert.java b/java/com/android/dialer/app/voicemail/error/VoicemailErrorAlert.java index d045b1bd3..dbdf0f067 100644 --- a/java/com/android/dialer/app/voicemail/error/VoicemailErrorAlert.java +++ b/java/com/android/dialer/app/voicemail/error/VoicemailErrorAlert.java @@ -20,6 +20,7 @@ import android.content.Context; import android.support.annotation.VisibleForTesting; import android.text.util.Linkify; import android.view.View; +import android.widget.ImageView; import android.widget.TextView; import com.android.dialer.app.alert.AlertManager; import com.android.dialer.app.voicemail.error.VoicemailErrorMessage.Action; @@ -132,6 +133,13 @@ public class VoicemailErrorAlert { TextView secondaryButton = (TextView) view.findViewById(R.id.voicemail_tos_button_accept); secondaryButton.setText(secondaryAction.getText()); secondaryButton.setOnClickListener(secondaryAction.getListener()); + + if (message.getImageResourceId() != null) { + ImageView voicemailTosImage = (ImageView) view.findViewById(R.id.voicemail_image); + voicemailTosImage.setImageResource(message.getImageResourceId()); + voicemailTosImage.setVisibility(View.VISIBLE); + } + return view; } diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessage.java b/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessage.java index a0dd30f0b..92c787d2d 100644 --- a/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessage.java +++ b/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessage.java @@ -47,6 +47,7 @@ public class VoicemailErrorMessage { private final List actions; private boolean modal; + private Integer imageResourceId; /** Something the user can click on to resolve an error, such as retrying or calling voicemail */ public static class Action { @@ -100,6 +101,16 @@ public class VoicemailErrorMessage { return this; } + @Nullable + public Integer getImageResourceId() { + return imageResourceId; + } + + public VoicemailErrorMessage setImageResourceId(Integer imageResourceId) { + this.imageResourceId = imageResourceId; + return this; + } + public VoicemailErrorMessage(CharSequence title, CharSequence description, Action... actions) { this(title, description, Arrays.asList(actions)); } diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java b/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java index 3f0ed1f58..f2cdaf644 100644 --- a/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java +++ b/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java @@ -22,10 +22,13 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.graphics.Typeface; import android.preference.PreferenceManager; import android.support.annotation.Nullable; import android.telecom.PhoneAccountHandle; import android.telephony.TelephonyManager; +import android.text.SpannableString; +import android.text.style.StyleSpan; import android.view.View; import android.view.View.OnClickListener; import com.android.contacts.common.compat.TelephonyManagerCompat; @@ -114,7 +117,8 @@ public class VoicemailTosMessageCreator { } }, true /* raised */)) - .setModal(true); + .setModal(true) + .setImageResourceId(getTosImageId()); } private void showDeclineTosDialog(final PhoneAccountHandle handle) { @@ -274,17 +278,32 @@ public class VoicemailTosMessageCreator { } } - private String getTosTitle() { + private CharSequence getTosTitle() { return isVvm3() ? context.getString(R.string.verizon_terms_and_conditions_title) : context.getString(R.string.dialer_terms_and_conditions_title); } - private String getTosMessage() { - return isVvm3() - ? context.getString( - R.string.verizon_terms_and_conditions_message, getDialerTos(), getVvm3Tos()) - : context.getString(R.string.dialer_terms_and_conditions_message, getDialerTos()); + private CharSequence getTosMessage() { + if (isVvm3()) { + // For verizon the TOS consist of three pieces: google dialer TOS, Verizon TOS message and + // Verizon TOS details. + CharSequence vvm3Details = getVvm3Tos(); + CharSequence tos = + context.getString( + R.string.verizon_terms_and_conditions_message, getDialerTos(), vvm3Details); + // Make all text bold except the details. + SpannableString spannableTos = new SpannableString(tos); + spannableTos.setSpan(new StyleSpan(Typeface.BOLD), 0, tos.length() - vvm3Details.length(), 0); + return spannableTos; + } else { + // The TOS for everyone else there are no details, so just make everything bold. + CharSequence tos = + context.getString(R.string.dialer_terms_and_conditions_message, getDialerTos()); + SpannableString spannableTos = new SpannableString(tos); + spannableTos.setSpan(new StyleSpan(Typeface.BOLD), 0, tos.length(), 0); + return spannableTos; + } } private int getTosDeclinedDialogMessageId() { @@ -298,4 +317,8 @@ public class VoicemailTosMessageCreator { ? R.string.verizon_terms_and_conditions_decline_dialog_downgrade : R.string.dialer_terms_and_conditions_decline_dialog_downgrade; } + + private Integer getTosImageId() { + return isVvm3() ? null : R.drawable.voicemail_tos_image; + } } diff --git a/java/com/android/dialer/app/voicemail/error/res/drawable/shadow.xml b/java/com/android/dialer/app/voicemail/error/res/drawable/shadow.xml new file mode 100644 index 000000000..681c795f5 --- /dev/null +++ b/java/com/android/dialer/app/voicemail/error/res/drawable/shadow.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/java/com/android/dialer/app/voicemail/error/res/drawable/voicemail_tos_image.png b/java/com/android/dialer/app/voicemail/error/res/drawable/voicemail_tos_image.png new file mode 100644 index 000000000..2e076c69a Binary files /dev/null and b/java/com/android/dialer/app/voicemail/error/res/drawable/voicemail_tos_image.png differ diff --git a/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml b/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml index a082e8e67..ec8abed6d 100644 --- a/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml +++ b/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml @@ -23,13 +23,21 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:paddingStart="16dp" - android:paddingEnd="16dp" android:orientation="vertical"> + + android:layout_height="0.5dp" + android:elevation="1dp" + android:background="@drawable/shadow"/> diff --git a/java/com/android/dialer/app/voicemail/error/res/values/dimens.xml b/java/com/android/dialer/app/voicemail/error/res/values/dimens.xml index 090311f15..dd815ca12 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values/dimens.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values/dimens.xml @@ -1,4 +1,20 @@ + + 24dp 16dp @@ -22,4 +38,6 @@ 4dp 16sp 14sp - \ No newline at end of file + + 200dp + 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 ad5240b9d..80349e168 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 @@ -174,16 +174,16 @@ Si no acepta todos estos términos y condiciones, no use el buzón de voz visual - See and listen to your messages, without having to call voicemail.\n\nGet transcripts of your voicemail using Google’s transcription service. + See and listen to your messages, without having to call voicemail.\nGet transcripts of your voicemail using Google’s transcription service. - ***TRANSLATE TO SPANISH***\nSee and listen to your messages, without having to call voicemail.\n\nGet transcripts of your voicemail using Google’s transcription service. + ***TRANSLATE TO SPANISH***\nSee and listen to your messages, without having to call voicemail.\nGet transcripts of your voicemail using Google’s transcription service. - Accept + Turn On Aceptar - Decline + No Thanks Rechazar Turn On diff --git a/java/com/android/dialer/app/voicemail/error/res/values/styles.xml b/java/com/android/dialer/app/voicemail/error/res/values/styles.xml index c4a8542f1..257e93d1b 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values/styles.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values/styles.xml @@ -1,6 +1,21 @@ - + + + + - \ No newline at end of file + diff --git a/java/com/android/dialer/blocking/res/values-hu/strings.xml b/java/com/android/dialer/blocking/res/values-hu/strings.xml index 10704546d..7981d6c14 100644 --- a/java/com/android/dialer/blocking/res/values-hu/strings.xml +++ b/java/com/android/dialer/blocking/res/values-hu/strings.xml @@ -33,7 +33,7 @@ "VISSZAVONÁS" "Az importálás nem sikerült" "A hívások tiltása funkció kikapcsolva 48 órára" - "Letiltva vészhívás miatt." + "Letiltva segélyhívás miatt." "Letiltja a következő számot: %1$s?" "A jövőben nem fogad hívásokat erről a számról." "%1$s A hívást spamként jelentjük be." diff --git a/java/com/android/dialer/callcomposer/CallComposerActivity.java b/java/com/android/dialer/callcomposer/CallComposerActivity.java index 314752f93..df5cc29e0 100644 --- a/java/com/android/dialer/callcomposer/CallComposerActivity.java +++ b/java/com/android/dialer/callcomposer/CallComposerActivity.java @@ -64,8 +64,8 @@ import com.android.dialer.constants.Constants; import com.android.dialer.dialercontact.DialerContact; import com.android.dialer.enrichedcall.EnrichedCallComponent; import com.android.dialer.enrichedcall.EnrichedCallManager; -import com.android.dialer.enrichedcall.EnrichedCallManager.State; import com.android.dialer.enrichedcall.Session; +import com.android.dialer.enrichedcall.Session.State; import com.android.dialer.enrichedcall.extensions.StateExtension; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; @@ -255,25 +255,25 @@ public class CallComposerActivity extends AppCompatActivity StateExtension.toString(state)); switch (state) { - case EnrichedCallManager.STATE_STARTING: + case Session.STATE_STARTING: timeoutHandler.postDelayed(sessionStartedTimedOut, getSessionStartedTimeoutMillis()); if (sendAndCallReady) { showLoadingUi(); } break; - case EnrichedCallManager.STATE_STARTED: + case Session.STATE_STARTED: timeoutHandler.removeCallbacks(sessionStartedTimedOut); if (sendAndCallReady) { sendAndCall(); } break; - case EnrichedCallManager.STATE_START_FAILED: - case EnrichedCallManager.STATE_CLOSED: + case Session.STATE_START_FAILED: + case Session.STATE_CLOSED: setFailedResultAndFinish(); break; - case EnrichedCallManager.STATE_MESSAGE_FAILED: - case EnrichedCallManager.STATE_MESSAGE_SENT: - case EnrichedCallManager.STATE_NONE: + case Session.STATE_MESSAGE_FAILED: + case Session.STATE_MESSAGE_SENT: + case Session.STATE_NONE: default: break; } @@ -385,7 +385,7 @@ public class CallComposerActivity extends AppCompatActivity private boolean sessionReady() { Session session = getEnrichedCallManager().getSession(sessionId); - return session != null && session.getState() == EnrichedCallManager.STATE_STARTED; + return session != null && session.getState() == Session.STATE_STARTED; } private void placeRCSCall(MultimediaData.Builder builder) { diff --git a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml index 588cc1d42..48d6368c2 100644 --- a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml +++ b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml @@ -43,6 +43,8 @@ android:layout_marginTop="@dimen/call_composer_contact_container_margin_top" android:paddingTop="@dimen/call_composer_contact_container_padding_top" android:paddingBottom="@dimen/call_composer_contact_container_padding_bottom" + android:paddingStart="16dp" + android:paddingEnd="16dp" android:background="@color/dialer_theme_color"> @@ -58,6 +62,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" + android:maxLines="1" + android:ellipsize="end" android:textColor="@color/background_dialer_white" android:textSize="@dimen/call_composer_number_text_size"/> diff --git a/java/com/android/dialer/callcomposer/res/values-af/strings.xml b/java/com/android/dialer/callcomposer/res/values-af/strings.xml index ef358651b..62a74579e 100644 --- a/java/com/android/dialer/callcomposer/res/values-af/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-af/strings.xml @@ -33,8 +33,6 @@ "Neem \'n foto" "Kies \'n foto" "Stuur \'n boodskap" - - - - + "Foto is via Boodskappe gestuur" + "Boodskap is via Boodskappe gestuur" diff --git a/java/com/android/dialer/callcomposer/res/values-am/strings.xml b/java/com/android/dialer/callcomposer/res/values-am/strings.xml index 8224b1e3d..fe1c1e586 100644 --- a/java/com/android/dialer/callcomposer/res/values-am/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-am/strings.xml @@ -33,8 +33,6 @@ "ፎቶ ያንሱ" "ፎቶ ይምረጡ" "መልዕክት ይላኩ" - - - - + "ፎቶ በመልዕክቶች በኩል ተልኳል" + "መልዕክት በመልዕክቶች በኩል ተልኳል" diff --git a/java/com/android/dialer/callcomposer/res/values-ar/strings.xml b/java/com/android/dialer/callcomposer/res/values-ar/strings.xml index 4e27f21ba..b70f3ff32 100644 --- a/java/com/android/dialer/callcomposer/res/values-ar/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ar/strings.xml @@ -33,8 +33,6 @@ "التقاط صورة" "اختيار صورة" "إرسال رسالة" - - - - + "‏صورة مرسلة عبر Messages" + "‏رسالة مرسلة عبر Messages" diff --git a/java/com/android/dialer/callcomposer/res/values-az/strings.xml b/java/com/android/dialer/callcomposer/res/values-az/strings.xml index d861e660e..7495555af 100644 --- a/java/com/android/dialer/callcomposer/res/values-az/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-az/strings.xml @@ -33,8 +33,6 @@ "Şəkil çəkin" "Foto seçin" "Mesaj göndərin" - - - - + "Foto Mesajlaşma tətbiqi vasitəsilə göndərildi" + "Mesaj Mesajlaşma tətbiqi vasitəsilə göndərildi" diff --git a/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml index 0a93b224c..88b801169 100644 --- a/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml @@ -33,8 +33,6 @@ "Slikajte" "Izaberite sliku" "Pošaljite poruku" - - - - + "Slika je poslata preko Messages-a" + "Poruka je poslata preko Messages-a" diff --git a/java/com/android/dialer/callcomposer/res/values-be/strings.xml b/java/com/android/dialer/callcomposer/res/values-be/strings.xml index ba55fc7b2..a741ccd4e 100644 --- a/java/com/android/dialer/callcomposer/res/values-be/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-be/strings.xml @@ -33,8 +33,6 @@ "Зрабіць фота" "Выбраць фота" "Адправіць паведамленне" - - - - + "Фота адпраўлена праз праграму \"Паведамленні\"" + "Паведамленне адпраўлена праз праграму \"Паведамленні\"" diff --git a/java/com/android/dialer/callcomposer/res/values-bg/strings.xml b/java/com/android/dialer/callcomposer/res/values-bg/strings.xml index 7dad394c3..4348bc6cd 100644 --- a/java/com/android/dialer/callcomposer/res/values-bg/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-bg/strings.xml @@ -33,8 +33,6 @@ "Правене на снимка" "Избиране на снимка" "Изпращане на съобщение" - - - - + "Снимката е изпратена чрез Messages" + "Съобщението е изпратено чрез Messages" diff --git a/java/com/android/dialer/callcomposer/res/values-bn/strings.xml b/java/com/android/dialer/callcomposer/res/values-bn/strings.xml index 607f195a1..f2f3f11c4 100644 --- a/java/com/android/dialer/callcomposer/res/values-bn/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-bn/strings.xml @@ -33,8 +33,6 @@ "একটি ছবি তুলুন" "একটি ফটো বেছে নিন" "একটি বার্তা পাঠান" - - - - + "Messages এর সাহায্যে ফটো পাঠানো হয়েছে" + "Messages-এর সাহায্যে বার্তা পাঠানো হয়েছে" diff --git a/java/com/android/dialer/callcomposer/res/values-bs/strings.xml b/java/com/android/dialer/callcomposer/res/values-bs/strings.xml index 99ca5db88..a5ecb0c87 100644 --- a/java/com/android/dialer/callcomposer/res/values-bs/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-bs/strings.xml @@ -33,8 +33,6 @@ "Uslikaj" "Izaberi fotografiju" "Pošalji poruku" - - - - + "Fotografija je poslana putem aplikacije Messages" + "Poruka je poslana putem aplikacije Messages" diff --git a/java/com/android/dialer/callcomposer/res/values-ca/strings.xml b/java/com/android/dialer/callcomposer/res/values-ca/strings.xml index 7b553467e..1f3007d5d 100644 --- a/java/com/android/dialer/callcomposer/res/values-ca/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ca/strings.xml @@ -33,8 +33,6 @@ "Fes una foto" "Tria una foto" "Envia un missatge" - - - - + "Foto enviada mitjançant Missatges" + "Missatge enviat mitjançant Missatges" diff --git a/java/com/android/dialer/callcomposer/res/values-cs/strings.xml b/java/com/android/dialer/callcomposer/res/values-cs/strings.xml index f30bb3c78..590ab1c6a 100644 --- a/java/com/android/dialer/callcomposer/res/values-cs/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-cs/strings.xml @@ -33,8 +33,6 @@ "Vyfotit" "Vybrat fotku" "Poslat zprávu" - - - - + "Fotka poslaná v aplikaci Zprávy" + "Zpráva poslaná v aplikaci Zprávy" diff --git a/java/com/android/dialer/callcomposer/res/values-da/strings.xml b/java/com/android/dialer/callcomposer/res/values-da/strings.xml index bae4495e9..179e0d02c 100644 --- a/java/com/android/dialer/callcomposer/res/values-da/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-da/strings.xml @@ -33,8 +33,6 @@ "Tag et billede" "Vælg et billede" "Send en sms" - - - - + "Fotoet blev sendt via Beskeder" + "Beskeden blev sendt via Beskeder" diff --git a/java/com/android/dialer/callcomposer/res/values-de/strings.xml b/java/com/android/dialer/callcomposer/res/values-de/strings.xml index ac7ce4e10..d0c88a938 100644 --- a/java/com/android/dialer/callcomposer/res/values-de/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-de/strings.xml @@ -33,8 +33,6 @@ "Bild aufnehmen" "Foto auswählen" "Nachricht senden" - - - - + "Foto über Messages gesendet" + "Nachricht über Messages gesendet." diff --git a/java/com/android/dialer/callcomposer/res/values-el/strings.xml b/java/com/android/dialer/callcomposer/res/values-el/strings.xml index 1e7659bfd..bfa626bd7 100644 --- a/java/com/android/dialer/callcomposer/res/values-el/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-el/strings.xml @@ -33,8 +33,6 @@ "Λήψη φωτογραφίας" "Επιλογή φωτογραφίας" "Αποστολή μηνύματος" - - - - + "Η φωτογραφία στάλθηκε μέσω του Messages" + "Το μήνυμα στάλθηκε μέσω του Messages" diff --git a/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml index 2b3f7a37d..5e2807b97 100644 --- a/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml @@ -33,8 +33,6 @@ "Take a picture" "Choose a photo" "Sending a message" - - - - + "Photo sent via Messages" + "Message sent via Messages" diff --git a/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml index 2b3f7a37d..5e2807b97 100644 --- a/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml @@ -33,8 +33,6 @@ "Take a picture" "Choose a photo" "Sending a message" - - - - + "Photo sent via Messages" + "Message sent via Messages" diff --git a/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml index 2b3f7a37d..5e2807b97 100644 --- a/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml @@ -33,8 +33,6 @@ "Take a picture" "Choose a photo" "Sending a message" - - - - + "Photo sent via Messages" + "Message sent via Messages" diff --git a/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml b/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml index 67bac9783..f1d470590 100644 --- a/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml @@ -33,8 +33,6 @@ "Tomar una foto" "Elegir una foto" "Enviar un mensaje" - - - - + "Foto enviada por Mensajes" + "Mensaje de texto enviado por Mensajes" diff --git a/java/com/android/dialer/callcomposer/res/values-es/strings.xml b/java/com/android/dialer/callcomposer/res/values-es/strings.xml index 4b87268d2..cba427be1 100644 --- a/java/com/android/dialer/callcomposer/res/values-es/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-es/strings.xml @@ -33,8 +33,6 @@ "Hacer una foto" "Elegir una foto" "Enviar un mensaje" - - - - + "Foto enviada a través de Mensajes" + "Mensaje enviado a través de Mensajes" diff --git a/java/com/android/dialer/callcomposer/res/values-et/strings.xml b/java/com/android/dialer/callcomposer/res/values-et/strings.xml index 896525db3..d79ca9072 100644 --- a/java/com/android/dialer/callcomposer/res/values-et/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-et/strings.xml @@ -33,8 +33,6 @@ "Pildistamine" "Foto valimine" "Sõnumi saatmine" - - - - + "Foto saadeti rakenduse Messages kaudu" + "Sõnum saadeti rakenduse Messages kaudu" diff --git a/java/com/android/dialer/callcomposer/res/values-eu/strings.xml b/java/com/android/dialer/callcomposer/res/values-eu/strings.xml index ce7e29617..32413f9d6 100644 --- a/java/com/android/dialer/callcomposer/res/values-eu/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-eu/strings.xml @@ -33,8 +33,6 @@ "Atera argazki bat" "Aukeratu argazki bat" "Bidali mezu bat" - - - - + "Mezuak aplikazioaren bidez bidali da argazkia" + "Mezuak aplikazioaren bidez bidali da mezua" diff --git a/java/com/android/dialer/callcomposer/res/values-fa/strings.xml b/java/com/android/dialer/callcomposer/res/values-fa/strings.xml index 6f0c2e55b..a2604a9b6 100644 --- a/java/com/android/dialer/callcomposer/res/values-fa/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-fa/strings.xml @@ -33,8 +33,6 @@ "عکس گرفتن" "انتخاب عکس" "ارسال پیام" - - - - + "عکس ارسال‌شده ازطریق «پیام‌ها»" + "پیام ارسال‌شده ازطریق «پیام‌ها»" diff --git a/java/com/android/dialer/callcomposer/res/values-fi/strings.xml b/java/com/android/dialer/callcomposer/res/values-fi/strings.xml index ce0786c9b..482a36afc 100644 --- a/java/com/android/dialer/callcomposer/res/values-fi/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-fi/strings.xml @@ -33,8 +33,6 @@ "Ota kuva" "Valitse kuva" "Lähetä viesti" - - - - + "Kuva lähetettiin Messages-sovelluksen kautta" + "Viesti lähetettiin Messages-sovelluksen kautta" diff --git a/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml b/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml index 0451dcfc1..be06baaf1 100644 --- a/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml @@ -33,8 +33,6 @@ "Prendre une photo" "Choisir une photo" "Envoyer un message" - - - - + "Photo envoyée au moyen de l\'application Messages" + "Message envoyé au moyen de l\'application Messages" diff --git a/java/com/android/dialer/callcomposer/res/values-fr/strings.xml b/java/com/android/dialer/callcomposer/res/values-fr/strings.xml index 50e61946c..f56ad7a00 100644 --- a/java/com/android/dialer/callcomposer/res/values-fr/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-fr/strings.xml @@ -33,8 +33,6 @@ "Prendre une photo" "Choisir une photo" "Envoyer un message" - - - - + "Photo envoyée via l\'application Messages" + "Message envoyé via l\'application Messages" diff --git a/java/com/android/dialer/callcomposer/res/values-gl/strings.xml b/java/com/android/dialer/callcomposer/res/values-gl/strings.xml index 2ad2c9a60..f2a0f15be 100644 --- a/java/com/android/dialer/callcomposer/res/values-gl/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-gl/strings.xml @@ -33,8 +33,6 @@ "Tira unha foto" "Escolle unha foto" "Envía unha mensaxe" - - - - + "Foto enviada a través de Mensaxes" + "Mensaxe enviada a través de Mensaxes" diff --git a/java/com/android/dialer/callcomposer/res/values-gu/strings.xml b/java/com/android/dialer/callcomposer/res/values-gu/strings.xml index 8c9a521eb..771d14865 100644 --- a/java/com/android/dialer/callcomposer/res/values-gu/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-gu/strings.xml @@ -33,8 +33,6 @@ "એક ચિત્ર લો" "ફોટો પસંદ કરો" "એક સંદેશ મોકલો" - - - - + "Messages મારફતે ફોટો મોકલ્યો" + "Messages મારફતે સંદેશ મોકલ્યો" diff --git a/java/com/android/dialer/callcomposer/res/values-hi/strings.xml b/java/com/android/dialer/callcomposer/res/values-hi/strings.xml index 8d4f91e40..4de9a6d5d 100644 --- a/java/com/android/dialer/callcomposer/res/values-hi/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-hi/strings.xml @@ -33,8 +33,6 @@ "चित्र लें" "एक फ़ोटो चुनें" "संदेश भेजें" - - - - + "संदेश ऐप्लिकेशन के ज़रिए फ़ोटो भेजा गया" + "संदेश ऐप्लिकेशन के ज़रिए संदेश भेजा गया" diff --git a/java/com/android/dialer/callcomposer/res/values-hr/strings.xml b/java/com/android/dialer/callcomposer/res/values-hr/strings.xml index cc3219d9f..4bea73cba 100644 --- a/java/com/android/dialer/callcomposer/res/values-hr/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-hr/strings.xml @@ -33,8 +33,6 @@ "Snimi fotografiju" "Odaberi fotografiju" "Pošalji poruku" - - - - + "Fotografija poslana putem Poruka" + "Poruka poslana putem Poruka" diff --git a/java/com/android/dialer/callcomposer/res/values-hu/strings.xml b/java/com/android/dialer/callcomposer/res/values-hu/strings.xml index b222c53a9..2a590e0bb 100644 --- a/java/com/android/dialer/callcomposer/res/values-hu/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-hu/strings.xml @@ -33,8 +33,6 @@ "Kép készítése" "Fotó kiválasztása" "Üzenet küldése" - - - - + "Fotó elküldve a Messages alkalmazásban" + "Üzenet elküldve a Messages alkalmazásban" diff --git a/java/com/android/dialer/callcomposer/res/values-hy/strings.xml b/java/com/android/dialer/callcomposer/res/values-hy/strings.xml index 01635f65a..1b5523412 100644 --- a/java/com/android/dialer/callcomposer/res/values-hy/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-hy/strings.xml @@ -33,8 +33,6 @@ "Լուսանկարել" "Ընտրել լուսանկար" "Ուղարկել հաղորդագրություն" - - - - + "Լուսանկարն ուղարկվել է Messages-ի միջոցով" + "Հաղորդագրությունն ուղարկվել է Messages-ի միջոցով" diff --git a/java/com/android/dialer/callcomposer/res/values-in/strings.xml b/java/com/android/dialer/callcomposer/res/values-in/strings.xml index 4c6d84495..7983c4de0 100644 --- a/java/com/android/dialer/callcomposer/res/values-in/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-in/strings.xml @@ -33,8 +33,6 @@ "Jepret" "Pilih foto" "Mengirim pesan" - - - - + "Foto dikirim lewat Message" + "Pesan dikirim lewat Message" diff --git a/java/com/android/dialer/callcomposer/res/values-is/strings.xml b/java/com/android/dialer/callcomposer/res/values-is/strings.xml index d951edd48..3bf4a6b2d 100644 --- a/java/com/android/dialer/callcomposer/res/values-is/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-is/strings.xml @@ -33,8 +33,6 @@ "Taka mynd" "Velja mynd" "Senda skilaboð" - - - - + "Mynd send með Messages" + "Skilaboð send með Messages" diff --git a/java/com/android/dialer/callcomposer/res/values-it/strings.xml b/java/com/android/dialer/callcomposer/res/values-it/strings.xml index 9d26b2ced..343dd84f0 100644 --- a/java/com/android/dialer/callcomposer/res/values-it/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-it/strings.xml @@ -33,8 +33,6 @@ "Scatta una foto" "Scegli una foto" "Invia un messaggio" - - - - + "Foto inviata tramite Messaggi" + "Messaggio inviato tramite Messaggi" diff --git a/java/com/android/dialer/callcomposer/res/values-iw/strings.xml b/java/com/android/dialer/callcomposer/res/values-iw/strings.xml index 26e7daf81..24c6203cd 100644 --- a/java/com/android/dialer/callcomposer/res/values-iw/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-iw/strings.xml @@ -33,8 +33,6 @@ "צילום תמונה" "בחירת תמונה" "שליחת הודעה" - - - - + "‏התמונה נשלחה דרך אפליקציית Messages" + "‏ההודעה נשלחה דרך אפליקציית Messages" diff --git a/java/com/android/dialer/callcomposer/res/values-ja/strings.xml b/java/com/android/dialer/callcomposer/res/values-ja/strings.xml index 96eaea5ae..33f48c924 100644 --- a/java/com/android/dialer/callcomposer/res/values-ja/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ja/strings.xml @@ -33,8 +33,6 @@ "画像を撮影します" "写真を選択します" "メッセージを送信します" - - - - + "Android メッセージで写真が送信されました" + "Android メッセージでメッセージが送信されました" diff --git a/java/com/android/dialer/callcomposer/res/values-ka/strings.xml b/java/com/android/dialer/callcomposer/res/values-ka/strings.xml index 0cef94df9..65084f3d2 100644 --- a/java/com/android/dialer/callcomposer/res/values-ka/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ka/strings.xml @@ -33,8 +33,6 @@ "სურათის გადაღება" "ფოტოს არჩევა" "შეტყობინების გაგზავნა" - - - - + "ფოტო გაიგზავნა Messages აპიდან" + "შეტყობინება გაიგზავნა Messages აპიდან" diff --git a/java/com/android/dialer/callcomposer/res/values-kk/strings.xml b/java/com/android/dialer/callcomposer/res/values-kk/strings.xml index c95fb7b26..bf4173674 100644 --- a/java/com/android/dialer/callcomposer/res/values-kk/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-kk/strings.xml @@ -33,8 +33,6 @@ "Суретке түсіру" "Суретті таңдау" "Хабар жіберу" - - - - + "Сурет Messages арқылы жіберілді" + "Хабар Messages арқылы жіберілді" diff --git a/java/com/android/dialer/callcomposer/res/values-km/strings.xml b/java/com/android/dialer/callcomposer/res/values-km/strings.xml index 66f82c581..10c8d52a1 100644 --- a/java/com/android/dialer/callcomposer/res/values-km/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-km/strings.xml @@ -33,8 +33,6 @@ "ថតរូប" "ជ្រើសរើស​រូបថត" "ផ្ញើសារ" - - - - + "រូបថត​ដែល​បាន​ផ្ញើ​តាមរយៈ Messages" + "សារ​ដែល​បាន​ផ្ញើ​តាមរយៈ Messages" diff --git a/java/com/android/dialer/callcomposer/res/values-kn/strings.xml b/java/com/android/dialer/callcomposer/res/values-kn/strings.xml index 7bb1e48ec..3776d9d1b 100644 --- a/java/com/android/dialer/callcomposer/res/values-kn/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-kn/strings.xml @@ -33,8 +33,6 @@ "ಚಿತ್ರ ತೆಗೆದುಕೊಳ್ಳಿ" "ಒಂದು ಫೋಟೋ ಆಯ್ಕೆಮಾಡಿ" "ಸಂದೇಶ ಕಳುಹಿಸಿ" - - - - + "ಸಂದೇಶಗಳ ಮೂಲಕ ಕಳುಹಿಸಲಾದ ಫೋಟೋ" + "ಸಂದೇಶಗಳ ಮೂಲಕ ಕಳುಹಿಸಲಾದ ಸಂದೇಶ" diff --git a/java/com/android/dialer/callcomposer/res/values-ko/strings.xml b/java/com/android/dialer/callcomposer/res/values-ko/strings.xml index 1052d551d..0e6820ed8 100644 --- a/java/com/android/dialer/callcomposer/res/values-ko/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ko/strings.xml @@ -33,8 +33,6 @@ "사진 촬영" "사진 선택" "메시지 보내기" - - - - + "메시지를 통해 전송된 사진" + "메시지를 통해 전송된 메시지" diff --git a/java/com/android/dialer/callcomposer/res/values-ky/strings.xml b/java/com/android/dialer/callcomposer/res/values-ky/strings.xml index 6e5889d69..f96ce4ddc 100644 --- a/java/com/android/dialer/callcomposer/res/values-ky/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ky/strings.xml @@ -33,8 +33,6 @@ "Сүрөткө тартуу" "Сүрөттү тандоо" "Билдирүү жөнөтүү" - - - - + "Сүрөт Android жазышуулары колдонмосу аркылуу жөнөтүлдү" + "Билдирүү Android жазышуулары колдонмосу аркылуу жөнөтүлдү" diff --git a/java/com/android/dialer/callcomposer/res/values-lo/strings.xml b/java/com/android/dialer/callcomposer/res/values-lo/strings.xml index 87d72dbc6..d14f03d1c 100644 --- a/java/com/android/dialer/callcomposer/res/values-lo/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-lo/strings.xml @@ -33,8 +33,6 @@ "ຖ່າຍຮູບ" "ເລືອກຮູບພາບ..." "ສົ່ງຂໍ້ຄວາມ" - - - - + "ສົ່ງຮູບຜ່ານ Messages ແລ້ວ" + "ສົ່ງຮູບຜ່ານ Messages ແລ້ວ" diff --git a/java/com/android/dialer/callcomposer/res/values-lt/strings.xml b/java/com/android/dialer/callcomposer/res/values-lt/strings.xml index 07fe444b0..4453bcd20 100644 --- a/java/com/android/dialer/callcomposer/res/values-lt/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-lt/strings.xml @@ -33,8 +33,6 @@ "Fotografuoti" "Pasirinkti nuotrauką" "Siųsti pranešimą" - - - - + "Nuotrauka išsiųsta naudojant „Messages“" + "Pranešimas išsiųstas naudojant „Messages“" diff --git a/java/com/android/dialer/callcomposer/res/values-lv/strings.xml b/java/com/android/dialer/callcomposer/res/values-lv/strings.xml index 9a3efc7c4..80e5214d3 100644 --- a/java/com/android/dialer/callcomposer/res/values-lv/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-lv/strings.xml @@ -33,8 +33,6 @@ "Uzņemt attēlu" "Izvēlēties fotoattēlu" "Sūtīt ziņojumu" - - - - + "Fotoattēls nosūtīts, izmantojot lietotni Ziņojumi" + "Ziņojums nosūtīts, izmantojot lietotni Ziņojumi" diff --git a/java/com/android/dialer/callcomposer/res/values-mk/strings.xml b/java/com/android/dialer/callcomposer/res/values-mk/strings.xml index 218c23d90..bd8f0c8d9 100644 --- a/java/com/android/dialer/callcomposer/res/values-mk/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-mk/strings.xml @@ -33,8 +33,6 @@ "Фотографирајте" "Изберете фотографија" "Испратете порака" - - - - + "Фотографијата е испратена преку Messages" + "Пораката е испратена преку Messages" diff --git a/java/com/android/dialer/callcomposer/res/values-ml/strings.xml b/java/com/android/dialer/callcomposer/res/values-ml/strings.xml index 0e58cbbf0..e4931cbea 100644 --- a/java/com/android/dialer/callcomposer/res/values-ml/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ml/strings.xml @@ -33,8 +33,6 @@ "ഒരു ചിത്രമെടുക്കുക" "ഒരു ഫോട്ടോ തിരഞ്ഞെടുക്കുക" "ഒരു സന്ദേശം അയയ്‌ക്കുക" - - - - + "മെസേജ് വഴി ഫോട്ടോ അയച്ചു" + "മെസേജ് വഴി സന്ദേശം അയച്ചു" diff --git a/java/com/android/dialer/callcomposer/res/values-mn/strings.xml b/java/com/android/dialer/callcomposer/res/values-mn/strings.xml index 872874071..62a775074 100644 --- a/java/com/android/dialer/callcomposer/res/values-mn/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-mn/strings.xml @@ -33,8 +33,6 @@ "Зураг авах" "Зураг сонгоно уу" "Зурвас илгээх" - - - - + "Зургийг Зурвасаар дамжуулан илгээсэн" + "Зурвасыг Зурвасаар дамжуулан илгээсэн" diff --git a/java/com/android/dialer/callcomposer/res/values-mr/strings.xml b/java/com/android/dialer/callcomposer/res/values-mr/strings.xml index 3ca51a2b2..e7a71901a 100644 --- a/java/com/android/dialer/callcomposer/res/values-mr/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-mr/strings.xml @@ -33,8 +33,6 @@ "एक फोटो घ्या" "फोटो निवडा" "एक संदेश पाठवा" - - - - + "Messages द्वारे फोटो पाठविला" + "Messages द्वारे संदेश पाठविला" diff --git a/java/com/android/dialer/callcomposer/res/values-ms/strings.xml b/java/com/android/dialer/callcomposer/res/values-ms/strings.xml index e722b88b2..39ed6fa6e 100644 --- a/java/com/android/dialer/callcomposer/res/values-ms/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ms/strings.xml @@ -33,8 +33,6 @@ "Ambil gambar" "Pilih foto" "Hantar mesej" - - - - + "Photo dihantar melalui Mesej" + "Mesej dihantar melalui Mesej" diff --git a/java/com/android/dialer/callcomposer/res/values-my/strings.xml b/java/com/android/dialer/callcomposer/res/values-my/strings.xml index b49b1eaad..a20dabc83 100644 --- a/java/com/android/dialer/callcomposer/res/values-my/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-my/strings.xml @@ -33,8 +33,6 @@ "ဓာတ်ပုံတစ်ပုံ ရိုက်ရန်" "ဓာတ်ပုံတစ်ပုံ ရွေးရန်" "မက်ဆေ့ဂျ်ပို့ရန်" - - - - + "မက်ဆေ့ဂျ်များမှတစ်ဆင့် ဓာတ်ပုံပို့ပြီးပါပြီ" + "မက်ဆေ့ဂျ်များမှတစ်ဆင့် မက်ဆေ့ဂျ်ပို့ပြီးပါပြီ" diff --git a/java/com/android/dialer/callcomposer/res/values-nb/strings.xml b/java/com/android/dialer/callcomposer/res/values-nb/strings.xml index 07caf6ee0..cbb1acca2 100644 --- a/java/com/android/dialer/callcomposer/res/values-nb/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-nb/strings.xml @@ -33,8 +33,6 @@ "Ta et bilde" "Velg et bilde" "Send en melding" - - - - + "Bildet er sendt via Messages" + "Meldingen er sendt via Messages" diff --git a/java/com/android/dialer/callcomposer/res/values-ne/strings.xml b/java/com/android/dialer/callcomposer/res/values-ne/strings.xml index 03eac6cba..f084dc9f6 100644 --- a/java/com/android/dialer/callcomposer/res/values-ne/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ne/strings.xml @@ -33,8 +33,6 @@ "तस्बिर खिच्नुहोस्" "तस्बिर छनौट गर्नुहोस्" "सन्देश पठाउनुहोस्" - - - - + "Messages मार्फत पठाइएको तस्बिर" + "Messages मार्फत पठाइएको सन्देश" diff --git a/java/com/android/dialer/callcomposer/res/values-nl/strings.xml b/java/com/android/dialer/callcomposer/res/values-nl/strings.xml index 7a73d93c1..5511427fa 100644 --- a/java/com/android/dialer/callcomposer/res/values-nl/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-nl/strings.xml @@ -33,8 +33,6 @@ "Een foto nemen" "Een foto kiezen" "Een bericht verzenden" - - - - + "Foto verzonden via Berichten" + "Bericht verzonden via Berichten" diff --git a/java/com/android/dialer/callcomposer/res/values-no/strings.xml b/java/com/android/dialer/callcomposer/res/values-no/strings.xml index 07caf6ee0..cbb1acca2 100644 --- a/java/com/android/dialer/callcomposer/res/values-no/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-no/strings.xml @@ -33,8 +33,6 @@ "Ta et bilde" "Velg et bilde" "Send en melding" - - - - + "Bildet er sendt via Messages" + "Meldingen er sendt via Messages" diff --git a/java/com/android/dialer/callcomposer/res/values-pa/strings.xml b/java/com/android/dialer/callcomposer/res/values-pa/strings.xml index 25de393e0..5c20adc7a 100644 --- a/java/com/android/dialer/callcomposer/res/values-pa/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-pa/strings.xml @@ -33,8 +33,6 @@ "ਇੱਕ ਤਸਵੀਰ ਖਿੱਚੋ" "ਇੱਕ ਫ਼ੋਟੋ ਚੁਣੋ" "ਇੱਕ ਸੁਨੇਹਾ ਭੇਜੋ" - - - - + "ਫ਼ੋਟੋ &quot;ਸੁਨੇਹੇ&quot; ਐਪ ਰਾਹੀਂ ਭੇਜੀ ਗਈ" + "ਸੁਨੇਹਾ &quot;ਸੁਨੇਹੇ&quot; ਐਪ ਰਾਹੀਂ ਭੇਜਿਆ ਗਿਆ" diff --git a/java/com/android/dialer/callcomposer/res/values-pl/strings.xml b/java/com/android/dialer/callcomposer/res/values-pl/strings.xml index b65ba236d..eea749604 100644 --- a/java/com/android/dialer/callcomposer/res/values-pl/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-pl/strings.xml @@ -33,8 +33,6 @@ "Zrób zdjęcie" "Wybierz zdjęcie" "Wyślij wiadomość" - - - - + "Zdjęcie zostało wysłane przez Wiadomości" + "Tekst został wysłany przez Wiadomości" diff --git a/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml index 669e8505a..026cface7 100644 --- a/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml @@ -33,8 +33,6 @@ "Tirar uma foto" "Escolher uma foto" "Enviar uma mensagem" - - - - + "Foto enviada pelo Mensagens" + "Mensagem enviada pelo Mensagens" diff --git a/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml index 45411d389..1a35ce2e6 100644 --- a/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml @@ -33,8 +33,6 @@ "Tirar uma foto" "Selecionar foto" "Enviar uma mensagem" - - - - + "Foto enviada através da aplicação Mensagens" + "Mensagem enviada através da aplicação Mensagens" diff --git a/java/com/android/dialer/callcomposer/res/values-pt/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt/strings.xml index 669e8505a..026cface7 100644 --- a/java/com/android/dialer/callcomposer/res/values-pt/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-pt/strings.xml @@ -33,8 +33,6 @@ "Tirar uma foto" "Escolher uma foto" "Enviar uma mensagem" - - - - + "Foto enviada pelo Mensagens" + "Mensagem enviada pelo Mensagens" diff --git a/java/com/android/dialer/callcomposer/res/values-ro/strings.xml b/java/com/android/dialer/callcomposer/res/values-ro/strings.xml index cd8359f53..ac55b8069 100644 --- a/java/com/android/dialer/callcomposer/res/values-ro/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ro/strings.xml @@ -33,8 +33,6 @@ "Fotografiați" "Alegeți o fotografie" "Trimiteți un mesaj" - - - - + "Fotografie trimisă prin Messages" + "Mesaj trimis prin Messages" diff --git a/java/com/android/dialer/callcomposer/res/values-ru/strings.xml b/java/com/android/dialer/callcomposer/res/values-ru/strings.xml index 1119a0eb8..79d8136ff 100644 --- a/java/com/android/dialer/callcomposer/res/values-ru/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ru/strings.xml @@ -33,8 +33,6 @@ "Сделать фото" "Выбрать фото" "Отправить сообщение" - - - - + "Фото отправлено через Android Сообщения" + "Сообщение отправлено через Android Сообщения" diff --git a/java/com/android/dialer/callcomposer/res/values-si/strings.xml b/java/com/android/dialer/callcomposer/res/values-si/strings.xml index dfae242f9..8c2b9536f 100644 --- a/java/com/android/dialer/callcomposer/res/values-si/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-si/strings.xml @@ -33,8 +33,6 @@ "පින්තුරයක් ගැනීම" "ඡායාරූපයක් තේරීම" "පණිවිඩයක් යැවීම" - - - - + "Messages හරහා ඡායාරූපය යවන ලදී" + "Messages හරහා පණිවිඩය යවන ලදී" diff --git a/java/com/android/dialer/callcomposer/res/values-sk/strings.xml b/java/com/android/dialer/callcomposer/res/values-sk/strings.xml index f54c73e25..ee062c475 100644 --- a/java/com/android/dialer/callcomposer/res/values-sk/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-sk/strings.xml @@ -33,8 +33,6 @@ "Odfotiť" "Vybrať fotku" "Odoslať správu" - - - - + "Fotka bola odoslaná prostredníctvom Správ" + "Správa bola odoslaná prostredníctvom Správ" diff --git a/java/com/android/dialer/callcomposer/res/values-sl/strings.xml b/java/com/android/dialer/callcomposer/res/values-sl/strings.xml index 010ad07b5..9d57cfd0a 100644 --- a/java/com/android/dialer/callcomposer/res/values-sl/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-sl/strings.xml @@ -33,8 +33,6 @@ "Posnemi fotografijo" "Izberi fotografijo" "Pošlji sporočilo" - - - - + "Fotografija je bila poslana prek aplikacije Messages" + "Sporočilo je bila poslano prek aplikacije Messages" diff --git a/java/com/android/dialer/callcomposer/res/values-sq/strings.xml b/java/com/android/dialer/callcomposer/res/values-sq/strings.xml index b106d5a1e..720994255 100644 --- a/java/com/android/dialer/callcomposer/res/values-sq/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-sq/strings.xml @@ -33,8 +33,6 @@ "Bëj një fotografi" "Zgjidh një fotografi" "Dërgo një mesazh" - - - - + "Fotografia u dërgua nëpërmjet \"Mesazheve\"" + "Mesazhi u dërgua nëpërmjet \"Mesazheve\"" diff --git a/java/com/android/dialer/callcomposer/res/values-sr/strings.xml b/java/com/android/dialer/callcomposer/res/values-sr/strings.xml index 2b85628d9..1eafcb79b 100644 --- a/java/com/android/dialer/callcomposer/res/values-sr/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-sr/strings.xml @@ -33,8 +33,6 @@ "Сликајте" "Изаберите слику" "Пошаљите поруку" - - - - + "Слика је послата преко Messages-а" + "Порука је послата преко Messages-а" diff --git a/java/com/android/dialer/callcomposer/res/values-sv/strings.xml b/java/com/android/dialer/callcomposer/res/values-sv/strings.xml index e60bbe946..787d8653a 100644 --- a/java/com/android/dialer/callcomposer/res/values-sv/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-sv/strings.xml @@ -33,8 +33,6 @@ "Ta en bild" "Välj ett foto" "Skicka ett meddelande" - - - - + "Fotot har skickats via Messages" + "Meddelandet har skickats via Messages" diff --git a/java/com/android/dialer/callcomposer/res/values-sw/strings.xml b/java/com/android/dialer/callcomposer/res/values-sw/strings.xml index f67c8994e..d33ff3186 100644 --- a/java/com/android/dialer/callcomposer/res/values-sw/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-sw/strings.xml @@ -33,8 +33,6 @@ "Piga picha" "Chagua picha" "Tuma ujumbe" - - - - + "Picha imetumwa kupitia Programu ya Messages" + "Ujumbe umetumwa kupitia Programu ya Messages" diff --git a/java/com/android/dialer/callcomposer/res/values-ta/strings.xml b/java/com/android/dialer/callcomposer/res/values-ta/strings.xml index ae59b3d30..37c0193d1 100644 --- a/java/com/android/dialer/callcomposer/res/values-ta/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ta/strings.xml @@ -33,8 +33,6 @@ "படமெடுக்கவும்" "புகைப்படத்தைத் தேர்வு செய்யும்" "செய்தியை அனுப்பும்" - - - - + "மெசேஜஸ் மூலம் படம் அனுப்பப்பட்டது" + "மெசேஜஸ் மூலம் செய்தி அனுப்பப்பட்டது" diff --git a/java/com/android/dialer/callcomposer/res/values-te/strings.xml b/java/com/android/dialer/callcomposer/res/values-te/strings.xml index 01d0910ea..548037034 100644 --- a/java/com/android/dialer/callcomposer/res/values-te/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-te/strings.xml @@ -33,8 +33,6 @@ "చిత్రాన్ని తీస్తుంది" "ఫోటోను ఎంచుకోండి" "సందేశాన్ని పంపుతుంది" - - - - + "సందేశాల అనువర్తనం ద్వారా ఫోటోను పంపాము" + "సందేశాల అనువర్తనం ద్వారా సందేశాన్ని పంపాము" diff --git a/java/com/android/dialer/callcomposer/res/values-th/strings.xml b/java/com/android/dialer/callcomposer/res/values-th/strings.xml index 53dbaea63..9d98d56b4 100644 --- a/java/com/android/dialer/callcomposer/res/values-th/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-th/strings.xml @@ -33,8 +33,6 @@ "ถ่ายภาพ" "เลือกรูปภาพ" "ส่งข้อความ" - - - - + "ส่งรูปภาพผ่าน Messages แล้ว" + "ส่งข้อความผ่าน Messages แล้ว" diff --git a/java/com/android/dialer/callcomposer/res/values-tl/strings.xml b/java/com/android/dialer/callcomposer/res/values-tl/strings.xml index 910d907a9..5bba94217 100644 --- a/java/com/android/dialer/callcomposer/res/values-tl/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-tl/strings.xml @@ -33,8 +33,6 @@ "Kumuha ng larawan" "Pumili ng larawan" "Magpadala ng mensahe" - - - - + "Larawang ipinadala sa pamamagitan ng Messages" + "Mensaheng ipinadala sa pamamagitan ng Messages" diff --git a/java/com/android/dialer/callcomposer/res/values-tr/strings.xml b/java/com/android/dialer/callcomposer/res/values-tr/strings.xml index 51069ead3..cfb8bfb90 100644 --- a/java/com/android/dialer/callcomposer/res/values-tr/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-tr/strings.xml @@ -33,8 +33,6 @@ "Resim çeker" "Fotoğraf seçilmesini sağlar" "Mesaj gönderir" - - - - + "Fotoğraf, Mesajlar uygulaması üzerinden gönderildi" + "Mesaj, Mesajlar uygulaması üzerinden gönderildi" diff --git a/java/com/android/dialer/callcomposer/res/values-uk/strings.xml b/java/com/android/dialer/callcomposer/res/values-uk/strings.xml index 57ee7224c..4cb1a2d6c 100644 --- a/java/com/android/dialer/callcomposer/res/values-uk/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-uk/strings.xml @@ -33,8 +33,6 @@ "Зробити знімок" "Вибрати фотографію" "Надіслати повідомлення" - - - - + "Фотографію надіслано через додаток Повідомлення" + "Текст надіслано через додаток Повідомлення" diff --git a/java/com/android/dialer/callcomposer/res/values-ur/strings.xml b/java/com/android/dialer/callcomposer/res/values-ur/strings.xml index 28d79b82b..c665cfb37 100644 --- a/java/com/android/dialer/callcomposer/res/values-ur/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ur/strings.xml @@ -33,8 +33,6 @@ "تصویر لیں" "ایک تصویر چنیں" "پیغام بھیجیں" - - - - + "تصویر پیغامات کے ذریعے بھیجی گئی" + "پیغام پیغامات کے ذریعے بھیجا گیا" diff --git a/java/com/android/dialer/callcomposer/res/values-uz/strings.xml b/java/com/android/dialer/callcomposer/res/values-uz/strings.xml index a3c7346ba..0237ab9e3 100644 --- a/java/com/android/dialer/callcomposer/res/values-uz/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-uz/strings.xml @@ -33,8 +33,6 @@ "Rasmga olish" "Rasm tanlash" "Xabar yuborish" - - - - + "Rasm Android Xabarlar orqali yuborildi" + "Xabar Android Xabarlar orqali yuborildi" diff --git a/java/com/android/dialer/callcomposer/res/values-vi/strings.xml b/java/com/android/dialer/callcomposer/res/values-vi/strings.xml index 7be47a00c..d617cfb58 100644 --- a/java/com/android/dialer/callcomposer/res/values-vi/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-vi/strings.xml @@ -33,8 +33,6 @@ "Chụp ảnh" "Chọn ảnh" "Gửi tin nhắn" - - - - + "Đã gửi ảnh qua Messages" + "Đã gửi tin nhắn qua Messages" diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml index 39ace9d71..97017d6f4 100644 --- a/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml @@ -33,8 +33,6 @@ "拍照" "选择一张照片" "发送信息" - - - - + "已通过“信息”应用发送照片" + "已通过“信息”应用发送短信" diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml index 87052ffb9..b191949fc 100644 --- a/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml @@ -33,8 +33,6 @@ "拍照" "選擇相片" "傳送訊息" - - - - + "已透過「訊息」傳送相片" + "已透過「訊息」傳送訊息" diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml index 51cc8f669..ef2cd9d16 100644 --- a/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml @@ -33,8 +33,6 @@ "拍攝相片" "選擇相片" "傳送訊息" - - - - + "透過訊息應用程式傳送的相片" + "透過訊息應用程式傳送的訊息" diff --git a/java/com/android/dialer/callcomposer/res/values-zu/strings.xml b/java/com/android/dialer/callcomposer/res/values-zu/strings.xml index 3e2db44d1..09845f65c 100644 --- a/java/com/android/dialer/callcomposer/res/values-zu/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-zu/strings.xml @@ -33,8 +33,6 @@ "Thatha isithombe" "Khetha isithombe" "Thumela umlayezo" - - - - + "Isithombe sithunyelwe ngemilayezo" + "Umlayezo uthunyelwe ngemilayezo" diff --git a/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java index bc989ea25..204e40721 100644 --- a/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java +++ b/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java @@ -36,7 +36,6 @@ import com.android.dialer.compat.AppCompatConstants; import com.android.dialer.enrichedcall.historyquery.proto.HistoryResult; import com.android.dialer.enrichedcall.historyquery.proto.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; @@ -88,9 +87,7 @@ public class CallDetailsEntryViewHolder extends ViewHolder { CallTypeHelper callTypeHelper, boolean showMultimediaDivider) { int callType = entry.getCallType(); - boolean isVideoCall = - (entry.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO - && CallUtil.isVideoEnabled(context); + boolean isVideoCall = (entry.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO; boolean isPulledCall = (entry.getFeatures() & Calls.FEATURES_PULLED_EXTERNALLY) == Calls.FEATURES_PULLED_EXTERNALLY; @@ -98,7 +95,7 @@ public class CallDetailsEntryViewHolder extends ViewHolder { callTime.setTextColor(getColorForCallType(context, callType)); callTypeIcon.clear(); callTypeIcon.add(callType); - callTypeIcon.setShowVideo((entry.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO); + callTypeIcon.setShowVideo(isVideoCall); callTypeIcon.setShowHd(MotorolaUtils.shouldShowHdIconInCallLog(context, entry.getFeatures())); callTypeIcon.setShowWifi( MotorolaUtils.shouldShowWifiIconInCallLog(context, entry.getFeatures())); diff --git a/java/com/android/dialer/calldetails/res/values-uz/strings.xml b/java/com/android/dialer/calldetails/res/values-uz/strings.xml index 4f38cabd2..57f052648 100644 --- a/java/com/android/dialer/calldetails/res/values-uz/strings.xml +++ b/java/com/android/dialer/calldetails/res/values-uz/strings.xml @@ -20,7 +20,7 @@ "Chaqiruv tafsilotlari" "O‘chirib tashlash" "Raqamni nusxalash" - "Qo‘ng‘iroq qilishdan oldin raqamni tahrirlash" + "Chaqiruvdan oldin raqamni tahrirlash" "Raqamdagi xatolik haqida xabar berish" "Rasm yuborildi" "Rasm qabul qilindi" diff --git a/java/com/android/dialer/callintent/CallIntentBuilder.java b/java/com/android/dialer/callintent/CallIntentBuilder.java index e5a0be848..e5449c804 100644 --- a/java/com/android/dialer/callintent/CallIntentBuilder.java +++ b/java/com/android/dialer/callintent/CallIntentBuilder.java @@ -22,6 +22,7 @@ import android.os.Bundle; import android.os.SystemClock; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.support.annotation.VisibleForTesting; import android.telecom.PhoneAccountHandle; import android.telecom.TelecomManager; import android.telecom.VideoProfile; @@ -38,25 +39,38 @@ public class CallIntentBuilder { private boolean isVideoCall; private String callSubject; + private static int lightbringerButtonAppearInExpandedCallLogItemCount = 0; + private static int lightbringerButtonAppearInCollapsedCallLogItemCount = 0; + private static int lightbringerButtonAppearInSearchCount = 0; + public CallIntentBuilder(@NonNull Uri uri, @NonNull CallSpecificAppData callSpecificAppData) { this.uri = Assert.isNotNull(uri); Assert.isNotNull(callSpecificAppData); Assert.checkArgument( callSpecificAppData.getCallInitiationType() != CallInitiationType.Type.UNKNOWN_INITIATION); + CallSpecificAppData.Builder builder = + CallSpecificAppData.newBuilder(callSpecificAppData) + .setLightbringerButtonAppearInExpandedCallLogItemCount( + lightbringerButtonAppearInExpandedCallLogItemCount) + .setLightbringerButtonAppearInCollapsedCallLogItemCount( + lightbringerButtonAppearInCollapsedCallLogItemCount) + .setLightbringerButtonAppearInSearchCount(lightbringerButtonAppearInSearchCount); + lightbringerButtonAppearInExpandedCallLogItemCount = 0; + lightbringerButtonAppearInCollapsedCallLogItemCount = 0; + lightbringerButtonAppearInSearchCount = 0; + if (PerformanceReport.isRecording()) { - this.callSpecificAppData = - CallSpecificAppData.newBuilder(callSpecificAppData) - .setTimeSinceAppLaunch(PerformanceReport.getTimeSinceAppLaunch()) - .setTimeSinceFirstClick(PerformanceReport.getTimeSinceFirstClick()) - .addAllUiActionsSinceAppLaunch(PerformanceReport.getActions()) - .addAllUiActionTimestampsSinceAppLaunch(PerformanceReport.getActionTimestamps()) - .setStartingTabIndex(PerformanceReport.getStartingTabIndex()) - .build(); + builder + .setTimeSinceAppLaunch(PerformanceReport.getTimeSinceAppLaunch()) + .setTimeSinceFirstClick(PerformanceReport.getTimeSinceFirstClick()) + .addAllUiActionsSinceAppLaunch(PerformanceReport.getActions()) + .addAllUiActionTimestampsSinceAppLaunch(PerformanceReport.getActionTimestamps()) + .build(); PerformanceReport.stopRecording(); - } else { - this.callSpecificAppData = callSpecificAppData; } + + this.callSpecificAppData = builder.build(); } public CallIntentBuilder(@NonNull Uri uri, CallInitiationType.Type callInitiationType) { @@ -119,4 +133,31 @@ public class CallIntentBuilder { CallSpecificAppData.newBuilder().setCallInitiationType(callInitiationType).build(); return callSpecificAppData; } + + public static void increaseLightbringerCallButtonAppearInExpandedCallLogItemCount() { + CallIntentBuilder.lightbringerButtonAppearInExpandedCallLogItemCount++; + } + + public static void increaseLightbringerCallButtonAppearInCollapsedCallLogItemCount() { + CallIntentBuilder.lightbringerButtonAppearInCollapsedCallLogItemCount++; + } + + public static void increaseLightbringerCallButtonAppearInSearchCount() { + CallIntentBuilder.lightbringerButtonAppearInSearchCount++; + } + + @VisibleForTesting + public static int getLightbringerButtonAppearInExpandedCallLogItemCount() { + return lightbringerButtonAppearInExpandedCallLogItemCount; + } + + @VisibleForTesting + public static int getLightbringerButtonAppearInCollapsedCallLogItemCount() { + return lightbringerButtonAppearInCollapsedCallLogItemCount; + } + + @VisibleForTesting + public static int getLightbringerButtonAppearInSearchCount() { + return lightbringerButtonAppearInSearchCount; + } } diff --git a/java/com/android/dialer/callintent/call_initiation_type.proto b/java/com/android/dialer/callintent/call_initiation_type.proto index e1385b7ef..318da9c86 100644 --- a/java/com/android/dialer/callintent/call_initiation_type.proto +++ b/java/com/android/dialer/callintent/call_initiation_type.proto @@ -57,5 +57,7 @@ message CallInitiationType { MISSED_CALL_NOTIFICATION = 15; CALL_SUBJECT_DIALOG = 16; + + IMS_VIDEO_BLOCKED_FALLBACK_TO_VOICE = 17; } } diff --git a/java/com/android/dialer/callintent/call_specific_app_data.proto b/java/com/android/dialer/callintent/call_specific_app_data.proto index 5d23794d5..82547fa03 100644 --- a/java/com/android/dialer/callintent/call_specific_app_data.proto +++ b/java/com/android/dialer/callintent/call_specific_app_data.proto @@ -14,7 +14,7 @@ import "java/com/android/dialer/logging/ui_action.proto"; // Miscellaneous data that's included in a new outgoing call initiated by // Dialer. The system will pass this data to the InCallUi which can use it // for logging or for something else. -// Next tag: 11 +// Next tag: 14 message CallSpecificAppData { optional CallInitiationType.Type call_initiation_type = 1; @@ -34,4 +34,11 @@ message CallSpecificAppData { repeated int64 ui_action_timestamps_since_app_launch = 9; optional int32 starting_tab_index = 10; + + // For recording the appearance of video call button + optional int32 lightbringer_button_appear_in_expanded_call_log_item_count = + 11; + optional int32 lightbringer_button_appear_in_collapsed_call_log_item_count = + 12; + optional int32 lightbringer_button_appear_in_search_count = 13; } 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 617d6d893..39afb6d1d 100644 --- a/java/com/android/dialer/calllogutils/res/values-ar/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ar/strings.xml @@ -34,8 +34,8 @@ "ث" "%d %s %d %s" "%d %s" - "%s\'%s\' %s\'%s" - "%s\'%s" + "%s\'%s\' %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 c280c8eda..0efe1e8ed 100644 --- a/java/com/android/dialer/calllogutils/res/values-az/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-az/strings.xml @@ -34,8 +34,8 @@ "san" "%d %s %d %s" "%d %s" - "%s\"%s\" %s\"%s\"" - "%s\"%s\"" + "%s\'%s\' %s\'%s\'" + "%s\'%s\'" saniyə saniyə 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 123002a26..21c6e0ead 100644 --- a/java/com/android/dialer/calllogutils/res/values-da/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-da/strings.xml @@ -34,8 +34,8 @@ "sek." "%d %s %d %s" "%d %s" - "%s\' %s\' %s\' %s\'" - "%s\' %s\'" + "%s \'%s\' %s \'%s\'" + "%s \'%s\'" sekund sekunder 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 5867b7344..4d6f416d2 100644 --- a/java/com/android/dialer/calllogutils/res/values-de/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-de/strings.xml @@ -34,8 +34,8 @@ "s" "%d %s %d %s" "%d %s" - "%s \"%s\" %s \"%s\"" - "%s \"%s\"" + "%s \'%s\' %s \'%s\'" + "%s \'%s\'"  Sekunden  Sekunde 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 a097ec857..7ab37c50f 100644 --- a/java/com/android/dialer/calllogutils/res/values-eu/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-eu/strings.xml @@ -34,7 +34,7 @@ "s" "%d %s eta %d %s" "%d %s" - "%s \'%s\' eta %s \'%s\'" + "%s \'%s\' \'eta\' %s \'%s\'" "%s \'%s\'" segundo 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 d20e88e02..b9a6241c3 100644 --- a/java/com/android/dialer/calllogutils/res/values-hi/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-hi/strings.xml @@ -34,8 +34,8 @@ "से." "%d %s %d %s" "%d %s" - "%s\'%s\' %s\'%s\'" - "%s\'%s\'" + "%s \'%s\' %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 2f298558e..1ab041a00 100644 --- a/java/com/android/dialer/calllogutils/res/values-iw/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-iw/strings.xml @@ -34,7 +34,7 @@ "שנ\'" "%d %s ו-%d %s" "%d %s" - "%s\'%s\' ו-%s\'%s\'" + "%s\'%s\' %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 f758dab7b..76d389eed 100644 --- a/java/com/android/dialer/calllogutils/res/values-ky/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ky/strings.xml @@ -35,7 +35,7 @@ "%d %s %d %s" "%d %s" "%s\'%s\' %s\'%s\'" - "%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 c01f7c171..9a7513bc0 100644 --- a/java/com/android/dialer/calllogutils/res/values-mr/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-mr/strings.xml @@ -34,8 +34,8 @@ "से" "%d %s %d %s" "%d %s" - "%s\'%s\' %s\'%s\'" - "%s\'%s\'" + "%s \'%s\' %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 2f744036a..4ec963d4e 100644 --- a/java/com/android/dialer/calllogutils/res/values-nb/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-nb/strings.xml @@ -34,8 +34,8 @@ "sek." "%d %s %d %s" "%d %s" - "%s\'%s\' %s\'%s\'" - "%s\'%s\'" + "%s \'%s\' %s \'%s\'" + "%s \'%s\'" sekunder sekund 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 d15610917..5239928dd 100644 --- a/java/com/android/dialer/calllogutils/res/values-nl/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-nl/strings.xml @@ -34,8 +34,8 @@ "s" "%d %s %d %s" "%d %s" - "%s\'%s\' %s\'%s\'" - "%s\'%s\'" + "%s \'%s\' %s \'%s\'" + "%s \'%s\'" seconden seconde 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 2f744036a..4ec963d4e 100644 --- a/java/com/android/dialer/calllogutils/res/values-no/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-no/strings.xml @@ -34,8 +34,8 @@ "sek." "%d %s %d %s" "%d %s" - "%s\'%s\' %s\'%s\'" - "%s\'%s\'" + "%s \'%s\' %s \'%s\'" + "%s \'%s\'" sekunder sekund 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 8c13e813e..ba526a868 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 @@ -34,8 +34,8 @@ "s" "%d %s %d %s" "%d %s" - "%s \"%s\" %s \"%s\"" - "%s \"%s\"" + "%s \'%s\' %s \'%s\'" + "%s \'%s\'" segundo segundos 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 e24d245a3..adb5dac7b 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 @@ -34,8 +34,8 @@ "seg" "%d %s, %d %s" "%d %s" - "%s\"%s\", %s\"%s\"" - "%s \"%s\"" + "%s\'%s\', %s\'%s\'" + "%s \'%s\'" seconds segundos 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 8c13e813e..ba526a868 100644 --- a/java/com/android/dialer/calllogutils/res/values-pt/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-pt/strings.xml @@ -34,8 +34,8 @@ "s" "%d %s %d %s" "%d %s" - "%s \"%s\" %s \"%s\"" - "%s \"%s\"" + "%s \'%s\' %s \'%s\'" + "%s \'%s\'" segundo segundos 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 5a5a6909a..46217e7e8 100644 --- a/java/com/android/dialer/calllogutils/res/values-sw/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sw/strings.xml @@ -34,8 +34,8 @@ "sek" "%d %s %d %s" "%d %s" - "%s\'%s\' %s\'%s\'" - "%s\'%s\'" + "\'%s\'%s \'%s\'%s" + "\'%s\'%s" Sekunde Sekunde 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 78e0b5be5..93cf690f5 100644 --- a/java/com/android/dialer/calllogutils/res/values-tr/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-tr/strings.xml @@ -34,8 +34,8 @@ "sn." "%d %s %d %s" "%d %s" - "%s \"%s\" %s \"%s\"" - "%s \"%s\"" + "%s \'%s\' %s \'%s\'" + "%s \'%s\'" saniye saniye diff --git a/java/com/android/dialer/constants/TrafficStatsTags.java b/java/com/android/dialer/constants/TrafficStatsTags.java index 4e6140431..13c3e2cd9 100644 --- a/java/com/android/dialer/constants/TrafficStatsTags.java +++ b/java/com/android/dialer/constants/TrafficStatsTags.java @@ -25,4 +25,5 @@ public class TrafficStatsTags { public static final int DOWNLOAD_LOCATION_MAP_TAG = 0xd000; public static final int REVERSE_GEOCODE_TAG = 0xd001; public static final int VISUAL_VOICEMAIL_TAG = 0xd002; + public static final int DIALER_VOIP_TAG = 0xd003; } diff --git a/java/com/android/dialer/enrichedcall/EnrichedCallManager.java b/java/com/android/dialer/enrichedcall/EnrichedCallManager.java index d341b43f9..f1057be1d 100644 --- a/java/com/android/dialer/enrichedcall/EnrichedCallManager.java +++ b/java/com/android/dialer/enrichedcall/EnrichedCallManager.java @@ -16,7 +16,6 @@ package com.android.dialer.enrichedcall; -import android.support.annotation.IntDef; import android.support.annotation.MainThread; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -25,8 +24,6 @@ import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry; import com.android.dialer.enrichedcall.historyquery.proto.HistoryResult; import com.android.dialer.enrichedcall.videoshare.VideoShareListener; import com.android.dialer.multimedia.MultimediaData; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; import java.util.List; import java.util.Map; @@ -81,27 +78,6 @@ public interface EnrichedCallManager { @MainThread void clearCachedData(); - /** Possible states for call composer sessions. */ - @Retention(RetentionPolicy.SOURCE) - @IntDef({ - STATE_NONE, - STATE_STARTING, - STATE_STARTED, - STATE_START_FAILED, - STATE_MESSAGE_SENT, - STATE_MESSAGE_FAILED, - STATE_CLOSED, - }) - @interface State {} - - int STATE_NONE = 0; - int STATE_STARTING = STATE_NONE + 1; - int STATE_STARTED = STATE_STARTING + 1; - int STATE_START_FAILED = STATE_STARTED + 1; - int STATE_MESSAGE_SENT = STATE_START_FAILED + 1; - int STATE_MESSAGE_FAILED = STATE_MESSAGE_SENT + 1; - int STATE_CLOSED = STATE_MESSAGE_FAILED + 1; - /** * Starts a call composer session with the given remote number. * @@ -119,7 +95,7 @@ public interface EnrichedCallManager { * @param sessionId the id for the session. See {@link #startCallComposerSession(String)} * @param data the {@link MultimediaData} * @throws IllegalArgumentException if there's no open session with the given number - * @throws IllegalStateException if the session isn't in the {@link #STATE_STARTED} state + * @throws IllegalStateException if the session isn't in the {@link Session#STATE_STARTED} state */ @MainThread void sendCallComposerData(long sessionId, @NonNull MultimediaData data); diff --git a/java/com/android/dialer/enrichedcall/Session.java b/java/com/android/dialer/enrichedcall/Session.java index b3f291438..06837e399 100644 --- a/java/com/android/dialer/enrichedcall/Session.java +++ b/java/com/android/dialer/enrichedcall/Session.java @@ -16,14 +16,37 @@ package com.android.dialer.enrichedcall; +import android.support.annotation.IntDef; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import com.android.dialer.enrichedcall.EnrichedCallManager.State; import com.android.dialer.multimedia.MultimediaData; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; /** Holds state information and data about enriched calling sessions. */ public interface Session { + /** Possible states for call composer sessions. */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({ + STATE_NONE, + STATE_STARTING, + STATE_STARTED, + STATE_START_FAILED, + STATE_MESSAGE_SENT, + STATE_MESSAGE_FAILED, + STATE_CLOSED, + }) + @interface State {} + + int STATE_NONE = 0; + int STATE_STARTING = STATE_NONE + 1; + int STATE_STARTED = STATE_STARTING + 1; + int STATE_START_FAILED = STATE_STARTED + 1; + int STATE_MESSAGE_SENT = STATE_START_FAILED + 1; + int STATE_MESSAGE_FAILED = STATE_MESSAGE_SENT + 1; + int STATE_CLOSED = STATE_MESSAGE_FAILED + 1; + /** Id used for sessions that fail to start. */ long NO_SESSION_ID = -1; diff --git a/java/com/android/dialer/enrichedcall/extensions/StateExtension.java b/java/com/android/dialer/enrichedcall/extensions/StateExtension.java index 8a4f6409d..5d90829c3 100644 --- a/java/com/android/dialer/enrichedcall/extensions/StateExtension.java +++ b/java/com/android/dialer/enrichedcall/extensions/StateExtension.java @@ -18,8 +18,8 @@ package com.android.dialer.enrichedcall.extensions; import android.support.annotation.NonNull; import com.android.dialer.common.Assert; -import com.android.dialer.enrichedcall.EnrichedCallManager; -import com.android.dialer.enrichedcall.EnrichedCallManager.State; +import com.android.dialer.enrichedcall.Session; +import com.android.dialer.enrichedcall.Session.State; /** Extends the {@link State} to include a toString method. */ public class StateExtension { @@ -27,25 +27,25 @@ public class StateExtension { /** Returns the string representation for the given {@link State}. */ @NonNull public static String toString(@State int callComposerState) { - if (callComposerState == EnrichedCallManager.STATE_NONE) { + if (callComposerState == Session.STATE_NONE) { return "STATE_NONE"; } - if (callComposerState == EnrichedCallManager.STATE_STARTING) { + if (callComposerState == Session.STATE_STARTING) { return "STATE_STARTING"; } - if (callComposerState == EnrichedCallManager.STATE_STARTED) { + if (callComposerState == Session.STATE_STARTED) { return "STATE_STARTED"; } - if (callComposerState == EnrichedCallManager.STATE_START_FAILED) { + if (callComposerState == Session.STATE_START_FAILED) { return "STATE_START_FAILED"; } - if (callComposerState == EnrichedCallManager.STATE_MESSAGE_SENT) { + if (callComposerState == Session.STATE_MESSAGE_SENT) { return "STATE_MESSAGE_SENT"; } - if (callComposerState == EnrichedCallManager.STATE_MESSAGE_FAILED) { + if (callComposerState == Session.STATE_MESSAGE_FAILED) { return "STATE_MESSAGE_FAILED"; } - if (callComposerState == EnrichedCallManager.STATE_CLOSED) { + if (callComposerState == Session.STATE_CLOSED) { return "STATE_CLOSED"; } Assert.checkArgument(false, "Unexpected callComposerState: %d", callComposerState); diff --git a/java/com/android/dialer/logging/dialer_impression.proto b/java/com/android/dialer/logging/dialer_impression.proto index 6db903724..2f89a3aed 100644 --- a/java/com/android/dialer/logging/dialer_impression.proto +++ b/java/com/android/dialer/logging/dialer_impression.proto @@ -6,11 +6,11 @@ option java_multiple_files = true; option optimize_for = LITE_RUNTIME; + message DialerImpression { // Event enums to be used for Impression Logging in Dialer. // It's perfectly acceptable for this enum to be large // Values should be from 1000 to 100000. - // Next Tag:1229 enum Type { UNKNOWN_AOSP_EVENT_TYPE = 1000; @@ -400,9 +400,10 @@ message DialerImpression { BUBBLE_END_CALL = 1195; LIGHTBRINGER_VIDEO_REQUESTED_FROM_SEARCH = 1196; - LIGHTBRINGER_VIDEO_REQUESTED_FROM_CALL_LOG = 1197; + LIGHTBRINGER_VIDEO_REQUESTED_FROM_CALL_LOG = + 1197; // Including call history IMS_VIDEO_REQUESTED_FROM_SEARCH = 1198; - IMS_VIDEO_REQUESTED_FROM_CALL_LOG = 1199; + IMS_VIDEO_REQUESTED_FROM_CALL_LOG = 1199; // Including call history // Multi select impressions MULTISELECT_LONG_PRESS_ENTER_MULTI_SELECT_MODE = 1200; @@ -442,5 +443,17 @@ message DialerImpression { // Impressions for dialer reporting caller id as inaccurate CALLER_ID_REPORTED = 1227; CALLER_ID_REPORT_FAILED = 1228; + + // Impressions for interactions with the voicemail transcription server + VVM_TRANSCRIPTION_REQUEST_SENT = 1229; + VVM_TRANSCRIPTION_REQUEST_RETRY = 1230; + VVM_TRANSCRIPTION_RESPONSE_SUCCESS = 1231; + VVM_TRANSCRIPTION_RESPONSE_EMPTY = 1232; + VVM_TRANSCRIPTION_RESPONSE_INVALID = 1233; + VVM_TRANSCRIPTION_RESPONSE_RECOVERABLE_ERROR = 1234; + VVM_TRANSCRIPTION_RESPONSE_FATAL_ERROR = 1235; + + // In in call UI + UPGRADE_TO_VIDEO_CALL_BUTTON_SHOWN = 1236; } } diff --git a/java/com/android/dialer/shortcuts/IconFactory.java b/java/com/android/dialer/shortcuts/IconFactory.java index a8c4ada4e..4ec964c7b 100644 --- a/java/com/android/dialer/shortcuts/IconFactory.java +++ b/java/com/android/dialer/shortcuts/IconFactory.java @@ -20,11 +20,16 @@ import android.content.Context; import android.content.pm.ShortcutInfo; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.graphics.drawable.AdaptiveIconDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.net.Uri; +import android.os.Build.VERSION; +import android.os.Build.VERSION_CODES; import android.provider.ContactsContract; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.annotation.RequiresApi; import android.support.annotation.WorkerThread; import android.support.v4.graphics.drawable.RoundedBitmapDrawable; import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory; @@ -83,6 +88,38 @@ class IconFactory { ContactsContract.Contacts.openContactPhotoInputStream( context.getContentResolver(), lookupUri, false /* preferHighres */); + return VERSION.SDK_INT >= VERSION_CODES.O + ? createAdaptiveIcon(displayName, lookupKey, inputStream) + : createFlatIcon(displayName, lookupKey, inputStream); + } + + @RequiresApi(VERSION_CODES.O) + private Icon createAdaptiveIcon( + @NonNull String displayName, @NonNull String lookupKey, @Nullable InputStream inputStream) { + if (inputStream == null) { + LetterTileDrawable letterTileDrawable = new LetterTileDrawable(context.getResources()); + // The adaptive icons clip the drawable to a safe area inside the drawable. Scale the letter + // so it fits inside the safe area. + letterTileDrawable.setScale(1f / (1f + AdaptiveIconDrawable.getExtraInsetFraction())); + letterTileDrawable.setCanonicalDialerLetterTileDetails( + displayName, + lookupKey, + LetterTileDrawable.SHAPE_RECTANGLE, + LetterTileDrawable.TYPE_DEFAULT); + + int iconSize = + context + .getResources() + .getDimensionPixelSize(R.dimen.launcher_shortcut_adaptive_icon_size); + return Icon.createWithAdaptiveBitmap( + DrawableConverter.drawableToBitmap(letterTileDrawable, iconSize, iconSize)); + } + Bitmap bitmap = BitmapFactory.decodeStream(inputStream); + return Icon.createWithAdaptiveBitmap(bitmap); + } + + private Icon createFlatIcon( + @NonNull String displayName, @NonNull String lookupKey, @Nullable InputStream inputStream) { Drawable drawable; if (inputStream == null) { // No photo for contact; use a letter tile. diff --git a/java/com/android/dialer/shortcuts/res/drawable-anydpi-v26/ic_shortcut_add_contact.xml b/java/com/android/dialer/shortcuts/res/drawable-anydpi-v26/ic_shortcut_add_contact.xml new file mode 100644 index 000000000..07ed17226 --- /dev/null +++ b/java/com/android/dialer/shortcuts/res/drawable-anydpi-v26/ic_shortcut_add_contact.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/java/com/android/dialer/shortcuts/res/drawable/ic_add_contact_foreground.xml b/java/com/android/dialer/shortcuts/res/drawable/ic_add_contact_foreground.xml new file mode 100644 index 000000000..6bc172767 --- /dev/null +++ b/java/com/android/dialer/shortcuts/res/drawable/ic_add_contact_foreground.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/java/com/android/dialer/shortcuts/res/values/dimens.xml b/java/com/android/dialer/shortcuts/res/values/dimens.xml index 232125653..369d38c15 100644 --- a/java/com/android/dialer/shortcuts/res/values/dimens.xml +++ b/java/com/android/dialer/shortcuts/res/values/dimens.xml @@ -16,4 +16,5 @@ --> 48dp + 108dp diff --git a/java/com/android/dialer/simulator/impl/SimulatorContacts.java b/java/com/android/dialer/simulator/impl/SimulatorContacts.java index e77788f02..5bd28986c 100644 --- a/java/com/android/dialer/simulator/impl/SimulatorContacts.java +++ b/java/com/android/dialer/simulator/impl/SimulatorContacts.java @@ -37,7 +37,7 @@ import java.util.ArrayList; import java.util.List; /** Populates the device database with contacts. */ -final class SimulatorContacts { +public final class SimulatorContacts { // Phone numbers from https://www.google.com/about/company/facts/locations/ private static final Contact[] SIMPLE_CONTACTS = { // US, contact with e164 number. @@ -114,7 +114,7 @@ final class SimulatorContacts { }; @WorkerThread - static void populateContacts(@NonNull Context context) { + public static void populateContacts(@NonNull Context context) { Assert.isWorkerThread(); ArrayList operations = new ArrayList<>(); for (Contact contact : SIMPLE_CONTACTS) { diff --git a/java/com/android/dialershared/bubble/ChangeOnScreenBounds.java b/java/com/android/dialershared/bubble/ChangeOnScreenBounds.java index 4da6a3561..37c820447 100644 --- a/java/com/android/dialershared/bubble/ChangeOnScreenBounds.java +++ b/java/com/android/dialershared/bubble/ChangeOnScreenBounds.java @@ -22,6 +22,7 @@ import android.animation.ObjectAnimator; import android.graphics.Path; import android.graphics.PointF; import android.graphics.Rect; +import android.support.annotation.VisibleForTesting; import android.transition.Transition; import android.transition.TransitionValues; import android.util.Property; @@ -31,9 +32,14 @@ import android.view.ViewGroup; /** Similar to {@link android.transition.ChangeBounds ChangeBounds} but works across windows */ public class ChangeOnScreenBounds extends Transition { - private static final String PROPNAME_BOUNDS = "bubble:changeScreenBounds:bounds"; - private static final String PROPNAME_SCREEN_X = "bubble:changeScreenBounds:screenX"; - private static final String PROPNAME_SCREEN_Y = "bubble:changeScreenBounds:screenY"; + @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) + static final String PROPNAME_BOUNDS = "bubble:changeScreenBounds:bounds"; + + @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) + static final String PROPNAME_SCREEN_X = "bubble:changeScreenBounds:screenX"; + + @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) + static final String PROPNAME_SCREEN_Y = "bubble:changeScreenBounds:screenY"; private static final Property TOP_LEFT_PROPERTY = new Property(PointF.class, "topLeft") { @@ -89,6 +95,12 @@ public class ChangeOnScreenBounds extends Transition { public Animator createAnimator( ViewGroup sceneRoot, TransitionValues startValues, TransitionValues endValues) { Rect startBounds = (Rect) startValues.values.get(PROPNAME_BOUNDS); + Rect endBounds = (Rect) endValues.values.get(PROPNAME_BOUNDS); + + if (startBounds == null || endBounds == null) { + // start or end values were not captured, so don't animate. + return null; + } // Offset the startBounds by the difference in screen position int startScreenX = (Integer) startValues.values.get(PROPNAME_SCREEN_X); @@ -97,7 +109,6 @@ public class ChangeOnScreenBounds extends Transition { int endScreenY = (Integer) endValues.values.get(PROPNAME_SCREEN_Y); startBounds.offset(startScreenX - endScreenX, startScreenY - endScreenY); - Rect endBounds = (Rect) endValues.values.get(PROPNAME_BOUNDS); final int startLeft = startBounds.left; final int endLeft = endBounds.left; final int startTop = startBounds.top; diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java index 6ea31fc4c..c95086c1e 100644 --- a/java/com/android/incallui/InCallActivity.java +++ b/java/com/android/incallui/InCallActivity.java @@ -28,7 +28,6 @@ import android.support.annotation.Nullable; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; import android.support.v4.graphics.ColorUtils; -import android.telecom.DisconnectCause; import android.telephony.TelephonyManager; import android.view.KeyEvent; import android.view.MenuItem; @@ -48,6 +47,7 @@ import com.android.incallui.answerproximitysensor.PseudoScreenState; import com.android.incallui.call.CallList; import com.android.incallui.call.DialerCall; import com.android.incallui.call.DialerCall.State; +import com.android.incallui.disconnectdialog.DisconnectMessage; import com.android.incallui.incall.bindings.InCallBindings; import com.android.incallui.incall.protocol.InCallButtonUiDelegate; import com.android.incallui.incall.protocol.InCallButtonUiDelegateFactory; @@ -393,8 +393,8 @@ public class InCallActivity extends TransactionSafeFragmentActivity common.showPostCharWaitDialog(callId, chars); } - public void maybeShowErrorDialogOnDisconnect(DisconnectCause disconnectCause) { - common.maybeShowErrorDialogOnDisconnect(disconnectCause); + public void maybeShowErrorDialogOnDisconnect(DisconnectMessage disconnectMessage) { + common.maybeShowErrorDialogOnDisconnect(disconnectMessage); } public void dismissPendingDialogs() { diff --git a/java/com/android/incallui/InCallActivityCommon.java b/java/com/android/incallui/InCallActivityCommon.java index 4b0a3cd05..3a264bed7 100644 --- a/java/com/android/incallui/InCallActivityCommon.java +++ b/java/com/android/incallui/InCallActivityCommon.java @@ -21,7 +21,6 @@ import android.app.ActivityManager.AppTask; import android.app.ActivityManager.TaskDescription; import android.app.AlertDialog; import android.app.Dialog; -import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnCancelListener; import android.content.DialogInterface.OnDismissListener; @@ -36,10 +35,7 @@ import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; import android.support.v4.content.res.ResourcesCompat; -import android.telecom.DisconnectCause; import android.telecom.PhoneAccountHandle; -import android.text.TextUtils; -import android.util.Pair; import android.view.KeyEvent; import android.view.View; import android.view.Window; @@ -62,9 +58,9 @@ import com.android.incallui.call.CallList; import com.android.incallui.call.DialerCall; import com.android.incallui.call.DialerCall.State; import com.android.incallui.call.TelecomAdapter; +import com.android.incallui.disconnectdialog.DisconnectMessage; import com.android.incallui.telecomeventui.InternationalCallOnWifiDialogFragment; import com.android.incallui.telecomeventui.InternationalCallOnWifiDialogFragment.Callback; -import com.android.incallui.wifi.EnableWifiCallingPrompt; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; @@ -497,18 +493,15 @@ public class InCallActivityCommon { } } - public void maybeShowErrorDialogOnDisconnect(DisconnectCause cause) { + public void maybeShowErrorDialogOnDisconnect(DisconnectMessage disconnectMessage) { LogUtil.i( - "InCallActivityCommon.maybeShowErrorDialogOnDisconnect", "disconnect cause: %s", cause); + "InCallActivityCommon.maybeShowErrorDialogOnDisconnect", + "disconnect cause: %s", + disconnectMessage); if (!inCallActivity.isFinishing()) { - if (EnableWifiCallingPrompt.shouldShowPrompt(cause)) { - Pair pair = - EnableWifiCallingPrompt.createDialog(inCallActivity, cause); - showErrorDialog(pair.first, pair.second); - } else if (shouldShowDisconnectErrorDialog(cause)) { - Pair pair = getDisconnectErrorDialog(inCallActivity, cause); - showErrorDialog(pair.first, pair.second); + if (disconnectMessage.dialog != null) { + showErrorDialog(disconnectMessage.dialog, disconnectMessage.toastMessage); } } } @@ -557,23 +550,6 @@ public class InCallActivityCommon { } } - private static boolean shouldShowDisconnectErrorDialog(@NonNull DisconnectCause cause) { - return !TextUtils.isEmpty(cause.getDescription()) - && (cause.getCode() == DisconnectCause.ERROR - || cause.getCode() == DisconnectCause.RESTRICTED); - } - - private static Pair getDisconnectErrorDialog( - @NonNull Context context, @NonNull DisconnectCause cause) { - CharSequence message = cause.getDescription(); - Dialog dialog = - new AlertDialog.Builder(context) - .setMessage(message) - .setPositiveButton(android.R.string.ok, null) - .create(); - return new Pair<>(dialog, message); - } - private void showErrorDialog(Dialog dialog, CharSequence message) { LogUtil.i("InCallActivityCommon.showErrorDialog", "message: %s", message); inCallActivity.dismissPendingDialogs(); diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java index 0bfd67e87..1528e7dcf 100644 --- a/java/com/android/incallui/InCallPresenter.java +++ b/java/com/android/incallui/InCallPresenter.java @@ -54,6 +54,7 @@ import com.android.incallui.call.CallList; import com.android.incallui.call.DialerCall; import com.android.incallui.call.ExternalCallList; import com.android.incallui.call.TelecomAdapter; +import com.android.incallui.disconnectdialog.DisconnectMessage; import com.android.incallui.latencyreport.LatencyReport; import com.android.incallui.legacyblocking.BlockedNumberContentObserver; import com.android.incallui.spam.SpamCallListListener; @@ -133,7 +134,9 @@ public class InCallPresenter implements CallList.Listener { android.telecom.Call telecomCall, String remainingPostDialSequence) { final DialerCall call = mCallList.getDialerCallFromTelecomCall(telecomCall); if (call == null) { - Log.w(this, "DialerCall not found in call list: " + telecomCall); + LogUtil.w( + "InCallPresenter.onPostDialWait", + "DialerCall not found in call list: " + telecomCall); return; } onPostDialCharWait(call.getId(), remainingPostDialSequence); @@ -144,7 +147,9 @@ public class InCallPresenter implements CallList.Listener { android.telecom.Call telecomCall, android.telecom.Call.Details details) { final DialerCall call = mCallList.getDialerCallFromTelecomCall(telecomCall); if (call == null) { - Log.w(this, "DialerCall not found in call list: " + telecomCall); + LogUtil.w( + "InCallPresenter.onDetailsChanged", + "DialerCall not found in call list: " + telecomCall); return; } @@ -152,7 +157,7 @@ public class InCallPresenter implements CallList.Listener { && !mExternalCallList.isCallTracked(telecomCall)) { // A regular call became an external call so swap call lists. - Log.i(this, "Call became external: " + telecomCall); + LogUtil.i("InCallPresenter.onDetailsChanged", "Call became external: " + telecomCall); mCallList.onInternalCallMadeExternal(mContext, telecomCall); mExternalCallList.onCallAdded(telecomCall); return; @@ -166,7 +171,9 @@ public class InCallPresenter implements CallList.Listener { @Override public void onConferenceableCallsChanged( android.telecom.Call telecomCall, List conferenceableCalls) { - Log.i(this, "onConferenceableCallsChanged: " + telecomCall); + LogUtil.i( + "InCallPresenter.onConferenceableCallsChanged", + "onConferenceableCallsChanged: " + telecomCall); onDetailsChanged(telecomCall, telecomCall.getDetails()); } }; @@ -289,7 +296,8 @@ public class InCallPresenter implements CallList.Listener { if ((call.getAccountHandle() == null && (phoneAccountHandles == null || phoneAccountHandles.isEmpty()))) { - Log.i(InCallPresenter.getInstance(), "No valid accounts for call " + call); + LogUtil.i( + "InCallPresenter.isCallWithNoValidAccounts", "No valid accounts for call " + call); return true; } } @@ -314,7 +322,7 @@ public class InCallPresenter implements CallList.Listener { ProximitySensor proximitySensor, FilteredNumberAsyncQueryHandler filteredNumberQueryHandler) { if (mServiceConnected) { - Log.i(this, "New service connection replacing existing one."); + LogUtil.i("InCallPresenter.setUp", "New service connection replacing existing one."); if (context != mContext || callList != mCallList) { throw new IllegalStateException(); } @@ -362,7 +370,7 @@ public class InCallPresenter implements CallList.Listener { .getSystemService(TelephonyManager.class) .listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE); - Log.d(this, "Finished InCallPresenter.setUp"); + LogUtil.d("InCallPresenter.setUp", "Finished InCallPresenter.setUp"); } /** @@ -373,7 +381,7 @@ public class InCallPresenter implements CallList.Listener { * secondary method that performs the aforementioned logic. */ public void tearDown() { - Log.d(this, "tearDown"); + LogUtil.d("InCallPresenter.tearDown", "tearDown"); mCallList.clearOnDisconnect(); mServiceConnected = false; @@ -388,7 +396,7 @@ public class InCallPresenter implements CallList.Listener { private void attemptFinishActivity() { final boolean doFinish = (mInCallActivity != null && isActivityStarted()); - Log.i(this, "Hide in call UI: " + doFinish); + LogUtil.i("InCallPresenter.attemptFinishActivity", "Hide in call UI: " + doFinish); if (doFinish) { mInCallActivity.setExcludeFromRecents(true); mInCallActivity.finish(); @@ -404,12 +412,13 @@ public class InCallPresenter implements CallList.Listener { throw new IllegalArgumentException("unregisterActivity cannot be called with null"); } if (mInCallActivity == null) { - Log.i(this, "No InCallActivity currently set, no need to unset."); + LogUtil.i( + "InCallPresenter.unsetActivity", "No InCallActivity currently set, no need to unset."); return; } if (mInCallActivity != inCallActivity) { - Log.w( - this, + LogUtil.w( + "InCallPresenter.unsetActivity", "Second instance of InCallActivity is trying to unregister when another" + " instance is active. Ignoring."); return; @@ -428,7 +437,7 @@ public class InCallPresenter implements CallList.Listener { if (inCallActivity != null) { if (mInCallActivity == null) { updateListeners = true; - Log.i(this, "UI Initialized"); + LogUtil.i("InCallPresenter.updateActivity", "UI Initialized"); } else { // since setActivity is called onStart(), it can be called multiple times. // This is fine and ignorable, but we do not want to update the world every time @@ -451,12 +460,12 @@ public class InCallPresenter implements CallList.Listener { // NOTE: This code relies on {@link #mInCallActivity} being set so we run it after // it has been set. if (mInCallState == InCallState.NO_CALLS) { - Log.i(this, "UI Initialized, but no calls left. shut down."); + LogUtil.i("InCallPresenter.updateActivity", "UI Initialized, but no calls left. Shut down"); attemptFinishActivity(); return; } } else { - Log.i(this, "UI Destroyed"); + LogUtil.i("InCallPresenter.updateActivity", "UI Destroyed"); updateListeners = true; mInCallActivity = null; @@ -496,7 +505,7 @@ public class InCallPresenter implements CallList.Listener { } public void onBringToForeground(boolean showDialpad) { - Log.i(this, "Bringing UI to foreground."); + LogUtil.i("InCallPresenter.onBringToForeground", "Bringing UI to foreground."); bringToForeground(showDialpad); } @@ -529,11 +538,15 @@ public class InCallPresenter implements CallList.Listener { return false; } if (TelecomCallUtil.isEmergencyCall(call)) { - Log.i(this, "Not attempting to block incoming emergency call"); + LogUtil.i( + "InCallPresenter.shouldAttemptBlocking", + "Not attempting to block incoming emergency call"); return false; } if (FilteredNumbersUtil.hasRecentEmergencyCall(mContext)) { - Log.i(this, "Not attempting to block incoming call due to recent emergency call"); + LogUtil.i( + "InCallPresenter.shouldAttemptBlocking", + "Not attempting to block incoming call due to recent emergency call"); return false; } if (call.getDetails().hasProperty(CallCompat.Details.PROPERTY_IS_EXTERNAL_CALL)) { @@ -583,7 +596,7 @@ public class InCallPresenter implements CallList.Listener { @Override public void onCheckComplete(final Integer id) { if (isReadyForTearDown()) { - Log.i(this, "InCallPresenter is torn down, not adding call"); + LogUtil.i("InCallPresenter.onCheckComplete", "torn down, not adding call"); return; } if (!hasTimedOut.get()) { @@ -595,7 +608,8 @@ public class InCallPresenter implements CallList.Listener { mCallList.onCallAdded(mContext, call, latencyReport); } } else if (id == FilteredNumberAsyncQueryHandler.INVALID_ID) { - Log.d(this, "checkForBlockedCall: invalid number, skipping block checking"); + LogUtil.d( + "InCallPresenter.onCheckComplete", "invalid number, skipping block checking"); if (!hasTimedOut.get()) { handler.removeCallbacks(runnable); @@ -603,7 +617,8 @@ public class InCallPresenter implements CallList.Listener { mCallList.onCallAdded(mContext, call, latencyReport); } } else { - Log.i(this, "Rejecting incoming call from blocked number"); + LogUtil.i( + "InCallPresenter.onCheckComplete", "Rejecting incoming call from blocked number"); call.reject(false, null); Logger.get(mContext).logInteraction(InteractionEvent.Type.CALL_BLOCKED); @@ -684,7 +699,9 @@ public class InCallPresenter implements CallList.Listener { InCallState newState = getPotentialStateFromCallList(callList); InCallState oldState = mInCallState; - Log.d(this, "onCallListChange oldState= " + oldState + " newState=" + newState); + LogUtil.d( + "InCallPresenter.onCallListChange", + "onCallListChange oldState= " + oldState + " newState=" + newState); // If the user placed a call and was asked to choose the account, but then pressed "Home", the // incall activity for that call will still exist (even if it's not visible). In the case of @@ -702,15 +719,20 @@ public class InCallPresenter implements CallList.Listener { } newState = startOrFinishUi(newState); - Log.d(this, "onCallListChange newState changed to " + newState); + LogUtil.d( + "InCallPresenter.onCallListChange", "onCallListChange newState changed to " + newState); // Set the new state before announcing it to the world - Log.i(this, "Phone switching state: " + oldState + " -> " + newState); + LogUtil.i( + "InCallPresenter.onCallListChange", + "Phone switching state: " + oldState + " -> " + newState); mInCallState = newState; // notify listeners of new state for (InCallStateListener listener : mListeners) { - Log.d(this, "Notify " + listener + " of state " + mInCallState.toString()); + LogUtil.d( + "InCallPresenter.onCallListChange", + "Notify " + listener + " of state " + mInCallState.toString()); listener.onStateChange(oldState, mInCallState, callList); } @@ -727,7 +749,8 @@ public class InCallPresenter implements CallList.Listener { InCallState newState = startOrFinishUi(InCallState.INCOMING); InCallState oldState = mInCallState; - Log.i(this, "Phone switching state: " + oldState + " -> " + newState); + LogUtil.i( + "InCallPresenter.onIncomingCall", "Phone switching state: " + oldState + " -> " + newState); mInCallState = newState; for (IncomingCallListener listener : mIncomingCallListeners) { @@ -841,7 +864,9 @@ public class InCallPresenter implements CallList.Listener { } public void setBoundAndWaitingForOutgoingCall(boolean isBound, PhoneAccountHandle handle) { - Log.i(this, "setBoundAndWaitingForOutgoingCall: " + isBound); + LogUtil.i( + "InCallPresenter.setBoundAndWaitingForOutgoingCall", + "setBoundAndWaitingForOutgoingCall: " + isBound); mBoundAndWaitingForOutgoingCall = isBound; mThemeColorManager.setPendingPhoneAccountHandle(handle); if (isBound && mInCallState == InCallState.NO_CALLS) { @@ -970,7 +995,9 @@ public class InCallPresenter implements CallList.Listener { if (mInCallActivity != null) { mIsChangingConfigurations = mInCallActivity.isChangingConfigurations(); } - Log.v(this, "updateIsChangingConfigurations = " + mIsChangingConfigurations); + LogUtil.v( + "InCallPresenter.updateIsChangingConfigurations", + "updateIsChangingConfigurations = " + mIsChangingConfigurations); } /** Called when the activity goes in/out of the foreground. */ @@ -990,10 +1017,10 @@ public class InCallPresenter implements CallList.Listener { broadcastIntent.putExtra(EXTRA_FIRST_TIME_SHOWN, !mIsActivityPreviouslyStarted); if (showing) { - Log.d(this, "Sending sticky broadcast: ", broadcastIntent); + LogUtil.d("InCallPresenter.onUiShowing", "Sending sticky broadcast: ", broadcastIntent); mContext.sendStickyBroadcast(broadcastIntent); } else { - Log.d(this, "Removing sticky broadcast: ", broadcastIntent); + LogUtil.d("InCallPresenter.onUiShowing", "Removing sticky broadcast: ", broadcastIntent); mContext.removeStickyBroadcast(broadcastIntent); } } @@ -1031,7 +1058,7 @@ public class InCallPresenter implements CallList.Listener { /*package*/ void onActivityStarted() { - Log.d(this, "onActivityStarted"); + LogUtil.d("InCallPresenter.onActivityStarted", "onActivityStarted"); notifyVideoPauseController(true); if (mStatusBarNotifier != null) { // TODO - b/36649622: Investigate this redundant call @@ -1041,13 +1068,14 @@ public class InCallPresenter implements CallList.Listener { /*package*/ void onActivityStopped() { - Log.d(this, "onActivityStopped"); + LogUtil.d("InCallPresenter.onActivityStopped", "onActivityStopped"); notifyVideoPauseController(false); } private void notifyVideoPauseController(boolean showing) { - Log.d( - this, "notifyVideoPauseController: mIsChangingConfigurations=" + mIsChangingConfigurations); + LogUtil.d( + "InCallPresenter.notifyVideoPauseController", + "mIsChangingConfigurations=" + mIsChangingConfigurations); if (!mIsChangingConfigurations) { VideoPauseController.getInstance().onUiShowing(showing); } @@ -1106,8 +1134,9 @@ public class InCallPresenter implements CallList.Listener { final boolean canSwap = activeCall.can(android.telecom.Call.Details.CAPABILITY_SWAP_CONFERENCE); - Log.v( - this, "activeCall: " + activeCall + ", canMerge: " + canMerge + ", canSwap: " + canSwap); + LogUtil.v( + "InCallPresenter.handleCallKey", + "activeCall: " + activeCall + ", canMerge: " + canMerge + ", canSwap: " + canSwap); // (2) Attempt actions on conference calls if (canMerge) { @@ -1126,7 +1155,7 @@ public class InCallPresenter implements CallList.Listener { // there is no harm in double checking. final boolean canHold = heldCall.can(android.telecom.Call.Details.CAPABILITY_HOLD); - Log.v(this, "heldCall: " + heldCall + ", canHold: " + canHold); + LogUtil.v("InCallPresenter.handleCallKey", "heldCall: " + heldCall + ", canHold: " + canHold); // (4) unhold call if (heldCall.getState() == DialerCall.State.ONHOLD && canHold) { @@ -1144,7 +1173,7 @@ public class InCallPresenter implements CallList.Listener { * checks to see if there should be any UI left and if not attempts to tear down the UI. */ public void onDismissDialog() { - Log.i(this, "Dialog dismissed"); + LogUtil.i("InCallPresenter.onDismissDialog", "Dialog dismissed"); if (mInCallState == InCallState.NO_CALLS) { attemptFinishActivity(); attemptCleanup(); @@ -1174,16 +1203,18 @@ public class InCallPresenter implements CallList.Listener { * @param force {@code true} if fullscreen mode should be set regardless of its current state. */ public void setFullScreen(boolean isFullScreen, boolean force) { - Log.i(this, "setFullScreen = " + isFullScreen); + LogUtil.i("InCallPresenter.setFullScreen", "setFullScreen = " + isFullScreen); // As a safeguard, ensure we cannot enter fullscreen if the dialpad is shown. if (isDialpadVisible()) { isFullScreen = false; - Log.v(this, "setFullScreen overridden as dialpad is shown = " + isFullScreen); + LogUtil.v( + "InCallPresenter.setFullScreen", + "setFullScreen overridden as dialpad is shown = " + isFullScreen); } if (mIsFullScreen == isFullScreen && !force) { - Log.v(this, "setFullScreen ignored as already in that state."); + LogUtil.v("InCallPresenter.setFullScreen", "setFullScreen ignored as already in that state."); return; } mIsFullScreen = isFullScreen; @@ -1219,7 +1250,8 @@ public class InCallPresenter implements CallList.Listener { if (call.getAccountHandle() == null && !call.isConferenceCall()) { setDisconnectCauseForMissingAccounts(call); } - mInCallActivity.maybeShowErrorDialogOnDisconnect(call.getDisconnectCause()); + mInCallActivity.maybeShowErrorDialogOnDisconnect( + new DisconnectMessage(mInCallActivity, call)); } } @@ -1228,7 +1260,8 @@ public class InCallPresenter implements CallList.Listener { * UI needs to be started or finished depending on the new state and does it. */ private InCallState startOrFinishUi(InCallState newState) { - Log.d(this, "startOrFinishUi: " + mInCallState + " -> " + newState); + LogUtil.d( + "InCallPresenter.startOrFinishUi", "startOrFinishUi: " + mInCallState + " -> " + newState); // TODO: Consider a proper state machine implementation @@ -1310,7 +1343,9 @@ public class InCallPresenter implements CallList.Listener { // up so we aren't going to lose anything by avoiding a second startup here. boolean activityIsFinishing = mInCallActivity != null && !isActivityStarted(); if (activityIsFinishing) { - Log.i(this, "Undo the state change: " + newState + " -> " + mInCallState); + LogUtil.i( + "InCallPresenter.startOrFinishUi", + "Undo the state change: " + newState + " -> " + mInCallState); return mInCallState; } @@ -1325,10 +1360,10 @@ public class InCallPresenter implements CallList.Listener { } if (showCallUi || showAccountPicker) { - Log.i(this, "Start in call UI"); + LogUtil.i("InCallPresenter.startOrFinishUi", "Start in call UI"); showInCall(false /* showDialpad */, !showAccountPicker /* newOutgoingCall */); } else if (startIncomingCallSequence) { - Log.i(this, "Start Full Screen in call UI"); + LogUtil.i("InCallPresenter.startOrFinishUi", "Start Full Screen in call UI"); mStatusBarNotifier.updateNotification(mCallList); } else if (newState == InCallState.NO_CALLS) { @@ -1381,7 +1416,7 @@ public class InCallPresenter implements CallList.Listener { */ private void attemptCleanup() { if (isReadyForTearDown()) { - Log.i(this, "Cleaning up"); + LogUtil.i("InCallPresenter.attemptCleanup", "Cleaning up"); cleanupSurfaces(); @@ -1431,12 +1466,12 @@ public class InCallPresenter implements CallList.Listener { mInCallEventListeners.clear(); mInCallUiListeners.clear(); - Log.d(this, "Finished InCallPresenter.CleanUp"); + LogUtil.d("InCallPresenter.attemptCleanup", "finished"); } } public void showInCall(boolean showDialpad, boolean newOutgoingCall) { - Log.i(this, "Showing InCallActivity"); + LogUtil.i("InCallPresenter.showInCall", "Showing InCallActivity"); mContext.startActivity( InCallActivity.getIntent( mContext, showDialpad, newOutgoingCall, false /* forFullScreen */)); @@ -1507,12 +1542,14 @@ public class InCallPresenter implements CallList.Listener { * InCallOrientationEventListener#SCREEN_ORIENTATION_270}). */ public void onDeviceOrientationChange(@ScreenOrientation int orientation) { - Log.d(this, "onDeviceOrientationChange: orientation= " + orientation); + LogUtil.d( + "InCallPresenter.onDeviceOrientationChange", + "onDeviceOrientationChange: orientation= " + orientation); if (mCallList != null) { mCallList.notifyCallsOfDeviceRotation(orientation); } else { - Log.w(this, "onDeviceOrientationChange: CallList is null."); + LogUtil.w("InCallPresenter.onDeviceOrientationChange", "CallList is null."); } // Notify listeners of device orientation changed. @@ -1530,16 +1567,18 @@ public class InCallPresenter implements CallList.Listener { */ public void setInCallAllowsOrientationChange(boolean allowOrientationChange) { if (mInCallActivity == null) { - Log.e(this, "InCallActivity is null. Can't set requested orientation."); + LogUtil.e( + "InCallPresenter.setInCallAllowsOrientationChange", + "InCallActivity is null. Can't set requested orientation."); return; } mInCallActivity.setAllowOrientationChange(allowOrientationChange); } public void enableScreenTimeout(boolean enable) { - Log.v(this, "enableScreenTimeout: value=" + enable); + LogUtil.v("InCallPresenter.enableScreenTimeout", "enableScreenTimeout: value=" + enable); if (mInCallActivity == null) { - Log.e(this, "enableScreenTimeout: InCallActivity is null."); + LogUtil.e("InCallPresenter.enableScreenTimeout", "InCallActivity is null."); return; } @@ -1600,7 +1639,8 @@ public class InCallPresenter implements CallList.Listener { throw new IllegalArgumentException("registerActivity cannot be called with null"); } if (mInCallActivity != null && mInCallActivity != inCallActivity) { - Log.w(this, "Setting a second activity before destroying the first."); + LogUtil.w( + "InCallPresenter.setActivity", "Setting a second activity before destroying the first."); } updateActivity(inCallActivity); } diff --git a/java/com/android/incallui/ReturnToCallController.java b/java/com/android/incallui/ReturnToCallController.java index 9972e6fbe..33154c5cf 100644 --- a/java/com/android/incallui/ReturnToCallController.java +++ b/java/com/android/incallui/ReturnToCallController.java @@ -113,7 +113,6 @@ public class ReturnToCallController implements InCallUiListener, Listener, Audio private Bubble startNewBubble() { if (!Bubble.canShowBubbles(context)) { LogUtil.i("ReturnToCallController.startNewBubble", "can't show bubble, no permission"); - context.startActivity(Bubble.getRequestPermissionIntent(context)); return null; } Bubble returnToCallBubble = Bubble.createBubble(context, generateBubbleInfo()); diff --git a/java/com/android/incallui/VideoPauseController.java b/java/com/android/incallui/VideoPauseController.java index 2595e2f8b..36c9ef350 100644 --- a/java/com/android/incallui/VideoPauseController.java +++ b/java/com/android/incallui/VideoPauseController.java @@ -66,11 +66,6 @@ class VideoPauseController implements InCallStateListener, IncomingCallListener return sVideoPauseController; } - private boolean wasIncomingCall() { - return (mPrevCallState == DialerCall.State.CALL_WAITING - || mPrevCallState == DialerCall.State.INCOMING); - } - /** * Determines if a call is in incoming/waiting state. * @@ -198,7 +193,7 @@ class VideoPauseController implements InCallStateListener, IncomingCallListener } final boolean canVideoPause = videoCanPause(call); - if ((wasIncomingCall() || wasDialing()) && canVideoPause && !mIsInBackground) { + if (canVideoPause && !mIsInBackground) { // Send resume request for the active call, if user rejects incoming call, ends dialing // call, or the call was previously in a paused state and UI is in the foreground. sendRequest(call, true); diff --git a/java/com/android/incallui/contactgrid/res/values-uz/strings.xml b/java/com/android/incallui/contactgrid/res/values-uz/strings.xml index a5ce1caea..f4569de03 100644 --- a/java/com/android/incallui/contactgrid/res/values-uz/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-uz/strings.xml @@ -34,7 +34,7 @@ "Bu foydalanuvchi Wi-Fi orqali video suhbatga o‘tishni so‘ramoqda:" "Kimdan qo‘ng‘iroq:" "Ish telefoniga kimdan qo‘ng‘iroq:" - "Kiruvchi qo‘ng‘iroq (operator: %s)" + "Kiruvchi chaqiruv (operator: %s)" "Shubhali abonent" "Teskari qo‘ng‘iroq uchun raqam: %1$s" diff --git a/java/com/android/incallui/disconnectdialog/AndroidManifest.xml b/java/com/android/incallui/disconnectdialog/AndroidManifest.xml new file mode 100644 index 000000000..eec9807d8 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/AndroidManifest.xml @@ -0,0 +1,19 @@ + + + + diff --git a/java/com/android/incallui/disconnectdialog/DefaultErrorDialog.java b/java/com/android/incallui/disconnectdialog/DefaultErrorDialog.java new file mode 100644 index 000000000..2ce238718 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/DefaultErrorDialog.java @@ -0,0 +1,50 @@ +/* + * 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.disconnectdialog; + +import android.app.AlertDialog; +import android.app.Dialog; +import android.content.Context; +import android.support.annotation.NonNull; +import android.telecom.DisconnectCause; +import android.text.TextUtils; +import android.util.Pair; +import com.android.incallui.call.DialerCall; + +/** Default error dialog shown to user after disconnect. */ +public class DefaultErrorDialog implements DisconnectDialog { + + @Override + public boolean shouldShow(DisconnectCause disconnectCause) { + return !TextUtils.isEmpty(disconnectCause.getDescription()) + && (disconnectCause.getCode() == DisconnectCause.ERROR + || disconnectCause.getCode() == DisconnectCause.RESTRICTED); + } + + @Override + public Pair createDialog(@NonNull Context context, DialerCall call) { + DisconnectCause disconnectCause = call.getDisconnectCause(); + CharSequence message = disconnectCause.getDescription(); + + Dialog dialog = + new AlertDialog.Builder(context) + .setMessage(message) + .setPositiveButton(android.R.string.cancel, null) + .create(); + return new Pair<>(dialog, message); + } +} diff --git a/java/com/android/incallui/disconnectdialog/DisconnectDialog.java b/java/com/android/incallui/disconnectdialog/DisconnectDialog.java new file mode 100644 index 000000000..0b2b8cc8f --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/DisconnectDialog.java @@ -0,0 +1,32 @@ +/* + * 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.disconnectdialog; + +import android.app.Dialog; +import android.content.Context; +import android.support.annotation.NonNull; +import android.telecom.DisconnectCause; +import android.util.Pair; +import com.android.incallui.call.DialerCall; + +/** Interface for disconnect dialog. */ +public interface DisconnectDialog { + + boolean shouldShow(DisconnectCause disconnectCause); + + Pair createDialog(@NonNull Context context, DialerCall call); +} diff --git a/java/com/android/incallui/disconnectdialog/DisconnectMessage.java b/java/com/android/incallui/disconnectdialog/DisconnectMessage.java new file mode 100644 index 000000000..97d58f27c --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/DisconnectMessage.java @@ -0,0 +1,66 @@ +/* + * 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.disconnectdialog; + +import android.app.Dialog; +import android.content.Context; +import android.telecom.DisconnectCause; +import android.util.Pair; +import com.android.incallui.call.DialerCall; +import java.util.Locale; + +/** + * Wrapper class around @Code{android.telecom.DisconnectCause} to provide more information to user. + */ +public class DisconnectMessage { + + // Disconnect dialog catalog. Default error dialog MUST be last one. + private static final DisconnectDialog[] DISCONNECT_DIALOGS = + new DisconnectDialog[] { + new EnableWifiCallingPrompt(), new VideoCallNotAvailablePrompt(), new DefaultErrorDialog() + }; + + public final Dialog dialog; + public final CharSequence toastMessage; + private final DisconnectCause cause; + + public DisconnectMessage(Context context, DialerCall call) { + cause = call.getDisconnectCause(); + + for (DisconnectDialog disconnectDialog : DISCONNECT_DIALOGS) { + if (disconnectDialog.shouldShow(cause)) { + Pair pair = disconnectDialog.createDialog(context, call); + dialog = pair.first; + toastMessage = pair.second; + return; + } + } + dialog = null; + toastMessage = null; + } + + @Override + public String toString() { + return String.format( + Locale.ENGLISH, + "DisconnectMessage {code: %d, description: %s, reason: %s, message: %s}", + cause.getCode(), + cause.getDescription(), + cause.getReason(), + toastMessage); + } +} diff --git a/java/com/android/incallui/disconnectdialog/EnableWifiCallingPrompt.java b/java/com/android/incallui/disconnectdialog/EnableWifiCallingPrompt.java new file mode 100644 index 000000000..da0c9d6be --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/EnableWifiCallingPrompt.java @@ -0,0 +1,75 @@ +/* + * 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.disconnectdialog; + +import android.app.AlertDialog; +import android.app.Dialog; +import android.content.Context; +import android.content.DialogInterface.OnClickListener; +import android.content.Intent; +import android.support.annotation.NonNull; +import android.telecom.DisconnectCause; +import android.util.Pair; +import com.android.dialer.common.Assert; +import com.android.dialer.common.LogUtil; +import com.android.incallui.call.DialerCall; + +/** Prompts the user to enable Wi-Fi calling. */ +public class EnableWifiCallingPrompt implements DisconnectDialog { + // This is a hidden constant in android.telecom.DisconnectCause. Telecom sets this as a disconnect + // reason if it wants us to prompt the user to enable Wi-Fi calling. In Android-O we might + // consider using a more explicit way to signal this. + private static final String REASON_WIFI_ON_BUT_WFC_OFF = "REASON_WIFI_ON_BUT_WFC_OFF"; + private static final String ACTION_WIFI_CALLING_SETTINGS = + "android.settings.WIFI_CALLING_SETTINGS"; + private static final String ANDROID_SETTINGS_PACKAGE = "com.android.settings"; + + @Override + public boolean shouldShow(DisconnectCause disconnectCause) { + String reason = disconnectCause.getReason(); + if (reason.startsWith(REASON_WIFI_ON_BUT_WFC_OFF)) { + LogUtil.i( + "EnableWifiCallingPrompt.shouldShowPrompt", + "showing prompt for disconnect cause: %s", + reason); + return true; + } + return false; + } + + @Override + public Pair createDialog(final @NonNull Context context, DialerCall call) { + Assert.isNotNull(context); + DisconnectCause cause = call.getDisconnectCause(); + CharSequence message = cause.getDescription(); + Dialog dialog = + new AlertDialog.Builder(context) + .setMessage(message) + .setPositiveButton( + R.string.incall_enable_wifi_calling_button, + (OnClickListener) (dialog1, which) -> openWifiCallingSettings(context)) + .setNegativeButton(android.R.string.cancel, null) + .create(); + return new Pair<>(dialog, message); + } + + private static void openWifiCallingSettings(@NonNull Context context) { + LogUtil.i("EnableWifiCallingPrompt.openWifiCallingSettings", "opening settings"); + context.startActivity( + new Intent(ACTION_WIFI_CALLING_SETTINGS).setPackage(ANDROID_SETTINGS_PACKAGE)); + } +} diff --git a/java/com/android/incallui/disconnectdialog/VideoCallNotAvailablePrompt.java b/java/com/android/incallui/disconnectdialog/VideoCallNotAvailablePrompt.java new file mode 100644 index 000000000..34db976b2 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/VideoCallNotAvailablePrompt.java @@ -0,0 +1,77 @@ +/* + * 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.disconnectdialog; + +import android.app.AlertDialog; +import android.app.Dialog; +import android.content.Context; +import android.content.Intent; +import android.support.annotation.NonNull; +import android.telecom.DisconnectCause; +import android.telecom.PhoneAccountHandle; +import android.util.Pair; +import com.android.dialer.callintent.CallInitiationType; +import com.android.dialer.callintent.CallIntentBuilder; +import com.android.dialer.common.LogUtil; +import com.android.dialer.util.DialerUtils; +import com.android.incallui.call.DialerCall; + +/** Prompt user to make voice call if video call is not currently available. */ +public class VideoCallNotAvailablePrompt implements DisconnectDialog { + + private static final String REASON_IMS_ACCESS_BLOCKED = "IMS_ACCESS_BLOCKED"; + + @Override + public boolean shouldShow(DisconnectCause disconnectCause) { + if (disconnectCause.getCode() == DisconnectCause.ERROR + && REASON_IMS_ACCESS_BLOCKED.equals(disconnectCause.getReason())) { + LogUtil.i( + "VideoCallNotAvailablePrompt.shouldShowPrompt", + "showing prompt for disconnect cause: %s", + disconnectCause.getReason()); + return true; + } else { + return false; + } + } + + @Override + public Pair createDialog(@NonNull Context context, DialerCall call) { + CharSequence title = context.getString(R.string.video_call_not_available_title); + + Dialog dialog = + new AlertDialog.Builder(context) + .setTitle(title) + .setMessage(context.getString(R.string.video_call_not_available_message)) + .setPositiveButton( + R.string.voice_call, + (dialog1, which) -> + makeVoiceCall(context, call.getNumber(), call.getAccountHandle())) + .setNegativeButton(android.R.string.cancel, null) + .create(); + return new Pair<>(dialog, title); + } + + private void makeVoiceCall(Context context, String number, PhoneAccountHandle accountHandle) { + LogUtil.enterBlock("VideoCallNotAvailablePrompt.makeVoiceCall"); + Intent intent = + new CallIntentBuilder(number, CallInitiationType.Type.IMS_VIDEO_BLOCKED_FALLBACK_TO_VOICE) + .setPhoneAccountHandle(accountHandle) + .build(); + DialerUtils.startActivityWithErrorToast(context, intent); + } +} diff --git a/java/com/android/incallui/disconnectdialog/res/values-af/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-af/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-af/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-am/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-am/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-am/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-ar/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ar/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-ar/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-az/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-az/strings.xml new file mode 100644 index 000000000..5a72e4c4a --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-az/strings.xml @@ -0,0 +1,24 @@ + + + + + "Aktiv edin" + "Video zəng hazırda əlçatan deyil" + "Daha sonra yenidən cəhd edin və ya audio zənglə davam edin." + "Video zəng" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-b+sr+Latn/strings.xml new file mode 100644 index 000000000..e782e705a --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-b+sr+Latn/strings.xml @@ -0,0 +1,24 @@ + + + + + "Omogući" + "Video poziv trenutno nije dostupan" + "Probajte ponovo da uputite poziv kasnije ili ga nastavite kao audio poziv." + "Audio poziv" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-be/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-be/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-be/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-bg/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-bg/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-bg/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-bn/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-bn/strings.xml new file mode 100644 index 000000000..dd0297c06 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-bn/strings.xml @@ -0,0 +1,24 @@ + + + + + "সক্ষম করুন" + "ভিডিও কলিং বর্তমানে উপলব্ধ নয়" + "পরে আবার কল করার চেষ্টা করুন বা কলটিকে একটি ভয়েস কল হিসাবে চালিয়ে যান৷" + "ভয়েস কল" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-bs/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-bs/strings.xml new file mode 100644 index 000000000..309427a2a --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-bs/strings.xml @@ -0,0 +1,24 @@ + + + + + "Omogući" + "Videopozivanje trenutno nije dostupno" + "Pozovite ponovo kasnije ili nastavite poziv kao glasovni poziv." + "Glasovni poziv" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-ca/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ca/strings.xml new file mode 100644 index 000000000..dca9551b9 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-ca/strings.xml @@ -0,0 +1,24 @@ + + + + + "Activa" + "Les videotrucades no estan disponibles actualment" + "Torna-ho a provar més tard o continua com a trucada de veu." + "Trucada de veu" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-cs/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-cs/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-cs/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-da/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-da/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-da/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-de/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-de/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-de/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-el/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-el/strings.xml new file mode 100644 index 000000000..1e182beb4 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-el/strings.xml @@ -0,0 +1,24 @@ + + + + + "Ενεργοποίηση" + "Η βιντεοκλήσεις δεν είναι προς το παρόν διαθέσιμες" + "Δοκιμάστε να καλέσετε ξανά αργότερα ή συνεχίστε την κλήση ως φωνητική κλήση." + "Φωνητική κλήση" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-en-rAU/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-en-rAU/strings.xml new file mode 100644 index 000000000..4665e11f1 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-en-rAU/strings.xml @@ -0,0 +1,24 @@ + + + + + "Enable" + "Video calling is currently not available" + "Try calling again later or continue the call as a voice call." + "Voice call" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-en-rGB/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-en-rGB/strings.xml new file mode 100644 index 000000000..4665e11f1 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-en-rGB/strings.xml @@ -0,0 +1,24 @@ + + + + + "Enable" + "Video calling is currently not available" + "Try calling again later or continue the call as a voice call." + "Voice call" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-en-rIN/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-en-rIN/strings.xml new file mode 100644 index 000000000..4665e11f1 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-en-rIN/strings.xml @@ -0,0 +1,24 @@ + + + + + "Enable" + "Video calling is currently not available" + "Try calling again later or continue the call as a voice call." + "Voice call" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-es-rUS/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-es-rUS/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-es-rUS/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-es/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-es/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-es/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-et/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-et/strings.xml new file mode 100644 index 000000000..dae212d9d --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-et/strings.xml @@ -0,0 +1,24 @@ + + + + + "Luba" + "Vidokõned pole praegu saadaval" + "Proovige hiljem uuesti helistada või jätkake helistamist häälkõnena." + "Häälkõne" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-eu/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-eu/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-eu/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-fa/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-fa/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-fa/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-fi/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-fi/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-fi/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-fr-rCA/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-fr-rCA/strings.xml new file mode 100644 index 000000000..e2bd4b1bb --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-fr-rCA/strings.xml @@ -0,0 +1,24 @@ + + + + + "Activer" + "Les appels vidéo ne sont pas disponibles pour le moment" + "Essayez de rappeler plus tard ou passez à un appel vocal." + "Appel vocal" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-fr/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-fr/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-fr/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-gl/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-gl/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-gl/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-gu/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-gu/strings.xml new file mode 100644 index 000000000..28825da37 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-gu/strings.xml @@ -0,0 +1,24 @@ + + + + + "સક્ષમ કરો" + "વિડિઓ કૉલિંગ હાલમાં ઉપલબ્ધ નથી" + "પછીથી ફરી કૉલ કરવાનો પ્રયાસ કરો અથવા કૉલને વૉઇસ કૉલ તરીકે ચાલુ રાખો." + "વૉઇસ કૉલ" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-hi/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-hi/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-hi/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-hr/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-hr/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-hr/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-hu/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-hu/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-hu/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-hy/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-hy/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-hy/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-in/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-in/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-in/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-is/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-is/strings.xml new file mode 100644 index 000000000..b16b43132 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-is/strings.xml @@ -0,0 +1,24 @@ + + + + + "Kveikja" + "Myndsímtal er ekki í boði sem stendur" + "Prófaðu að hringja aftur seinna eða hringdu hefðbundið símtal í staðinn" + "Símtal" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-it/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-it/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-it/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-iw/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-iw/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-iw/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-ja/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ja/strings.xml new file mode 100644 index 000000000..8e196f202 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-ja/strings.xml @@ -0,0 +1,24 @@ + + + + + "有効にする" + "ビデオハングアウトは現在利用できません" + "しばらくしてからもう一度試すか、音声通話で続けてください。" + "音声通話" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-ka/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ka/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-ka/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-kk/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-kk/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-kk/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-km/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-km/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-km/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-kn/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-kn/strings.xml new file mode 100644 index 000000000..384e92b4a --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-kn/strings.xml @@ -0,0 +1,24 @@ + + + + + "ಸಕ್ರಿಯಗೊಳಿಸಿ" + "ವೀಡಿಯೊ ಕರೆ ಪ್ರಸ್ತುತವಾಗಿ ಲಭ್ಯವಿಲ್ಲ" + "ನಂತರ ಮತ್ತೆ ಕರೆ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿ ಅಥವಾ ಧ್ವನಿ ಕರೆಯಂತೆ ಕರೆಯನ್ನು ಮುಂದುವರಿಸಿ." + "ಧ್ವನಿ ಕರೆ" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-ko/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ko/strings.xml new file mode 100644 index 000000000..30e156509 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-ko/strings.xml @@ -0,0 +1,24 @@ + + + + + "사용" + "현재 화상 통화를 사용할 수 없음" + "나중에 다시 전화하거나, 계속하려면 음성 통화를 이용하세요." + "음성 통화" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-ky/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ky/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-ky/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-lo/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-lo/strings.xml new file mode 100644 index 000000000..c3f8b96f8 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-lo/strings.xml @@ -0,0 +1,24 @@ + + + + + "ເປິດນຳໃຊ້" + "ຕອນນີ້ບໍ່ສາມາດໃຊ້ການໂທວິດີໂອໄດ້" + "ກະລຸນາລອງໂທໃໝ່ໃນພາຍຫຼັງ ຫຼື ສືບຕໍ່ສາຍເປັນການໂທແບບສຽງ." + "ການໂທດ້ວຍສຽງ" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-lt/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-lt/strings.xml new file mode 100644 index 000000000..38d6ef8bb --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-lt/strings.xml @@ -0,0 +1,24 @@ + + + + + "Įgalinti" + "Vaizdo skambučių funkcija šiuo metu nepasiekiama" + "Vėliau pabandykite skambinti dar kartą arba tęskite skambutį kaip balso skambutį." + "Balso skambutis" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-lv/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-lv/strings.xml new file mode 100644 index 000000000..279f0f56b --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-lv/strings.xml @@ -0,0 +1,24 @@ + + + + + "Iespējot" + "Videozvani pašlaik nav pieejami" + "Vēlāk mēģiniet zvanīt vēlreiz vai turpiniet sarunu kā balss zvanu." + "Balss zvans" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-mk/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-mk/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-mk/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-ml/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ml/strings.xml new file mode 100644 index 000000000..719d6e874 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-ml/strings.xml @@ -0,0 +1,24 @@ + + + + + "പ്രവർത്തനക്ഷമമാക്കുക" + "വീഡിയോ കോളിംഗ് നിലവിൽ ലഭ്യമല്ല" + "പിന്നീട് വീണ്ടും വിളിക്കുന്നതോ വോയ്‌സ് കോളായി കോൾ തുടരുന്നതോ പരീക്ഷിക്കൂ." + "വോയ്‌സ് കോൾ" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-mn/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-mn/strings.xml new file mode 100644 index 000000000..fae6708da --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-mn/strings.xml @@ -0,0 +1,24 @@ + + + + + "Идэвхжүүлэх" + "Одоогоор видео дуудлага хийх боломжгүй" + "Дараа дахин залгаж үзэх буюу энгийн дуудлагаар үргэлжлүүлнэ үү." + "Дуудлага" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-mr/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-mr/strings.xml new file mode 100644 index 000000000..854978594 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-mr/strings.xml @@ -0,0 +1,24 @@ + + + + + "चालू करा" + "व्हिडिओ कॉलिंग सध्या उपलब्ध नाही" + "नंतर पुन्हा कॉल करून पहा किंवा कॉल व्हॉइस कॉल म्हणून सुरू ठेवा." + "व्हॉईस कॉल" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-ms/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ms/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-ms/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-my/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-my/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-my/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-nb/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-nb/strings.xml new file mode 100644 index 000000000..14a41fad2 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-nb/strings.xml @@ -0,0 +1,24 @@ + + + + + "Slå på" + "Videoanrop er ikke tilgjengelige akkurat nå" + "Prøv å ringe på nytt senere eller fortsett anropet som taleanrop." + "Taleanrop" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-ne/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ne/strings.xml new file mode 100644 index 000000000..9cc63fd4d --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-ne/strings.xml @@ -0,0 +1,24 @@ + + + + + "सक्षम पार्नुहोस्" + "भिडियो कल हाल उपलब्ध छैन" + "पछि फेरि कल गर्ने प्रयास गर्नुहोस् वा भ्वाइस कलका रूपमा कल जारी राख्नुहोस्।" + "भ्वाइस कल" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-nl/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-nl/strings.xml new file mode 100644 index 000000000..c3380db4c --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-nl/strings.xml @@ -0,0 +1,24 @@ + + + + + "Inschakelen" + "Videobellen is momenteel niet beschikbaar" + "Probeer later opnieuw te bellen of start een spraakoproep." + "Spraakoproep" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-no/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-no/strings.xml new file mode 100644 index 000000000..14a41fad2 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-no/strings.xml @@ -0,0 +1,24 @@ + + + + + "Slå på" + "Videoanrop er ikke tilgjengelige akkurat nå" + "Prøv å ringe på nytt senere eller fortsett anropet som taleanrop." + "Taleanrop" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-pa/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-pa/strings.xml new file mode 100644 index 000000000..722183b3a --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-pa/strings.xml @@ -0,0 +1,24 @@ + + + + + "ਯੋਗ ਬਣਾਓ" + "ਵੀਡੀਓ ਕਾਲਿੰਗ ਇਸ ਵੇਲੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ" + "ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜਾਂ ਕਾਲ ਨੂੰ ਵੌਇਸ ਕਾਲ ਵਜੋਂ ਜਾਰੀ ਰੱਖੋ।" + "ਵੌਇਸ ਕਾਲ" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-pl/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-pl/strings.xml new file mode 100644 index 000000000..b8307e926 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-pl/strings.xml @@ -0,0 +1,24 @@ + + + + + "Włącz" + "Rozmowy wideo nie są obecnie dostępne" + "Spróbuj zadzwonić później, aby kontynuować rozmowę w trybie wideo." + "Połączenie głosowe" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-pt-rBR/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-pt-rBR/strings.xml new file mode 100644 index 000000000..ce249f67c --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-pt-rBR/strings.xml @@ -0,0 +1,24 @@ + + + + + "Ativar" + "O recurso de videochamada não está disponível no momento" + "Ligue novamente mais tarde ou continue esta chamada sem o vídeo." + "Chamada de voz" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-pt-rPT/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-pt-rPT/strings.xml new file mode 100644 index 000000000..7d11ede5f --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-pt-rPT/strings.xml @@ -0,0 +1,24 @@ + + + + + "Ativar" + "Neste momento, as videochamadas não estão disponíveis" + "Experimente efetuar a videochamada mais tarde ou continue a chamada como uma chamada de voz." + "Chamada de voz" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-pt/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-pt/strings.xml new file mode 100644 index 000000000..ce249f67c --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-pt/strings.xml @@ -0,0 +1,24 @@ + + + + + "Ativar" + "O recurso de videochamada não está disponível no momento" + "Ligue novamente mais tarde ou continue esta chamada sem o vídeo." + "Chamada de voz" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-ro/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ro/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-ro/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-ru/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ru/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-ru/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-si/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-si/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-si/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-sk/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-sk/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-sk/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-sl/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-sl/strings.xml new file mode 100644 index 000000000..6afd14cd5 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-sl/strings.xml @@ -0,0 +1,24 @@ + + + + + "Omogoči" + "Videoklicanje trenutno ni na voljo" + "Poskusite klicati znova pozneje ali pa klic nadaljujte kot glasovni klic." + "Glasovni klic" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-sq/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-sq/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-sq/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-sr/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-sr/strings.xml new file mode 100644 index 000000000..620c39e51 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-sr/strings.xml @@ -0,0 +1,24 @@ + + + + + "Омогући" + "Видео позив тренутно није доступан" + "Пробајте поново да упутите позив касније или га наставите као аудио позив." + "Аудио позив" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-sv/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-sv/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-sv/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-sw/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-sw/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-sw/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-ta/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ta/strings.xml new file mode 100644 index 000000000..626d0d66f --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-ta/strings.xml @@ -0,0 +1,24 @@ + + + + + "இயக்கு" + "தற்போது வீடியோவில் அழைக்க முடியாது" + "பிறகு அழைக்க முயற்சிக்கவும் அல்லது குரல் அழைப்பைச் செய்யவும்." + "குரல் அழைப்பு" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-te/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-te/strings.xml new file mode 100644 index 000000000..737d67763 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-te/strings.xml @@ -0,0 +1,24 @@ + + + + + "ప్రారంభించు" + "ప్రస్తుతం వీడియో కాలింగ్ అందుబాటులో లేదు" + "మళ్లీ కాల్ చేసి ప్రయత్నించండి లేదా కాల్‌ను వాయిస్ కాల్ వలె కొనసాగించండి." + "వాయిస్ కాల్" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-th/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-th/strings.xml new file mode 100644 index 000000000..a6fa2b165 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-th/strings.xml @@ -0,0 +1,24 @@ + + + + + "เปิดใช้" + "วิดีโอคอลไม่พร้อมใช้งานในตอนนี้" + "ลองโทรอีกครั้งในภายหลัง หรือโทรด้วยเสียงต่อไป" + "การโทรด้วยเสียง" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-tl/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-tl/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-tl/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-tr/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-tr/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-tr/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-uk/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-uk/strings.xml new file mode 100644 index 000000000..36a3c4574 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-uk/strings.xml @@ -0,0 +1,24 @@ + + + + + "Увімкнути" + "Наразі не можна здійснювати відеодзвінки" + "Спробуйте пізніше або перейдіть у режим голосового дзвінка." + "Голосовий дзвінок" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-ur/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ur/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-ur/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-uz/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-uz/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-uz/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-vi/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-vi/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-vi/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-zh-rCN/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-zh-rCN/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-zh-rCN/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-zh-rHK/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-zh-rHK/strings.xml new file mode 100644 index 000000000..605c84761 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-zh-rHK/strings.xml @@ -0,0 +1,24 @@ + + + + + "啟用" + "視像通話目前無法使用" + "請稍後再撥，或是以語音通話的形式繼續通話。" + "語音通話" + diff --git a/java/com/android/incallui/disconnectdialog/res/values-zh-rTW/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-zh-rTW/strings.xml new file mode 100644 index 000000000..dae242699 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-zh-rTW/strings.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/java/com/android/incallui/disconnectdialog/res/values-zu/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-zu/strings.xml new file mode 100644 index 000000000..1c0dd48ea --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-zu/strings.xml @@ -0,0 +1,24 @@ + + + + + "Nika amandla" + "Ukushaya kwevidiyo manje akutholakali" + "Zama ukushaya emuva kwesikhathi noma qhuba ikholi njengekholi yezwi." + "Ikholi yezwi" + diff --git a/java/com/android/incallui/disconnectdialog/res/values/strings.xml b/java/com/android/incallui/disconnectdialog/res/values/strings.xml new file mode 100644 index 000000000..91389db76 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values/strings.xml @@ -0,0 +1,32 @@ + + + + + + + Enable + + + Video calling is currently not available + + Try calling again later or continue the call as a voice call. + + Voice call + + diff --git a/java/com/android/incallui/incall/impl/InCallFragment.java b/java/com/android/incallui/incall/impl/InCallFragment.java index e102ee009..54d01e716 100644 --- a/java/com/android/incallui/incall/impl/InCallFragment.java +++ b/java/com/android/incallui/incall/impl/InCallFragment.java @@ -41,6 +41,8 @@ import android.widget.Toast; import com.android.dialer.common.Assert; import com.android.dialer.common.FragmentUtils; import com.android.dialer.common.LogUtil; +import com.android.dialer.logging.DialerImpression; +import com.android.dialer.logging.Logger; import com.android.dialer.multimedia.MultimediaData; import com.android.dialer.widget.LockableViewPager; import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment; @@ -385,6 +387,10 @@ public class InCallFragment extends Fragment show); if (isSupportedButton(buttonId)) { getButtonController(buttonId).setAllowed(show); + if (buttonId == InCallButtonIds.BUTTON_UPGRADE_TO_VIDEO && show) { + Logger.get(getContext()) + .logImpression(DialerImpression.Type.UPGRADE_TO_VIDEO_CALL_BUTTON_SHOWN); + } } } diff --git a/java/com/android/incallui/res/values-pl/strings.xml b/java/com/android/incallui/res/values-pl/strings.xml index 451c8ba73..cb27c7394 100644 --- a/java/com/android/incallui/res/values-pl/strings.xml +++ b/java/com/android/incallui/res/values-pl/strings.xml @@ -76,7 +76,7 @@ "Sieć komórkowa jest niedostępna." "Aby zadzwonić, wybierz prawidłowy numer." "Nie można dzwonić." - "Rozpoczynanie sekwencji MMI..." + "Uruchamiam sekwencję MMI..." "Usługa nie jest obsługiwana." "Nie można przełączyć połączeń." "Nie można rozdzielić połączenia." diff --git a/java/com/android/incallui/res/values-uz/strings.xml b/java/com/android/incallui/res/values-uz/strings.xml index 26120f119..2341da3c6 100644 --- a/java/com/android/incallui/res/values-uz/strings.xml +++ b/java/com/android/incallui/res/values-uz/strings.xml @@ -31,7 +31,7 @@ "Ovozli pochta raqami" "Raqam terilmoqda" "%s chaqiruvi javobsiz qoldi" - "Joriy qo‘ng‘iroq" + "Joriy chaqiruv" "Chiquvchi ishchi qo‘ng‘irog‘i" "Joriy Wi-Fi qo‘ng‘iroq" "Joriy Wi-Fi qo‘ng‘iroq (ish)" @@ -55,9 +55,9 @@ "Surat, xabar va joy. ax. ega muhim kiruv. chaqiruv" "Biriktirmalarga ega muhim kiruvchi chaqiruv" "Kiruvchi ishchi qo‘ng‘irog‘i" - "Kiruvchi Wi-Fi qo‘ng‘iroq" - "Kiruvchi Wi-Fi qo‘ng‘iroq (ish)" - "Shubhali kiruvchi qo‘ng‘iroq" + "Kiruvchi Wi-Fi chaqiruv" + "Kiruvchi Wi-Fi chaqiruv (ish)" + "Kiruvchi chaqiruv: shubhali spam" "Kiruvchi video so\'rovi" "Xizmat mavjud emas" "Tanlangan tarmoq (%s) mavjud emas" diff --git a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml index d2147ea62..b93db63ad 100644 --- a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml +++ b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml @@ -16,29 +16,34 @@ --> - + android:textAppearance="@style/Dialer.Incall.TextAppearance.Message" + android:background="@drawable/answer_text_only_background" + app:autoSizeTextType="uniform" + app:autoSizeMaxTextSize="44sp"/> - diff --git a/java/com/android/incallui/wifi/EnableWifiCallingPrompt.java b/java/com/android/incallui/wifi/EnableWifiCallingPrompt.java deleted file mode 100644 index 85603bfb1..000000000 --- a/java/com/android/incallui/wifi/EnableWifiCallingPrompt.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * 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.wifi; - -import android.app.AlertDialog; -import android.app.Dialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.DialogInterface.OnClickListener; -import android.content.Intent; -import android.support.annotation.NonNull; -import android.telecom.DisconnectCause; -import android.util.Pair; -import com.android.dialer.common.Assert; -import com.android.dialer.common.LogUtil; - -/** Prompts the user to enable Wi-Fi calling. */ -public class EnableWifiCallingPrompt { - // This is a hidden constant in android.telecom.DisconnectCause. Telecom sets this as a disconnect - // reason if it wants us to prompt the user to enable Wi-Fi calling. In Android-O we might - // consider using a more explicit way to signal this. - private static final String REASON_WIFI_ON_BUT_WFC_OFF = "REASON_WIFI_ON_BUT_WFC_OFF"; - private static final String ACTION_WIFI_CALLING_SETTINGS = - "android.settings.WIFI_CALLING_SETTINGS"; - private static final String ANDROID_SETTINGS_PACKAGE = "com.android.settings"; - - public static boolean shouldShowPrompt(@NonNull DisconnectCause cause) { - Assert.isNotNull(cause); - if (cause.getReason() != null && cause.getReason().startsWith(REASON_WIFI_ON_BUT_WFC_OFF)) { - LogUtil.i( - "EnableWifiCallingPrompt.shouldShowPrompt", - "showing prompt for disconnect cause: %s", - cause); - return true; - } - return false; - } - - @NonNull - public static Pair createDialog( - final @NonNull Context context, @NonNull DisconnectCause cause) { - Assert.isNotNull(context); - Assert.isNotNull(cause); - CharSequence message = cause.getDescription(); - Dialog dialog = - new AlertDialog.Builder(context) - .setMessage(message) - .setPositiveButton( - R.string.incall_enable_wifi_calling_button, - new OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - openWifiCallingSettings(context); - } - }) - .setNegativeButton(android.R.string.cancel, null) - .create(); - return new Pair(dialog, message); - } - - private static void openWifiCallingSettings(@NonNull Context context) { - LogUtil.i("EnableWifiCallingPrompt.openWifiCallingSettings", "opening settings"); - context.startActivity( - new Intent(ACTION_WIFI_CALLING_SETTINGS).setPackage(ANDROID_SETTINGS_PACKAGE)); - } - - private EnableWifiCallingPrompt() {} -} diff --git a/java/com/android/incallui/wifi/res/values-af/strings.xml b/java/com/android/incallui/wifi/res/values-af/strings.xml deleted file mode 100644 index d9df5c6c9..000000000 --- a/java/com/android/incallui/wifi/res/values-af/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Aktiveer" - diff --git a/java/com/android/incallui/wifi/res/values-am/strings.xml b/java/com/android/incallui/wifi/res/values-am/strings.xml deleted file mode 100644 index 1aa567318..000000000 --- a/java/com/android/incallui/wifi/res/values-am/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "አንቃ" - diff --git a/java/com/android/incallui/wifi/res/values-ar/strings.xml b/java/com/android/incallui/wifi/res/values-ar/strings.xml deleted file mode 100644 index 972cd37b2..000000000 --- a/java/com/android/incallui/wifi/res/values-ar/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "تمكين" - diff --git a/java/com/android/incallui/wifi/res/values-az/strings.xml b/java/com/android/incallui/wifi/res/values-az/strings.xml deleted file mode 100644 index 46bbda1a9..000000000 --- a/java/com/android/incallui/wifi/res/values-az/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Aktiv edin" - diff --git a/java/com/android/incallui/wifi/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/wifi/res/values-b+sr+Latn/strings.xml deleted file mode 100644 index 51a57e403..000000000 --- a/java/com/android/incallui/wifi/res/values-b+sr+Latn/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Omogući" - diff --git a/java/com/android/incallui/wifi/res/values-be/strings.xml b/java/com/android/incallui/wifi/res/values-be/strings.xml deleted file mode 100644 index a8277a119..000000000 --- a/java/com/android/incallui/wifi/res/values-be/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Уключыць" - diff --git a/java/com/android/incallui/wifi/res/values-bg/strings.xml b/java/com/android/incallui/wifi/res/values-bg/strings.xml deleted file mode 100644 index ff5b94d90..000000000 --- a/java/com/android/incallui/wifi/res/values-bg/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Активиране" - diff --git a/java/com/android/incallui/wifi/res/values-bn/strings.xml b/java/com/android/incallui/wifi/res/values-bn/strings.xml deleted file mode 100644 index 94e84c371..000000000 --- a/java/com/android/incallui/wifi/res/values-bn/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "সক্ষম করুন" - diff --git a/java/com/android/incallui/wifi/res/values-bs/strings.xml b/java/com/android/incallui/wifi/res/values-bs/strings.xml deleted file mode 100644 index 51a57e403..000000000 --- a/java/com/android/incallui/wifi/res/values-bs/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Omogući" - diff --git a/java/com/android/incallui/wifi/res/values-ca/strings.xml b/java/com/android/incallui/wifi/res/values-ca/strings.xml deleted file mode 100644 index 8af77c9d8..000000000 --- a/java/com/android/incallui/wifi/res/values-ca/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Activa" - diff --git a/java/com/android/incallui/wifi/res/values-cs/strings.xml b/java/com/android/incallui/wifi/res/values-cs/strings.xml deleted file mode 100644 index b057d1cc0..000000000 --- a/java/com/android/incallui/wifi/res/values-cs/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Zapnout" - diff --git a/java/com/android/incallui/wifi/res/values-da/strings.xml b/java/com/android/incallui/wifi/res/values-da/strings.xml deleted file mode 100644 index 81f837ff5..000000000 --- a/java/com/android/incallui/wifi/res/values-da/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Aktivér" - diff --git a/java/com/android/incallui/wifi/res/values-de/strings.xml b/java/com/android/incallui/wifi/res/values-de/strings.xml deleted file mode 100644 index d6dda7ecb..000000000 --- a/java/com/android/incallui/wifi/res/values-de/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Aktivieren" - diff --git a/java/com/android/incallui/wifi/res/values-el/strings.xml b/java/com/android/incallui/wifi/res/values-el/strings.xml deleted file mode 100644 index c1817432c..000000000 --- a/java/com/android/incallui/wifi/res/values-el/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Ενεργοποίηση" - diff --git a/java/com/android/incallui/wifi/res/values-en-rAU/strings.xml b/java/com/android/incallui/wifi/res/values-en-rAU/strings.xml deleted file mode 100644 index 6877c4957..000000000 --- a/java/com/android/incallui/wifi/res/values-en-rAU/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Enable" - diff --git a/java/com/android/incallui/wifi/res/values-en-rGB/strings.xml b/java/com/android/incallui/wifi/res/values-en-rGB/strings.xml deleted file mode 100644 index 6877c4957..000000000 --- a/java/com/android/incallui/wifi/res/values-en-rGB/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Enable" - diff --git a/java/com/android/incallui/wifi/res/values-en-rIN/strings.xml b/java/com/android/incallui/wifi/res/values-en-rIN/strings.xml deleted file mode 100644 index 6877c4957..000000000 --- a/java/com/android/incallui/wifi/res/values-en-rIN/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Enable" - diff --git a/java/com/android/incallui/wifi/res/values-es-rUS/strings.xml b/java/com/android/incallui/wifi/res/values-es-rUS/strings.xml deleted file mode 100644 index f460251db..000000000 --- a/java/com/android/incallui/wifi/res/values-es-rUS/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Habilitar" - diff --git a/java/com/android/incallui/wifi/res/values-es/strings.xml b/java/com/android/incallui/wifi/res/values-es/strings.xml deleted file mode 100644 index f460251db..000000000 --- a/java/com/android/incallui/wifi/res/values-es/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Habilitar" - diff --git a/java/com/android/incallui/wifi/res/values-et/strings.xml b/java/com/android/incallui/wifi/res/values-et/strings.xml deleted file mode 100644 index ae447bde1..000000000 --- a/java/com/android/incallui/wifi/res/values-et/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Luba" - diff --git a/java/com/android/incallui/wifi/res/values-eu/strings.xml b/java/com/android/incallui/wifi/res/values-eu/strings.xml deleted file mode 100644 index 557bdfbb9..000000000 --- a/java/com/android/incallui/wifi/res/values-eu/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Gaitu" - diff --git a/java/com/android/incallui/wifi/res/values-fa/strings.xml b/java/com/android/incallui/wifi/res/values-fa/strings.xml deleted file mode 100644 index a1bf8dafb..000000000 --- a/java/com/android/incallui/wifi/res/values-fa/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "فعال کردن" - diff --git a/java/com/android/incallui/wifi/res/values-fi/strings.xml b/java/com/android/incallui/wifi/res/values-fi/strings.xml deleted file mode 100644 index 06aac1d7c..000000000 --- a/java/com/android/incallui/wifi/res/values-fi/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Ota käyttöön" - diff --git a/java/com/android/incallui/wifi/res/values-fr-rCA/strings.xml b/java/com/android/incallui/wifi/res/values-fr-rCA/strings.xml deleted file mode 100644 index ff7bc8b4e..000000000 --- a/java/com/android/incallui/wifi/res/values-fr-rCA/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Activer" - diff --git a/java/com/android/incallui/wifi/res/values-fr/strings.xml b/java/com/android/incallui/wifi/res/values-fr/strings.xml deleted file mode 100644 index ff7bc8b4e..000000000 --- a/java/com/android/incallui/wifi/res/values-fr/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Activer" - diff --git a/java/com/android/incallui/wifi/res/values-gl/strings.xml b/java/com/android/incallui/wifi/res/values-gl/strings.xml deleted file mode 100644 index eb6e93982..000000000 --- a/java/com/android/incallui/wifi/res/values-gl/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Activar" - diff --git a/java/com/android/incallui/wifi/res/values-gu/strings.xml b/java/com/android/incallui/wifi/res/values-gu/strings.xml deleted file mode 100644 index 39b9849e9..000000000 --- a/java/com/android/incallui/wifi/res/values-gu/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "સક્ષમ કરો" - diff --git a/java/com/android/incallui/wifi/res/values-hi/strings.xml b/java/com/android/incallui/wifi/res/values-hi/strings.xml deleted file mode 100644 index f6c6b78ca..000000000 --- a/java/com/android/incallui/wifi/res/values-hi/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "सक्षम करें" - diff --git a/java/com/android/incallui/wifi/res/values-hr/strings.xml b/java/com/android/incallui/wifi/res/values-hr/strings.xml deleted file mode 100644 index 51a57e403..000000000 --- a/java/com/android/incallui/wifi/res/values-hr/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Omogući" - diff --git a/java/com/android/incallui/wifi/res/values-hu/strings.xml b/java/com/android/incallui/wifi/res/values-hu/strings.xml deleted file mode 100644 index c1daa2437..000000000 --- a/java/com/android/incallui/wifi/res/values-hu/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Engedélyezés" - diff --git a/java/com/android/incallui/wifi/res/values-hy/strings.xml b/java/com/android/incallui/wifi/res/values-hy/strings.xml deleted file mode 100644 index e9390bdc2..000000000 --- a/java/com/android/incallui/wifi/res/values-hy/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Միացնել" - diff --git a/java/com/android/incallui/wifi/res/values-in/strings.xml b/java/com/android/incallui/wifi/res/values-in/strings.xml deleted file mode 100644 index c6ed43cbb..000000000 --- a/java/com/android/incallui/wifi/res/values-in/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Aktifkan" - diff --git a/java/com/android/incallui/wifi/res/values-is/strings.xml b/java/com/android/incallui/wifi/res/values-is/strings.xml deleted file mode 100644 index 03316aa09..000000000 --- a/java/com/android/incallui/wifi/res/values-is/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Kveikja" - diff --git a/java/com/android/incallui/wifi/res/values-it/strings.xml b/java/com/android/incallui/wifi/res/values-it/strings.xml deleted file mode 100644 index d53ccdcff..000000000 --- a/java/com/android/incallui/wifi/res/values-it/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Abilita" - diff --git a/java/com/android/incallui/wifi/res/values-iw/strings.xml b/java/com/android/incallui/wifi/res/values-iw/strings.xml deleted file mode 100644 index c624f6494..000000000 --- a/java/com/android/incallui/wifi/res/values-iw/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "הפעל" - diff --git a/java/com/android/incallui/wifi/res/values-ja/strings.xml b/java/com/android/incallui/wifi/res/values-ja/strings.xml deleted file mode 100644 index e918153be..000000000 --- a/java/com/android/incallui/wifi/res/values-ja/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "有効にする" - diff --git a/java/com/android/incallui/wifi/res/values-ka/strings.xml b/java/com/android/incallui/wifi/res/values-ka/strings.xml deleted file mode 100644 index bd778d58a..000000000 --- a/java/com/android/incallui/wifi/res/values-ka/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "ჩართვა" - diff --git a/java/com/android/incallui/wifi/res/values-kk/strings.xml b/java/com/android/incallui/wifi/res/values-kk/strings.xml deleted file mode 100644 index c0c62a415..000000000 --- a/java/com/android/incallui/wifi/res/values-kk/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Қосу" - diff --git a/java/com/android/incallui/wifi/res/values-km/strings.xml b/java/com/android/incallui/wifi/res/values-km/strings.xml deleted file mode 100644 index 73f194f10..000000000 --- a/java/com/android/incallui/wifi/res/values-km/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "បើក" - diff --git a/java/com/android/incallui/wifi/res/values-kn/strings.xml b/java/com/android/incallui/wifi/res/values-kn/strings.xml deleted file mode 100644 index 2f776cf08..000000000 --- a/java/com/android/incallui/wifi/res/values-kn/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "ಸಕ್ರಿಯಗೊಳಿಸಿ" - diff --git a/java/com/android/incallui/wifi/res/values-ko/strings.xml b/java/com/android/incallui/wifi/res/values-ko/strings.xml deleted file mode 100644 index 354efe699..000000000 --- a/java/com/android/incallui/wifi/res/values-ko/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "사용" - diff --git a/java/com/android/incallui/wifi/res/values-ky/strings.xml b/java/com/android/incallui/wifi/res/values-ky/strings.xml deleted file mode 100644 index 6cf39dbe1..000000000 --- a/java/com/android/incallui/wifi/res/values-ky/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Иштетүү" - diff --git a/java/com/android/incallui/wifi/res/values-lo/strings.xml b/java/com/android/incallui/wifi/res/values-lo/strings.xml deleted file mode 100644 index a34d48ea9..000000000 --- a/java/com/android/incallui/wifi/res/values-lo/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "ເປິດນຳໃຊ້" - diff --git a/java/com/android/incallui/wifi/res/values-lt/strings.xml b/java/com/android/incallui/wifi/res/values-lt/strings.xml deleted file mode 100644 index b473b2d85..000000000 --- a/java/com/android/incallui/wifi/res/values-lt/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Įgalinti" - diff --git a/java/com/android/incallui/wifi/res/values-lv/strings.xml b/java/com/android/incallui/wifi/res/values-lv/strings.xml deleted file mode 100644 index 670484635..000000000 --- a/java/com/android/incallui/wifi/res/values-lv/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Iespējot" - diff --git a/java/com/android/incallui/wifi/res/values-mk/strings.xml b/java/com/android/incallui/wifi/res/values-mk/strings.xml deleted file mode 100644 index 30e6e8496..000000000 --- a/java/com/android/incallui/wifi/res/values-mk/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Овозможи" - diff --git a/java/com/android/incallui/wifi/res/values-ml/strings.xml b/java/com/android/incallui/wifi/res/values-ml/strings.xml deleted file mode 100644 index d20daa1f2..000000000 --- a/java/com/android/incallui/wifi/res/values-ml/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "പ്രവർത്തനക്ഷമമാക്കുക" - diff --git a/java/com/android/incallui/wifi/res/values-mn/strings.xml b/java/com/android/incallui/wifi/res/values-mn/strings.xml deleted file mode 100644 index a0b6bb414..000000000 --- a/java/com/android/incallui/wifi/res/values-mn/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Идэвхжүүлэх" - diff --git a/java/com/android/incallui/wifi/res/values-mr/strings.xml b/java/com/android/incallui/wifi/res/values-mr/strings.xml deleted file mode 100644 index e45dda101..000000000 --- a/java/com/android/incallui/wifi/res/values-mr/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "सक्षम करा" - diff --git a/java/com/android/incallui/wifi/res/values-ms/strings.xml b/java/com/android/incallui/wifi/res/values-ms/strings.xml deleted file mode 100644 index d87f96c89..000000000 --- a/java/com/android/incallui/wifi/res/values-ms/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Dayakan" - diff --git a/java/com/android/incallui/wifi/res/values-my/strings.xml b/java/com/android/incallui/wifi/res/values-my/strings.xml deleted file mode 100644 index 93fba1cca..000000000 --- a/java/com/android/incallui/wifi/res/values-my/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "ဖွင့်ရန်" - diff --git a/java/com/android/incallui/wifi/res/values-nb/strings.xml b/java/com/android/incallui/wifi/res/values-nb/strings.xml deleted file mode 100644 index 0afafec16..000000000 --- a/java/com/android/incallui/wifi/res/values-nb/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Slå på" - diff --git a/java/com/android/incallui/wifi/res/values-ne/strings.xml b/java/com/android/incallui/wifi/res/values-ne/strings.xml deleted file mode 100644 index 0f15de79d..000000000 --- a/java/com/android/incallui/wifi/res/values-ne/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "सक्षम पार्नुहोस्" - diff --git a/java/com/android/incallui/wifi/res/values-nl/strings.xml b/java/com/android/incallui/wifi/res/values-nl/strings.xml deleted file mode 100644 index 4fed4b312..000000000 --- a/java/com/android/incallui/wifi/res/values-nl/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Inschakelen" - diff --git a/java/com/android/incallui/wifi/res/values-no/strings.xml b/java/com/android/incallui/wifi/res/values-no/strings.xml deleted file mode 100644 index 0afafec16..000000000 --- a/java/com/android/incallui/wifi/res/values-no/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Slå på" - diff --git a/java/com/android/incallui/wifi/res/values-pa/strings.xml b/java/com/android/incallui/wifi/res/values-pa/strings.xml deleted file mode 100644 index 33974915a..000000000 --- a/java/com/android/incallui/wifi/res/values-pa/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "ਯੋਗ ਬਣਾਓ" - diff --git a/java/com/android/incallui/wifi/res/values-pl/strings.xml b/java/com/android/incallui/wifi/res/values-pl/strings.xml deleted file mode 100644 index 43ff017d1..000000000 --- a/java/com/android/incallui/wifi/res/values-pl/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Włącz" - diff --git a/java/com/android/incallui/wifi/res/values-pt-rBR/strings.xml b/java/com/android/incallui/wifi/res/values-pt-rBR/strings.xml deleted file mode 100644 index 4f1a42319..000000000 --- a/java/com/android/incallui/wifi/res/values-pt-rBR/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Ativar" - diff --git a/java/com/android/incallui/wifi/res/values-pt-rPT/strings.xml b/java/com/android/incallui/wifi/res/values-pt-rPT/strings.xml deleted file mode 100644 index 4f1a42319..000000000 --- a/java/com/android/incallui/wifi/res/values-pt-rPT/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Ativar" - diff --git a/java/com/android/incallui/wifi/res/values-pt/strings.xml b/java/com/android/incallui/wifi/res/values-pt/strings.xml deleted file mode 100644 index 4f1a42319..000000000 --- a/java/com/android/incallui/wifi/res/values-pt/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Ativar" - diff --git a/java/com/android/incallui/wifi/res/values-ro/strings.xml b/java/com/android/incallui/wifi/res/values-ro/strings.xml deleted file mode 100644 index af9004517..000000000 --- a/java/com/android/incallui/wifi/res/values-ro/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Activați" - diff --git a/java/com/android/incallui/wifi/res/values-ru/strings.xml b/java/com/android/incallui/wifi/res/values-ru/strings.xml deleted file mode 100644 index 00ae00e91..000000000 --- a/java/com/android/incallui/wifi/res/values-ru/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Включить" - diff --git a/java/com/android/incallui/wifi/res/values-si/strings.xml b/java/com/android/incallui/wifi/res/values-si/strings.xml deleted file mode 100644 index a19c389de..000000000 --- a/java/com/android/incallui/wifi/res/values-si/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "සබල කරන්න" - diff --git a/java/com/android/incallui/wifi/res/values-sk/strings.xml b/java/com/android/incallui/wifi/res/values-sk/strings.xml deleted file mode 100644 index 252f6e544..000000000 --- a/java/com/android/incallui/wifi/res/values-sk/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Povoliť" - diff --git a/java/com/android/incallui/wifi/res/values-sl/strings.xml b/java/com/android/incallui/wifi/res/values-sl/strings.xml deleted file mode 100644 index f1efb71f3..000000000 --- a/java/com/android/incallui/wifi/res/values-sl/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Omogoči" - diff --git a/java/com/android/incallui/wifi/res/values-sq/strings.xml b/java/com/android/incallui/wifi/res/values-sq/strings.xml deleted file mode 100644 index c69185da5..000000000 --- a/java/com/android/incallui/wifi/res/values-sq/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Aktivizo" - diff --git a/java/com/android/incallui/wifi/res/values-sr/strings.xml b/java/com/android/incallui/wifi/res/values-sr/strings.xml deleted file mode 100644 index 8bd22f602..000000000 --- a/java/com/android/incallui/wifi/res/values-sr/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Омогући" - diff --git a/java/com/android/incallui/wifi/res/values-sv/strings.xml b/java/com/android/incallui/wifi/res/values-sv/strings.xml deleted file mode 100644 index d0dbc4067..000000000 --- a/java/com/android/incallui/wifi/res/values-sv/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Aktivera" - diff --git a/java/com/android/incallui/wifi/res/values-sw/strings.xml b/java/com/android/incallui/wifi/res/values-sw/strings.xml deleted file mode 100644 index f0cb2456f..000000000 --- a/java/com/android/incallui/wifi/res/values-sw/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Washa" - diff --git a/java/com/android/incallui/wifi/res/values-ta/strings.xml b/java/com/android/incallui/wifi/res/values-ta/strings.xml deleted file mode 100644 index 38628af21..000000000 --- a/java/com/android/incallui/wifi/res/values-ta/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "இயக்கு" - diff --git a/java/com/android/incallui/wifi/res/values-te/strings.xml b/java/com/android/incallui/wifi/res/values-te/strings.xml deleted file mode 100644 index 40fd08f27..000000000 --- a/java/com/android/incallui/wifi/res/values-te/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "ప్రారంభించు" - diff --git a/java/com/android/incallui/wifi/res/values-th/strings.xml b/java/com/android/incallui/wifi/res/values-th/strings.xml deleted file mode 100644 index f201a20b9..000000000 --- a/java/com/android/incallui/wifi/res/values-th/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "เปิดใช้" - diff --git a/java/com/android/incallui/wifi/res/values-tl/strings.xml b/java/com/android/incallui/wifi/res/values-tl/strings.xml deleted file mode 100644 index b182eec86..000000000 --- a/java/com/android/incallui/wifi/res/values-tl/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "I-enable" - diff --git a/java/com/android/incallui/wifi/res/values-tr/strings.xml b/java/com/android/incallui/wifi/res/values-tr/strings.xml deleted file mode 100644 index 65e70e23f..000000000 --- a/java/com/android/incallui/wifi/res/values-tr/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Etkinleştir" - diff --git a/java/com/android/incallui/wifi/res/values-uk/strings.xml b/java/com/android/incallui/wifi/res/values-uk/strings.xml deleted file mode 100644 index db64076c5..000000000 --- a/java/com/android/incallui/wifi/res/values-uk/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Увімкнути" - diff --git a/java/com/android/incallui/wifi/res/values-ur/strings.xml b/java/com/android/incallui/wifi/res/values-ur/strings.xml deleted file mode 100644 index a78828065..000000000 --- a/java/com/android/incallui/wifi/res/values-ur/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "فعال کریں" - diff --git a/java/com/android/incallui/wifi/res/values-uz/strings.xml b/java/com/android/incallui/wifi/res/values-uz/strings.xml deleted file mode 100644 index dd5c47558..000000000 --- a/java/com/android/incallui/wifi/res/values-uz/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Yoqish" - diff --git a/java/com/android/incallui/wifi/res/values-vi/strings.xml b/java/com/android/incallui/wifi/res/values-vi/strings.xml deleted file mode 100644 index 003d5ad35..000000000 --- a/java/com/android/incallui/wifi/res/values-vi/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Bật" - diff --git a/java/com/android/incallui/wifi/res/values-zh-rCN/strings.xml b/java/com/android/incallui/wifi/res/values-zh-rCN/strings.xml deleted file mode 100644 index a198042c3..000000000 --- a/java/com/android/incallui/wifi/res/values-zh-rCN/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "启用" - diff --git a/java/com/android/incallui/wifi/res/values-zh-rHK/strings.xml b/java/com/android/incallui/wifi/res/values-zh-rHK/strings.xml deleted file mode 100644 index b7cf926a1..000000000 --- a/java/com/android/incallui/wifi/res/values-zh-rHK/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "啟用" - diff --git a/java/com/android/incallui/wifi/res/values-zh-rTW/strings.xml b/java/com/android/incallui/wifi/res/values-zh-rTW/strings.xml deleted file mode 100644 index b7cf926a1..000000000 --- a/java/com/android/incallui/wifi/res/values-zh-rTW/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "啟用" - diff --git a/java/com/android/incallui/wifi/res/values-zu/strings.xml b/java/com/android/incallui/wifi/res/values-zu/strings.xml deleted file mode 100644 index 6c516e7f2..000000000 --- a/java/com/android/incallui/wifi/res/values-zu/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Vumela" - diff --git a/java/com/android/incallui/wifi/res/values/strings.xml b/java/com/android/incallui/wifi/res/values/strings.xml deleted file mode 100644 index 1b52b9fdc..000000000 --- a/java/com/android/incallui/wifi/res/values/strings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - Enable - - diff --git a/java/com/android/voicemail/impl/OmtpConstants.java b/java/com/android/voicemail/impl/OmtpConstants.java index 599d0d5f0..97da2a8e3 100644 --- a/java/com/android/voicemail/impl/OmtpConstants.java +++ b/java/com/android/voicemail/impl/OmtpConstants.java @@ -234,6 +234,39 @@ public class OmtpConstants { public static final int CHANGE_PIN_INVALID_CHARACTER = 5; public static final int CHANGE_PIN_SYSTEM_ERROR = 6; - /** Indicates the client is Google visual voicemail version 1.0. */ - public static final String CLIENT_TYPE_GOOGLE_10 = "google.vvm.10"; + public static String getClientType() { + String manufacturer = + truncate( + android.os.Build.MANUFACTURER + .replace('=', '_') + .replace(';', '_') + .replace('.', '_') + .replace(' ', '_'), + 12); + + String version = + truncate( + android.os.Build.VERSION + .RELEASE + .replace('=', '_') + .replace(';', '_') + .replace('.', '_') + .replace(' ', '_'), + 8); + + String model = + truncate( + android.os.Build.MODEL + .replace('=', '_') + .replace(';', '_') + .replace('.', '_') + .replace(' ', '_'), + 28 - manufacturer.length() - version.length()); + + return String.format("%s.%s.%s", manufacturer, model, version); + } + + private static final String truncate(String string, int length) { + return string.substring(0, Math.min(length, string.length())); + } } diff --git a/java/com/android/voicemail/impl/protocol/OmtpProtocol.java b/java/com/android/voicemail/impl/protocol/OmtpProtocol.java index 27aab8a7c..971edcf4f 100644 --- a/java/com/android/voicemail/impl/protocol/OmtpProtocol.java +++ b/java/com/android/voicemail/impl/protocol/OmtpProtocol.java @@ -35,7 +35,7 @@ public class OmtpProtocol extends VisualVoicemailProtocol { phoneAccountHandle, applicationPort, destinationNumber, - OmtpConstants.CLIENT_TYPE_GOOGLE_10, + OmtpConstants.getClientType(), OmtpConstants.PROTOCOL_VERSION1_1, null /*clientPrefix*/); } diff --git a/java/com/android/voicemail/impl/transcribe/TranscriptionTask.java b/java/com/android/voicemail/impl/transcribe/TranscriptionTask.java index 0fbc33ad5..a14b6df91 100644 --- a/java/com/android/voicemail/impl/transcribe/TranscriptionTask.java +++ b/java/com/android/voicemail/impl/transcribe/TranscriptionTask.java @@ -21,6 +21,8 @@ import android.content.Context; import android.net.Uri; import android.text.TextUtils; import com.android.dialer.common.concurrent.ThreadUtil; +import com.android.dialer.logging.DialerImpression; +import com.android.dialer.logging.Logger; import com.android.voicemail.impl.VvmLog; import com.android.voicemail.impl.transcribe.TranscriptionService.JobCallback; import com.android.voicemail.impl.transcribe.grpc.TranscriptionClient; @@ -98,24 +100,37 @@ public class TranscriptionTask implements Runnable { String transcript = null; for (int i = 0; transcript == null && i < MAX_RETRIES; i++) { VvmLog.i(TAG, "transcribeVoicemail, try: " + (i + 1)); + if (i == 0) { + Logger.get(context).logImpression(DialerImpression.Type.VVM_TRANSCRIPTION_REQUEST_SENT); + } else { + Logger.get(context).logImpression(DialerImpression.Type.VVM_TRANSCRIPTION_REQUEST_RETRY); + } TranscriptionClient.TranscriptionResponseWrapper responseWrapper = client.transcribeVoicemail(request); if (responseWrapper.status != null) { VvmLog.i(TAG, "transcribeVoicemail, status: " + responseWrapper.status.getCode()); if (shouldRetryRequest(responseWrapper.status)) { + Logger.get(context) + .logImpression(DialerImpression.Type.VVM_TRANSCRIPTION_RESPONSE_RECOVERABLE_ERROR); backoff(i); } else { + Logger.get(context) + .logImpression(DialerImpression.Type.VVM_TRANSCRIPTION_RESPONSE_FATAL_ERROR); break; } } else if (responseWrapper.response != null) { if (!TextUtils.isEmpty(responseWrapper.response.getTranscript())) { VvmLog.i(TAG, "transcribeVoicemail, got response"); transcript = responseWrapper.response.getTranscript(); + Logger.get(context) + .logImpression(DialerImpression.Type.VVM_TRANSCRIPTION_RESPONSE_SUCCESS); } else { VvmLog.i(TAG, "transcribeVoicemail, empty transcription"); + Logger.get(context).logImpression(DialerImpression.Type.VVM_TRANSCRIPTION_RESPONSE_EMPTY); } } else { VvmLog.w(TAG, "transcribeVoicemail, no response"); + Logger.get(context).logImpression(DialerImpression.Type.VVM_TRANSCRIPTION_RESPONSE_INVALID); } } -- cgit v1.2.3