From 10ae593a59aa50963e1d3159747da2d65ca79bed Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Fri, 4 Aug 2017 14:54:19 -0700 Subject: This change brings Dialer oc-mr1-dev up to date with v11.1 RC06. This is to resolve a merge conflict in: I48296c56fb1d275a06b7c314f5380266c1195ef2 Test: make master is already up to date and Merged-In: I858e3665253139b8aab4e4c063bfc4c419f33cc9 Change-Id: Ifc146f2fec24fd2f8a51cd32feb3699bb1c07136 --- Android.mk | 5 +- AndroidManifest.xml | 5 +- .../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 .../drawable/quantum_ic_enterprise_vd_theme_24.xml | 2 +- .../common/compat/TelephonyManagerCompat.java | 6 +- .../compat/telecom/TelecomManagerCompat.java | 4 +- .../database/NoNullCursorAsyncQueryHandler.java | 31 ---- .../common/list/PhoneNumberListAdapter.java | 7 +- .../common/list/PhoneNumberPickerFragment.java | 2 +- .../contacts/common/res/values-zh-rHK/strings.xml | 2 +- .../android/contacts/common/res/values/colors.xml | 1 - .../about/res/raw/third_party_license_metadata | 0 .../dialer/about/res/raw/third_party_licenses | 0 java/com/android/dialer/app/DialtactsActivity.java | 8 +- .../android/dialer/app/calllog/CallLogAdapter.java | 44 +++--- .../app/calllog/CallLogListItemViewHolder.java | 29 ++-- .../calllogcache/CallLogCacheLollipopMr1.java | 96 +++++++++++ .../dialer/app/contactinfo/ContactInfoCache.java | 2 +- .../com/android/dialer/app/list/ListsFragment.java | 4 +- .../res/drawable-hdpi/ic_dialer_fork_add_call.png | Bin .../drawable-hdpi/ic_dialer_fork_current_call.png | Bin .../res/drawable-hdpi/ic_dialer_fork_tt_keypad.png | Bin .../app/res/layout/call_log_list_item_actions.xml | 3 +- .../android/dialer/app/res/values-bs/strings.xml | 6 +- .../android/dialer/app/res/values-da/strings.xml | 2 +- .../android/dialer/app/res/values-sq/strings.xml | 4 +- .../android/dialer/app/res/values-ur/strings.xml | 4 +- .../app/voicemail/VoicemailErrorManager.java | 2 +- .../app/voicemail/VoicemailPlaybackLayout.java | 2 +- .../app/voicemail/VoicemailPlaybackPresenter.java | 6 + .../error/VoicemailTosMessageCreator.java | 35 ++++- .../error/Vvm3VoicemailMessageCreator.java | 2 +- .../dialer/binary/google/AndroidManifest.xml | 118 -------------- .../binary/google/GoogleStubDialerApplication.java | 37 ----- .../google/GoogleStubDialerRootComponent.java | 52 ------ .../blocking/FilteredNumberAsyncQueryHandler.java | 2 +- .../dialer/blocking/FilteredNumberCompat.java | 2 +- .../dialer/blocking/res/values-hu/strings.xml | 2 +- .../buildtype/bugfood/BuildTypeAccessorImpl.java | 30 ---- .../buildtype/dogfood/BuildTypeAccessorImpl.java | 30 ---- .../buildtype/fishfood/BuildTypeAccessorImpl.java | 30 ---- .../buildtype/test/BuildTypeAccessorImpl.java | 30 ---- .../dialer/callcomposer/CallComposerActivity.java | 2 +- .../callcomposer/CameraComposerFragment.java | 17 +- .../dialer/callcomposer/camera/CameraManager.java | 2 +- .../camera/camerafocus/FocusOverlayManager.java | 2 +- .../callcomposer/camera/exif/ExifParser.java | 2 +- .../dialer/callcomposer/camera/exif/ExifTag.java | 2 +- .../res/layout/fragment_message_composer.xml | 1 + .../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 | 8 +- .../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 +- .../dialer/callcomposer/res/values/dimens.xml | 12 +- .../dialer/callcomposer/res/values/styles.xml | 3 +- .../dialer/calldetails/CallDetailsAdapter.java | 5 +- .../calldetails/CallDetailsEntryViewHolder.java | 6 +- .../calldetails/CallDetailsHeaderViewHolder.java | 5 +- .../calldetails/proto/call_details_entries.proto | 1 - .../dialer/calldetails/res/values-uz/strings.xml | 2 +- .../dialer/callintent/call_initiation_type.proto | 1 - .../callintent/speed_dial_contact_type.proto | 1 - .../database/AnnotatedCallLogDatabaseHelper.java | 2 +- .../android/dialer/calllog/database/Coalescer.java | 2 +- .../datasources/contacts/ContactsDataSource.java | 10 +- .../systemcalllog/SystemCallLogDataSource.java | 4 +- .../dialer/calllog/ui/NewCallLogFragment.java | 4 +- .../dialer/calllog/ui/NewCallLogViewHolder.java | 2 +- .../dialer/calllogutils/CallEntryFormatter.java | 24 ++- .../dialer/calllogutils/CallTypeHelper.java | 28 +--- .../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 | 5 - .../constants/googledialer/ConstantsImpl.java | 43 ----- .../contactactions/ContactActionBottomSheet.java | 2 +- .../dialer/contactsfragment/FastScroller.java | 1 - .../dialer/database/CallLogQueryHandler.java | 14 ++ .../dialer/database/VoicemailStatusQuery.java | 2 +- .../dialer/enrichedcall/EnrichedCallManager.java | 9 -- .../enrichedcall/stub/EnrichedCallManagerStub.java | 9 -- .../videoshare/VideoShareListener.java | 1 - .../enrichedcall/videoshare/VideoShareSession.java | 39 ----- .../res/layout/phone_disambig_item.xml | 0 .../dialer/interactions/res/values-bs/strings.xml | 4 +- .../android/dialer/lightbringer/Lightbringer.java | 11 +- .../dialer/lightbringer/stub/LightbringerStub.java | 18 +-- .../dialer/logging/contact_lookup_result.proto | 2 - .../android/dialer/logging/contact_source.proto | 2 - .../android/dialer/logging/dialer_impression.proto | 23 --- .../android/dialer/logging/interaction_event.proto | 2 - .../dialer/logging/reporting_location.proto | 2 - java/com/android/dialer/logging/screen_event.proto | 2 - java/com/android/dialer/logging/ui_action.proto | 2 - .../com/android/dialer/main/impl/MainActivity.java | 2 +- .../android/dialer/main/impl/MainPagerAdapter.java | 4 +- .../dialer/notification/VoicemailChannelUtils.java | 2 +- .../android/dialer/oem/CequintCallerIdManager.java | 2 +- .../dialer/persistentlog/PersistentLogger.java | 2 +- .../dialer/phonenumberutil/PhoneNumberHelper.java | 2 +- .../android/dialer/postcall/AndroidManifest.xml | 3 +- .../postcall/res/layout/post_call_activity.xml | 23 ++- .../searchfragment/common/QueryFilteringUtil.java | 2 +- .../searchfragment/cp2/SearchContactCursor.java | 2 +- .../cp2/SearchContactViewHolder.java | 12 +- .../searchfragment/list/NewSearchFragment.java | 2 +- .../dialer/searchfragment/list/SearchAdapter.java | 2 +- .../searchfragment/list/SearchCursorManager.java | 4 +- .../dialer/speeddial/SpeedDialFragment.java | 4 +- .../android/dialer/theme/res/values-af/strings.xml | 1 - .../android/dialer/theme/res/values-am/strings.xml | 1 - .../android/dialer/theme/res/values-ar/strings.xml | 1 - .../android/dialer/theme/res/values-az/strings.xml | 1 - .../dialer/theme/res/values-b+sr+Latn/strings.xml | 1 - .../android/dialer/theme/res/values-be/strings.xml | 1 - .../android/dialer/theme/res/values-bg/strings.xml | 1 - .../android/dialer/theme/res/values-bn/strings.xml | 1 - .../android/dialer/theme/res/values-bs/strings.xml | 1 - .../android/dialer/theme/res/values-ca/strings.xml | 1 - .../android/dialer/theme/res/values-cs/strings.xml | 1 - .../android/dialer/theme/res/values-da/strings.xml | 1 - .../android/dialer/theme/res/values-de/strings.xml | 1 - .../android/dialer/theme/res/values-el/strings.xml | 1 - .../dialer/theme/res/values-en-rAU/strings.xml | 1 - .../dialer/theme/res/values-en-rGB/strings.xml | 1 - .../dialer/theme/res/values-en-rIN/strings.xml | 1 - .../dialer/theme/res/values-es-rUS/strings.xml | 1 - .../android/dialer/theme/res/values-es/strings.xml | 1 - .../android/dialer/theme/res/values-et/strings.xml | 1 - .../android/dialer/theme/res/values-eu/strings.xml | 1 - .../android/dialer/theme/res/values-fa/strings.xml | 1 - .../android/dialer/theme/res/values-fi/strings.xml | 1 - .../dialer/theme/res/values-fr-rCA/strings.xml | 1 - .../android/dialer/theme/res/values-fr/strings.xml | 1 - .../android/dialer/theme/res/values-gl/strings.xml | 1 - .../android/dialer/theme/res/values-gu/strings.xml | 1 - .../android/dialer/theme/res/values-hi/strings.xml | 1 - .../android/dialer/theme/res/values-hr/strings.xml | 1 - .../android/dialer/theme/res/values-hu/strings.xml | 1 - .../android/dialer/theme/res/values-hy/strings.xml | 1 - .../android/dialer/theme/res/values-in/strings.xml | 1 - .../android/dialer/theme/res/values-is/strings.xml | 1 - .../android/dialer/theme/res/values-it/strings.xml | 1 - .../android/dialer/theme/res/values-iw/strings.xml | 1 - .../android/dialer/theme/res/values-ja/strings.xml | 1 - .../android/dialer/theme/res/values-ka/strings.xml | 1 - .../android/dialer/theme/res/values-kk/strings.xml | 1 - .../android/dialer/theme/res/values-km/strings.xml | 1 - .../android/dialer/theme/res/values-kn/strings.xml | 1 - .../android/dialer/theme/res/values-ko/strings.xml | 1 - .../android/dialer/theme/res/values-ky/strings.xml | 1 - .../android/dialer/theme/res/values-lo/strings.xml | 1 - .../android/dialer/theme/res/values-lt/strings.xml | 1 - .../android/dialer/theme/res/values-lv/strings.xml | 1 - .../android/dialer/theme/res/values-mk/strings.xml | 1 - .../android/dialer/theme/res/values-ml/strings.xml | 1 - .../android/dialer/theme/res/values-mn/strings.xml | 1 - .../android/dialer/theme/res/values-mr/strings.xml | 1 - .../android/dialer/theme/res/values-ms/strings.xml | 1 - .../android/dialer/theme/res/values-my/strings.xml | 1 - .../android/dialer/theme/res/values-nb/strings.xml | 1 - .../android/dialer/theme/res/values-ne/strings.xml | 1 - .../android/dialer/theme/res/values-nl/strings.xml | 1 - .../android/dialer/theme/res/values-no/strings.xml | 1 - .../android/dialer/theme/res/values-pa/strings.xml | 1 - .../android/dialer/theme/res/values-pl/strings.xml | 1 - .../dialer/theme/res/values-pt-rBR/strings.xml | 1 - .../dialer/theme/res/values-pt-rPT/strings.xml | 1 - .../android/dialer/theme/res/values-pt/strings.xml | 1 - .../android/dialer/theme/res/values-ro/strings.xml | 1 - .../android/dialer/theme/res/values-ru/strings.xml | 1 - .../android/dialer/theme/res/values-si/strings.xml | 1 - .../android/dialer/theme/res/values-sk/strings.xml | 1 - .../android/dialer/theme/res/values-sl/strings.xml | 1 - .../android/dialer/theme/res/values-sq/strings.xml | 1 - .../android/dialer/theme/res/values-sr/strings.xml | 1 - .../android/dialer/theme/res/values-sv/strings.xml | 1 - .../android/dialer/theme/res/values-sw/strings.xml | 1 - .../android/dialer/theme/res/values-ta/strings.xml | 1 - .../android/dialer/theme/res/values-te/strings.xml | 1 - .../android/dialer/theme/res/values-th/strings.xml | 1 - .../android/dialer/theme/res/values-tl/strings.xml | 1 - .../android/dialer/theme/res/values-tr/strings.xml | 1 - .../android/dialer/theme/res/values-uk/strings.xml | 1 - .../android/dialer/theme/res/values-ur/strings.xml | 1 - .../android/dialer/theme/res/values-uz/strings.xml | 1 - .../android/dialer/theme/res/values-vi/strings.xml | 1 - .../dialer/theme/res/values-zh-rCN/strings.xml | 1 - .../dialer/theme/res/values-zh-rHK/strings.xml | 1 - .../dialer/theme/res/values-zh-rTW/strings.xml | 1 - .../android/dialer/theme/res/values-zu/strings.xml | 1 - .../android/dialer/theme/res/values/strings.xml | 3 - java/com/android/dialer/util/PermissionsUtil.java | 26 +++ .../android/dialer/util/res/values-af/strings.xml | 2 + .../android/dialer/util/res/values-am/strings.xml | 2 + .../android/dialer/util/res/values-ar/strings.xml | 2 + .../android/dialer/util/res/values-az/strings.xml | 2 + .../dialer/util/res/values-b+sr+Latn/strings.xml | 2 + .../android/dialer/util/res/values-be/strings.xml | 2 + .../android/dialer/util/res/values-bg/strings.xml | 2 + .../android/dialer/util/res/values-bn/strings.xml | 2 + .../android/dialer/util/res/values-bs/strings.xml | 2 + .../android/dialer/util/res/values-ca/strings.xml | 2 + .../android/dialer/util/res/values-cs/strings.xml | 2 + .../android/dialer/util/res/values-da/strings.xml | 2 + .../android/dialer/util/res/values-de/strings.xml | 2 + .../android/dialer/util/res/values-el/strings.xml | 2 + .../dialer/util/res/values-en-rAU/strings.xml | 2 + .../dialer/util/res/values-en-rGB/strings.xml | 2 + .../dialer/util/res/values-en-rIN/strings.xml | 2 + .../dialer/util/res/values-es-rUS/strings.xml | 2 + .../android/dialer/util/res/values-es/strings.xml | 2 + .../android/dialer/util/res/values-et/strings.xml | 2 + .../android/dialer/util/res/values-eu/strings.xml | 2 + .../android/dialer/util/res/values-fa/strings.xml | 2 + .../android/dialer/util/res/values-fi/strings.xml | 2 + .../dialer/util/res/values-fr-rCA/strings.xml | 2 + .../android/dialer/util/res/values-fr/strings.xml | 2 + .../android/dialer/util/res/values-gl/strings.xml | 2 + .../android/dialer/util/res/values-gu/strings.xml | 2 + .../android/dialer/util/res/values-hi/strings.xml | 2 + .../android/dialer/util/res/values-hr/strings.xml | 2 + .../android/dialer/util/res/values-hu/strings.xml | 2 + .../android/dialer/util/res/values-hy/strings.xml | 2 + .../android/dialer/util/res/values-in/strings.xml | 2 + .../android/dialer/util/res/values-is/strings.xml | 2 + .../android/dialer/util/res/values-it/strings.xml | 2 + .../android/dialer/util/res/values-iw/strings.xml | 2 + .../android/dialer/util/res/values-ja/strings.xml | 2 + .../android/dialer/util/res/values-ka/strings.xml | 2 + .../android/dialer/util/res/values-kk/strings.xml | 2 + .../android/dialer/util/res/values-km/strings.xml | 2 + .../android/dialer/util/res/values-kn/strings.xml | 2 + .../android/dialer/util/res/values-ko/strings.xml | 2 + .../android/dialer/util/res/values-ky/strings.xml | 2 + .../android/dialer/util/res/values-lo/strings.xml | 2 + .../android/dialer/util/res/values-lt/strings.xml | 2 + .../android/dialer/util/res/values-lv/strings.xml | 2 + .../android/dialer/util/res/values-mk/strings.xml | 2 + .../android/dialer/util/res/values-ml/strings.xml | 2 + .../android/dialer/util/res/values-mn/strings.xml | 2 + .../android/dialer/util/res/values-mr/strings.xml | 2 + .../android/dialer/util/res/values-ms/strings.xml | 2 + .../android/dialer/util/res/values-my/strings.xml | 2 + .../android/dialer/util/res/values-nb/strings.xml | 2 + .../android/dialer/util/res/values-ne/strings.xml | 2 + .../android/dialer/util/res/values-nl/strings.xml | 2 + .../android/dialer/util/res/values-no/strings.xml | 2 + .../android/dialer/util/res/values-pa/strings.xml | 2 + .../android/dialer/util/res/values-pl/strings.xml | 2 + .../dialer/util/res/values-pt-rBR/strings.xml | 2 + .../dialer/util/res/values-pt-rPT/strings.xml | 2 + .../android/dialer/util/res/values-pt/strings.xml | 2 + .../android/dialer/util/res/values-ro/strings.xml | 2 + .../android/dialer/util/res/values-ru/strings.xml | 2 + .../android/dialer/util/res/values-si/strings.xml | 2 + .../android/dialer/util/res/values-sk/strings.xml | 2 + .../android/dialer/util/res/values-sl/strings.xml | 2 + .../android/dialer/util/res/values-sq/strings.xml | 2 + .../android/dialer/util/res/values-sr/strings.xml | 2 + .../android/dialer/util/res/values-sv/strings.xml | 2 + .../android/dialer/util/res/values-sw/strings.xml | 2 + .../android/dialer/util/res/values-ta/strings.xml | 2 + .../android/dialer/util/res/values-te/strings.xml | 2 + .../android/dialer/util/res/values-th/strings.xml | 2 + .../android/dialer/util/res/values-tl/strings.xml | 2 + .../android/dialer/util/res/values-tr/strings.xml | 2 + .../android/dialer/util/res/values-uk/strings.xml | 2 + .../android/dialer/util/res/values-ur/strings.xml | 2 + .../android/dialer/util/res/values-uz/strings.xml | 2 + .../android/dialer/util/res/values-vi/strings.xml | 2 + .../dialer/util/res/values-zh-rCN/strings.xml | 2 + .../dialer/util/res/values-zh-rHK/strings.xml | 2 + .../dialer/util/res/values-zh-rTW/strings.xml | 2 + .../android/dialer/util/res/values-zu/strings.xml | 2 + .../com/android/dialer/util/res/values/strings.xml | 2 + .../VisualVoicemailEnabledChecker.java | 4 +- .../voicemailstatus/VoicemailStatusHelper.java | 20 ++- .../dialer/widget/res/layout/fragment_message.xml | 32 ++-- java/com/android/incallui/CallButtonPresenter.java | 4 +- java/com/android/incallui/ContactInfoCache.java | 24 ++- java/com/android/incallui/DialpadFragment.java | 2 +- java/com/android/incallui/InCallPresenter.java | 19 ++- java/com/android/incallui/ProximitySensor.java | 5 +- java/com/android/incallui/VideoCallPresenter.java | 24 +-- .../incallui/answer/impl/AnswerFragment.java | 2 +- .../incallui/answer/impl/hint/AnswerHint.java | 2 +- .../AnswerProximitySensor.java | 2 +- .../autoresizetext/AutoResizeTextView.java | 2 +- java/com/android/incallui/call/DialerCall.java | 25 ++- .../incallui/calllocation/impl/AndroidManifest.xml | 1 - .../calllocation/impl/LocationUrlBuilder.java | 2 +- .../incallui/contactgrid/ContactGridManager.java | 15 +- .../incallui/contactgrid/res/values-uz/strings.xml | 2 +- .../disconnectdialog/res/values-af/strings.xml | 24 +++ .../disconnectdialog/res/values-am/strings.xml | 24 +++ .../disconnectdialog/res/values-ar/strings.xml | 24 +++ .../disconnectdialog/res/values-az/strings.xml | 24 +++ .../res/values-b+sr+Latn/strings.xml | 24 +++ .../disconnectdialog/res/values-be/strings.xml | 24 +++ .../disconnectdialog/res/values-bg/strings.xml | 24 +++ .../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 | 24 +++ .../disconnectdialog/res/values-da/strings.xml | 24 +++ .../disconnectdialog/res/values-de/strings.xml | 24 +++ .../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 | 24 +++ .../disconnectdialog/res/values-es/strings.xml | 24 +++ .../disconnectdialog/res/values-et/strings.xml | 24 +++ .../disconnectdialog/res/values-eu/strings.xml | 24 +++ .../disconnectdialog/res/values-fa/strings.xml | 24 +++ .../disconnectdialog/res/values-fi/strings.xml | 24 +++ .../disconnectdialog/res/values-fr-rCA/strings.xml | 24 +++ .../disconnectdialog/res/values-fr/strings.xml | 24 +++ .../disconnectdialog/res/values-gl/strings.xml | 24 +++ .../disconnectdialog/res/values-gu/strings.xml | 24 +++ .../disconnectdialog/res/values-hi/strings.xml | 24 +++ .../disconnectdialog/res/values-hr/strings.xml | 24 +++ .../disconnectdialog/res/values-hu/strings.xml | 24 +++ .../disconnectdialog/res/values-hy/strings.xml | 24 +++ .../disconnectdialog/res/values-in/strings.xml | 24 +++ .../disconnectdialog/res/values-is/strings.xml | 24 +++ .../disconnectdialog/res/values-it/strings.xml | 24 +++ .../disconnectdialog/res/values-iw/strings.xml | 24 +++ .../disconnectdialog/res/values-ja/strings.xml | 24 +++ .../disconnectdialog/res/values-ka/strings.xml | 24 +++ .../disconnectdialog/res/values-kk/strings.xml | 24 +++ .../disconnectdialog/res/values-km/strings.xml | 24 +++ .../disconnectdialog/res/values-kn/strings.xml | 24 +++ .../disconnectdialog/res/values-ko/strings.xml | 24 +++ .../disconnectdialog/res/values-ky/strings.xml | 24 +++ .../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 | 24 +++ .../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 | 24 +++ .../disconnectdialog/res/values-my/strings.xml | 24 +++ .../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 | 24 +++ .../disconnectdialog/res/values-ru/strings.xml | 24 +++ .../disconnectdialog/res/values-si/strings.xml | 24 +++ .../disconnectdialog/res/values-sk/strings.xml | 24 +++ .../disconnectdialog/res/values-sl/strings.xml | 24 +++ .../disconnectdialog/res/values-sq/strings.xml | 24 +++ .../disconnectdialog/res/values-sr/strings.xml | 24 +++ .../disconnectdialog/res/values-sv/strings.xml | 24 +++ .../disconnectdialog/res/values-sw/strings.xml | 24 +++ .../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 | 24 +++ .../disconnectdialog/res/values-tr/strings.xml | 24 +++ .../disconnectdialog/res/values-uk/strings.xml | 24 +++ .../disconnectdialog/res/values-ur/strings.xml | 24 +++ .../disconnectdialog/res/values-uz/strings.xml | 24 +++ .../disconnectdialog/res/values-vi/strings.xml | 24 +++ .../disconnectdialog/res/values-zh-rCN/strings.xml | 24 +++ .../disconnectdialog/res/values-zh-rHK/strings.xml | 24 +++ .../disconnectdialog/res/values-zh-rTW/strings.xml | 24 +++ .../disconnectdialog/res/values-zu/strings.xml | 24 +++ .../incallui/incall/impl/InCallPagerAdapter.java | 2 +- .../android/incallui/maps/impl/AndroidManifest.xml | 1 - .../com/android/incallui/res/values-pl/strings.xml | 2 +- .../com/android/incallui/res/values-uz/strings.xml | 8 +- .../video/impl/SurfaceViewVideoCallFragment.java | 22 +-- .../incallui/video/impl/VideoCallFragment.java | 26 ++- .../video/protocol/VideoCallScreenDelegate.java | 2 +- .../videotech/lightbringer/LightbringerTech.java | 4 +- .../incallui/videotech/utils/VideoUtils.java | 20 +-- java/com/android/voicemail/AndroidManifest.xml | 21 ++- java/com/android/voicemail/VoicemailClient.java | 26 +++ .../voicemail/VoicemailPowerCycleReceiver.java | 38 +++++ .../voicemail/VoicemailSecretCodeReceiver.java | 36 +++++ .../com/android/voicemail/impl/AndroidManifest.xml | 22 +-- java/com/android/voicemail/impl/OmtpService.java | 52 +++++- .../voicemail/impl/OmtpVvmCarrierConfigHelper.java | 56 +++++-- .../voicemail/impl/PackageReplacedReceiver.java | 43 ----- .../voicemail/impl/VoicemailClientImpl.java | 29 ++++ .../voicemail/impl/VvmPhoneStateListener.java | 2 +- .../voicemail/impl/configui/AndroidManifest.xml | 25 +++ .../impl/configui/ConfigOverrideFragment.java | 175 +++++++++++++++++++++ .../impl/configui/VoicemailSecretCodeActivity.java | 58 +++++++ .../impl/configui/res/values-af/strings.xml | 19 +++ .../impl/configui/res/values-am/strings.xml | 19 +++ .../impl/configui/res/values-ar/strings.xml | 19 +++ .../impl/configui/res/values-az/strings.xml | 19 +++ .../impl/configui/res/values-b+sr+Latn/strings.xml | 19 +++ .../impl/configui/res/values-be/strings.xml | 19 +++ .../impl/configui/res/values-bg/strings.xml | 19 +++ .../impl/configui/res/values-bn/strings.xml | 19 +++ .../impl/configui/res/values-bs/strings.xml | 19 +++ .../impl/configui/res/values-ca/strings.xml | 19 +++ .../impl/configui/res/values-cs/strings.xml | 19 +++ .../impl/configui/res/values-da/strings.xml | 19 +++ .../impl/configui/res/values-de/strings.xml | 19 +++ .../impl/configui/res/values-el/strings.xml | 19 +++ .../impl/configui/res/values-en-rAU/strings.xml | 19 +++ .../impl/configui/res/values-en-rGB/strings.xml | 19 +++ .../impl/configui/res/values-en-rIN/strings.xml | 19 +++ .../impl/configui/res/values-es-rUS/strings.xml | 19 +++ .../impl/configui/res/values-es/strings.xml | 19 +++ .../impl/configui/res/values-et/strings.xml | 19 +++ .../impl/configui/res/values-eu/strings.xml | 19 +++ .../impl/configui/res/values-fa/strings.xml | 19 +++ .../impl/configui/res/values-fi/strings.xml | 19 +++ .../impl/configui/res/values-fr-rCA/strings.xml | 19 +++ .../impl/configui/res/values-fr/strings.xml | 19 +++ .../impl/configui/res/values-gl/strings.xml | 19 +++ .../impl/configui/res/values-gu/strings.xml | 19 +++ .../impl/configui/res/values-hi/strings.xml | 19 +++ .../impl/configui/res/values-hr/strings.xml | 19 +++ .../impl/configui/res/values-hu/strings.xml | 19 +++ .../impl/configui/res/values-hy/strings.xml | 19 +++ .../impl/configui/res/values-in/strings.xml | 19 +++ .../impl/configui/res/values-is/strings.xml | 19 +++ .../impl/configui/res/values-it/strings.xml | 19 +++ .../impl/configui/res/values-iw/strings.xml | 19 +++ .../impl/configui/res/values-ja/strings.xml | 19 +++ .../impl/configui/res/values-ka/strings.xml | 19 +++ .../impl/configui/res/values-kk/strings.xml | 19 +++ .../impl/configui/res/values-km/strings.xml | 19 +++ .../impl/configui/res/values-kn/strings.xml | 19 +++ .../impl/configui/res/values-ko/strings.xml | 19 +++ .../impl/configui/res/values-ky/strings.xml | 19 +++ .../impl/configui/res/values-lo/strings.xml | 19 +++ .../impl/configui/res/values-lt/strings.xml | 19 +++ .../impl/configui/res/values-lv/strings.xml | 19 +++ .../impl/configui/res/values-mk/strings.xml | 19 +++ .../impl/configui/res/values-ml/strings.xml | 19 +++ .../impl/configui/res/values-mn/strings.xml | 19 +++ .../impl/configui/res/values-mr/strings.xml | 19 +++ .../impl/configui/res/values-ms/strings.xml | 19 +++ .../impl/configui/res/values-my/strings.xml | 19 +++ .../impl/configui/res/values-nb/strings.xml | 19 +++ .../impl/configui/res/values-ne/strings.xml | 19 +++ .../impl/configui/res/values-nl/strings.xml | 19 +++ .../impl/configui/res/values-no/strings.xml | 19 +++ .../impl/configui/res/values-pa/strings.xml | 19 +++ .../impl/configui/res/values-pl/strings.xml | 19 +++ .../impl/configui/res/values-pt-rBR/strings.xml | 19 +++ .../impl/configui/res/values-pt-rPT/strings.xml | 19 +++ .../impl/configui/res/values-pt/strings.xml | 19 +++ .../impl/configui/res/values-ro/strings.xml | 19 +++ .../impl/configui/res/values-ru/strings.xml | 19 +++ .../impl/configui/res/values-si/strings.xml | 19 +++ .../impl/configui/res/values-sk/strings.xml | 19 +++ .../impl/configui/res/values-sl/strings.xml | 19 +++ .../impl/configui/res/values-sq/strings.xml | 19 +++ .../impl/configui/res/values-sr/strings.xml | 19 +++ .../impl/configui/res/values-sv/strings.xml | 19 +++ .../impl/configui/res/values-sw/strings.xml | 19 +++ .../impl/configui/res/values-ta/strings.xml | 19 +++ .../impl/configui/res/values-te/strings.xml | 19 +++ .../impl/configui/res/values-th/strings.xml | 19 +++ .../impl/configui/res/values-tl/strings.xml | 19 +++ .../impl/configui/res/values-tr/strings.xml | 19 +++ .../impl/configui/res/values-uk/strings.xml | 19 +++ .../impl/configui/res/values-ur/strings.xml | 19 +++ .../impl/configui/res/values-uz/strings.xml | 19 +++ .../impl/configui/res/values-vi/strings.xml | 19 +++ .../impl/configui/res/values-zh-rCN/strings.xml | 19 +++ .../impl/configui/res/values-zh-rHK/strings.xml | 19 +++ .../impl/configui/res/values-zh-rTW/strings.xml | 19 +++ .../impl/configui/res/values-zu/strings.xml | 19 +++ .../voicemail/impl/configui/res/values/strings.xml | 21 +++ .../impl/configui/res/xml/vvm_config_override.xml | 76 +++++++++ java/com/android/voicemail/impl/proguard.flags | 4 - .../android/voicemail/impl/res/values/strings.xml | 4 + .../android/voicemail/impl/res/xml/vvm_config.xml | 1 - .../voicemail/impl/sms/OmtpMessageSender.java | 6 - .../impl/sync/VvmNetworkRequestCallback.java | 2 +- .../transcribe/grpc/voicemail_transcription.proto | 3 +- .../voicemail/stub/StubVoicemailClient.java | 18 +++ 585 files changed, 4993 insertions(+), 1406 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 mode change 100755 => 100644 java/com/android/dialer/about/res/raw/third_party_license_metadata mode change 100755 => 100644 java/com/android/dialer/about/res/raw/third_party_licenses create mode 100644 java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java mode change 100755 => 100644 java/com/android/dialer/app/res/drawable-hdpi/ic_dialer_fork_add_call.png mode change 100755 => 100644 java/com/android/dialer/app/res/drawable-hdpi/ic_dialer_fork_current_call.png mode change 100755 => 100644 java/com/android/dialer/app/res/drawable-hdpi/ic_dialer_fork_tt_keypad.png delete mode 100644 java/com/android/dialer/binary/google/AndroidManifest.xml delete mode 100644 java/com/android/dialer/binary/google/GoogleStubDialerApplication.java delete mode 100644 java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java delete mode 100644 java/com/android/dialer/buildtype/bugfood/BuildTypeAccessorImpl.java delete mode 100644 java/com/android/dialer/buildtype/dogfood/BuildTypeAccessorImpl.java delete mode 100644 java/com/android/dialer/buildtype/fishfood/BuildTypeAccessorImpl.java delete mode 100644 java/com/android/dialer/buildtype/test/BuildTypeAccessorImpl.java delete mode 100644 java/com/android/dialer/constants/googledialer/ConstantsImpl.java delete mode 100644 java/com/android/dialer/enrichedcall/videoshare/VideoShareSession.java mode change 100755 => 100644 java/com/android/dialer/interactions/res/layout/phone_disambig_item.xml 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/voicemail/VoicemailPowerCycleReceiver.java create mode 100644 java/com/android/voicemail/VoicemailSecretCodeReceiver.java delete mode 100644 java/com/android/voicemail/impl/PackageReplacedReceiver.java create mode 100644 java/com/android/voicemail/impl/configui/AndroidManifest.xml create mode 100644 java/com/android/voicemail/impl/configui/ConfigOverrideFragment.java create mode 100644 java/com/android/voicemail/impl/configui/VoicemailSecretCodeActivity.java create mode 100644 java/com/android/voicemail/impl/configui/res/values-af/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-am/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-ar/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-az/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-b+sr+Latn/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-be/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-bg/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-bn/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-bs/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-ca/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-cs/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-da/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-de/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-el/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-en-rAU/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-en-rGB/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-en-rIN/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-es-rUS/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-es/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-et/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-eu/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-fa/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-fi/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-fr-rCA/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-fr/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-gl/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-gu/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-hi/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-hr/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-hu/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-hy/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-in/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-is/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-it/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-iw/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-ja/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-ka/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-kk/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-km/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-kn/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-ko/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-ky/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-lo/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-lt/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-lv/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-mk/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-ml/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-mn/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-mr/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-ms/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-my/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-nb/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-ne/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-nl/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-no/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-pa/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-pl/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-pt-rBR/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-pt-rPT/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-pt/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-ro/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-ru/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-si/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-sk/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-sl/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-sq/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-sr/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-sv/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-sw/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-ta/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-te/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-th/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-tl/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-tr/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-uk/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-ur/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-uz/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-vi/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-zh-rCN/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-zh-rHK/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-zh-rTW/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values-zu/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/values/strings.xml create mode 100644 java/com/android/voicemail/impl/configui/res/xml/vvm_config_override.xml delete mode 100644 java/com/android/voicemail/impl/proguard.flags diff --git a/Android.mk b/Android.mk index efbdb0973..beccd865a 100644 --- a/Android.mk +++ b/Android.mk @@ -118,6 +118,7 @@ RES_DIRS := \ $(BASE_DIR)/incallui/telecomeventui/res \ $(BASE_DIR)/incallui/video/impl/res \ $(BASE_DIR)/incallui/video/protocol/res \ + $(BASE_DIR)/voicemail/impl/configui/res \ $(BASE_DIR)/voicemail/impl/res \ @@ -178,6 +179,7 @@ DIALER_MANIFEST_FILES += \ $(BASE_DIR)/incallui/video/impl/AndroidManifest.xml \ $(BASE_DIR)/incallui/video/protocol/AndroidManifest.xml \ $(BASE_DIR)/voicemail/AndroidManifest.xml \ + $(BASE_DIR)/voicemail/impl/configui/AndroidManifest.xml \ $(BASE_DIR)/voicemail/impl/AndroidManifest.xml \ @@ -257,6 +259,7 @@ LOCAL_AAPT_FLAGS := \ --extra-packages com.android.incallui.video.impl \ --extra-packages com.android.phone.common \ --extra-packages com.android.voicemail \ + --extra-packages com.android.voicemail.impl.configui \ --extra-packages com.android.voicemail.impl \ --extra-packages com.android.voicemail.impl.fetch \ --extra-packages com.android.voicemail.impl.settings \ @@ -554,4 +557,4 @@ LOCAL_UNINSTALLABLE_MODULE := true include $(BUILD_PREBUILT) -include $(CLEAR_VARS) +include $(CLEAR_VARS) \ No newline at end of file diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 79912dc66..5420ec05c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -16,8 +16,8 @@ + android:versionCode="150000" + android:versionName="11.0"> - diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_report_grey600_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_report_grey600_24.png new file mode 100644 index 000000000..63edb42b6 Binary files /dev/null and b/assets/quantum/res/drawable-hdpi/quantum_ic_report_grey600_24.png differ diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_report_grey600_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_report_grey600_24.png new file mode 100644 index 000000000..88fa79443 Binary files /dev/null and b/assets/quantum/res/drawable-mdpi/quantum_ic_report_grey600_24.png differ diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_report_grey600_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_report_grey600_24.png new file mode 100644 index 000000000..9b9d49fe6 Binary files /dev/null and b/assets/quantum/res/drawable-xhdpi/quantum_ic_report_grey600_24.png differ diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_report_grey600_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_report_grey600_24.png new file mode 100644 index 000000000..e0721e63b Binary files /dev/null and b/assets/quantum/res/drawable-xxhdpi/quantum_ic_report_grey600_24.png differ diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_report_grey600_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_report_grey600_24.png new file mode 100644 index 000000000..29ac881a9 Binary files /dev/null and b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_report_grey600_24.png differ diff --git a/assets/quantum/res/drawable/quantum_ic_enterprise_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_enterprise_vd_theme_24.xml index 6495ac7eb..b3493b8f5 100644 --- a/assets/quantum/res/drawable/quantum_ic_enterprise_vd_theme_24.xml +++ b/assets/quantum/res/drawable/quantum_ic_enterprise_vd_theme_24.xml @@ -6,5 +6,5 @@ android:tint="?attr/colorControlNormal"> + android:pathData="M20,6h-4L16,4c0,-1.11 -0.89,-2 -2,-2h-4c-1.11,0 -2,0.89 -2,2v2L4,6c-1.11,0 -1.99,0.89 -1.99,2L2,19c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM12,15c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM14,6h-4L10,4h4v2z"/> diff --git a/java/com/android/contacts/common/compat/TelephonyManagerCompat.java b/java/com/android/contacts/common/compat/TelephonyManagerCompat.java index b428908cd..02113ca55 100644 --- a/java/com/android/contacts/common/compat/TelephonyManagerCompat.java +++ b/java/com/android/contacts/common/compat/TelephonyManagerCompat.java @@ -32,7 +32,7 @@ import java.lang.reflect.InvocationTargetException; public class TelephonyManagerCompat { - // TODO(maxwelb): Use public API for these constants when available + // TODO: Use public API for these constants when available public static final String EVENT_HANDOVER_VIDEO_FROM_WIFI_TO_LTE = "android.telephony.event.EVENT_HANDOVER_VIDEO_FROM_WIFI_TO_LTE"; public static final String EVENT_HANDOVER_TO_WIFI_FAILED = @@ -120,7 +120,7 @@ public class TelephonyManagerCompat { } /** - * This method uses a new system API to enable or disable visual voicemail. TODO(twyen): restrict + * This method uses a new system API to enable or disable visual voicemail. TODO: restrict * to N MR1, not needed in future SDK. */ public static void setVisualVoicemailEnabled( @@ -138,7 +138,7 @@ public class TelephonyManagerCompat { } /** - * This method uses a new system API to check if visual voicemail is enabled TODO(twyen): restrict + * This method uses a new system API to check if visual voicemail is enabled TODO: restrict * to N MR1, not needed in future SDK. */ public static boolean isVisualVoicemailEnabled( diff --git a/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java b/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java index 172fb11e3..2d77dc73f 100644 --- a/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java +++ b/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java @@ -23,7 +23,7 @@ import java.lang.reflect.Field; /** Compatibility class for {@link android.telecom.TelecomManager}. */ public class TelecomManagerCompat { - // TODO(mdooley): remove once this is available in android.telecom.Call + // TODO: remove once this is available in android.telecom.Call // b/33779976 public static final String EXTRA_LAST_EMERGENCY_CALLBACK_TIME_MILLIS = "android.telecom.extra.LAST_EMERGENCY_CALLBACK_TIME_MILLIS"; @@ -37,7 +37,7 @@ public class TelecomManagerCompat { // This is a hidden constant in android.telecom.DisconnectCause. Telecom sets this as a disconnect // reason if it wants us to prompt the user that the video call is not available. - // TODO(wangqi): Reference it to constant in android.telecom.DisconnectCause. + // TODO: Reference it to constant in android.telecom.DisconnectCause. public static final String REASON_IMS_ACCESS_BLOCKED = "REASON_IMS_ACCESS_BLOCKED"; /** diff --git a/java/com/android/contacts/common/database/NoNullCursorAsyncQueryHandler.java b/java/com/android/contacts/common/database/NoNullCursorAsyncQueryHandler.java index 5d10720b5..d5e61354a 100644 --- a/java/com/android/contacts/common/database/NoNullCursorAsyncQueryHandler.java +++ b/java/com/android/contacts/common/database/NoNullCursorAsyncQueryHandler.java @@ -20,9 +20,6 @@ import android.content.AsyncQueryHandler; import android.content.ContentResolver; import android.database.Cursor; import android.net.Uri; -import android.support.annotation.Nullable; -import android.support.annotation.VisibleForTesting; -import java.util.concurrent.atomic.AtomicInteger; /** * An {@AsyncQueryHandler} that will never return a null cursor. @@ -30,8 +27,6 @@ import java.util.concurrent.atomic.AtomicInteger; *

Instead, will return a {@link Cursor} with 0 records. */ public abstract class NoNullCursorAsyncQueryHandler extends AsyncQueryHandler { - private static final AtomicInteger pendingQueryCount = new AtomicInteger(); - @Nullable private static PendingQueryCountChangedListener pendingQueryCountChangedListener; public NoNullCursorAsyncQueryHandler(ContentResolver cr) { super(cr); @@ -46,11 +41,6 @@ public abstract class NoNullCursorAsyncQueryHandler extends AsyncQueryHandler { String selection, String[] selectionArgs, String orderBy) { - pendingQueryCount.getAndIncrement(); - if (pendingQueryCountChangedListener != null) { - pendingQueryCountChangedListener.onPendingQueryCountChanged(); - } - final CookieWithProjection projectionCookie = new CookieWithProjection(cookie, projection); super.startQuery(token, projectionCookie, uri, projection, selection, selectionArgs, orderBy); } @@ -65,31 +55,10 @@ public abstract class NoNullCursorAsyncQueryHandler extends AsyncQueryHandler { cursor = new EmptyCursor(projectionCookie.projection); } onNotNullableQueryComplete(token, projectionCookie.originalCookie, cursor); - - pendingQueryCount.getAndDecrement(); - if (pendingQueryCountChangedListener != null) { - pendingQueryCountChangedListener.onPendingQueryCountChanged(); - } } protected abstract void onNotNullableQueryComplete(int token, Object cookie, Cursor cursor); - @VisibleForTesting(otherwise = VisibleForTesting.NONE) - public static void setPendingQueryCountChangedListener( - @Nullable PendingQueryCountChangedListener listener) { - pendingQueryCountChangedListener = listener; - } - - @VisibleForTesting(otherwise = VisibleForTesting.NONE) - public static int getPendingQueryCount() { - return pendingQueryCount.get(); - } - - /** Callback to listen for changes in the number of queries that have not completed. */ - public interface PendingQueryCountChangedListener { - void onPendingQueryCountChanged(); - } - /** Class to add projection to an existing cookie. */ private static class CookieWithProjection { diff --git a/java/com/android/contacts/common/list/PhoneNumberListAdapter.java b/java/com/android/contacts/common/list/PhoneNumberListAdapter.java index d1118c3c7..ae15eb232 100644 --- a/java/com/android/contacts/common/list/PhoneNumberListAdapter.java +++ b/java/com/android/contacts/common/list/PhoneNumberListAdapter.java @@ -27,6 +27,7 @@ import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.CommonDataKinds.SipAddress; import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Directory; +import android.support.annotation.VisibleForTesting; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; @@ -357,7 +358,8 @@ public class PhoneNumberListAdapter extends ContactEntryListAdapter { bindPhoneNumber(view, cursor, directory.isDisplayNumber(), position); } - protected void bindPhoneNumber( + @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED) + public void bindPhoneNumber( ContactListItemView view, Cursor cursor, boolean displayNumber, int position) { CharSequence label = null; if (displayNumber && !cursor.isNull(PhoneQuery.PHONE_TYPE)) { @@ -397,7 +399,8 @@ public class PhoneNumberListAdapter extends ContactEntryListAdapter { } } - if (LightbringerComponent.get(mContext).getLightbringer().isReachable(mContext, number)) { + if (action == ContactListItemView.NONE + && LightbringerComponent.get(mContext).getLightbringer().isReachable(mContext, number)) { action = ContactListItemView.LIGHTBRINGER; } diff --git a/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java b/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java index 558f3b209..de7903e83 100644 --- a/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java +++ b/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java @@ -278,7 +278,7 @@ public class PhoneNumberPickerFragment extends ContactEntryListFragment loader, Cursor data) { Assert.isMainThread(); - // TODO(strongarm): define and verify behavior for "Nearby places", corp directories, + // TODO: define and verify behavior for "Nearby places", corp directories, // and dividers listed in UI between these categories if (mCursorReranker != null && data != null 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/contacts/common/res/values/colors.xml b/java/com/android/contacts/common/res/values/colors.xml index 20b28c9d9..434d193c7 100644 --- a/java/com/android/contacts/common/res/values/colors.xml +++ b/java/com/android/contacts/common/res/values/colors.xml @@ -60,7 +60,6 @@ #000 - #DB4437 #E91E63 diff --git a/java/com/android/dialer/about/res/raw/third_party_license_metadata b/java/com/android/dialer/about/res/raw/third_party_license_metadata old mode 100755 new mode 100644 diff --git a/java/com/android/dialer/about/res/raw/third_party_licenses b/java/com/android/dialer/about/res/raw/third_party_licenses old mode 100755 new mode 100644 diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java index 1c9718e40..b6025d354 100644 --- a/java/com/android/dialer/app/DialtactsActivity.java +++ b/java/com/android/dialer/app/DialtactsActivity.java @@ -287,7 +287,7 @@ public class DialtactsActivity extends TransactionSafeActivity } mSearchQuery = newText; - // TODO(calderwoodra): show p13n when newText is empty. + // TODO: show p13n when newText is empty. // Show search fragment only when the query string is changed to non-empty text. if (!TextUtils.isEmpty(newText)) { // Call enterSearchUi only if we are switching search modes, or showing a search @@ -598,7 +598,7 @@ public class DialtactsActivity extends TransactionSafeActivity new P13nRefreshCompleteListener() { @Override public void onP13nRefreshComplete() { - // TODO(strongarm): make zero-query search results visible + // TODO: make zero-query search results visible } }); Trace.endSection(); @@ -1171,7 +1171,7 @@ public class DialtactsActivity extends TransactionSafeActivity } transaction.add(R.id.dialtacts_frame, fragment, tag); } else { - // TODO(calderwoodra): if this is a transition from dialpad to searchbar, animate fragment + // TODO: if this is a transition from dialpad to searchbar, animate fragment // down, and vice versa. Perhaps just add a coordinator behavior with the search bar. transaction.show(fragment); } @@ -1184,7 +1184,7 @@ public class DialtactsActivity extends TransactionSafeActivity ((SearchFragment) fragment) .setShowEmptyListForNullQuery(mP13nRanker.shouldShowEmptyListForNullQuery()); } else { - // TODO(calderwoodra): add p13n ranker to new search. + // TODO: add p13n ranker to new search. } if (!smartDialSearch && !useNewSearch) { diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java index 41c9d6003..e0cd1706d 100644 --- a/java/com/android/dialer/app/calllog/CallLogAdapter.java +++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java @@ -368,20 +368,30 @@ public class CallLogAdapter extends GroupingListAdapter } expandViewHolderActions(viewHolder); - if (viewHolder.videoCallButtonView != null - && viewHolder.videoCallButtonView.getVisibility() == View.VISIBLE - && LightbringerComponent.get(mActivity).getLightbringer().getPackageName() != null - && LightbringerComponent.get(mActivity) - .getLightbringer() - .getPackageName() - .equals( - ((IntentProvider) viewHolder.videoCallButtonView.getTag()) - .getIntent(mActivity) - .getPackage())) { + if (isLightbringerCallButtonVisible(viewHolder.videoCallButtonView)) { CallIntentBuilder.increaseLightbringerCallButtonAppearInExpandedCallLogItemCount(); } } } + + private boolean isLightbringerCallButtonVisible(View videoCallButtonView) { + if (videoCallButtonView == null) { + return false; + } + if (videoCallButtonView.getVisibility() != View.VISIBLE) { + return false; + } + IntentProvider intentProvider = (IntentProvider) videoCallButtonView.getTag(); + if (intentProvider == null) { + return false; + } + String packageName = + LightbringerComponent.get(mActivity).getLightbringer().getPackageName(); + if (packageName == null) { + return false; + } + return packageName.equals(intentProvider.getIntent(mActivity).getPackage()); + } }; private void checkMarkCallLogEntry(CallLogListItemViewHolder viewHolder) { @@ -444,7 +454,7 @@ public class CallLogAdapter extends GroupingListAdapter * Holds a list of URIs that are pending deletion or undo. If the activity ends before the undo * timeout, all of the pending URIs will be deleted. * - *

TODO(twyen): move this and OnVoicemailDeletedListener to somewhere like {@link + *

TODO: move this and OnVoicemailDeletedListener to somewhere like {@link * VisualVoicemailCallLogFragment}. The CallLogAdapter does not need to know about what to do with * hidden item or what to hide. */ @@ -967,7 +977,7 @@ public class CallLogAdapter extends GroupingListAdapter } @MainThread - private CallDetailsEntries createCallDetailsEntries(Cursor cursor, int count) { + private static CallDetailsEntries createCallDetailsEntries(Cursor cursor, int count) { Assert.isMainThread(); int position = cursor.getPosition(); CallDetailsEntries.Builder entries = CallDetailsEntries.newBuilder(); @@ -980,16 +990,6 @@ public class CallLogAdapter extends GroupingListAdapter .setDate(cursor.getLong(CallLogQuery.DATE)) .setDuration(cursor.getLong(CallLogQuery.DURATION)) .setFeatures(cursor.getInt(CallLogQuery.FEATURES)); - - String phoneAccountComponentName = cursor.getString(CallLogQuery.ACCOUNT_COMPONENT_NAME); - if (getLightbringer().getPhoneAccountComponentName() != null - && getLightbringer() - .getPhoneAccountComponentName() - .flattenToString() - .equals(phoneAccountComponentName)) { - entry.setIsLightbringerCall(true); - } - entries.addEntries(entry.build()); cursor.moveToNext(); } diff --git a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java index 6b97bd694..a4a2ba2ff 100644 --- a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java +++ b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java @@ -551,12 +551,15 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder private void bindActionButtons() { boolean canPlaceCallToNumber = PhoneNumberHelper.canPlaceCallsTo(number, numberPresentation); + // Hide the call buttons by default. We then set it to be visible when appropriate below. + // This saves us having to remember to set it to GONE in multiple places. + callButtonView.setVisibility(View.GONE); + videoCallButtonView.setVisibility(View.GONE); + if (isFullyUndialableVoicemail()) { // Sometimes the voicemail server will report the message is from some non phone number // source. If the number does not contains any dialable digit treat it as it is from a unknown // number, remove all action buttons but still show the voicemail playback layout. - callButtonView.setVisibility(View.GONE); - videoCallButtonView.setVisibility(View.GONE); detailsButtonView.setVisibility(View.GONE); createNewContactButtonView.setVisibility(View.GONE); addToExistingContactButtonView.setVisibility(View.GONE); @@ -581,16 +584,8 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder return; } - TextView callTypeOrLocationView = - ((TextView) callButtonView.findViewById(R.id.call_type_or_location_text)); - if (canPlaceCallToNumber) { - // Set up the call button but hide it by default (the primary action is to call so it is - // redundant). We then set it to be visible when appropriate below. This saves us having to - // remember to set it to GONE in multiple places. callButtonView.setTag(IntentProvider.getReturnCallIntentProvider(number)); - callButtonView.setVisibility(View.GONE); - callTypeOrLocationView.setVisibility(View.GONE); } if (!TextUtils.isEmpty(voicemailUri) && canPlaceCallToNumber) { @@ -599,10 +594,13 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder TextUtils.expandTemplate( mContext.getString(R.string.call_log_action_call), nameOrNumber == null ? "" : nameOrNumber)); - + TextView callTypeOrLocationView = + ((TextView) callButtonView.findViewById(R.id.call_type_or_location_text)); if (callType == Calls.VOICEMAIL_TYPE && !TextUtils.isEmpty(callTypeOrLocation)) { callTypeOrLocationView.setText(callTypeOrLocation); callTypeOrLocationView.setVisibility(View.VISIBLE); + } else { + callTypeOrLocationView.setVisibility(View.GONE); } callButtonView.setVisibility(View.VISIBLE); } @@ -617,8 +615,6 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder } else if (lightbringerReady) { videoCallButtonView.setTag(IntentProvider.getLightbringerIntentProvider(number)); videoCallButtonView.setVisibility(View.VISIBLE); - } else { - videoCallButtonView.setVisibility(View.GONE); } // For voicemail calls, show the voicemail playback layout; hide otherwise. @@ -945,12 +941,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder String accountLabel = mCallLogCache.getAccountLabel(accountHandle); if (!TextUtils.isEmpty(accountLabel)) { SimDetails.Builder simDetails = SimDetails.newBuilder().setNetwork(accountLabel); - int color = mCallLogCache.getAccountColor(accountHandle); - if (color == PhoneAccount.NO_HIGHLIGHT_COLOR) { - simDetails.setColor(R.color.secondary_text_color); - } else { - simDetails.setColor(color); - } + simDetails.setColor(mCallLogCache.getAccountColor(accountHandle)); contact.setSimDetails(simDetails.build()); } return contact.build(); diff --git a/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java b/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java new file mode 100644 index 000000000..2424b6dbd --- /dev/null +++ b/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java @@ -0,0 +1,96 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.dialer.app.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; +import java.util.Map; + +/** + * This is the CallLogCache for versions of dialer Lollipop Mr1 and above with support for multi-SIM + * devices. + * + *

This class should not be initialized directly and instead be acquired from {@link + * CallLogCache#getCallLogCache}. + */ +class CallLogCacheLollipopMr1 extends CallLogCache { + + private final Map mPhoneAccountLabelCache = new ArrayMap<>(); + private final Map mPhoneAccountColorCache = new ArrayMap<>(); + private final Map mPhoneAccountCallWithNoteCache = new ArrayMap<>(); + + /* package */ CallLogCacheLollipopMr1(Context context) { + super(context); + } + + @Override + public void reset() { + mPhoneAccountLabelCache.clear(); + mPhoneAccountColorCache.clear(); + mPhoneAccountCallWithNoteCache.clear(); + + super.reset(); + } + + @Override + public boolean isVoicemailNumber( + PhoneAccountHandle accountHandle, @Nullable CharSequence number) { + if (TextUtils.isEmpty(number)) { + return false; + } + return TelecomUtil.isVoicemailNumber(mContext, accountHandle, number.toString()); + } + + @Override + public String getAccountLabel(PhoneAccountHandle accountHandle) { + if (mPhoneAccountLabelCache.containsKey(accountHandle)) { + return mPhoneAccountLabelCache.get(accountHandle); + } else { + String label = PhoneAccountUtils.getAccountLabel(mContext, accountHandle); + mPhoneAccountLabelCache.put(accountHandle, label); + return label; + } + } + + @Override + public int getAccountColor(PhoneAccountHandle accountHandle) { + if (mPhoneAccountColorCache.containsKey(accountHandle)) { + return mPhoneAccountColorCache.get(accountHandle); + } else { + Integer color = PhoneAccountUtils.getAccountColor(mContext, accountHandle); + mPhoneAccountColorCache.put(accountHandle, color); + return color; + } + } + + @Override + public boolean doesAccountSupportCallSubject(PhoneAccountHandle accountHandle) { + if (mPhoneAccountCallWithNoteCache.containsKey(accountHandle)) { + return mPhoneAccountCallWithNoteCache.get(accountHandle); + } else { + Boolean supportsCallWithNote = + PhoneAccountUtils.getAccountSupportsCallSubject(mContext, accountHandle); + mPhoneAccountCallWithNoteCache.put(accountHandle, supportsCallWithNote); + return supportsCallWithNote; + } + } +} diff --git a/java/com/android/dialer/app/contactinfo/ContactInfoCache.java b/java/com/android/dialer/app/contactinfo/ContactInfoCache.java index 155a6a2eb..82fc229af 100644 --- a/java/com/android/dialer/app/contactinfo/ContactInfoCache.java +++ b/java/com/android/dialer/app/contactinfo/ContactInfoCache.java @@ -163,7 +163,7 @@ public class ContactInfoCache { if (request.isLocalRequest()) { info = mContactInfoHelper.lookupNumber(request.number, request.countryIso); if (info != null && !info.contactExists) { - // TODO(wangqi): Maybe skip look up if it's already available in cached number lookup + // TODO: Maybe skip look up if it's already available in cached number lookup // service. long start = SystemClock.elapsedRealtime(); mContactInfoHelper.updateFromCequintCallerId(mCequintCallerIdManager, info, request.number); diff --git a/java/com/android/dialer/app/list/ListsFragment.java b/java/com/android/dialer/app/list/ListsFragment.java index 3f03db1e8..dbb6c8b5c 100644 --- a/java/com/android/dialer/app/list/ListsFragment.java +++ b/java/com/android/dialer/app/list/ListsFragment.java @@ -75,7 +75,6 @@ public class ListsFragment extends Fragment implements OnPageChangeListener, Lis private SharedPreferences mPrefs; private boolean mHasFetchedVoicemailStatus; private boolean mShowVoicemailTabAfterVoicemailStatusIsFetched; - private VoicemailStatusHelper mVoicemailStatusHelper; private final ArrayList mOnPageChangeListeners = new ArrayList<>(); /** The position of the currently selected tab. */ private int mTabIndex = TAB_INDEX_SPEED_DIAL; @@ -99,7 +98,6 @@ public class ListsFragment extends Fragment implements OnPageChangeListener, Lis LogUtil.d("ListsFragment.onCreate", null); Trace.beginSection(TAG + " onCreate"); super.onCreate(savedInstanceState); - mVoicemailStatusHelper = new VoicemailStatusHelper(); mPrefs = PreferenceManager.getDefaultSharedPreferences(getActivity()); Trace.endSection(); } @@ -294,7 +292,7 @@ public class ListsFragment extends Fragment implements OnPageChangeListener, Lis // Update hasActiveVoicemailProvider, which controls the number of tabs displayed. boolean hasActiveVoicemailProvider = - mVoicemailStatusHelper.getNumberActivityVoicemailSources(statusCursor) > 0; + VoicemailStatusHelper.getNumberActivityVoicemailSources(statusCursor) > 0; if (hasActiveVoicemailProvider != mAdapter.hasActiveVoicemailProvider()) { mAdapter.setHasActiveVoicemailProvider(hasActiveVoicemailProvider); mAdapter.notifyDataSetChanged(); diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_dialer_fork_add_call.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_dialer_fork_add_call.png old mode 100755 new mode 100644 diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_dialer_fork_current_call.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_dialer_fork_current_call.png old mode 100755 new mode 100644 diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_dialer_fork_tt_keypad.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_dialer_fork_tt_keypad.png old mode 100755 new mode 100644 diff --git a/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml b/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml index ec9e5a00e..504638348 100644 --- a/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml +++ b/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml @@ -35,7 +35,8 @@ + style="@style/CallLogActionStyle" + android:paddingTop="@dimen/call_log_actions_top_padding"> "Videopoziv." "Pošalji SMS kontaktu %1$s" "Nepreslušana govorna pošta" - "Pokreni glasovnu pretragu" + "Pokreni glasovno pretraživanje" "Pozovi %s" "Govorna pošta" "%s sek." @@ -127,7 +127,7 @@ "MEID" "Učitavanje sa SIM kartice…" "Kontakti sa SIM kartice" - "Glasovna pretraga nije dostupna" + "Glasovno pretraživanje nije dostupno" "Nije moguće uputiti poziv jer je aplikacija Telefon onemogućena." "Traži kontakte" "Dodajte broj ili tražite kontakte" @@ -157,7 +157,7 @@ "Dodaj u favorite" "Dodirnite sliku da vidite sve brojeve ili dodirnite i držite da promijenite raspored." "Ukloni" - "Izaberi sve" + "Odaberi sve" "Videopoziv" "Pošalji poruku" "Detalji o pozivu" diff --git a/java/com/android/dialer/app/res/values-da/strings.xml b/java/com/android/dialer/app/res/values-da/strings.xml index 81fd5ddb5..aabe678d6 100644 --- a/java/com/android/dialer/app/res/values-da/strings.xml +++ b/java/com/android/dialer/app/res/values-da/strings.xml @@ -88,7 +88,7 @@ "Indgående opkald" "Massehandlingstilstanden startes" "Massehandlingstilstanden blev afsluttet" - "Vælg %1$s" + "Valgt %1$s" "Fravalgt %1$s" "Afspil telefonsvarerbesked" "Vis kontaktpersonen %1$s" 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/VoicemailErrorManager.java b/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java index bc6ffb5a7..a0bae36cc 100644 --- a/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java +++ b/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java @@ -92,7 +92,7 @@ public class VoicemailErrorManager implements CallLogQueryHandler.Listener, Voic } } alertItem.updateStatus(statuses, this); - // TODO(twyen): b/30668323 support error from multiple sources. + // TODO: b/30668323 support error from multiple sources. return; } diff --git a/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java b/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java index 9c1e446ab..f160e024e 100644 --- a/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java +++ b/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java @@ -85,7 +85,7 @@ public class VoicemailPlaybackLayout extends LinearLayout // When the undo button is pressed, the viewHolder we have is no longer valid because when // we hide the view it is binded to something else, and the layout is not updated for // hidden items. copy the adapter position so we can update the view upon undo. - // TODO(twyen): refactor this so the view holder will always be valid. + // TODO: refactor this so the view holder will always be valid. final int adapterPosition = mViewHolder.getAdapterPosition(); mPresenter.pausePlayback(); diff --git a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java index 5c9bc01c2..6d5015a22 100644 --- a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java +++ b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java @@ -57,6 +57,7 @@ import com.android.dialer.constants.Constants; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; import com.android.dialer.phonenumbercache.CallLogQuery; +import com.android.dialer.telecom.TelecomUtil; import com.android.dialer.util.PermissionsUtil; import com.google.common.io.ByteStreams; import java.io.File; @@ -515,6 +516,11 @@ public class VoicemailPlaybackPresenter mView.disableUiElements(); mIsPrepared = false; + if (mContext != null && TelecomUtil.isInCall(mContext)) { + handleError(new IllegalStateException("Cannot play voicemail when call is in progress")); + return; + } + try { mMediaPlayer = new MediaPlayer(); mMediaPlayer.setOnPreparedListener(this); diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java b/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java index 56de4e91a..e3dc0b0b7 100644 --- a/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java +++ b/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java @@ -33,8 +33,8 @@ import android.view.View; import android.view.View.OnClickListener; import com.android.contacts.common.compat.TelephonyManagerCompat; import com.android.dialer.app.voicemail.error.VoicemailErrorMessage.Action; -import com.android.dialer.buildtype.BuildType; import com.android.dialer.common.LogUtil; +import com.android.dialer.configprovider.ConfigProviderBindings; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; import com.android.voicemail.VisualVoicemailTypeExtensions; @@ -75,17 +75,15 @@ public class VoicemailTosMessageCreator { @Nullable VoicemailErrorMessage maybeCreateTosMessage() { - // TODO(mdooley): add filtering based on carrier + // TODO: add filtering based on carrier if (hasAcceptedTos()) { return null; } - // TODO(mdooley): temporarily skip the terms of service for dogfood builds - if (BuildType.get() == BuildType.DOGFOOD) { - LogUtil.i( - "VoicemailTosMessageCreator.maybeCreateTosMessage", - "Skipping voicemail ToS for dogfood build"); + + if (!shouldShowTos()) { return null; } + logTosCreatedImpression(); return new VoicemailTosMessage( @@ -121,6 +119,25 @@ public class VoicemailTosMessageCreator { .setImageResourceId(getTosImageId()); } + private boolean shouldShowTos() { + if (isVvm3()) { + LogUtil.i("VoicemailTosMessageCreator.shouldShowTos", "showing TOS for verizon"); + return true; + } + + if (isVoicemailTranscriptionEnabled()) { + LogUtil.i( + "VoicemailTosMessageCreator.shouldShowTos", "showing TOS for Google transcription users"); + return true; + } + + return false; + } + + private boolean isVoicemailTranscriptionEnabled() { + return ConfigProviderBindings.get(context).getBoolean("voicemail_transcription_enabled", false); + } + private void showDeclineTosDialog(final PhoneAccountHandle handle) { if (isVvm3() && Vvm3VoicemailMessageCreator.PIN_NOT_SET == status.configurationState) { LogUtil.i( @@ -249,6 +266,10 @@ public class VoicemailTosMessageCreator { } private CharSequence getDialerTos() { + if (!isVoicemailTranscriptionEnabled()) { + return ""; + } + return useSpanish() ? context.getString(R.string.dialer_terms_and_conditions_1_0_spanish) : context.getString(R.string.dialer_terms_and_conditions_1_0_english); diff --git a/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java b/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java index d3024f4c5..e639eff23 100644 --- a/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java +++ b/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java @@ -259,7 +259,7 @@ public class Vvm3VoicemailMessageCreator { @NonNull private static CharSequence getCustomerSupportString(Context context, int id) { - // TODO(twyen): get number based on the country the user is currently in. + // TODO: get number based on the country the user is currently in. return ContactDisplayUtils.getTtsSpannedPhoneNumber( context.getResources(), id, diff --git a/java/com/android/dialer/binary/google/AndroidManifest.xml b/java/com/android/dialer/binary/google/AndroidManifest.xml deleted file mode 100644 index a27056ff5..000000000 --- a/java/com/android/dialer/binary/google/AndroidManifest.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/java/com/android/dialer/binary/google/GoogleStubDialerApplication.java b/java/com/android/dialer/binary/google/GoogleStubDialerApplication.java deleted file mode 100644 index e9289af73..000000000 --- a/java/com/android/dialer/binary/google/GoogleStubDialerApplication.java +++ /dev/null @@ -1,37 +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.dialer.binary.google; - -import android.support.annotation.NonNull; -import com.android.dialer.binary.common.DialerApplication; -import com.android.dialer.inject.ContextModule; - -/** - * The application class for the Google Stub Dialer. This is a version of the Dialer app that - * depends on Google Play Services. - */ -public class GoogleStubDialerApplication extends DialerApplication { - - /** Returns a new instance of the root component for the Google Stub Dialer. */ - @Override - @NonNull - protected Object buildRootComponent() { - return DaggerGoogleStubDialerRootComponent.builder() - .contextModule(new ContextModule(this)) - .build(); - } -} diff --git a/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java b/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java deleted file mode 100644 index 2b4de974b..000000000 --- a/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java +++ /dev/null @@ -1,52 +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.dialer.binary.google; - -import com.android.dialer.binary.basecomponent.BaseDialerRootComponent; -import com.android.dialer.calllog.CallLogModule; -import com.android.dialer.common.concurrent.DialerExecutorModule; -import com.android.dialer.configprovider.SharedPrefConfigProviderModule; -import com.android.dialer.enrichedcall.stub.StubEnrichedCallModule; -import com.android.dialer.inject.ContextModule; -import com.android.dialer.lightbringer.stub.StubLightbringerModule; -import com.android.dialer.simulator.impl.SimulatorModule; -import com.android.incallui.calllocation.impl.CallLocationModule; -import com.android.incallui.maps.impl.MapsModule; -import com.android.voicemail.impl.VoicemailModule; -import dagger.Component; -import javax.inject.Singleton; - -/** - * Root component for the Google Stub Dialer application. Unlike the AOSP variant, this component - * can pull in modules that depend on Google Play Services like the maps module. - */ -@Singleton -@Component( - modules = { - CallLocationModule.class, - CallLogModule.class, - ContextModule.class, - DialerExecutorModule.class, - SharedPrefConfigProviderModule.class, - SimulatorModule.class, - StubEnrichedCallModule.class, - MapsModule.class, - VoicemailModule.class, - StubLightbringerModule.class - } -) -public interface GoogleStubDialerRootComponent extends BaseDialerRootComponent {} diff --git a/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java b/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java index d806a8303..fa74850ba 100644 --- a/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java +++ b/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java @@ -262,7 +262,7 @@ public class FilteredNumberAsyncQueryHandler extends AsyncQueryHandler { } /* - * TODO(maxwelb): b/27779827, non-e164 numbers can be blocked in the new form of blocking. As a + * TODO: b/27779827, non-e164 numbers can be blocked in the new form of blocking. As a * temporary workaround, determine which column of the database to query based on whether the * number is e164 or not. */ diff --git a/java/com/android/dialer/blocking/FilteredNumberCompat.java b/java/com/android/dialer/blocking/FilteredNumberCompat.java index e104c4f94..9e0112762 100644 --- a/java/com/android/dialer/blocking/FilteredNumberCompat.java +++ b/java/com/android/dialer/blocking/FilteredNumberCompat.java @@ -270,7 +270,7 @@ public class FilteredNumberCompat { } // Great Wall blocking, must be primary user and the default or system dialer - // TODO(maxwelb): check that we're the system Dialer + // TODO: check that we're the system Dialer return TelecomUtil.isDefaultDialer(context) && safeBlockedNumbersContractCanCurrentUserBlockNumbers(context); } 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/buildtype/bugfood/BuildTypeAccessorImpl.java b/java/com/android/dialer/buildtype/bugfood/BuildTypeAccessorImpl.java deleted file mode 100644 index 45d72e05c..000000000 --- a/java/com/android/dialer/buildtype/bugfood/BuildTypeAccessorImpl.java +++ /dev/null @@ -1,30 +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.dialer.buildtype; - -import com.android.dialer.proguard.UsedByReflection; - -/** Gets the build type. */ -@UsedByReflection(value = "BuildType.java") -public class BuildTypeAccessorImpl implements BuildTypeAccessor { - - @Override - @BuildType.Type - public int getBuildType() { - return BuildType.BUGFOOD; - } -} diff --git a/java/com/android/dialer/buildtype/dogfood/BuildTypeAccessorImpl.java b/java/com/android/dialer/buildtype/dogfood/BuildTypeAccessorImpl.java deleted file mode 100644 index e1f2cdc79..000000000 --- a/java/com/android/dialer/buildtype/dogfood/BuildTypeAccessorImpl.java +++ /dev/null @@ -1,30 +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.dialer.buildtype; - -import com.android.dialer.proguard.UsedByReflection; - -/** Gets the build type. */ -@UsedByReflection(value = "BuildType.java") -public class BuildTypeAccessorImpl implements BuildTypeAccessor { - - @Override - @BuildType.Type - public int getBuildType() { - return BuildType.DOGFOOD; - } -} diff --git a/java/com/android/dialer/buildtype/fishfood/BuildTypeAccessorImpl.java b/java/com/android/dialer/buildtype/fishfood/BuildTypeAccessorImpl.java deleted file mode 100644 index e5ad9015f..000000000 --- a/java/com/android/dialer/buildtype/fishfood/BuildTypeAccessorImpl.java +++ /dev/null @@ -1,30 +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.dialer.buildtype; - -import com.android.dialer.proguard.UsedByReflection; - -/** Gets the build type. */ -@UsedByReflection(value = "BuildType.java") -public class BuildTypeAccessorImpl implements BuildTypeAccessor { - - @Override - @BuildType.Type - public int getBuildType() { - return BuildType.FISHFOOD; - } -} diff --git a/java/com/android/dialer/buildtype/test/BuildTypeAccessorImpl.java b/java/com/android/dialer/buildtype/test/BuildTypeAccessorImpl.java deleted file mode 100644 index 80a1cb728..000000000 --- a/java/com/android/dialer/buildtype/test/BuildTypeAccessorImpl.java +++ /dev/null @@ -1,30 +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.dialer.buildtype; - -import com.android.dialer.proguard.UsedByReflection; - -/** Gets the build type. */ -@UsedByReflection(value = "BuildType.java") -public class BuildTypeAccessorImpl implements BuildTypeAccessor { - - @Override - @BuildType.Type - public int getBuildType() { - return BuildType.TEST; - } -} diff --git a/java/com/android/dialer/callcomposer/CallComposerActivity.java b/java/com/android/dialer/callcomposer/CallComposerActivity.java index 0b4c20a55..df5cc29e0 100644 --- a/java/com/android/dialer/callcomposer/CallComposerActivity.java +++ b/java/com/android/dialer/callcomposer/CallComposerActivity.java @@ -415,7 +415,7 @@ public class CallComposerActivity extends AppCompatActivity /** Give permission to Messenger to view our image for RCS purposes. */ private Uri grantUriPermission(Uri uri) { - // TODO(sail): Move this to the enriched call manager. + // TODO: Move this to the enriched call manager. grantUriPermission( "com.google.android.apps.messaging", uri, Intent.FLAG_GRANT_READ_URI_PERMISSION); return uri; diff --git a/java/com/android/dialer/callcomposer/CameraComposerFragment.java b/java/com/android/dialer/callcomposer/CameraComposerFragment.java index d55f3222c..7ec6611d9 100644 --- a/java/com/android/dialer/callcomposer/CameraComposerFragment.java +++ b/java/com/android/dialer/callcomposer/CameraComposerFragment.java @@ -18,13 +18,11 @@ package com.android.dialer.callcomposer; import android.Manifest; import android.content.Intent; -import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.graphics.drawable.Animatable; import android.hardware.Camera.CameraInfo; import android.net.Uri; import android.os.Bundle; -import android.preference.PreferenceManager; import android.provider.Settings; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -57,7 +55,6 @@ import com.android.dialer.util.PermissionsUtil; public class CameraComposerFragment extends CallComposerFragment implements CameraManagerListener, OnClickListener, CameraManager.MediaCallback { - private static final String CAMERA_PRIVACY_PREF = "camera_privacy_permission"; private static final String CAMERA_DIRECTION_KEY = "camera_direction"; private static final String CAMERA_URI_KEY = "camera_key"; @@ -134,11 +131,8 @@ public class CameraComposerFragment extends CallComposerFragment } private void setupCamera() { - SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getContext()); - if (!preferences.getBoolean(CAMERA_PRIVACY_PREF, false)) { - Toast.makeText(getContext(), getString(R.string.camera_privacy_text), Toast.LENGTH_LONG) - .show(); - preferences.edit().putBoolean(CAMERA_PRIVACY_PREF, true).apply(); + if (!PermissionsUtil.hasCameraPrivacyToastShown(getContext())) { + PermissionsUtil.showCameraPermissionToast(getContext()); } CameraManager.get().setListener(this); preview.setShown(); @@ -332,11 +326,7 @@ public class CameraComposerFragment extends CallComposerFragment /** Updates the state of the buttons and overlays based on the current state of the view */ private void updateViewState() { Assert.isNotNull(cameraView); - if (isDetached() || getContext() == null) { - LogUtil.i( - "CameraComposerFragment.updateViewState", "Fragment detached, cannot update view state"); - return; - } + Assert.isNotNull(getContext()); boolean isCameraAvailable = CameraManager.get().isCameraAvailable(); boolean uriReadyOrProcessing = cameraUri != null || processingUri; @@ -403,6 +393,7 @@ public class CameraComposerFragment extends CallComposerFragment Logger.get(getContext()).logImpression(DialerImpression.Type.CAMERA_PERMISSION_GRANTED); LogUtil.i("CameraComposerFragment.onRequestPermissionsResult", "Permission granted."); permissionView.setVisibility(View.GONE); + PermissionsUtil.setCameraPrivacyToastShown(getContext()); setupCamera(); } else if (requestCode == CAMERA_PERMISSION) { Logger.get(getContext()).logImpression(DialerImpression.Type.CAMERA_PERMISSION_DENIED); diff --git a/java/com/android/dialer/callcomposer/camera/CameraManager.java b/java/com/android/dialer/callcomposer/camera/CameraManager.java index 783b57ec3..5915ce331 100644 --- a/java/com/android/dialer/callcomposer/camera/CameraManager.java +++ b/java/com/android/dialer/callcomposer/camera/CameraManager.java @@ -118,7 +118,7 @@ public class CameraManager implements FocusOverlayManager.Listener { /** * The task for opening the camera, so it doesn't block the UI thread Using AsyncTask rather than * SafeAsyncTask because the tasks need to be serialized, but don't need to be on the UI thread - * TODO(blemmon): If we have other AyncTasks (not SafeAsyncTasks) this may contend and we may need + * TODO: If we have other AyncTasks (not SafeAsyncTasks) this may contend and we may need * to create a dedicated thread, or synchronize the threads in the thread pool */ private AsyncTask mOpenCameraTask; diff --git a/java/com/android/dialer/callcomposer/camera/camerafocus/FocusOverlayManager.java b/java/com/android/dialer/callcomposer/camera/camerafocus/FocusOverlayManager.java index a5edf3309..1c5ac380c 100644 --- a/java/com/android/dialer/callcomposer/camera/camerafocus/FocusOverlayManager.java +++ b/java/com/android/dialer/callcomposer/camera/camerafocus/FocusOverlayManager.java @@ -389,7 +389,7 @@ public class FocusOverlayManager { focusIndicator.showStart(); } else { if (Parameters.FOCUS_MODE_CONTINUOUS_PICTURE.equals(mFocusMode)) { - // TODO(blemmon): check HAL behavior and decide if this can be removed. + // TODO: check HAL behavior and decide if this can be removed. focusIndicator.showSuccess(false); } else if (mState == STATE_SUCCESS) { focusIndicator.showSuccess(false); diff --git a/java/com/android/dialer/callcomposer/camera/exif/ExifParser.java b/java/com/android/dialer/callcomposer/camera/exif/ExifParser.java index c728845a1..23d748c17 100644 --- a/java/com/android/dialer/callcomposer/camera/exif/ExifParser.java +++ b/java/com/android/dialer/callcomposer/camera/exif/ExifParser.java @@ -499,7 +499,7 @@ public class ExifParser { mTiffStream.skip(4); return null; } - // TODO(blemmon): handle numOfComp overflow + // TODO: handle numOfComp overflow ExifTag tag = new ExifTag( tagId, diff --git a/java/com/android/dialer/callcomposer/camera/exif/ExifTag.java b/java/com/android/dialer/callcomposer/camera/exif/ExifTag.java index 9a03c103c..a254ae93b 100644 --- a/java/com/android/dialer/callcomposer/camera/exif/ExifTag.java +++ b/java/com/android/dialer/callcomposer/camera/exif/ExifTag.java @@ -187,7 +187,7 @@ public class ExifTag { /** Gets the component count of this tag. */ - // TODO(blemmon): fix integer overflows with this + // TODO: fix integer overflows with this int getComponentCount() { return mComponentCountActual; } diff --git a/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml b/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml index 39c2d0d47..15562476a 100644 --- a/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml +++ b/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml @@ -51,6 +51,7 @@ android:background="@color/call_composer_divider"/> 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..8ba9e72e8 100644 --- a/java/com/android/dialer/callcomposer/res/values-bs/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-bs/strings.xml @@ -31,10 +31,8 @@ "Da snimite fotografiju, dajte pristup Kameri" "Da podijelite sliku, dozvolite pristup Medijima" "Uslikaj" - "Izaberi fotografiju" + "Odaberi 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/callcomposer/res/values/dimens.xml b/java/com/android/dialer/callcomposer/res/values/dimens.xml index 798c46f8e..083bd0ab5 100644 --- a/java/com/android/dialer/callcomposer/res/values/dimens.xml +++ b/java/com/android/dialer/callcomposer/res/values/dimens.xml @@ -15,15 +15,15 @@ ~ limitations under the License --> - 292dp + 306dp 2dp - 112dp - 56dp - 56dp - 16dp - 28sp + 116dp + 58dp + 58dp + 18dp + 32sp 16sp 2dp diff --git a/java/com/android/dialer/callcomposer/res/values/styles.xml b/java/com/android/dialer/callcomposer/res/values/styles.xml index a03ee4894..16e7fb622 100644 --- a/java/com/android/dialer/callcomposer/res/values/styles.xml +++ b/java/com/android/dialer/callcomposer/res/values/styles.xml @@ -34,8 +34,7 @@ diff --git a/java/com/android/dialer/calldetails/CallDetailsAdapter.java b/java/com/android/dialer/calldetails/CallDetailsAdapter.java index 66a736c8d..48e9b6998 100644 --- a/java/com/android/dialer/calldetails/CallDetailsAdapter.java +++ b/java/com/android/dialer/calldetails/CallDetailsAdapter.java @@ -26,7 +26,6 @@ import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry; import com.android.dialer.calllogutils.CallTypeHelper; import com.android.dialer.common.Assert; import com.android.dialer.dialercontact.DialerContact; -import com.android.dialer.lightbringer.LightbringerComponent; import java.util.List; /** Adapter for RecyclerView in {@link CallDetailsActivity}. */ @@ -49,9 +48,7 @@ final class CallDetailsAdapter extends RecyclerView.Adapter"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/call_initiation_type.proto b/java/com/android/dialer/callintent/call_initiation_type.proto index 32e4e49fc..318da9c86 100644 --- a/java/com/android/dialer/callintent/call_initiation_type.proto +++ b/java/com/android/dialer/callintent/call_initiation_type.proto @@ -8,7 +8,6 @@ option optimize_for = LITE_RUNTIME; package com.android.dialer.callintent; - // Different ways a call can be initiated. message CallInitiationType { enum Type { diff --git a/java/com/android/dialer/callintent/speed_dial_contact_type.proto b/java/com/android/dialer/callintent/speed_dial_contact_type.proto index ecb1c3f28..588eadf5a 100644 --- a/java/com/android/dialer/callintent/speed_dial_contact_type.proto +++ b/java/com/android/dialer/callintent/speed_dial_contact_type.proto @@ -8,7 +8,6 @@ option optimize_for = LITE_RUNTIME; package com.android.dialer.callintent; - // The type of speed call contact (favorites). Applies to initiation type // SPEED_DIAL only. message SpeedDialContactType { diff --git a/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java b/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java index 5f48d7b1f..887dfcbb6 100644 --- a/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java +++ b/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java @@ -68,7 +68,7 @@ class AnnotatedCallLogDatabaseHelper extends SQLiteOpenHelper { long startTime = System.currentTimeMillis(); db.execSQL(CREATE_TABLE_SQL); db.execSQL(String.format(Locale.US, CREATE_TRIGGER_SQL, maxRows, maxRows)); - // TODO(zachh): Consider logging impression. + // TODO: Consider logging impression. LogUtil.i( "AnnotatedCallLogDatabaseHelper.onCreate", "took: %dms", diff --git a/java/com/android/dialer/calllog/database/Coalescer.java b/java/com/android/dialer/calllog/database/Coalescer.java index 23ddc9c21..5683687fd 100644 --- a/java/com/android/dialer/calllog/database/Coalescer.java +++ b/java/com/android/dialer/calllog/database/Coalescer.java @@ -129,7 +129,7 @@ public class Coalescer { */ private static boolean rowsShouldBeCombined( DialerPhoneNumberUtil dialerPhoneNumberUtil, ContentValues row1, ContentValues row2) { - // TODO(zachh): Real implementation. + // TODO: Real implementation. DialerPhoneNumber number1; DialerPhoneNumber number2; try { diff --git a/java/com/android/dialer/calllog/datasources/contacts/ContactsDataSource.java b/java/com/android/dialer/calllog/datasources/contacts/ContactsDataSource.java index db7421515..82a85235b 100644 --- a/java/com/android/dialer/calllog/datasources/contacts/ContactsDataSource.java +++ b/java/com/android/dialer/calllog/datasources/contacts/ContactsDataSource.java @@ -39,7 +39,7 @@ public final class ContactsDataSource implements CallLogDataSource { public boolean isDirty(Context appContext) { Assert.isWorkerThread(); - // TODO(zachh): Implementation. + // TODO: Implementation. return false; } @@ -49,7 +49,7 @@ public final class ContactsDataSource implements CallLogDataSource { Context appContext, CallLogMutations mutations) { Assert.isWorkerThread(); - // TODO(zachh): Implementation. + // TODO: Implementation. for (ContentValues contentValues : mutations.getInserts().values()) { contentValues.put(AnnotatedCallLog.CONTACT_NAME, "Placeholder name"); } @@ -57,12 +57,12 @@ public final class ContactsDataSource implements CallLogDataSource { @Override public void onSuccessfulFill(Context appContext) { - // TODO(zachh): Implementation. + // TODO: Implementation. } @Override public ContentValues coalesce(List individualRowsSortedByTimestampDesc) { - // TODO(zachh): Implementation. + // TODO: Implementation. return new RowCombiner(individualRowsSortedByTimestampDesc) .useSingleValueString(AnnotatedCallLog.CONTACT_NAME) .combine(); @@ -72,6 +72,6 @@ public final class ContactsDataSource implements CallLogDataSource { @Override public void registerContentObservers( Context appContext, ContentObserverCallbacks contentObserverCallbacks) { - // TODO(zachh): Guard against missing permissions during callback registration. + // TODO: Guard against missing permissions during callback registration. } } diff --git a/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java b/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java index 86145a95b..f2063283f 100644 --- a/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java +++ b/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java @@ -143,7 +143,7 @@ public class SystemCallLogDataSource implements CallLogDataSource { @Override public ContentValues coalesce(List individualRowsSortedByTimestampDesc) { - // TODO(zachh): Complete implementation. + // TODO: Complete implementation. ContentValues coalescedValues = new RowCombiner(individualRowsSortedByTimestampDesc) .useMostRecentLong(AnnotatedCallLog.TIMESTAMP) @@ -182,7 +182,7 @@ public class SystemCallLogDataSource implements CallLogDataSource { DialerPhoneNumberUtil dialerPhoneNumberUtil = new DialerPhoneNumberUtil(PhoneNumberUtil.getInstance()); - // TODO(zachh): Really should be getting last 1000 by timestamp, not by last modified. + // TODO: Really should be getting last 1000 by timestamp, not by last modified. try (Cursor cursor = appContext .getContentResolver() diff --git a/java/com/android/dialer/calllog/ui/NewCallLogFragment.java b/java/com/android/dialer/calllog/ui/NewCallLogFragment.java index 17fcf1939..712f7cf25 100644 --- a/java/com/android/dialer/calllog/ui/NewCallLogFragment.java +++ b/java/com/android/dialer/calllog/ui/NewCallLogFragment.java @@ -92,7 +92,7 @@ public final class NewCallLogFragment extends Fragment CallLogFramework callLogFramework = CallLogComponent.get(getContext()).callLogFramework(); callLogFramework.attachUi(this); - // TODO(zachh): Consider doing this when fragment becomes visible. + // TODO: Consider doing this when fragment becomes visible. checkAnnotatedCallLogDirtyAndRefreshIfNecessary(); } @@ -142,7 +142,7 @@ public final class NewCallLogFragment extends Fragment public void onLoadFinished(Loader loader, Cursor newCursor) { LogUtil.enterBlock("NewCallLogFragment.onLoadFinished"); - // TODO(zachh): Handle empty cursor by showing empty view. + // TODO: Handle empty cursor by showing empty view. recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); recyclerView.setAdapter(new NewCallLogAdapter(newCursor)); } diff --git a/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java b/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java index 9521a032c..4c459e123 100644 --- a/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java +++ b/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java @@ -24,7 +24,7 @@ import java.util.Locale; /** {@link RecyclerView.ViewHolder} for the new call log. */ final class NewCallLogViewHolder extends RecyclerView.ViewHolder { - // TODO(zachh): Format correctly using current locale. + // TODO: Format correctly using current locale. private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.US); private final TextView contactNameView; diff --git a/java/com/android/dialer/calllogutils/CallEntryFormatter.java b/java/com/android/dialer/calllogutils/CallEntryFormatter.java index 6aa93af52..c5ec15748 100644 --- a/java/com/android/dialer/calllogutils/CallEntryFormatter.java +++ b/java/com/android/dialer/calllogutils/CallEntryFormatter.java @@ -95,9 +95,29 @@ public class CallEntryFormatter { // example output: "1s" formatPattern = context.getString(R.string.call_duration_short_format_pattern, "s", secondsString); + + // Temporary work around for a broken Hebrew(iw) translation. + if (formatPattern.endsWith("\'\'")) { + formatPattern = formatPattern.substring(0, formatPattern.length() - 1); + } + } + + // If new translation issues arise, we should catch them here to prevent crashes. + try { + Date date = new Date(TimeUnit.SECONDS.toMillis(elapsedSeconds)); + SimpleDateFormat format = new SimpleDateFormat(formatPattern); + String duration = format.format(date); + + // SimpleDateFormat cannot display more than 59 minutes, instead it displays MINUTES % 60. + // Here we check for that value and replace it with the correct value. + if (elapsedSeconds >= TimeUnit.MINUTES.toSeconds(60)) { + int minutes = (int) (elapsedSeconds / 60); + duration = duration.replaceFirst(Integer.toString(minutes % 60), Integer.toString(minutes)); + } + return duration; + } catch (Exception e) { + return ""; } - SimpleDateFormat format = new SimpleDateFormat(formatPattern); - return format.format(new Date(TimeUnit.SECONDS.toMillis(elapsedSeconds))); } private static CharSequence formatDurationA11y(Context context, long elapsedSeconds) { diff --git a/java/com/android/dialer/calllogutils/CallTypeHelper.java b/java/com/android/dialer/calllogutils/CallTypeHelper.java index 783f799f3..d3b5b67d7 100644 --- a/java/com/android/dialer/calllogutils/CallTypeHelper.java +++ b/java/com/android/dialer/calllogutils/CallTypeHelper.java @@ -18,7 +18,6 @@ package com.android.dialer.calllogutils; import android.content.res.Resources; import com.android.dialer.compat.AppCompatConstants; -import com.android.dialer.lightbringer.Lightbringer; /** Helper class to perform operations related to call types. */ public class CallTypeHelper { @@ -51,12 +50,8 @@ public class CallTypeHelper { private final CharSequence mBlockedName; /** Name used to identify calls which were answered on another device. */ private final CharSequence mAnsweredElsewhereName; - /** Name used to identify incoming lightbringer calls. */ - private final CharSequence mIncomingLightbringerCall; - /** Name used to identify outgoing lightbringer calls. */ - private final CharSequence mOutgoingLightbringerCall; - public CallTypeHelper(Resources resources, Lightbringer lightbringer) { + public CallTypeHelper(Resources resources) { // Cache these values so that we do not need to look them up each time. mIncomingName = resources.getString(R.string.type_incoming); mIncomingPulledName = resources.getString(R.string.type_incoming_pulled); @@ -72,18 +67,6 @@ public class CallTypeHelper { mRejectedName = resources.getString(R.string.type_rejected); mBlockedName = resources.getString(R.string.type_blocked); mAnsweredElsewhereName = resources.getString(R.string.type_answered_elsewhere); - - if (lightbringer.getIncomingCallTypeText() != -1) { - mIncomingLightbringerCall = resources.getString(lightbringer.getIncomingCallTypeText()); - } else { - mIncomingLightbringerCall = mIncomingVideoName; - } - - if (lightbringer.getOutgoingCallTypeText() != -1) { - mOutgoingLightbringerCall = resources.getString(lightbringer.getOutgoingCallTypeText()); - } else { - mOutgoingLightbringerCall = mOutgoingVideoName; - } } public static boolean isMissedCallType(int callType) { @@ -94,17 +77,13 @@ public class CallTypeHelper { } /** Returns the text used to represent the given call type. */ - public CharSequence getCallTypeText( - int callType, boolean isVideoCall, boolean isPulledCall, boolean isLightbringerCall) { + public CharSequence getCallTypeText(int callType, boolean isVideoCall, boolean isPulledCall) { switch (callType) { case AppCompatConstants.CALLS_INCOMING_TYPE: if (isVideoCall) { if (isPulledCall) { return mIncomingVideoPulledName; } else { - if (isLightbringerCall) { - return mIncomingLightbringerCall; - } return mIncomingVideoName; } } else { @@ -120,9 +99,6 @@ public class CallTypeHelper { if (isPulledCall) { return mOutgoingVideoPulledName; } else { - if (isLightbringerCall) { - return mOutgoingLightbringerCall; - } return mOutgoingVideoName; } } else { 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 b473402db..13c3e2cd9 100644 --- a/java/com/android/dialer/constants/TrafficStatsTags.java +++ b/java/com/android/dialer/constants/TrafficStatsTags.java @@ -26,9 +26,4 @@ public class TrafficStatsTags { public static final int REVERSE_GEOCODE_TAG = 0xd001; public static final int VISUAL_VOICEMAIL_TAG = 0xd002; public static final int DIALER_VOIP_TAG = 0xd003; - - // 0xFFFFFE00 to 0xFFFFFF00 reserved for proprietary extensions to the dialer app. - - // 0xFFFFFF00 to 0xFFFFFFFF reserved by the system (see TrafficStats#getAndSetThreadStatsTag) - } diff --git a/java/com/android/dialer/constants/googledialer/ConstantsImpl.java b/java/com/android/dialer/constants/googledialer/ConstantsImpl.java deleted file mode 100644 index 28d8b2514..000000000 --- a/java/com/android/dialer/constants/googledialer/ConstantsImpl.java +++ /dev/null @@ -1,43 +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.dialer.constants; - -import android.support.annotation.NonNull; -import com.android.dialer.proguard.UsedByReflection; - -/** Provider config values for Google Dialer. */ -@UsedByReflection(value = "Constants.java") -public class ConstantsImpl extends Constants { - - @Override - @NonNull - public String getFilteredNumberProviderAuthority() { - return "com.google.android.dialer.blocking.filterednumberprovider"; - } - - @Override - @NonNull - public String getFileProviderAuthority() { - return "com.google.android.dialer.files"; - } - - @NonNull - @Override - public String getAnnotatedCallLogProviderAuthority() { - return "com.google.android.dialer.annotatedcalllog"; - } -} diff --git a/java/com/android/dialer/contactactions/ContactActionBottomSheet.java b/java/com/android/dialer/contactactions/ContactActionBottomSheet.java index 56c8a9465..4718ff036 100644 --- a/java/com/android/dialer/contactactions/ContactActionBottomSheet.java +++ b/java/com/android/dialer/contactactions/ContactActionBottomSheet.java @@ -75,7 +75,7 @@ public class ContactActionBottomSheet extends BottomSheetDialog implements OnCli } } - // TODO(calderwoodra): add on click action to contact. + // TODO: add on click action to contact. private View getContactView(ViewGroup container) { LayoutInflater inflater = LayoutInflater.from(getContext()); View contactView = inflater.inflate(R.layout.contact_layout, container, false); diff --git a/java/com/android/dialer/contactsfragment/FastScroller.java b/java/com/android/dialer/contactsfragment/FastScroller.java index 2a86a3bb6..0223c5f1f 100644 --- a/java/com/android/dialer/contactsfragment/FastScroller.java +++ b/java/com/android/dialer/contactsfragment/FastScroller.java @@ -91,7 +91,6 @@ public class FastScroller extends RelativeLayout { int targetPos = getValueInRange(0, itemCount - 1, (int) scrolledPosition); layoutManager.scrollToPositionWithOffset(targetPos, 0); container.setText(adapter.getHeaderString(targetPos)); - adapter.refreshHeaders(); } // Returns a float in range [0, 1] which represents the position of the scroller. diff --git a/java/com/android/dialer/database/CallLogQueryHandler.java b/java/com/android/dialer/database/CallLogQueryHandler.java index 35f7854ac..4867d9dce 100644 --- a/java/com/android/dialer/database/CallLogQueryHandler.java +++ b/java/com/android/dialer/database/CallLogQueryHandler.java @@ -188,6 +188,20 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler { VoicemailComponent.get(mContext) .getVoicemailClient() .appendOmtpVoicemailSelectionClause(mContext, where, selectionArgs); + } else { + // Filter out all Duo entries other than video calls + where + .append(" AND (") + .append(Calls.PHONE_ACCOUNT_COMPONENT_NAME) + .append(" IS NULL OR ") + .append(Calls.PHONE_ACCOUNT_COMPONENT_NAME) + .append(" NOT LIKE 'com.google.android.apps.tachyon%' OR ") + .append(Calls.FEATURES) + .append(" & ") + .append(Calls.FEATURES_VIDEO) + .append(" == ") + .append(Calls.FEATURES_VIDEO) + .append(")"); } final int limit = (mLogLimit == -1) ? NUM_LOGS_TO_DISPLAY : mLogLimit; diff --git a/java/com/android/dialer/database/VoicemailStatusQuery.java b/java/com/android/dialer/database/VoicemailStatusQuery.java index dbd88be1f..d9e1b721b 100644 --- a/java/com/android/dialer/database/VoicemailStatusQuery.java +++ b/java/com/android/dialer/database/VoicemailStatusQuery.java @@ -27,7 +27,7 @@ import java.util.List; /** The query for the call voicemail status table. */ public class VoicemailStatusQuery { - // TODO(maxwelb): Column indices should be removed in favor of Cursor#getColumnIndex + // TODO: Column indices should be removed in favor of Cursor#getColumnIndex public static final int SOURCE_PACKAGE_INDEX = 0; public static final int SETTINGS_URI_INDEX = 1; public static final int VOICEMAIL_ACCESS_URI_INDEX = 2; diff --git a/java/com/android/dialer/enrichedcall/EnrichedCallManager.java b/java/com/android/dialer/enrichedcall/EnrichedCallManager.java index 4d00854ef..f1057be1d 100644 --- a/java/com/android/dialer/enrichedcall/EnrichedCallManager.java +++ b/java/com/android/dialer/enrichedcall/EnrichedCallManager.java @@ -23,7 +23,6 @@ import com.android.dialer.calldetails.CallDetailsEntries; 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.enrichedcall.videoshare.VideoShareSession; import com.android.dialer.multimedia.MultimediaData; import java.util.List; import java.util.Map; @@ -299,14 +298,6 @@ public interface EnrichedCallManager { @MainThread long getVideoShareInviteSessionId(@NonNull String number); - /** - * Returns the {@link VideoShareSession} for the given sessionId, or {@code null} if no session - * exists. - */ - @MainThread - @Nullable - VideoShareSession getVideoShareSession(long sessionId); - /** * Ends the given video share session. * diff --git a/java/com/android/dialer/enrichedcall/stub/EnrichedCallManagerStub.java b/java/com/android/dialer/enrichedcall/stub/EnrichedCallManagerStub.java index de95e0725..1f2b00514 100644 --- a/java/com/android/dialer/enrichedcall/stub/EnrichedCallManagerStub.java +++ b/java/com/android/dialer/enrichedcall/stub/EnrichedCallManagerStub.java @@ -27,7 +27,6 @@ import com.android.dialer.enrichedcall.EnrichedCallManager; import com.android.dialer.enrichedcall.Session; import com.android.dialer.enrichedcall.historyquery.proto.HistoryResult; import com.android.dialer.enrichedcall.videoshare.VideoShareListener; -import com.android.dialer.enrichedcall.videoshare.VideoShareSession; import com.android.dialer.multimedia.MultimediaData; import java.util.Collections; import java.util.List; @@ -170,14 +169,6 @@ public final class EnrichedCallManagerStub implements EnrichedCallManager { return Session.NO_SESSION_ID; } - @MainThread - @Nullable - @Override - public VideoShareSession getVideoShareSession(long sessionId) { - Assert.isMainThread(); - return null; - } - @Override public void endVideoShareSession(long sessionId) {} } diff --git a/java/com/android/dialer/enrichedcall/videoshare/VideoShareListener.java b/java/com/android/dialer/enrichedcall/videoshare/VideoShareListener.java index 0e5f79f2b..f24724afd 100644 --- a/java/com/android/dialer/enrichedcall/videoshare/VideoShareListener.java +++ b/java/com/android/dialer/enrichedcall/videoshare/VideoShareListener.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package com.android.dialer.enrichedcall.videoshare; import android.support.annotation.MainThread; diff --git a/java/com/android/dialer/enrichedcall/videoshare/VideoShareSession.java b/java/com/android/dialer/enrichedcall/videoshare/VideoShareSession.java deleted file mode 100644 index b0f24ff28..000000000 --- a/java/com/android/dialer/enrichedcall/videoshare/VideoShareSession.java +++ /dev/null @@ -1,39 +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.dialer.enrichedcall.videoshare; - -import android.support.annotation.NonNull; -import android.view.SurfaceView; - -/** Holds state information and data about video share sessions. */ -public interface VideoShareSession { - void setSessionId(long sessionId); - - long getSessionId(); - - int getState(); - - void pause(); - - void unpause(); - - void dispose(); - - void setSurfaceView(@NonNull SurfaceView surfaceView); - - void setCamera(String cameraId); -} diff --git a/java/com/android/dialer/interactions/res/layout/phone_disambig_item.xml b/java/com/android/dialer/interactions/res/layout/phone_disambig_item.xml old mode 100755 new mode 100644 diff --git a/java/com/android/dialer/interactions/res/values-bs/strings.xml b/java/com/android/dialer/interactions/res/values-bs/strings.xml index d7434f898..24601b51a 100644 --- a/java/com/android/dialer/interactions/res/values-bs/strings.xml +++ b/java/com/android/dialer/interactions/res/values-bs/strings.xml @@ -17,7 +17,7 @@ - "Izaberite broj" - "Izaberite broj" + "Odaberite broj" + "Odaberite broj" "Zapamti ovaj izbor" diff --git a/java/com/android/dialer/lightbringer/Lightbringer.java b/java/com/android/dialer/lightbringer/Lightbringer.java index 9b8a18061..8bfa7736a 100644 --- a/java/com/android/dialer/lightbringer/Lightbringer.java +++ b/java/com/android/dialer/lightbringer/Lightbringer.java @@ -22,12 +22,13 @@ import android.content.Intent; import android.support.annotation.MainThread; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.support.annotation.StringRes; import android.telecom.Call; import android.telecom.PhoneAccountHandle; public interface Lightbringer { + boolean isEnabled(); + @MainThread boolean isReachable(@NonNull Context context, @Nullable String number); @@ -57,12 +58,4 @@ public interface Lightbringer { @Nullable @MainThread String getPackageName(); - - @StringRes - @MainThread - int getOutgoingCallTypeText(); - - @StringRes - @MainThread - int getIncomingCallTypeText(); } diff --git a/java/com/android/dialer/lightbringer/stub/LightbringerStub.java b/java/com/android/dialer/lightbringer/stub/LightbringerStub.java index 92230a49e..e691b96f0 100644 --- a/java/com/android/dialer/lightbringer/stub/LightbringerStub.java +++ b/java/com/android/dialer/lightbringer/stub/LightbringerStub.java @@ -22,7 +22,6 @@ import android.content.Intent; import android.support.annotation.MainThread; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.support.annotation.StringRes; import android.telecom.Call; import android.telecom.PhoneAccountHandle; import com.android.dialer.common.Assert; @@ -35,6 +34,11 @@ public class LightbringerStub implements Lightbringer { @Inject public LightbringerStub() {} + @Override + public boolean isEnabled() { + return false; + } + @MainThread @Override public boolean isReachable(@NonNull Context context, @Nullable String number) { @@ -98,16 +102,4 @@ public class LightbringerStub implements Lightbringer { public String getPackageName() { return null; } - - @StringRes - @Override - public int getOutgoingCallTypeText() { - return -1; - } - - @StringRes - @Override - public int getIncomingCallTypeText() { - return -1; - } } diff --git a/java/com/android/dialer/logging/contact_lookup_result.proto b/java/com/android/dialer/logging/contact_lookup_result.proto index 6c83908b9..13ea3c8e5 100644 --- a/java/com/android/dialer/logging/contact_lookup_result.proto +++ b/java/com/android/dialer/logging/contact_lookup_result.proto @@ -6,8 +6,6 @@ option java_multiple_files = true; option optimize_for = LITE_RUNTIME; - - message ContactLookupResult { // The different results of a contact lookup done using a phone number. enum Type { diff --git a/java/com/android/dialer/logging/contact_source.proto b/java/com/android/dialer/logging/contact_source.proto index 3a24da1d0..ffd32de0e 100644 --- a/java/com/android/dialer/logging/contact_source.proto +++ b/java/com/android/dialer/logging/contact_source.proto @@ -6,8 +6,6 @@ option java_multiple_files = true; option optimize_for = LITE_RUNTIME; - - message ContactSource { // Applies only to reports made from call history. If we have contact // information for the phone number, this field indicates its source. diff --git a/java/com/android/dialer/logging/dialer_impression.proto b/java/com/android/dialer/logging/dialer_impression.proto index 8ccaf2dea..2f89a3aed 100644 --- a/java/com/android/dialer/logging/dialer_impression.proto +++ b/java/com/android/dialer/logging/dialer_impression.proto @@ -7,7 +7,6 @@ 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 @@ -49,7 +48,6 @@ message DialerImpression { // This happens when the user had initially blocked a number and also claimed the number was // spam and had now proceeded to undo that. REPORT_AS_NOT_SPAM_VIA_UNBLOCK_NUMBER = 1009 - ; // A number that was identified as spam and the user proceeded to block it. However this @@ -65,12 +63,10 @@ message DialerImpression { // the number via call log. This is for case where the user wants to block a number and also // report it as spam REPORT_CALL_AS_SPAM_VIA_CALL_LOG_BLOCK_REPORT_SPAM_SENT_VIA_BLOCK_NUMBER_DIALOG = 1011 - ; // User made it to the last step and actually blocked the number USER_ACTION_BLOCKED_NUMBER = 1012 - ; // User made it to the last step and actually unblocked the number @@ -93,19 +89,16 @@ message DialerImpression { // User added the number to contacts from the after call notification SPAM_AFTER_CALL_NOTIFICATION_ADD_TO_CONTACTS = 1019 - ; // User marked the number as spam on the after call notification flow SPAM_AFTER_CALL_NOTIFICATION_MARKED_NUMBER_AS_SPAM = 1020 - ; SPAM_AFTER_CALL_NOTIFICATION_MARKED_NUMBER_AS_NOT_SPAM_AND_BLOCKED = 1021; // User reported the number as not spam SPAM_AFTER_CALL_NOTIFICATION_REPORT_NUMBER_AS_NOT_SPAM = 1022 - ; // User dismissed the spam notification @@ -127,7 +120,6 @@ message DialerImpression { // able to stitch different types of events if they make sense e.g user pressed a speaker button // and we want to associate that to a call event USER_PARTICIPATED_IN_A_CALL = 1028 - ; // Incoming call is a spam call @@ -160,54 +152,44 @@ message DialerImpression { // User deleted a call log entry USER_DELETED_CALL_LOG_ITEM = 1048 - ; // User tapped on "Send a message" CALL_LOG_SEND_MESSAGE = 1049 - ; // User tapped on "Add to contact" CALL_LOG_ADD_TO_CONTACT = 1050 - ; // User tapped on "Create new contact" CALL_LOG_CREATE_NEW_CONTACT = 1051 - ; // User deleted an entry from the voicemail tab VOICEMAIL_DELETE_ENTRY = 1052 - ; // Voicemail call log entry was expanded. Could be either if the user tapped the voicemail // call log entry or pressed the play button when the voicemail call log entry was not expanded VOICEMAIL_EXPAND_ENTRY = 1053 - ; // The play button for voicemail call log entry was tapped directly (i.e when the voicemail // call log entry was not expanded and the playbutton was tapped) VOICEMAIL_PLAY_AUDIO_DIRECTLY= 1054 - ; // The play button after expanding the voicemail call log entry was tapped VOICEMAIL_PLAY_AUDIO_AFTER_EXPANDING_ENTRY= 1055 - ; // Incoming call was rejected from the notifications REJECT_INCOMING_CALL_FROM_NOTIFICATION= 1056 - ; // Incoming call was rejected from the answer screen including rejecting via sms and talkback REJECT_INCOMING_CALL_FROM_ANSWER_SCREEN= 1057 - ; // User tapped block and spam buttons in context menu, same as buttons in @@ -380,19 +362,14 @@ message DialerImpression { EMERGENCY_LAUNCHED_MAP = 1173; VIDEO_CALL_UPGRADE_REQUESTED = 1174 - ; VIDEO_CALL_REQUEST_ACCEPTED = 1175 - ; VIDEO_CALL_REQUEST_ACCEPTED_AS_AUDIO = 1176 - ; VIDEO_CALL_REQUEST_DECLINED = 1177 - ; VIDEO_CALL_REQUEST_RECEIVED = 1178 - ; RCS_VIDEO_SHARE_UPGRADE_REQUESTED = 1179; diff --git a/java/com/android/dialer/logging/interaction_event.proto b/java/com/android/dialer/logging/interaction_event.proto index 47ea53461..89cf46fc9 100644 --- a/java/com/android/dialer/logging/interaction_event.proto +++ b/java/com/android/dialer/logging/interaction_event.proto @@ -6,8 +6,6 @@ option java_multiple_files = true; option optimize_for = LITE_RUNTIME; - - message InteractionEvent { // Next Tag: 38 enum Type { diff --git a/java/com/android/dialer/logging/reporting_location.proto b/java/com/android/dialer/logging/reporting_location.proto index 3c1baf0fe..d436564df 100644 --- a/java/com/android/dialer/logging/reporting_location.proto +++ b/java/com/android/dialer/logging/reporting_location.proto @@ -6,8 +6,6 @@ option java_multiple_files = true; option optimize_for = LITE_RUNTIME; - - message ReportingLocation { // Spam reporting location enum Type { diff --git a/java/com/android/dialer/logging/screen_event.proto b/java/com/android/dialer/logging/screen_event.proto index 603f7104e..ca624774d 100644 --- a/java/com/android/dialer/logging/screen_event.proto +++ b/java/com/android/dialer/logging/screen_event.proto @@ -6,8 +6,6 @@ option java_multiple_files = true; option optimize_for = LITE_RUNTIME; - - message ScreenEvent { enum Type { diff --git a/java/com/android/dialer/logging/ui_action.proto b/java/com/android/dialer/logging/ui_action.proto index 886fe04eb..784dbed9b 100644 --- a/java/com/android/dialer/logging/ui_action.proto +++ b/java/com/android/dialer/logging/ui_action.proto @@ -6,8 +6,6 @@ option java_multiple_files = true; option optimize_for = LITE_RUNTIME; - - message UiAction { enum Type { UNKNOWN = 0; diff --git a/java/com/android/dialer/main/impl/MainActivity.java b/java/com/android/dialer/main/impl/MainActivity.java index 6dced3db2..4b2bd2e05 100644 --- a/java/com/android/dialer/main/impl/MainActivity.java +++ b/java/com/android/dialer/main/impl/MainActivity.java @@ -77,7 +77,7 @@ public final class MainActivity extends AppCompatActivity implements View.OnClic // open contacts return true; } else { - // TODO(calderwoodra) handle other menu items + // TODO handle other menu items return super.onOptionsItemSelected(item); } } diff --git a/java/com/android/dialer/main/impl/MainPagerAdapter.java b/java/com/android/dialer/main/impl/MainPagerAdapter.java index c669a620a..19cf4e7b1 100644 --- a/java/com/android/dialer/main/impl/MainPagerAdapter.java +++ b/java/com/android/dialer/main/impl/MainPagerAdapter.java @@ -49,13 +49,13 @@ final class MainPagerAdapter extends FragmentStatePagerAdapter { @Override public int getCount() { - // TODO(calderwoodra): add logic to hide/show voicemail tab + // TODO: add logic to hide/show voicemail tab return 3; } @Override public Fragment getItem(int position) { - // TODO(calderwoodra): implement tabs + // TODO: implement tabs return new StubFragment(); } diff --git a/java/com/android/dialer/notification/VoicemailChannelUtils.java b/java/com/android/dialer/notification/VoicemailChannelUtils.java index e2d0f3a21..dc74799ca 100644 --- a/java/com/android/dialer/notification/VoicemailChannelUtils.java +++ b/java/com/android/dialer/notification/VoicemailChannelUtils.java @@ -193,7 +193,7 @@ import java.util.Set; private static NotificationChannel newChannel( @NonNull Context context, @NonNull String channelId, @Nullable CharSequence nameSuffix) { CharSequence name = context.getText(R.string.notification_channel_voicemail); - // TODO(sail): Use a string resource template after v10. + // TODO: Use a string resource template after v10. if (!TextUtils.isEmpty(nameSuffix)) { name = TextUtils.concat(name, ": ", nameSuffix); } diff --git a/java/com/android/dialer/oem/CequintCallerIdManager.java b/java/com/android/dialer/oem/CequintCallerIdManager.java index 7b6ddbc3a..86097c41a 100644 --- a/java/com/android/dialer/oem/CequintCallerIdManager.java +++ b/java/com/android/dialer/oem/CequintCallerIdManager.java @@ -74,7 +74,7 @@ public class CequintCallerIdManager { private static boolean hasAlreadyCheckedCequintCallerIdPackage; private static boolean isCequintCallerIdEnabled; - // TODO(wangqi): Revisit it and maybe remove it if it's not necessary. + // TODO: Revisit it and maybe remove it if it's not necessary. private final ConcurrentHashMap callLogCache; /** Cequint caller id contact information. */ diff --git a/java/com/android/dialer/persistentlog/PersistentLogger.java b/java/com/android/dialer/persistentlog/PersistentLogger.java index 7d82ec1a1..cf43b8ca8 100644 --- a/java/com/android/dialer/persistentlog/PersistentLogger.java +++ b/java/com/android/dialer/persistentlog/PersistentLogger.java @@ -43,7 +43,7 @@ import java.util.concurrent.LinkedBlockingQueue; * com.google.android.apps.dialer.crashreporter.SilentCrashReporter} is expected to handle such * cases. * - *

{@link #logText(String, String)} should be used to log ad-hoc text logs. TODO(twyen): switch + *

{@link #logText(String, String)} should be used to log ad-hoc text logs. TODO: switch * to structured logging */ public final class PersistentLogger { diff --git a/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java b/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java index cc4ec2da8..ea4396f02 100644 --- a/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java +++ b/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java @@ -214,7 +214,7 @@ public class PhoneNumberHelper { private static boolean isVerizon(Context context) { // Verizon MCC/MNC codes copied from com/android/voicemailomtp/res/xml/vvm_config.xml. - // TODO(sail): Need a better way to do per carrier and per OEM configurations. + // TODO: Need a better way to do per carrier and per OEM configurations. switch (context.getSystemService(TelephonyManager.class).getSimOperator()) { case "310004": case "310010": diff --git a/java/com/android/dialer/postcall/AndroidManifest.xml b/java/com/android/dialer/postcall/AndroidManifest.xml index 7e69d3368..22c77dd93 100644 --- a/java/com/android/dialer/postcall/AndroidManifest.xml +++ b/java/com/android/dialer/postcall/AndroidManifest.xml @@ -22,6 +22,7 @@ android:name="com.android.dialer.postcall.PostCallActivity" android:exported="false" android:theme="@style/DialerThemeBase.NoActionBar" - android:windowSoftInputMode="adjustResize"/> + android:windowSoftInputMode="adjustResize" + android:screenOrientation="portrait"/> diff --git a/java/com/android/dialer/postcall/res/layout/post_call_activity.xml b/java/com/android/dialer/postcall/res/layout/post_call_activity.xml index c42764e5b..256c110b9 100644 --- a/java/com/android/dialer/postcall/res/layout/post_call_activity.xml +++ b/java/com/android/dialer/postcall/res/layout/post_call_activity.xml @@ -14,21 +14,20 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> - - - + android:layout_height="match_parent"> - \ No newline at end of file + + + \ No newline at end of file diff --git a/java/com/android/dialer/searchfragment/common/QueryFilteringUtil.java b/java/com/android/dialer/searchfragment/common/QueryFilteringUtil.java index ee6e61c2e..b23315b15 100644 --- a/java/com/android/dialer/searchfragment/common/QueryFilteringUtil.java +++ b/java/com/android/dialer/searchfragment/common/QueryFilteringUtil.java @@ -42,7 +42,7 @@ public class QueryFilteringUtil { } // Check matches initials - // TODO(calderwoodra) investigate faster implementation + // TODO investigate faster implementation query = digitsOnly(query); int queryIndex = 0; diff --git a/java/com/android/dialer/searchfragment/cp2/SearchContactCursor.java b/java/com/android/dialer/searchfragment/cp2/SearchContactCursor.java index 51992646a..a2ef58c3c 100644 --- a/java/com/android/dialer/searchfragment/cp2/SearchContactCursor.java +++ b/java/com/android/dialer/searchfragment/cp2/SearchContactCursor.java @@ -67,7 +67,7 @@ public final class SearchContactCursor implements Cursor { * @param query to filter cursor results. */ public SearchContactCursor(Cursor cursor, @Nullable String query) { - // TODO(calderwoodra) investigate copying this into a MatrixCursor and holding in memory + // TODO investigate copying this into a MatrixCursor and holding in memory this.cursor = cursor; filter(query); } diff --git a/java/com/android/dialer/searchfragment/cp2/SearchContactViewHolder.java b/java/com/android/dialer/searchfragment/cp2/SearchContactViewHolder.java index d3df02f79..5f06b5991 100644 --- a/java/com/android/dialer/searchfragment/cp2/SearchContactViewHolder.java +++ b/java/com/android/dialer/searchfragment/cp2/SearchContactViewHolder.java @@ -127,8 +127,8 @@ public final class SearchContactViewHolder extends ViewHolder implements OnClick return Contacts.getLookupUri(contactId, lookupKey); } - // TODO(calderwoodra): handle CNAP and cequint types. - // TODO(calderwoodra): unify this into a utility method with CallLogAdapter#getNumberType + // TODO: handle CNAP and cequint types. + // TODO: unify this into a utility method with CallLogAdapter#getNumberType private static String getLabel(Resources resources, Cursor cursor) { int numberType = cursor.getInt(Projections.PHONE_TYPE); String numberLabel = cursor.getString(Projections.PHONE_LABEL); @@ -171,7 +171,7 @@ public final class SearchContactViewHolder extends ViewHolder implements OnClick return CallToAction.VIDEO_CALL; } - // TODO(calderwoodra): enriched calling + // TODO: enriched calling return CallToAction.NONE; } @@ -183,13 +183,13 @@ public final class SearchContactViewHolder extends ViewHolder implements OnClick callToActionView.setVisibility(View.VISIBLE); callToActionView.setImageDrawable( context.getDrawable(com.android.contacts.common.R.drawable.ic_phone_attach)); - // TODO(calderwoodra): open call composer. + // TODO: open call composer. break; case CallToAction.VIDEO_CALL: callToActionView.setVisibility(View.VISIBLE); callToActionView.setImageDrawable( context.getDrawable(R.drawable.quantum_ic_videocam_white_24)); - // TODO(calderwoodra): place a video call + // TODO: place a video call break; case CallToAction.NONE: default: @@ -197,7 +197,7 @@ public final class SearchContactViewHolder extends ViewHolder implements OnClick "Invalid Call to action type: " + currentAction); } } else { - // TODO(calderwoodra): set the correct call initiation type. + // TODO: set the correct call initiation type. TelecomUtil.placeCall(context, new CallIntentBuilder(number, Type.REGULAR_SEARCH).build()); } } diff --git a/java/com/android/dialer/searchfragment/list/NewSearchFragment.java b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java index d20bb1f8c..fcc87c386 100644 --- a/java/com/android/dialer/searchfragment/list/NewSearchFragment.java +++ b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java @@ -67,7 +67,7 @@ public final class NewSearchFragment extends Fragment implements LoaderCallbacks @Override public Loader onCreateLoader(int id, Bundle bundle) { - // TODO(calderwoodra) add enterprise loader + // TODO add enterprise loader if (id == CONTACTS_LOADER_ID) { return new SearchContactsCursorLoader(getContext()); } else if (id == NEARBY_PLACES_ID) { diff --git a/java/com/android/dialer/searchfragment/list/SearchAdapter.java b/java/com/android/dialer/searchfragment/list/SearchAdapter.java index faa80fe85..023513e47 100644 --- a/java/com/android/dialer/searchfragment/list/SearchAdapter.java +++ b/java/com/android/dialer/searchfragment/list/SearchAdapter.java @@ -53,7 +53,7 @@ class SearchAdapter extends RecyclerView.Adapter { case RowType.NEARBY_PLACES_HEADER: return new HeaderViewHolder( LayoutInflater.from(context).inflate(R.layout.header_layout, root, false)); - case RowType.DIRECTORY_ROW: // TODO(calderwoodra): add directory rows to search + case RowType.DIRECTORY_ROW: // TODO: add directory rows to search case RowType.INVALID: default: throw Assert.createIllegalStateFailException("Invalid RowType: " + rowType); diff --git a/java/com/android/dialer/searchfragment/list/SearchCursorManager.java b/java/com/android/dialer/searchfragment/list/SearchCursorManager.java index 45d66aab8..216a9ada9 100644 --- a/java/com/android/dialer/searchfragment/list/SearchCursorManager.java +++ b/java/com/android/dialer/searchfragment/list/SearchCursorManager.java @@ -124,7 +124,7 @@ final class SearchCursorManager { void setQuery(String query) { if (contactsCursor != null) { - // TODO(calderwoodra): abstract this + // TODO: abstract this ((SearchContactCursor) contactsCursor).filter(query); } } @@ -242,7 +242,7 @@ final class SearchCursorManager { switch (rowType) { case RowType.NEARBY_PLACES_HEADER: return R.string.nearby_places; - case RowType.DIRECTORY_HEADER: // TODO(calderwoodra) + case RowType.DIRECTORY_HEADER: // TODO case RowType.DIRECTORY_ROW: case RowType.CONTACT_ROW: case RowType.NEARBY_PLACES_ROW: diff --git a/java/com/android/dialer/speeddial/SpeedDialFragment.java b/java/com/android/dialer/speeddial/SpeedDialFragment.java index c087439eb..68ee3888b 100644 --- a/java/com/android/dialer/speeddial/SpeedDialFragment.java +++ b/java/com/android/dialer/speeddial/SpeedDialFragment.java @@ -23,7 +23,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -/** Favorites fragment. Contents TBD. TODO(calderwoodra) */ +/** Favorites fragment. Contents TBD. TODO */ public class SpeedDialFragment extends Fragment { public static SpeedDialFragment newInstance() { @@ -38,7 +38,7 @@ public class SpeedDialFragment extends Fragment { } public boolean hasFrequents() { - // TODO(calderwoodra) + // TODO return false; } } diff --git a/java/com/android/dialer/theme/res/values-af/strings.xml b/java/com/android/dialer/theme/res/values-af/strings.xml index 17e6ceac4..9681aee94 100644 --- a/java/com/android/dialer/theme/res/values-af/strings.xml +++ b/java/com/android/dialer/theme/res/values-af/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Telefoonhokkie" "Foon" - "Kameratoestemming is geaktiveer" "Video-oproep" "Bel" diff --git a/java/com/android/dialer/theme/res/values-am/strings.xml b/java/com/android/dialer/theme/res/values-am/strings.xml index 5b0b2fd1f..0bbcc02b7 100644 --- a/java/com/android/dialer/theme/res/values-am/strings.xml +++ b/java/com/android/dialer/theme/res/values-am/strings.xml @@ -21,7 +21,6 @@ "%s %d" "የሕዝብ ስልክ" "ስልክ" - "የካሜራ ፈቃድ ነቅቷል" "የቪዲዮ ጥሪ" "ደውል" diff --git a/java/com/android/dialer/theme/res/values-ar/strings.xml b/java/com/android/dialer/theme/res/values-ar/strings.xml index ea3468e61..c474c6e44 100644 --- a/java/com/android/dialer/theme/res/values-ar/strings.xml +++ b/java/com/android/dialer/theme/res/values-ar/strings.xml @@ -21,7 +21,6 @@ "%s %d" "هاتف يعمل بالعملة" "الهاتف" - "تم تمكين إذن الكاميرا" "مكالمة فيديو" "اتصال" diff --git a/java/com/android/dialer/theme/res/values-az/strings.xml b/java/com/android/dialer/theme/res/values-az/strings.xml index 91ead1b68..f3e7a014d 100644 --- a/java/com/android/dialer/theme/res/values-az/strings.xml +++ b/java/com/android/dialer/theme/res/values-az/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Taksofon" "Telefon" - "Kamera icazəsi aktiv edildi" "Video zəng" "Zəng edin" diff --git a/java/com/android/dialer/theme/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/theme/res/values-b+sr+Latn/strings.xml index a1e59654f..e1a26fa90 100644 --- a/java/com/android/dialer/theme/res/values-b+sr+Latn/strings.xml +++ b/java/com/android/dialer/theme/res/values-b+sr+Latn/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Telefonska govornica" "Telefon" - "Omogućena je dozvola za kameru" "Uputi video poziv" "Pozovi" diff --git a/java/com/android/dialer/theme/res/values-be/strings.xml b/java/com/android/dialer/theme/res/values-be/strings.xml index 881aa7f20..305f608f0 100644 --- a/java/com/android/dialer/theme/res/values-be/strings.xml +++ b/java/com/android/dialer/theme/res/values-be/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Таксафон" "Тэлефон" - "Уключаны дазвол на выкарыстанне камеры" "Відэавыклік" "Выклікаць" diff --git a/java/com/android/dialer/theme/res/values-bg/strings.xml b/java/com/android/dialer/theme/res/values-bg/strings.xml index debc23803..77c80863b 100644 --- a/java/com/android/dialer/theme/res/values-bg/strings.xml +++ b/java/com/android/dialer/theme/res/values-bg/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Обществен телефон" "Телефон" - "Активирано бе разрешението за камерата" "Видеообаждане" "Обаждане" diff --git a/java/com/android/dialer/theme/res/values-bn/strings.xml b/java/com/android/dialer/theme/res/values-bn/strings.xml index 806ee8e02..1e13496ed 100644 --- a/java/com/android/dialer/theme/res/values-bn/strings.xml +++ b/java/com/android/dialer/theme/res/values-bn/strings.xml @@ -21,7 +21,6 @@ "%s %d" "পে ফোন" "ফোন" - "ক্যামেরার অনুমতি সক্ষম করা হয়েছে" "ভিডিও কল" "কল করুন" diff --git a/java/com/android/dialer/theme/res/values-bs/strings.xml b/java/com/android/dialer/theme/res/values-bs/strings.xml index bed71a230..051e4e947 100644 --- a/java/com/android/dialer/theme/res/values-bs/strings.xml +++ b/java/com/android/dialer/theme/res/values-bs/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Telefonska govornica" "Telefon" - "Dozvola za kameru je omogućena" "Videopoziv" "Pozovi" diff --git a/java/com/android/dialer/theme/res/values-ca/strings.xml b/java/com/android/dialer/theme/res/values-ca/strings.xml index 5140ca574..ce3bd4316 100644 --- a/java/com/android/dialer/theme/res/values-ca/strings.xml +++ b/java/com/android/dialer/theme/res/values-ca/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Telèfon públic" "Telèfon" - "S\'ha activat el permís d\'accés a la càmera" "Videotrucada" "Truca" diff --git a/java/com/android/dialer/theme/res/values-cs/strings.xml b/java/com/android/dialer/theme/res/values-cs/strings.xml index a951fe7a8..235260fb1 100644 --- a/java/com/android/dialer/theme/res/values-cs/strings.xml +++ b/java/com/android/dialer/theme/res/values-cs/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Telefonní automat" "Telefon" - "Byl povolen přístup k fotoaparátu" "Zahájit videohovor" "Volat" diff --git a/java/com/android/dialer/theme/res/values-da/strings.xml b/java/com/android/dialer/theme/res/values-da/strings.xml index 54f185041..552574486 100644 --- a/java/com/android/dialer/theme/res/values-da/strings.xml +++ b/java/com/android/dialer/theme/res/values-da/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Mønttelefon" "Opkald" - "Kameratilladelse er aktiveret" "Videoopkald" "Ring op" diff --git a/java/com/android/dialer/theme/res/values-de/strings.xml b/java/com/android/dialer/theme/res/values-de/strings.xml index 0c97581cb..b1555773d 100644 --- a/java/com/android/dialer/theme/res/values-de/strings.xml +++ b/java/com/android/dialer/theme/res/values-de/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Münztelefon" "Telefon" - "Berechtigung für Kamera aktiviert" "Videoanruf" "Anrufen" diff --git a/java/com/android/dialer/theme/res/values-el/strings.xml b/java/com/android/dialer/theme/res/values-el/strings.xml index 1c34a69c7..156b7cdbe 100644 --- a/java/com/android/dialer/theme/res/values-el/strings.xml +++ b/java/com/android/dialer/theme/res/values-el/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Τηλέφωνο με χρέωση" "Τηλέφωνο" - "Το δικαίωμα χρήσης της κάμερας έχει ενεργοποιηθεί" "Βιντεοκλήση" "Κλήση" diff --git a/java/com/android/dialer/theme/res/values-en-rAU/strings.xml b/java/com/android/dialer/theme/res/values-en-rAU/strings.xml index 136d7df33..36de9e5ae 100644 --- a/java/com/android/dialer/theme/res/values-en-rAU/strings.xml +++ b/java/com/android/dialer/theme/res/values-en-rAU/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Payphone" "Phone" - "Camera permission enabled" "Video call" "Call" diff --git a/java/com/android/dialer/theme/res/values-en-rGB/strings.xml b/java/com/android/dialer/theme/res/values-en-rGB/strings.xml index 136d7df33..36de9e5ae 100644 --- a/java/com/android/dialer/theme/res/values-en-rGB/strings.xml +++ b/java/com/android/dialer/theme/res/values-en-rGB/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Payphone" "Phone" - "Camera permission enabled" "Video call" "Call" diff --git a/java/com/android/dialer/theme/res/values-en-rIN/strings.xml b/java/com/android/dialer/theme/res/values-en-rIN/strings.xml index 136d7df33..36de9e5ae 100644 --- a/java/com/android/dialer/theme/res/values-en-rIN/strings.xml +++ b/java/com/android/dialer/theme/res/values-en-rIN/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Payphone" "Phone" - "Camera permission enabled" "Video call" "Call" diff --git a/java/com/android/dialer/theme/res/values-es-rUS/strings.xml b/java/com/android/dialer/theme/res/values-es-rUS/strings.xml index 90837b76a..be2eac8fc 100644 --- a/java/com/android/dialer/theme/res/values-es-rUS/strings.xml +++ b/java/com/android/dialer/theme/res/values-es-rUS/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Teléfono público" "Teléfono" - "Se activó el permiso de la cámara" "Videollamada" "Llamar" diff --git a/java/com/android/dialer/theme/res/values-es/strings.xml b/java/com/android/dialer/theme/res/values-es/strings.xml index c2d3ee3d4..c63374c24 100644 --- a/java/com/android/dialer/theme/res/values-es/strings.xml +++ b/java/com/android/dialer/theme/res/values-es/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Teléfono público" "Teléfono" - "Se ha habilitado el acceso a la cámara" "Videollamada" "Llamar" diff --git a/java/com/android/dialer/theme/res/values-et/strings.xml b/java/com/android/dialer/theme/res/values-et/strings.xml index 269fa6403..1f76a4b20 100644 --- a/java/com/android/dialer/theme/res/values-et/strings.xml +++ b/java/com/android/dialer/theme/res/values-et/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Telefoniautomaat" "Telefon" - "Kaameraluba on antud" "Videokõne" "Helista" diff --git a/java/com/android/dialer/theme/res/values-eu/strings.xml b/java/com/android/dialer/theme/res/values-eu/strings.xml index 14345f05f..8b284671a 100644 --- a/java/com/android/dialer/theme/res/values-eu/strings.xml +++ b/java/com/android/dialer/theme/res/values-eu/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Telefono publikoa" "Telefonoa" - "Kamera atzitzeko baimena eman da" "Bideo-deia" "Deitu" diff --git a/java/com/android/dialer/theme/res/values-fa/strings.xml b/java/com/android/dialer/theme/res/values-fa/strings.xml index f751f3404..340adb156 100644 --- a/java/com/android/dialer/theme/res/values-fa/strings.xml +++ b/java/com/android/dialer/theme/res/values-fa/strings.xml @@ -21,7 +21,6 @@ "%d %s" "تلفن عمومی" "تلفن" - "مجوز دوربین فعال شد" "تماس ویدیویی" "تماس" diff --git a/java/com/android/dialer/theme/res/values-fi/strings.xml b/java/com/android/dialer/theme/res/values-fi/strings.xml index 0c09d7f43..52cab8a83 100644 --- a/java/com/android/dialer/theme/res/values-fi/strings.xml +++ b/java/com/android/dialer/theme/res/values-fi/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Maksupuhelin" "Puhelin" - "Kameran käyttöoikeus myönnettiin" "Videopuhelu" "Soita" diff --git a/java/com/android/dialer/theme/res/values-fr-rCA/strings.xml b/java/com/android/dialer/theme/res/values-fr-rCA/strings.xml index 7d901ca39..b1d0ff12d 100644 --- a/java/com/android/dialer/theme/res/values-fr-rCA/strings.xml +++ b/java/com/android/dialer/theme/res/values-fr-rCA/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Cabine téléphonique" "Téléphone" - "Autorisation d\'accès à l\'appareil photo activée" "Appel vidéo" "Appeler" diff --git a/java/com/android/dialer/theme/res/values-fr/strings.xml b/java/com/android/dialer/theme/res/values-fr/strings.xml index 1c30ef1e7..b1d0ff12d 100644 --- a/java/com/android/dialer/theme/res/values-fr/strings.xml +++ b/java/com/android/dialer/theme/res/values-fr/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Cabine téléphonique" "Téléphone" - "Autorisation d\'accès à l\'appareil photo accordée" "Appel vidéo" "Appeler" diff --git a/java/com/android/dialer/theme/res/values-gl/strings.xml b/java/com/android/dialer/theme/res/values-gl/strings.xml index 083d395ad..1788843f2 100644 --- a/java/com/android/dialer/theme/res/values-gl/strings.xml +++ b/java/com/android/dialer/theme/res/values-gl/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Teléfono público" "Teléfono" - "Activouse o permiso de acceso á cámara" "Videochamada" "Chamar" diff --git a/java/com/android/dialer/theme/res/values-gu/strings.xml b/java/com/android/dialer/theme/res/values-gu/strings.xml index 4baba6971..8de6e2a4a 100644 --- a/java/com/android/dialer/theme/res/values-gu/strings.xml +++ b/java/com/android/dialer/theme/res/values-gu/strings.xml @@ -21,7 +21,6 @@ "%s %d" "પેફોન" "ફોન" - "કૅમેરાની પરવાનગી સક્ષમ કરી" "વિડિઓ કૉલ" "કૉલ કરો" diff --git a/java/com/android/dialer/theme/res/values-hi/strings.xml b/java/com/android/dialer/theme/res/values-hi/strings.xml index 758be5d22..fbc56e9c9 100644 --- a/java/com/android/dialer/theme/res/values-hi/strings.xml +++ b/java/com/android/dialer/theme/res/values-hi/strings.xml @@ -21,7 +21,6 @@ "%s %d" "पे-फ़ोन" "फ़ोन" - "कैमरे की अनुमति सक्षम की गई" "वीडियो कॉल" "कॉल करें" diff --git a/java/com/android/dialer/theme/res/values-hr/strings.xml b/java/com/android/dialer/theme/res/values-hr/strings.xml index 89a5aeec2..73c6542f9 100644 --- a/java/com/android/dialer/theme/res/values-hr/strings.xml +++ b/java/com/android/dialer/theme/res/values-hr/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Javna telefonska govornica" "Telefon" - "Omogućen je pristup kameri" "Videopoziv" "Pozovi" diff --git a/java/com/android/dialer/theme/res/values-hu/strings.xml b/java/com/android/dialer/theme/res/values-hu/strings.xml index 30051d430..d70977df4 100644 --- a/java/com/android/dialer/theme/res/values-hu/strings.xml +++ b/java/com/android/dialer/theme/res/values-hu/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Nyilvános telefon" "Telefon" - "Kameraengedély megadva" "Videohívás" "Hívás" diff --git a/java/com/android/dialer/theme/res/values-hy/strings.xml b/java/com/android/dialer/theme/res/values-hy/strings.xml index 6577dab16..5f53c9fea 100644 --- a/java/com/android/dialer/theme/res/values-hy/strings.xml +++ b/java/com/android/dialer/theme/res/values-hy/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Բջջային տերմինալ" "Հեռախոս" - "Տեսախցիկից օգտվելու թույլտվությունը տրամադրված է" "Տեսազանգ" "Զանգել" diff --git a/java/com/android/dialer/theme/res/values-in/strings.xml b/java/com/android/dialer/theme/res/values-in/strings.xml index d2d72b832..193c6e949 100644 --- a/java/com/android/dialer/theme/res/values-in/strings.xml +++ b/java/com/android/dialer/theme/res/values-in/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Telepon Umum" "Telepon" - "Izin kamera diaktifkan" "Video call" "Telepon" diff --git a/java/com/android/dialer/theme/res/values-is/strings.xml b/java/com/android/dialer/theme/res/values-is/strings.xml index ff3faf836..6a67ad942 100644 --- a/java/com/android/dialer/theme/res/values-is/strings.xml +++ b/java/com/android/dialer/theme/res/values-is/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Símasjálfsali" "Sími" - "Myndavélarheimild virk" "Hringja myndsímtal" "Hringja" diff --git a/java/com/android/dialer/theme/res/values-it/strings.xml b/java/com/android/dialer/theme/res/values-it/strings.xml index 4b26288ac..46c6d56b8 100644 --- a/java/com/android/dialer/theme/res/values-it/strings.xml +++ b/java/com/android/dialer/theme/res/values-it/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Cabina telefonica" "Telefono" - "Autorizzazioni della fotocamera attivate" "Videochiamata" "Chiama" diff --git a/java/com/android/dialer/theme/res/values-iw/strings.xml b/java/com/android/dialer/theme/res/values-iw/strings.xml index 09abf2ed1..1bc8cbbaa 100644 --- a/java/com/android/dialer/theme/res/values-iw/strings.xml +++ b/java/com/android/dialer/theme/res/values-iw/strings.xml @@ -21,7 +21,6 @@ "%s %d" "טלפון ציבורי" "טלפון" - "הרשאת הגישה למצלמה הופעלה" "שיחת וידאו" "התקשר" diff --git a/java/com/android/dialer/theme/res/values-ja/strings.xml b/java/com/android/dialer/theme/res/values-ja/strings.xml index 551d67983..839495d5b 100644 --- a/java/com/android/dialer/theme/res/values-ja/strings.xml +++ b/java/com/android/dialer/theme/res/values-ja/strings.xml @@ -21,7 +21,6 @@ "%s（%d）" "公衆電話" "電話" - "カメラへのアクセスを自動で許可しました" "ビデオハングアウト" "発信" diff --git a/java/com/android/dialer/theme/res/values-ka/strings.xml b/java/com/android/dialer/theme/res/values-ka/strings.xml index ab225954e..37fdabdb1 100644 --- a/java/com/android/dialer/theme/res/values-ka/strings.xml +++ b/java/com/android/dialer/theme/res/values-ka/strings.xml @@ -21,7 +21,6 @@ "%s %d" "გადახდის ტელეფონი" "ტელეფონი" - "კამერაზე წვდომის ნებართვა ჩართულია" "ვიდეოზარი" "დარეკვა" diff --git a/java/com/android/dialer/theme/res/values-kk/strings.xml b/java/com/android/dialer/theme/res/values-kk/strings.xml index d3a1b7bb9..1b6a516e6 100644 --- a/java/com/android/dialer/theme/res/values-kk/strings.xml +++ b/java/com/android/dialer/theme/res/values-kk/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Автомат-телефон" "Телефон" - "Камера рұқсаты қосылды" "Бейне қоңырау" "Қоңырау шалу" diff --git a/java/com/android/dialer/theme/res/values-km/strings.xml b/java/com/android/dialer/theme/res/values-km/strings.xml index 900f1d690..cfc20104d 100644 --- a/java/com/android/dialer/theme/res/values-km/strings.xml +++ b/java/com/android/dialer/theme/res/values-km/strings.xml @@ -21,7 +21,6 @@ "%s %d" "ទូរស័ព្ទសាធារណៈ" "ទូរស័ព្ទ" - "បានបើក​ការអនុញ្ញាត​កាមេរ៉ា" "ការ​ហៅវីដេអូ" "ហៅ​ទូរសព្ទ" diff --git a/java/com/android/dialer/theme/res/values-kn/strings.xml b/java/com/android/dialer/theme/res/values-kn/strings.xml index ab9f816db..dffa10e08 100644 --- a/java/com/android/dialer/theme/res/values-kn/strings.xml +++ b/java/com/android/dialer/theme/res/values-kn/strings.xml @@ -21,7 +21,6 @@ "%s %d" "ಪೇಫೋನ್" "ಫೋನ್" - "ಕ್ಯಾಮರಾ ಅನುಮತಿಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ" "ವೀಡಿಯೊ ಕರೆ" "ಕರೆಮಾಡಿ" diff --git a/java/com/android/dialer/theme/res/values-ko/strings.xml b/java/com/android/dialer/theme/res/values-ko/strings.xml index b5ac55695..ff6710c95 100644 --- a/java/com/android/dialer/theme/res/values-ko/strings.xml +++ b/java/com/android/dialer/theme/res/values-ko/strings.xml @@ -21,7 +21,6 @@ "%s %d" "공중전화" "휴대전화" - "카메라 권한 사용 가능" "화상 통화" "전화" diff --git a/java/com/android/dialer/theme/res/values-ky/strings.xml b/java/com/android/dialer/theme/res/values-ky/strings.xml index 0a9bec294..036c27096 100644 --- a/java/com/android/dialer/theme/res/values-ky/strings.xml +++ b/java/com/android/dialer/theme/res/values-ky/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Таксофон" "Телефон" - "Камеранын уруксаты иштетилди" "Видео чалуу" "Чалуу" diff --git a/java/com/android/dialer/theme/res/values-lo/strings.xml b/java/com/android/dialer/theme/res/values-lo/strings.xml index d33d43e5b..9204a022d 100644 --- a/java/com/android/dialer/theme/res/values-lo/strings.xml +++ b/java/com/android/dialer/theme/res/values-lo/strings.xml @@ -21,7 +21,6 @@ "%s %d" "ຕູ້​ໂທ​ລະ​ສັບ​ສາ​ທາ​ລະ​ນະ" "ໂທລະສັບ" - "ເປີດໃຊ້ສິດອະນຸຍາດກ້ອງຖ່າຍຮູບແລ້ວ" "ໂທວິດີໂອ" "ໂທ" diff --git a/java/com/android/dialer/theme/res/values-lt/strings.xml b/java/com/android/dialer/theme/res/values-lt/strings.xml index fdf31e227..be145363c 100644 --- a/java/com/android/dialer/theme/res/values-lt/strings.xml +++ b/java/com/android/dialer/theme/res/values-lt/strings.xml @@ -21,7 +21,6 @@ "%d %s" "Taksofonas" "Telefonas" - "Fotoaparato leidimas įgalintas" "Vaizdo skambutis" "Skambinti" diff --git a/java/com/android/dialer/theme/res/values-lv/strings.xml b/java/com/android/dialer/theme/res/values-lv/strings.xml index 031c5bdea..35b742f84 100644 --- a/java/com/android/dialer/theme/res/values-lv/strings.xml +++ b/java/com/android/dialer/theme/res/values-lv/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Maksas tālrunis" "Tālrunis" - "Kameras atļauja iespējota" "Videozvans" "Zvanīt" diff --git a/java/com/android/dialer/theme/res/values-mk/strings.xml b/java/com/android/dialer/theme/res/values-mk/strings.xml index d89d12e90..3975ae5ff 100644 --- a/java/com/android/dialer/theme/res/values-mk/strings.xml +++ b/java/com/android/dialer/theme/res/values-mk/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Говорница" "Телефон" - "Дозволата за камера е овозможена" "Воспоставете видеоповик" "Повикајте" diff --git a/java/com/android/dialer/theme/res/values-ml/strings.xml b/java/com/android/dialer/theme/res/values-ml/strings.xml index f02ceeb06..146bfdf60 100644 --- a/java/com/android/dialer/theme/res/values-ml/strings.xml +++ b/java/com/android/dialer/theme/res/values-ml/strings.xml @@ -21,7 +21,6 @@ "%s %d" "പണം നൽകി ഉപയോഗിക്കുന്ന ഫോൺ" "ഫോണ്‍" - "ക്യാമറ അനുമതി നൽകി" "വീഡിയോ കോള്‍" "വിളിക്കുക" diff --git a/java/com/android/dialer/theme/res/values-mn/strings.xml b/java/com/android/dialer/theme/res/values-mn/strings.xml index 7a07e5d4d..0e27e8db0 100644 --- a/java/com/android/dialer/theme/res/values-mn/strings.xml +++ b/java/com/android/dialer/theme/res/values-mn/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Payphone" "Утас" - "Камерын зөвшөөрөл идэвхжсэн" "Видео дуудлага" "Залгах" diff --git a/java/com/android/dialer/theme/res/values-mr/strings.xml b/java/com/android/dialer/theme/res/values-mr/strings.xml index eeb9afa1e..7fa6f26d9 100644 --- a/java/com/android/dialer/theme/res/values-mr/strings.xml +++ b/java/com/android/dialer/theme/res/values-mr/strings.xml @@ -21,7 +21,6 @@ "%s %d" "सार्वजनिक फोन" "फोन" - "कॅमेरा परवानगी सक्षम केली" "व्हिडिओ कॉल" "कॉल करा" diff --git a/java/com/android/dialer/theme/res/values-ms/strings.xml b/java/com/android/dialer/theme/res/values-ms/strings.xml index 2e424fdf7..18df9122d 100644 --- a/java/com/android/dialer/theme/res/values-ms/strings.xml +++ b/java/com/android/dialer/theme/res/values-ms/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Telefon Awam" "Telefon" - "Kebenaran kamera didayakan" "Panggilan video" "Panggil" diff --git a/java/com/android/dialer/theme/res/values-my/strings.xml b/java/com/android/dialer/theme/res/values-my/strings.xml index 97b871b30..67b9b28c7 100644 --- a/java/com/android/dialer/theme/res/values-my/strings.xml +++ b/java/com/android/dialer/theme/res/values-my/strings.xml @@ -21,7 +21,6 @@ "%s %d" "ငွေပေးရသည့်ဖုန်း" "ဖုန်း" - "ကင်မရာအသုံးပြုခွင့် ဖွင့်ထားပါသည်" "ဗီဒီယိုခေါ်ဆိုမှု" "ခေါ်ဆိုရန်" diff --git a/java/com/android/dialer/theme/res/values-nb/strings.xml b/java/com/android/dialer/theme/res/values-nb/strings.xml index 7587b7e30..1a6e593e5 100644 --- a/java/com/android/dialer/theme/res/values-nb/strings.xml +++ b/java/com/android/dialer/theme/res/values-nb/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Telefonkiosk" "Telefon" - "Kameratillatelsen er aktivert" "Videosamtale" "Ring" diff --git a/java/com/android/dialer/theme/res/values-ne/strings.xml b/java/com/android/dialer/theme/res/values-ne/strings.xml index af1ad5e24..eb73de90c 100644 --- a/java/com/android/dialer/theme/res/values-ne/strings.xml +++ b/java/com/android/dialer/theme/res/values-ne/strings.xml @@ -21,7 +21,6 @@ "%s %d" "पेफोन" "फोन" - "क्यामेरा सम्बन्धी अनुमतिहरूलाई सक्षम पारियो" "भिडियो कल" "कल गर्नुहोस्" diff --git a/java/com/android/dialer/theme/res/values-nl/strings.xml b/java/com/android/dialer/theme/res/values-nl/strings.xml index ab51c97ae..36e904cc2 100644 --- a/java/com/android/dialer/theme/res/values-nl/strings.xml +++ b/java/com/android/dialer/theme/res/values-nl/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Telefooncel" "Telefoon" - "Camerarechten ingeschakeld" "Videogesprek" "Bellen" diff --git a/java/com/android/dialer/theme/res/values-no/strings.xml b/java/com/android/dialer/theme/res/values-no/strings.xml index 7587b7e30..1a6e593e5 100644 --- a/java/com/android/dialer/theme/res/values-no/strings.xml +++ b/java/com/android/dialer/theme/res/values-no/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Telefonkiosk" "Telefon" - "Kameratillatelsen er aktivert" "Videosamtale" "Ring" diff --git a/java/com/android/dialer/theme/res/values-pa/strings.xml b/java/com/android/dialer/theme/res/values-pa/strings.xml index 8784bcae1..af263c82c 100644 --- a/java/com/android/dialer/theme/res/values-pa/strings.xml +++ b/java/com/android/dialer/theme/res/values-pa/strings.xml @@ -21,7 +21,6 @@ "%s %d" "ਪੇਫੋਨ" "ਫੋਨ" - "ਕੈਮਰਾ ਇਜਾਜ਼ਤ ਨੂੰ ਯੋਗ ਬਣਾਇਆ ਗਿਆ ਹੈ" "ਵੀਡੀਓ ਕਾਲ" "ਕਾਲ ਕਰੋ" diff --git a/java/com/android/dialer/theme/res/values-pl/strings.xml b/java/com/android/dialer/theme/res/values-pl/strings.xml index 246261e97..a25df0a2a 100644 --- a/java/com/android/dialer/theme/res/values-pl/strings.xml +++ b/java/com/android/dialer/theme/res/values-pl/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Automat telefoniczny" "Telefon" - "Uprawnienia do korzystania z aparatu zostały włączone" "Rozmowa wideo" "Zadzwoń" diff --git a/java/com/android/dialer/theme/res/values-pt-rBR/strings.xml b/java/com/android/dialer/theme/res/values-pt-rBR/strings.xml index c1356d9b3..9f44269aa 100644 --- a/java/com/android/dialer/theme/res/values-pt-rBR/strings.xml +++ b/java/com/android/dialer/theme/res/values-pt-rBR/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Telefone público" "Telefone" - "Permissão de câmera ativada" "Videochamada" "Ligar" diff --git a/java/com/android/dialer/theme/res/values-pt-rPT/strings.xml b/java/com/android/dialer/theme/res/values-pt-rPT/strings.xml index 2b46e44a1..1b77257e8 100644 --- a/java/com/android/dialer/theme/res/values-pt-rPT/strings.xml +++ b/java/com/android/dialer/theme/res/values-pt-rPT/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Telefone público" "Telefone" - "Autorização da câmara ativada" "Videochamada" "Telefonar" diff --git a/java/com/android/dialer/theme/res/values-pt/strings.xml b/java/com/android/dialer/theme/res/values-pt/strings.xml index c1356d9b3..9f44269aa 100644 --- a/java/com/android/dialer/theme/res/values-pt/strings.xml +++ b/java/com/android/dialer/theme/res/values-pt/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Telefone público" "Telefone" - "Permissão de câmera ativada" "Videochamada" "Ligar" diff --git a/java/com/android/dialer/theme/res/values-ro/strings.xml b/java/com/android/dialer/theme/res/values-ro/strings.xml index 8978e9240..1cf8c8ca0 100644 --- a/java/com/android/dialer/theme/res/values-ro/strings.xml +++ b/java/com/android/dialer/theme/res/values-ro/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Telefon public" "Telefon" - "Permisiunea pentru cameră a fost activată." "Apel video" "Apelați" diff --git a/java/com/android/dialer/theme/res/values-ru/strings.xml b/java/com/android/dialer/theme/res/values-ru/strings.xml index a155052be..8aa6e8fa0 100644 --- a/java/com/android/dialer/theme/res/values-ru/strings.xml +++ b/java/com/android/dialer/theme/res/values-ru/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Телефон-автомат" "Телефон" - "Доступ к камере разрешен" "Видеовызов" "Позвонить" diff --git a/java/com/android/dialer/theme/res/values-si/strings.xml b/java/com/android/dialer/theme/res/values-si/strings.xml index 424a11255..04d04687d 100644 --- a/java/com/android/dialer/theme/res/values-si/strings.xml +++ b/java/com/android/dialer/theme/res/values-si/strings.xml @@ -21,7 +21,6 @@ "%s %d" "පේෆෝනය" "දුරකථනය" - "කැමරා අවසර සබල කර ඇත" "වීඩියෝ ඇමතුම" "ඇමතුම" diff --git a/java/com/android/dialer/theme/res/values-sk/strings.xml b/java/com/android/dialer/theme/res/values-sk/strings.xml index 411b85edc..9e56e12ab 100644 --- a/java/com/android/dialer/theme/res/values-sk/strings.xml +++ b/java/com/android/dialer/theme/res/values-sk/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Telefónny automat" "Telefón" - "Povolenie pre fotoaparát je aktivované" "Videohovor" "Volať" diff --git a/java/com/android/dialer/theme/res/values-sl/strings.xml b/java/com/android/dialer/theme/res/values-sl/strings.xml index 85a3e2b8e..623653563 100644 --- a/java/com/android/dialer/theme/res/values-sl/strings.xml +++ b/java/com/android/dialer/theme/res/values-sl/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Telefonska govorilnica" "Telefon" - "Dovoljenje za dostop do fotoaparata je omogočeno" "Videoklic" "Pokliči" diff --git a/java/com/android/dialer/theme/res/values-sq/strings.xml b/java/com/android/dialer/theme/res/values-sq/strings.xml index 5cbd587d3..6fecf147a 100644 --- a/java/com/android/dialer/theme/res/values-sq/strings.xml +++ b/java/com/android/dialer/theme/res/values-sq/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Telefon me pagesë" "Telefoni" - "Leja e kamerës është aktivizuar" "Telefonatë me video" "Telefono" diff --git a/java/com/android/dialer/theme/res/values-sr/strings.xml b/java/com/android/dialer/theme/res/values-sr/strings.xml index 310da735d..8f910540b 100644 --- a/java/com/android/dialer/theme/res/values-sr/strings.xml +++ b/java/com/android/dialer/theme/res/values-sr/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Телефонска говорница" "Телефон" - "Омогућена је дозвола за камеру" "Упути видео позив" "Позови" diff --git a/java/com/android/dialer/theme/res/values-sv/strings.xml b/java/com/android/dialer/theme/res/values-sv/strings.xml index af8e5f7b1..f31a3788c 100644 --- a/java/com/android/dialer/theme/res/values-sv/strings.xml +++ b/java/com/android/dialer/theme/res/values-sv/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Telefonautomat" "Telefon" - "Kamerabehörighet har aktiverats" "Videosamtal" "Ring" diff --git a/java/com/android/dialer/theme/res/values-sw/strings.xml b/java/com/android/dialer/theme/res/values-sw/strings.xml index 31615febb..c35d56017 100644 --- a/java/com/android/dialer/theme/res/values-sw/strings.xml +++ b/java/com/android/dialer/theme/res/values-sw/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Simu ya kulipia" "Simu" - "Imewasha ruhusa ya kamera" "Simu ya video" "Piga simu" diff --git a/java/com/android/dialer/theme/res/values-ta/strings.xml b/java/com/android/dialer/theme/res/values-ta/strings.xml index ab15f0b0c..737e43edf 100644 --- a/java/com/android/dialer/theme/res/values-ta/strings.xml +++ b/java/com/android/dialer/theme/res/values-ta/strings.xml @@ -21,7 +21,6 @@ "%s %d" "கட்டணத் தொலைபேசி" "மொபைல்" - "கேமராவிற்கான அனுமதி இயக்கப்பட்டது" "வீடியோ அழைப்பு" "அழை" diff --git a/java/com/android/dialer/theme/res/values-te/strings.xml b/java/com/android/dialer/theme/res/values-te/strings.xml index 4a6fca1fb..c1a02123c 100644 --- a/java/com/android/dialer/theme/res/values-te/strings.xml +++ b/java/com/android/dialer/theme/res/values-te/strings.xml @@ -21,7 +21,6 @@ "%s %d" "పే ఫోన్" "ఫోన్" - "కెమెరా అనుమతిని ప్రారంభించాము" "వీడియో కాల్" "కాల్ చేయి" diff --git a/java/com/android/dialer/theme/res/values-th/strings.xml b/java/com/android/dialer/theme/res/values-th/strings.xml index 51db053fa..0df98d9c4 100644 --- a/java/com/android/dialer/theme/res/values-th/strings.xml +++ b/java/com/android/dialer/theme/res/values-th/strings.xml @@ -21,7 +21,6 @@ "%s %d" "โทรศัพท์สาธารณะ" "โทรศัพท์" - "ให้สิทธิ์เข้าถึงกล้องถ่ายรูปแล้ว" "แฮงเอาท์วิดีโอ" "โทร" diff --git a/java/com/android/dialer/theme/res/values-tl/strings.xml b/java/com/android/dialer/theme/res/values-tl/strings.xml index 97f69ec1c..573b6b889 100644 --- a/java/com/android/dialer/theme/res/values-tl/strings.xml +++ b/java/com/android/dialer/theme/res/values-tl/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Payphone" "Telepono" - "Na-enable ang pahintulot sa camera" "Mag-video call" "Tawag" diff --git a/java/com/android/dialer/theme/res/values-tr/strings.xml b/java/com/android/dialer/theme/res/values-tr/strings.xml index b38f0674d..21e288964 100644 --- a/java/com/android/dialer/theme/res/values-tr/strings.xml +++ b/java/com/android/dialer/theme/res/values-tr/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Ankesörlü telefon" "Telefon" - "Kamera izni etkinleştirildi" "Görüntülü görüşme" "Telefon et" diff --git a/java/com/android/dialer/theme/res/values-uk/strings.xml b/java/com/android/dialer/theme/res/values-uk/strings.xml index f0702770a..dab89df98 100644 --- a/java/com/android/dialer/theme/res/values-uk/strings.xml +++ b/java/com/android/dialer/theme/res/values-uk/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Таксофон" "Телефон" - "Камері надано дозвіл" "Відеодзвінок" "Виклик" diff --git a/java/com/android/dialer/theme/res/values-ur/strings.xml b/java/com/android/dialer/theme/res/values-ur/strings.xml index e9a4b44bb..187eb22d2 100644 --- a/java/com/android/dialer/theme/res/values-ur/strings.xml +++ b/java/com/android/dialer/theme/res/values-ur/strings.xml @@ -21,7 +21,6 @@ "%s %d" "پے فون" "فون" - "کیمرا کی اجازت فعال ہے" "ویڈیو کال" "کال کریں" diff --git a/java/com/android/dialer/theme/res/values-uz/strings.xml b/java/com/android/dialer/theme/res/values-uz/strings.xml index 2bbaf2080..959ca779a 100644 --- a/java/com/android/dialer/theme/res/values-uz/strings.xml +++ b/java/com/android/dialer/theme/res/values-uz/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Taksofon" "Telefon" - "Kameraga kirishga ruxsat berildi" "Video suhbat" "Chaqirish" diff --git a/java/com/android/dialer/theme/res/values-vi/strings.xml b/java/com/android/dialer/theme/res/values-vi/strings.xml index fae318091..38bd8ec4f 100644 --- a/java/com/android/dialer/theme/res/values-vi/strings.xml +++ b/java/com/android/dialer/theme/res/values-vi/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Điện thoại công cộng" "Điện thoại" - "Đã bật quyền sử dụng máy ảnh" "Gọi điện video" "Gọi" diff --git a/java/com/android/dialer/theme/res/values-zh-rCN/strings.xml b/java/com/android/dialer/theme/res/values-zh-rCN/strings.xml index 2e6096296..c80f19748 100644 --- a/java/com/android/dialer/theme/res/values-zh-rCN/strings.xml +++ b/java/com/android/dialer/theme/res/values-zh-rCN/strings.xml @@ -21,7 +21,6 @@ "%s %d" "公用电话" "电话" - "已启用相机使用权限" "视频通话" "拨打电话" diff --git a/java/com/android/dialer/theme/res/values-zh-rHK/strings.xml b/java/com/android/dialer/theme/res/values-zh-rHK/strings.xml index 7b08024ac..605089bbb 100644 --- a/java/com/android/dialer/theme/res/values-zh-rHK/strings.xml +++ b/java/com/android/dialer/theme/res/values-zh-rHK/strings.xml @@ -21,7 +21,6 @@ "%s %d" "公共電話" "電話" - "已啟用相機權限" "視像通話" "通話" diff --git a/java/com/android/dialer/theme/res/values-zh-rTW/strings.xml b/java/com/android/dialer/theme/res/values-zh-rTW/strings.xml index 57d7fe2b1..7a5604c0a 100644 --- a/java/com/android/dialer/theme/res/values-zh-rTW/strings.xml +++ b/java/com/android/dialer/theme/res/values-zh-rTW/strings.xml @@ -21,7 +21,6 @@ "%s %d" "公用電話" "電話" - "已啟用相機權限" "視訊通話" "撥號" diff --git a/java/com/android/dialer/theme/res/values-zu/strings.xml b/java/com/android/dialer/theme/res/values-zu/strings.xml index d0dd7288b..ae07c45cc 100644 --- a/java/com/android/dialer/theme/res/values-zu/strings.xml +++ b/java/com/android/dialer/theme/res/values-zu/strings.xml @@ -21,7 +21,6 @@ "%s %d" "Ucingo olufakwa imali" "Ifoni" - "Imvume yekhamera inikwe amandla" "Ikholi yevidiyo" "Shaya" diff --git a/java/com/android/dialer/theme/res/values/strings.xml b/java/com/android/dialer/theme/res/values/strings.xml index af61d3596..74cabadf7 100644 --- a/java/com/android/dialer/theme/res/values/strings.xml +++ b/java/com/android/dialer/theme/res/values/strings.xml @@ -30,9 +30,6 @@ used in the Launcher icon. --> Phone - - Camera permission enabled - Video call diff --git a/java/com/android/dialer/util/PermissionsUtil.java b/java/com/android/dialer/util/PermissionsUtil.java index 34828317d..cb973680d 100644 --- a/java/com/android/dialer/util/PermissionsUtil.java +++ b/java/com/android/dialer/util/PermissionsUtil.java @@ -38,6 +38,7 @@ import android.content.pm.PackageManager; import android.support.annotation.NonNull; import android.support.v4.content.ContextCompat; import android.support.v4.content.LocalBroadcastManager; +import android.widget.Toast; import com.android.dialer.common.LogUtil; import java.util.ArrayList; import java.util.Arrays; @@ -47,6 +48,7 @@ import java.util.List; /** Utility class to help with runtime permissions. */ public class PermissionsUtil { + private static final String PREFERENCE_CAMERA_ALLOWED_BY_USER = "camera_allowed_by_user"; private static final String PERMISSION_PREFERENCE = "dialer_permissions"; private static final String CEQUINT_PERMISSION = "com.cequint.ecid.CALLER_ID_LOOKUP"; @@ -207,4 +209,28 @@ public class PermissionsUtil { } return permissionsCurrentlyDenied.toArray(new String[permissionsCurrentlyDenied.size()]); } + + /** + * Since we are granted the camera permission automatically as a first-party app, we need to show + * a toast to let users know the permission was granted for privacy reasons. + * + * @return true if we've already shown the camera privacy toast. + */ + public static boolean hasCameraPrivacyToastShown(@NonNull Context context) { + return DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context) + .getBoolean(PREFERENCE_CAMERA_ALLOWED_BY_USER, false); + } + + public static void showCameraPermissionToast(@NonNull Context context) { + Toast.makeText(context, context.getString(R.string.camera_privacy_text), Toast.LENGTH_LONG) + .show(); + setCameraPrivacyToastShown(context); + } + + public static void setCameraPrivacyToastShown(@NonNull Context context) { + DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context) + .edit() + .putBoolean(PREFERENCE_CAMERA_ALLOWED_BY_USER, true) + .apply(); + } } diff --git a/java/com/android/dialer/util/res/values-af/strings.xml b/java/com/android/dialer/util/res/values-af/strings.xml index 7457e9b30..3b6780703 100644 --- a/java/com/android/dialer/util/res/values-af/strings.xml +++ b/java/com/android/dialer/util/res/values-af/strings.xml @@ -23,4 +23,6 @@ "Geen program daarvoor op hierdie toestel nie" "As jy \'n WPS-oproep maak, sal dit jou huidige oproep afsny." "Gaan voort" + + diff --git a/java/com/android/dialer/util/res/values-am/strings.xml b/java/com/android/dialer/util/res/values-am/strings.xml index 18fcb56c1..d3418b417 100644 --- a/java/com/android/dialer/util/res/values-am/strings.xml +++ b/java/com/android/dialer/util/res/values-am/strings.xml @@ -23,4 +23,6 @@ "ለዚያ የሚሆን መተግበሪያ በዚህ መሣሪያ ላይ የለም" "የWPS ጥሪ ማድረግ አሁን ያለውን ጥሪዎን ያቋርጠዋል።" "ቀጥል" + + diff --git a/java/com/android/dialer/util/res/values-ar/strings.xml b/java/com/android/dialer/util/res/values-ar/strings.xml index 8f25fb517..13a5235c3 100644 --- a/java/com/android/dialer/util/res/values-ar/strings.xml +++ b/java/com/android/dialer/util/res/values-ar/strings.xml @@ -23,4 +23,6 @@ "لا يوجد تطبيق لإجراء ذلك على هذا الجهاز" "‏سيؤدي إجراء مكالمة WPS إلى قطع اتصال مكالماتك الحالية." "متابعة" + + diff --git a/java/com/android/dialer/util/res/values-az/strings.xml b/java/com/android/dialer/util/res/values-az/strings.xml index ffe8ec5a8..3b6674127 100644 --- a/java/com/android/dialer/util/res/values-az/strings.xml +++ b/java/com/android/dialer/util/res/values-az/strings.xml @@ -23,4 +23,6 @@ "Bu cihazda onun üçün heç bir proqram yoxdur" "WPS zənginin edilməsi mövcud zənginizi sonlandıracaq." "Davam edin" + + diff --git a/java/com/android/dialer/util/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/util/res/values-b+sr+Latn/strings.xml index 8f16f823a..803c954a1 100644 --- a/java/com/android/dialer/util/res/values-b+sr+Latn/strings.xml +++ b/java/com/android/dialer/util/res/values-b+sr+Latn/strings.xml @@ -23,4 +23,6 @@ "Na ovom uređaju nema aplikacija za to" "Ako uputite WPS poziv, prekinućete postojeći poziv." "Nastavi" + + diff --git a/java/com/android/dialer/util/res/values-be/strings.xml b/java/com/android/dialer/util/res/values-be/strings.xml index f88ca1932..120247f42 100644 --- a/java/com/android/dialer/util/res/values-be/strings.xml +++ b/java/com/android/dialer/util/res/values-be/strings.xml @@ -23,4 +23,6 @@ "На прыладзе няма праграмы для гэтага" "Выкананне выкліку WPS прывядзе да раз\'яднання бягучага выкліку." "Працягнуць" + + diff --git a/java/com/android/dialer/util/res/values-bg/strings.xml b/java/com/android/dialer/util/res/values-bg/strings.xml index 44bb00fe4..3a425abf1 100644 --- a/java/com/android/dialer/util/res/values-bg/strings.xml +++ b/java/com/android/dialer/util/res/values-bg/strings.xml @@ -23,4 +23,6 @@ "На устройството няма приложение за това действие" "Ако извършите обаждане през WPS, текущото ви обаждане ще бъде прекъснато." "Напред" + + diff --git a/java/com/android/dialer/util/res/values-bn/strings.xml b/java/com/android/dialer/util/res/values-bn/strings.xml index 769c3c2f2..186b34146 100644 --- a/java/com/android/dialer/util/res/values-bn/strings.xml +++ b/java/com/android/dialer/util/res/values-bn/strings.xml @@ -23,4 +23,6 @@ "এর জন্য এই ডিভাইসে কোনো অ্যাপ্লিকেশান নেই" "একটি WPS কল করা হলে তা আপনার বিদ্যমান কলটি কেটে দেবে৷" "চালিয়ে যান" + + diff --git a/java/com/android/dialer/util/res/values-bs/strings.xml b/java/com/android/dialer/util/res/values-bs/strings.xml index a36bd98d2..e000c5fe4 100644 --- a/java/com/android/dialer/util/res/values-bs/strings.xml +++ b/java/com/android/dialer/util/res/values-bs/strings.xml @@ -23,4 +23,6 @@ "Na ovom uređaju nema aplikacije za to" "Upućivanje WPS poziva prekinut će trenutni poziv." "Nastavi" + + diff --git a/java/com/android/dialer/util/res/values-ca/strings.xml b/java/com/android/dialer/util/res/values-ca/strings.xml index c2a661fc8..8b6b2da78 100644 --- a/java/com/android/dialer/util/res/values-ca/strings.xml +++ b/java/com/android/dialer/util/res/values-ca/strings.xml @@ -23,4 +23,6 @@ "No hi ha cap aplicació per a això en aquest dispositiu." "En fer una trucada WPS, es desconnectarà la trucada en curs." "Continua" + + diff --git a/java/com/android/dialer/util/res/values-cs/strings.xml b/java/com/android/dialer/util/res/values-cs/strings.xml index d7de840bd..0e74288b2 100644 --- a/java/com/android/dialer/util/res/values-cs/strings.xml +++ b/java/com/android/dialer/util/res/values-cs/strings.xml @@ -23,4 +23,6 @@ "Pro tuto akci v zařízení nemáte žádnou aplikaci." "Zahájením hovoru WPS odpojíte probíhající hovor." "Pokračovat" + + diff --git a/java/com/android/dialer/util/res/values-da/strings.xml b/java/com/android/dialer/util/res/values-da/strings.xml index 555bb69d1..d38292f2e 100644 --- a/java/com/android/dialer/util/res/values-da/strings.xml +++ b/java/com/android/dialer/util/res/values-da/strings.xml @@ -23,4 +23,6 @@ "Der findes Ingen app til det på denne enhed" "Hvis du foretager et WPS-opkald, afsluttes dit nuværende opkald." "Fortsæt" + + diff --git a/java/com/android/dialer/util/res/values-de/strings.xml b/java/com/android/dialer/util/res/values-de/strings.xml index 7d154b6a3..dc23b32ee 100644 --- a/java/com/android/dialer/util/res/values-de/strings.xml +++ b/java/com/android/dialer/util/res/values-de/strings.xml @@ -23,4 +23,6 @@ "Keine entsprechende App auf diesem Gerät" "Wenn du jetzt einen Anruf über WPS tätigst, wird deine bestehende Verbindung getrennt." "Weiter" + + diff --git a/java/com/android/dialer/util/res/values-el/strings.xml b/java/com/android/dialer/util/res/values-el/strings.xml index efbdc4e6d..996cb2ab2 100644 --- a/java/com/android/dialer/util/res/values-el/strings.xml +++ b/java/com/android/dialer/util/res/values-el/strings.xml @@ -23,4 +23,6 @@ "Δεν υπάρχει εφαρμογή γι\' αυτήν την ενέργεια σε αυτήν τη συσκευή" "Η διενέργεια κλήσης μέσω WPS θα αποσυνδέσει την υφιστάμενη κλήση." "Συνέχεια" + + diff --git a/java/com/android/dialer/util/res/values-en-rAU/strings.xml b/java/com/android/dialer/util/res/values-en-rAU/strings.xml index 545a2a884..3cdf170a2 100644 --- a/java/com/android/dialer/util/res/values-en-rAU/strings.xml +++ b/java/com/android/dialer/util/res/values-en-rAU/strings.xml @@ -23,4 +23,6 @@ "No app for that on this device" "Placing a WPS call will disconnect your existing call." "Continue" + + diff --git a/java/com/android/dialer/util/res/values-en-rGB/strings.xml b/java/com/android/dialer/util/res/values-en-rGB/strings.xml index 545a2a884..3cdf170a2 100644 --- a/java/com/android/dialer/util/res/values-en-rGB/strings.xml +++ b/java/com/android/dialer/util/res/values-en-rGB/strings.xml @@ -23,4 +23,6 @@ "No app for that on this device" "Placing a WPS call will disconnect your existing call." "Continue" + + diff --git a/java/com/android/dialer/util/res/values-en-rIN/strings.xml b/java/com/android/dialer/util/res/values-en-rIN/strings.xml index 545a2a884..3cdf170a2 100644 --- a/java/com/android/dialer/util/res/values-en-rIN/strings.xml +++ b/java/com/android/dialer/util/res/values-en-rIN/strings.xml @@ -23,4 +23,6 @@ "No app for that on this device" "Placing a WPS call will disconnect your existing call." "Continue" + + diff --git a/java/com/android/dialer/util/res/values-es-rUS/strings.xml b/java/com/android/dialer/util/res/values-es-rUS/strings.xml index 4aa072520..e9c86317c 100644 --- a/java/com/android/dialer/util/res/values-es-rUS/strings.xml +++ b/java/com/android/dialer/util/res/values-es-rUS/strings.xml @@ -23,4 +23,6 @@ "No hay una aplicación para esa acción en este dispositivo." "Realizar una llamada de WPS desconectará tu llamada existente." "Continuar" + + diff --git a/java/com/android/dialer/util/res/values-es/strings.xml b/java/com/android/dialer/util/res/values-es/strings.xml index 6c92947ff..0672f65f8 100644 --- a/java/com/android/dialer/util/res/values-es/strings.xml +++ b/java/com/android/dialer/util/res/values-es/strings.xml @@ -23,4 +23,6 @@ "No hay aplicaciones para esa acción en este dispositivo" "Al hacer una llamada WPS, se finalizará tu llamada actual." "Continuar" + + diff --git a/java/com/android/dialer/util/res/values-et/strings.xml b/java/com/android/dialer/util/res/values-et/strings.xml index 465d2b401..20429fbd2 100644 --- a/java/com/android/dialer/util/res/values-et/strings.xml +++ b/java/com/android/dialer/util/res/values-et/strings.xml @@ -23,4 +23,6 @@ "Seadmes pole selleks sobilikku rakendust" "WPS-kõne tegemisel katkestatakse teie praegune kõne." "Jätka" + + diff --git a/java/com/android/dialer/util/res/values-eu/strings.xml b/java/com/android/dialer/util/res/values-eu/strings.xml index ba434ce52..89b35c2c1 100644 --- a/java/com/android/dialer/util/res/values-eu/strings.xml +++ b/java/com/android/dialer/util/res/values-eu/strings.xml @@ -23,4 +23,6 @@ "Ez dago hori egin dezakeen aplikaziorik gailu honetan" "WPS dei bat egiten baduzu, eten egingo da uneko deia." "Jarraitu" + + diff --git a/java/com/android/dialer/util/res/values-fa/strings.xml b/java/com/android/dialer/util/res/values-fa/strings.xml index c22c38699..c98fdc9bb 100644 --- a/java/com/android/dialer/util/res/values-fa/strings.xml +++ b/java/com/android/dialer/util/res/values-fa/strings.xml @@ -23,4 +23,6 @@ "هیچ برنامه‌ای برای انجام این کار در این دستگاه نصب نیست" "‏اگر تماس WPS برقرار کنید، تماس فعلی‌تان قطع می‌شود." "ادامه" + + diff --git a/java/com/android/dialer/util/res/values-fi/strings.xml b/java/com/android/dialer/util/res/values-fi/strings.xml index 237232f5d..58494d10e 100644 --- a/java/com/android/dialer/util/res/values-fi/strings.xml +++ b/java/com/android/dialer/util/res/values-fi/strings.xml @@ -23,4 +23,6 @@ "Laitteessa ei ole kyseiseen toimintoon tarvittavaa sovellusta" "WPS-puhelun soittaminen katkaisee meneillään olevan puhelun." "Jatka" + + diff --git a/java/com/android/dialer/util/res/values-fr-rCA/strings.xml b/java/com/android/dialer/util/res/values-fr-rCA/strings.xml index 1d73fcfa7..e82fb5df0 100644 --- a/java/com/android/dialer/util/res/values-fr-rCA/strings.xml +++ b/java/com/android/dialer/util/res/values-fr-rCA/strings.xml @@ -23,4 +23,6 @@ "Cette action ne peut être effectuée par aucune application sur cet appareil." "Si vous faites un appel WPS, vous déconnecterez l\'appel en cours." "Continuer" + + diff --git a/java/com/android/dialer/util/res/values-fr/strings.xml b/java/com/android/dialer/util/res/values-fr/strings.xml index 48f1dbbef..3e411d33f 100644 --- a/java/com/android/dialer/util/res/values-fr/strings.xml +++ b/java/com/android/dialer/util/res/values-fr/strings.xml @@ -23,4 +23,6 @@ "Cette action ne peut être effectuée via aucune application sur cet appareil." "L\'émission d\'un appel WPS mettra fin à l\'appel en cours." "Continuer" + + diff --git a/java/com/android/dialer/util/res/values-gl/strings.xml b/java/com/android/dialer/util/res/values-gl/strings.xml index 8cdcffaf7..c5b544810 100644 --- a/java/com/android/dialer/util/res/values-gl/strings.xml +++ b/java/com/android/dialer/util/res/values-gl/strings.xml @@ -23,4 +23,6 @@ "Non hai ningunha aplicación para esa acción neste dispositivo" "Se realizas unha chamada WPS, desconectarase a túa chamada actual." "Continuar" + + diff --git a/java/com/android/dialer/util/res/values-gu/strings.xml b/java/com/android/dialer/util/res/values-gu/strings.xml index ee4b59242..e3342b100 100644 --- a/java/com/android/dialer/util/res/values-gu/strings.xml +++ b/java/com/android/dialer/util/res/values-gu/strings.xml @@ -23,4 +23,6 @@ "આ ઉપકરણ પર તે માટે કોઈ ઍપ્લિકેશન નથી" "WPS કૉલ કરવાનું તમારા અસ્તિત્વમાંના કૉલને ડિસ્કનેક્ટ કરશે." "ચાલુ રાખો" + + diff --git a/java/com/android/dialer/util/res/values-hi/strings.xml b/java/com/android/dialer/util/res/values-hi/strings.xml index 9a1bc3550..08d52c784 100644 --- a/java/com/android/dialer/util/res/values-hi/strings.xml +++ b/java/com/android/dialer/util/res/values-hi/strings.xml @@ -23,4 +23,6 @@ "उसके लिए इस डिवाइस पर कोई एेप नहीं है" "WPS कॉल करने से आपका मौजूदा कॉल डिसकनेक्ट हो जाएगा." "जारी रखें" + + diff --git a/java/com/android/dialer/util/res/values-hr/strings.xml b/java/com/android/dialer/util/res/values-hr/strings.xml index 1fc54dad7..16964ba48 100644 --- a/java/com/android/dialer/util/res/values-hr/strings.xml +++ b/java/com/android/dialer/util/res/values-hr/strings.xml @@ -23,4 +23,6 @@ "Na ovom uređaju nema aplikacije za to" "Uspostavljanje WPS poziva prekinut će postojeći poziv." "Nastavi" + + diff --git a/java/com/android/dialer/util/res/values-hu/strings.xml b/java/com/android/dialer/util/res/values-hu/strings.xml index ad5f29d8e..5c503823a 100644 --- a/java/com/android/dialer/util/res/values-hu/strings.xml +++ b/java/com/android/dialer/util/res/values-hu/strings.xml @@ -23,4 +23,6 @@ "Nincs megfelelő alkalmazás a művelethez ezen az eszközön" "WPS-hívás indításával megszakítja a folyamatban lévő hívást." "Folytatás" + + diff --git a/java/com/android/dialer/util/res/values-hy/strings.xml b/java/com/android/dialer/util/res/values-hy/strings.xml index 18f2001c9..8a2c75e14 100644 --- a/java/com/android/dialer/util/res/values-hy/strings.xml +++ b/java/com/android/dialer/util/res/values-hy/strings.xml @@ -23,4 +23,6 @@ "Սարքի վրա համապատասխան հավելված չկա" "Եթե WPS-ի միջոցով զանգ կատարեք, ձեր ընթացիկ զանգը կընդհատվի:" "Շարունակել" + + diff --git a/java/com/android/dialer/util/res/values-in/strings.xml b/java/com/android/dialer/util/res/values-in/strings.xml index 55a5e3eb9..8abd5fb1f 100644 --- a/java/com/android/dialer/util/res/values-in/strings.xml +++ b/java/com/android/dialer/util/res/values-in/strings.xml @@ -23,4 +23,6 @@ "Tidak ada aplikasi untuk tindakan tersebut di perangkat ini" "Melakukan panggilan WPS akan mengakhiri panggilan yang ada." "Lanjutkan" + + diff --git a/java/com/android/dialer/util/res/values-is/strings.xml b/java/com/android/dialer/util/res/values-is/strings.xml index e6615e349..8ba1a2dad 100644 --- a/java/com/android/dialer/util/res/values-is/strings.xml +++ b/java/com/android/dialer/util/res/values-is/strings.xml @@ -23,4 +23,6 @@ "Ekkert forrit fyrir þetta er í tækinu" "Ef þú hringir WPS-símtal slitnar núverandi símtal." "Áfram" + + diff --git a/java/com/android/dialer/util/res/values-it/strings.xml b/java/com/android/dialer/util/res/values-it/strings.xml index 3ed55c650..3ef5f83f3 100644 --- a/java/com/android/dialer/util/res/values-it/strings.xml +++ b/java/com/android/dialer/util/res/values-it/strings.xml @@ -23,4 +23,6 @@ "Sul dispositivo non sono presenti app per tale azione" "Se effettui una chiamata WPS, la chiamata esistente verrà disconnessa." "Continua" + + diff --git a/java/com/android/dialer/util/res/values-iw/strings.xml b/java/com/android/dialer/util/res/values-iw/strings.xml index 5a1062dd8..8863eb60e 100644 --- a/java/com/android/dialer/util/res/values-iw/strings.xml +++ b/java/com/android/dialer/util/res/values-iw/strings.xml @@ -23,4 +23,6 @@ "אין אפליקציה עבור הפעולה הזו במכשיר הזה" "התקשרות באמצעות השירות האלחוטי המועדף תנתק את השיחה הנוכחית." "המשך" + + diff --git a/java/com/android/dialer/util/res/values-ja/strings.xml b/java/com/android/dialer/util/res/values-ja/strings.xml index 78986b1d6..a447ee9d4 100644 --- a/java/com/android/dialer/util/res/values-ja/strings.xml +++ b/java/com/android/dialer/util/res/values-ja/strings.xml @@ -23,4 +23,6 @@ "この操作を行うアプリが端末上にありません" "WPS で通話を発信すると現在の通話が切断されます。" "次へ" + + diff --git a/java/com/android/dialer/util/res/values-ka/strings.xml b/java/com/android/dialer/util/res/values-ka/strings.xml index 13e7ad0c9..379e3b3c5 100644 --- a/java/com/android/dialer/util/res/values-ka/strings.xml +++ b/java/com/android/dialer/util/res/values-ka/strings.xml @@ -23,4 +23,6 @@ "ამ მოწყობილობაზე არ არის შესაბამისი აპლიკაცია" "WPS ზარის განხორციელება თქვენს მიმდინარე ზარს გათიშავს." "გაგრძელება" + + diff --git a/java/com/android/dialer/util/res/values-kk/strings.xml b/java/com/android/dialer/util/res/values-kk/strings.xml index 49b60913b..8683b850a 100644 --- a/java/com/android/dialer/util/res/values-kk/strings.xml +++ b/java/com/android/dialer/util/res/values-kk/strings.xml @@ -23,4 +23,6 @@ "Бұл үшін осы құрылғыда қолданба жоқ" "WPS қоңырауын шалу қазіргі қоңырауды тоқтатады." "Жалғастыру" + + diff --git a/java/com/android/dialer/util/res/values-km/strings.xml b/java/com/android/dialer/util/res/values-km/strings.xml index f55fdf5e0..37cd04513 100644 --- a/java/com/android/dialer/util/res/values-km/strings.xml +++ b/java/com/android/dialer/util/res/values-km/strings.xml @@ -23,4 +23,6 @@ "មិនមានកម្មវិធីសម្រាប់សកម្មភាពនេះនៅលើឧបករណ៍នេះទេ" "ការ​ហៅ​ចេញ​​ដោយ​ប្រើ​សេវា WPS នឹង​ផ្ដាច់​ការ​ហៅ​ដែល​មាន​​របស់​អ្នក។" "បន្ត" + + diff --git a/java/com/android/dialer/util/res/values-kn/strings.xml b/java/com/android/dialer/util/res/values-kn/strings.xml index d6de0f84f..8fc851b5e 100644 --- a/java/com/android/dialer/util/res/values-kn/strings.xml +++ b/java/com/android/dialer/util/res/values-kn/strings.xml @@ -23,4 +23,6 @@ "ಈ ಸಾಧನದಲ್ಲಿ ಅದಕ್ಕಾಗಿ ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಲ್ಲ" "WPS ಕರೆ ಅನ್ನು ಮಾಡುವುದರಿಂದ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ನಿಮ್ಮ ಕರೆ ಕಡಿತಗೊಳ್ಳುತ್ತದೆ." "ಮುಂದುವರಿಸಿ" + + diff --git a/java/com/android/dialer/util/res/values-ko/strings.xml b/java/com/android/dialer/util/res/values-ko/strings.xml index f7a0679b1..aa0c138e1 100644 --- a/java/com/android/dialer/util/res/values-ko/strings.xml +++ b/java/com/android/dialer/util/res/values-ko/strings.xml @@ -23,4 +23,6 @@ "이 기기에 작업을 처리할 수 있는 앱이 없습니다." "WPS 전화를 걸면 기존 전화 연결이 해제됩니다." "계속" + + diff --git a/java/com/android/dialer/util/res/values-ky/strings.xml b/java/com/android/dialer/util/res/values-ky/strings.xml index e37ace837..80dea0a1a 100644 --- a/java/com/android/dialer/util/res/values-ky/strings.xml +++ b/java/com/android/dialer/util/res/values-ky/strings.xml @@ -23,4 +23,6 @@ "Бул түзмөктө ал үчүн колдонмо жок" "Азыр WPS аркылуу чалсаңыз, учурдагы чалуу үзүлүп калат." "Улантуу" + + diff --git a/java/com/android/dialer/util/res/values-lo/strings.xml b/java/com/android/dialer/util/res/values-lo/strings.xml index d7c6764ca..a003183a5 100644 --- a/java/com/android/dialer/util/res/values-lo/strings.xml +++ b/java/com/android/dialer/util/res/values-lo/strings.xml @@ -23,4 +23,6 @@ "ບໍ່​ມີ​ແອັ​ບຯ​ສຳ​ລັບ​ສິ່ງນັ້ນ​ຢູ່​ໃນ​ອຸ​ປະ​ກອນ​ນີ້" "ການໂທ WPS ຈະຕັດສາຍທີ່ມີຢູ່ແລ້ວຂອງທ່ານ." "ດຳເນີນການຕໍ່" + + diff --git a/java/com/android/dialer/util/res/values-lt/strings.xml b/java/com/android/dialer/util/res/values-lt/strings.xml index bf77d5c05..00fd0c169 100644 --- a/java/com/android/dialer/util/res/values-lt/strings.xml +++ b/java/com/android/dialer/util/res/values-lt/strings.xml @@ -23,4 +23,6 @@ "Šiame įrenginyje nėra tam skirtos programos" "Pradėjus WPS skambutį bus atjungtas dabartinis skambutis." "Tęsti" + + diff --git a/java/com/android/dialer/util/res/values-lv/strings.xml b/java/com/android/dialer/util/res/values-lv/strings.xml index 7b462646a..d29c06a2f 100644 --- a/java/com/android/dialer/util/res/values-lv/strings.xml +++ b/java/com/android/dialer/util/res/values-lv/strings.xml @@ -23,4 +23,6 @@ "Šajā ierīcē nav nevienas šai darbībai piemērotas lietotnes." "Veicot WPS zvanu, tiks pārtraukts esošais zvans." "Turpināt" + + diff --git a/java/com/android/dialer/util/res/values-mk/strings.xml b/java/com/android/dialer/util/res/values-mk/strings.xml index 4451d707a..5f45fbf23 100644 --- a/java/com/android/dialer/util/res/values-mk/strings.xml +++ b/java/com/android/dialer/util/res/values-mk/strings.xml @@ -23,4 +23,6 @@ "Нема апликација за тоа на уредот" "Воспоставувањето повик преку WPS ќе го исклучи вашиот тековен повик." "Продолжи" + + diff --git a/java/com/android/dialer/util/res/values-ml/strings.xml b/java/com/android/dialer/util/res/values-ml/strings.xml index d861641dd..be9828973 100644 --- a/java/com/android/dialer/util/res/values-ml/strings.xml +++ b/java/com/android/dialer/util/res/values-ml/strings.xml @@ -23,4 +23,6 @@ "അതിനായി ഈ ഉപകരണത്തിൽ അപ്ലിക്കേഷനുകളൊന്നുമില്ല" "ഒരു WPS കോൾ ചെയ്യുന്നത് നിങ്ങളുടെ നിലവിലെ കോൾ വിച്ഛേദിക്കാനിടയാക്കും." "തുടരുക" + + diff --git a/java/com/android/dialer/util/res/values-mn/strings.xml b/java/com/android/dialer/util/res/values-mn/strings.xml index 51fe7ca3d..314db16cf 100644 --- a/java/com/android/dialer/util/res/values-mn/strings.xml +++ b/java/com/android/dialer/util/res/values-mn/strings.xml @@ -23,4 +23,6 @@ "Энэхүү төхөөрөмж дээр тухайн үйлдлийг гүйцэтгэх апликейшн байхгүй байна." "WPS дуудлага хийвэл одоо байгаа дуудлагыг таслах болно." "Үргэлжлүүлэх" + + diff --git a/java/com/android/dialer/util/res/values-mr/strings.xml b/java/com/android/dialer/util/res/values-mr/strings.xml index 4cb82304a..37bef2933 100644 --- a/java/com/android/dialer/util/res/values-mr/strings.xml +++ b/java/com/android/dialer/util/res/values-mr/strings.xml @@ -23,4 +23,6 @@ "या डिव्हाइसवर त्यासाठी कोणताही अॅप नाही" "WPS कॉल केल्याने आपला विद्यमान कॉल डिस्कनेक्ट केला जाईल." "सुरु ठेवा" + + diff --git a/java/com/android/dialer/util/res/values-ms/strings.xml b/java/com/android/dialer/util/res/values-ms/strings.xml index d149cc519..fbda09d42 100644 --- a/java/com/android/dialer/util/res/values-ms/strings.xml +++ b/java/com/android/dialer/util/res/values-ms/strings.xml @@ -23,4 +23,6 @@ "Tiada apl untuk tindakan itu pada peranti ini" "Membuat panggilan WPS akan memutuskan panggilan anda yang sedia ada." "Teruskan" + + diff --git a/java/com/android/dialer/util/res/values-my/strings.xml b/java/com/android/dialer/util/res/values-my/strings.xml index 7ec6501d4..3a5b79fc6 100644 --- a/java/com/android/dialer/util/res/values-my/strings.xml +++ b/java/com/android/dialer/util/res/values-my/strings.xml @@ -23,4 +23,6 @@ "ဒီကိရိယာထဲမှာ အဲဒါ့အတွက် app မရှိပါ" "WPS ခေါ်ဆိုပါက သင့်လက်ရှိခေါ်ဆိုမှု ပြတ်တောက်သွားပါမည်။" "ဆက်လုပ်ရန်" + + diff --git a/java/com/android/dialer/util/res/values-nb/strings.xml b/java/com/android/dialer/util/res/values-nb/strings.xml index 52ae935c8..c1c1b238b 100644 --- a/java/com/android/dialer/util/res/values-nb/strings.xml +++ b/java/com/android/dialer/util/res/values-nb/strings.xml @@ -23,4 +23,6 @@ "Det finnes ingen apper for det på denne enheten" "Den pågående samtalen brytes hvis du foretar et WPS-anrop (Wireless Priority Service)." "Fortsett" + + diff --git a/java/com/android/dialer/util/res/values-ne/strings.xml b/java/com/android/dialer/util/res/values-ne/strings.xml index aedc538af..b596a8510 100644 --- a/java/com/android/dialer/util/res/values-ne/strings.xml +++ b/java/com/android/dialer/util/res/values-ne/strings.xml @@ -23,4 +23,6 @@ "यस यन्त्रमा त्यसका लागि कुनै पनि अनुप्रयोग छैन" "WPS कल गर्नुले तपाईंको जारी कललाई विच्छेद गर्ने छ।" "जारी राख्नुहोस्" + + diff --git a/java/com/android/dialer/util/res/values-nl/strings.xml b/java/com/android/dialer/util/res/values-nl/strings.xml index a9fc32e70..d09054cc8 100644 --- a/java/com/android/dialer/util/res/values-nl/strings.xml +++ b/java/com/android/dialer/util/res/values-nl/strings.xml @@ -23,4 +23,6 @@ "Daarvoor is geen app beschikbaar op dit apparaat" "Als je een WPS-oproep plaatst, wordt je huidige gesprek afgebroken." "Doorgaan" + + diff --git a/java/com/android/dialer/util/res/values-no/strings.xml b/java/com/android/dialer/util/res/values-no/strings.xml index 52ae935c8..c1c1b238b 100644 --- a/java/com/android/dialer/util/res/values-no/strings.xml +++ b/java/com/android/dialer/util/res/values-no/strings.xml @@ -23,4 +23,6 @@ "Det finnes ingen apper for det på denne enheten" "Den pågående samtalen brytes hvis du foretar et WPS-anrop (Wireless Priority Service)." "Fortsett" + + diff --git a/java/com/android/dialer/util/res/values-pa/strings.xml b/java/com/android/dialer/util/res/values-pa/strings.xml index 4ad601fc3..dfb47c590 100644 --- a/java/com/android/dialer/util/res/values-pa/strings.xml +++ b/java/com/android/dialer/util/res/values-pa/strings.xml @@ -23,4 +23,6 @@ "ਉਸ ਲਈ ਇਸ ਡੀਵਾਈਸ ਤੇ ਕੋਈ ਐਪ ਨਹੀਂ" "ਇੱਕ WPS ਕਾਲ ਕਰਨਾ ਤੁਹਾਡੀ ਮੌਜੂਦਾ ਕਾਲ ਨੂੰ ਡਿਸਕਨੈਕਟ ਕਰ ਦੇਵੇਗਾ।" "ਜਾਰੀ ਰੱਖੋ" + + diff --git a/java/com/android/dialer/util/res/values-pl/strings.xml b/java/com/android/dialer/util/res/values-pl/strings.xml index c49c55ae8..4ea0d8b9c 100644 --- a/java/com/android/dialer/util/res/values-pl/strings.xml +++ b/java/com/android/dialer/util/res/values-pl/strings.xml @@ -23,4 +23,6 @@ "Na urządzeniu nie ma aplikacji, która mogłaby wykonać tę czynność" "Jeśli nawiążesz połączenie WPS, bieżące połączenie zostanie przerwane." "Dalej" + + diff --git a/java/com/android/dialer/util/res/values-pt-rBR/strings.xml b/java/com/android/dialer/util/res/values-pt-rBR/strings.xml index 04eb8c663..af5ec9343 100644 --- a/java/com/android/dialer/util/res/values-pt-rBR/strings.xml +++ b/java/com/android/dialer/util/res/values-pt-rBR/strings.xml @@ -23,4 +23,6 @@ "Nenhum app está disponível para essa ação neste dispositivo" "Fazer uma chamada usando o WPS desconectará a chamada atual." "Continuar" + + diff --git a/java/com/android/dialer/util/res/values-pt-rPT/strings.xml b/java/com/android/dialer/util/res/values-pt-rPT/strings.xml index b90230216..1626e9e3a 100644 --- a/java/com/android/dialer/util/res/values-pt-rPT/strings.xml +++ b/java/com/android/dialer/util/res/values-pt-rPT/strings.xml @@ -23,4 +23,6 @@ "Não existe nenhuma aplicação para isso neste dispositivo" "Efetuar uma chamada WPS irá desligar a sua chamada atual." "Continuar" + + diff --git a/java/com/android/dialer/util/res/values-pt/strings.xml b/java/com/android/dialer/util/res/values-pt/strings.xml index 04eb8c663..af5ec9343 100644 --- a/java/com/android/dialer/util/res/values-pt/strings.xml +++ b/java/com/android/dialer/util/res/values-pt/strings.xml @@ -23,4 +23,6 @@ "Nenhum app está disponível para essa ação neste dispositivo" "Fazer uma chamada usando o WPS desconectará a chamada atual." "Continuar" + + diff --git a/java/com/android/dialer/util/res/values-ro/strings.xml b/java/com/android/dialer/util/res/values-ro/strings.xml index 40cbc3623..c5d7d3f38 100644 --- a/java/com/android/dialer/util/res/values-ro/strings.xml +++ b/java/com/android/dialer/util/res/values-ro/strings.xml @@ -23,4 +23,6 @@ "Pe dispozitiv nu există nicio aplicație pentru această acțiune" "Dacă inițiați un apel WPS, apelul existent va fi deconectat." "Continuați" + + diff --git a/java/com/android/dialer/util/res/values-ru/strings.xml b/java/com/android/dialer/util/res/values-ru/strings.xml index c2908f9dc..837a07560 100644 --- a/java/com/android/dialer/util/res/values-ru/strings.xml +++ b/java/com/android/dialer/util/res/values-ru/strings.xml @@ -23,4 +23,6 @@ "На устройстве нет подходящего приложения" "Если вы начнете WPS-вызов, текущий вызов будет прекращен." "Продолжить" + + diff --git a/java/com/android/dialer/util/res/values-si/strings.xml b/java/com/android/dialer/util/res/values-si/strings.xml index f7404d7a1..f91ef87e7 100644 --- a/java/com/android/dialer/util/res/values-si/strings.xml +++ b/java/com/android/dialer/util/res/values-si/strings.xml @@ -23,4 +23,6 @@ "මෙම උපාංගයෙහි ඒ සඳහා යෙදුමක් නැත" "WPS ඇමතුමක් කිරීමෙන් ඔබේ දැනට පවතින ඇමතුම විසන්ධි කරනු ඇත." "දිගටම කරගෙන යන්න" + + diff --git a/java/com/android/dialer/util/res/values-sk/strings.xml b/java/com/android/dialer/util/res/values-sk/strings.xml index 4a1ed0230..731abb9fe 100644 --- a/java/com/android/dialer/util/res/values-sk/strings.xml +++ b/java/com/android/dialer/util/res/values-sk/strings.xml @@ -23,4 +23,6 @@ "Na tomto zariadení nie je aplikácia na vykonanie danej akcie" "Uskutočnením hovoru cez WPS prerušíte existujúci hovor." "Pokračovať" + + diff --git a/java/com/android/dialer/util/res/values-sl/strings.xml b/java/com/android/dialer/util/res/values-sl/strings.xml index e18514d0c..cde40ea70 100644 --- a/java/com/android/dialer/util/res/values-sl/strings.xml +++ b/java/com/android/dialer/util/res/values-sl/strings.xml @@ -23,4 +23,6 @@ "V tej napravi ni aplikacije za to" "Če začnete klic WPS, bo obstoječi klic prekinjen." "Nadaljuj" + + diff --git a/java/com/android/dialer/util/res/values-sq/strings.xml b/java/com/android/dialer/util/res/values-sq/strings.xml index 8046d926f..ab53f1e27 100644 --- a/java/com/android/dialer/util/res/values-sq/strings.xml +++ b/java/com/android/dialer/util/res/values-sq/strings.xml @@ -23,4 +23,6 @@ "Nuk ka aplikacion për atë në këtë pajisje" "Kryerja e një telefonate WPS do të shkëputë telefonatën tënde ekzistuese." "Vazhdo" + + diff --git a/java/com/android/dialer/util/res/values-sr/strings.xml b/java/com/android/dialer/util/res/values-sr/strings.xml index d7de55254..5193c6a0e 100644 --- a/java/com/android/dialer/util/res/values-sr/strings.xml +++ b/java/com/android/dialer/util/res/values-sr/strings.xml @@ -23,4 +23,6 @@ "На овом уређају нема апликација за то" "Ако упутите WPS позив, прекинућете постојећи позив." "Настави" + + diff --git a/java/com/android/dialer/util/res/values-sv/strings.xml b/java/com/android/dialer/util/res/values-sv/strings.xml index 5b17b0690..23c34f020 100644 --- a/java/com/android/dialer/util/res/values-sv/strings.xml +++ b/java/com/android/dialer/util/res/values-sv/strings.xml @@ -23,4 +23,6 @@ "Det finns ingen app för detta på enheten" "Ringer du ett WPS-samtal kopplas det nuvarande samtalet bort." "Fortsätt" + + diff --git a/java/com/android/dialer/util/res/values-sw/strings.xml b/java/com/android/dialer/util/res/values-sw/strings.xml index 8ee684311..6dabc8424 100644 --- a/java/com/android/dialer/util/res/values-sw/strings.xml +++ b/java/com/android/dialer/util/res/values-sw/strings.xml @@ -23,4 +23,6 @@ "Hakuna programu kwa ajili ya hiyo kwenye kifaa hiki" "Ukipiga simu ya WPS, simu inayoendelea sasa itakatwa." "Endelea" + + diff --git a/java/com/android/dialer/util/res/values-ta/strings.xml b/java/com/android/dialer/util/res/values-ta/strings.xml index ed63669e4..4f1b6919b 100644 --- a/java/com/android/dialer/util/res/values-ta/strings.xml +++ b/java/com/android/dialer/util/res/values-ta/strings.xml @@ -23,4 +23,6 @@ "சாதனத்தில் இந்தச் செயலைச் செய்வதற்கான பயன்பாடு எதுவும் இல்லை" "WPS அழைப்பை மேற்கொண்டால், தற்போது செயலில் உள்ள அழைப்புத் துண்டிக்கப்படும்." "தொடர்க" + + diff --git a/java/com/android/dialer/util/res/values-te/strings.xml b/java/com/android/dialer/util/res/values-te/strings.xml index 44c84f5bf..3e54163c8 100644 --- a/java/com/android/dialer/util/res/values-te/strings.xml +++ b/java/com/android/dialer/util/res/values-te/strings.xml @@ -23,4 +23,6 @@ "ఈ పరికరంలో దాని కోసం అనువర్తనం ఏదీ లేదు" "WPS కాల్ చేయడం వలన మీరు ప్రస్తుతం మాట్లాడుతున్న కాల్ డిస్‌కనెక్ట్ అవుతుంది." "కొనసాగించు" + + diff --git a/java/com/android/dialer/util/res/values-th/strings.xml b/java/com/android/dialer/util/res/values-th/strings.xml index f0055733a..59341c3b6 100644 --- a/java/com/android/dialer/util/res/values-th/strings.xml +++ b/java/com/android/dialer/util/res/values-th/strings.xml @@ -23,4 +23,6 @@ "ไม่มีแอปสำหรับการทำงานนั้นบนอุปกรณ์นี้" "หากคุณโทรผ่านบริการ WPS ตอนนี้ สายที่โทรอยู่จะตัดการเชื่อมต่อ" "ต่อไป" + + diff --git a/java/com/android/dialer/util/res/values-tl/strings.xml b/java/com/android/dialer/util/res/values-tl/strings.xml index 73de8b52a..e2a2ed062 100644 --- a/java/com/android/dialer/util/res/values-tl/strings.xml +++ b/java/com/android/dialer/util/res/values-tl/strings.xml @@ -23,4 +23,6 @@ "Walang app para doon sa device na ito" "Ang paggawa ng WPS na tawag ay puputulin sa koneksyon ang dati mo nang tawag." "Magpatuloy" + + diff --git a/java/com/android/dialer/util/res/values-tr/strings.xml b/java/com/android/dialer/util/res/values-tr/strings.xml index 108b20a0b..dcd3e83e0 100644 --- a/java/com/android/dialer/util/res/values-tr/strings.xml +++ b/java/com/android/dialer/util/res/values-tr/strings.xml @@ -23,4 +23,6 @@ "Bu cihazda bu işlem için uygun uygulama yok" "WPS çağrısı yaparsanız, devam eden çağrı sonlandırılır." "Devam" + + diff --git a/java/com/android/dialer/util/res/values-uk/strings.xml b/java/com/android/dialer/util/res/values-uk/strings.xml index d57b1de11..2b5bd38b8 100644 --- a/java/com/android/dialer/util/res/values-uk/strings.xml +++ b/java/com/android/dialer/util/res/values-uk/strings.xml @@ -23,4 +23,6 @@ "На цьому пристрої немає додатка, який може виконати цю дію" "Якщо здійснити виклик WPS, буде роз’єднано поточний виклик." "Продовжити" + + diff --git a/java/com/android/dialer/util/res/values-ur/strings.xml b/java/com/android/dialer/util/res/values-ur/strings.xml index 7c036d096..2e3f8a0cb 100644 --- a/java/com/android/dialer/util/res/values-ur/strings.xml +++ b/java/com/android/dialer/util/res/values-ur/strings.xml @@ -23,4 +23,6 @@ "اس آلہ پر اس کیلئے کوئی ایپ نہیں ہے" "‏WPS کال کرنے سے آپ کی موجودہ کال غیر منسلک ہو جائے گی۔" "جاری رکھیں" + + diff --git a/java/com/android/dialer/util/res/values-uz/strings.xml b/java/com/android/dialer/util/res/values-uz/strings.xml index 0e28bf7a0..ca7c8218f 100644 --- a/java/com/android/dialer/util/res/values-uz/strings.xml +++ b/java/com/android/dialer/util/res/values-uz/strings.xml @@ -23,4 +23,6 @@ "Qurilmada buni bajaradigan ilova yo‘q" "WPS-chaqiruv boshlab yuborilsa, hozirgi qo‘ng‘iroq tugatiladi." "Davom ettirish" + + diff --git a/java/com/android/dialer/util/res/values-vi/strings.xml b/java/com/android/dialer/util/res/values-vi/strings.xml index 925b91ecf..8a225a305 100644 --- a/java/com/android/dialer/util/res/values-vi/strings.xml +++ b/java/com/android/dialer/util/res/values-vi/strings.xml @@ -23,4 +23,6 @@ "Không có ứng dụng nào cho thao tác đó trên thiết bị này" "Việc thực hiện cuộc gọi WPS sẽ ngắt kết nối cuộc gọi hiện có của bạn." "Tiếp tục" + + diff --git a/java/com/android/dialer/util/res/values-zh-rCN/strings.xml b/java/com/android/dialer/util/res/values-zh-rCN/strings.xml index 6d3e8218f..0f2d65828 100644 --- a/java/com/android/dialer/util/res/values-zh-rCN/strings.xml +++ b/java/com/android/dialer/util/res/values-zh-rCN/strings.xml @@ -23,4 +23,6 @@ "此设备上没有可执行此操作的应用" "拨打 WPS 电话会中断现有通话。" "继续" + + diff --git a/java/com/android/dialer/util/res/values-zh-rHK/strings.xml b/java/com/android/dialer/util/res/values-zh-rHK/strings.xml index 2193cfa35..873de4dcf 100644 --- a/java/com/android/dialer/util/res/values-zh-rHK/strings.xml +++ b/java/com/android/dialer/util/res/values-zh-rHK/strings.xml @@ -23,4 +23,6 @@ "這部裝置上沒有可用的應用程式" "撥打 WPS 電話會掛斷現有通話。" "繼續" + + diff --git a/java/com/android/dialer/util/res/values-zh-rTW/strings.xml b/java/com/android/dialer/util/res/values-zh-rTW/strings.xml index 192631831..6af0cd176 100644 --- a/java/com/android/dialer/util/res/values-zh-rTW/strings.xml +++ b/java/com/android/dialer/util/res/values-zh-rTW/strings.xml @@ -23,4 +23,6 @@ "這個裝置未安裝可執行該操作的應用程式" "撥打 WPS 電話會中斷你正在進行的通話。" "繼續" + + diff --git a/java/com/android/dialer/util/res/values-zu/strings.xml b/java/com/android/dialer/util/res/values-zu/strings.xml index cdc7f892b..ea15b7d43 100644 --- a/java/com/android/dialer/util/res/values-zu/strings.xml +++ b/java/com/android/dialer/util/res/values-zu/strings.xml @@ -23,4 +23,6 @@ "Alukho uhlelo lokusebenza lalokho kule divayisi" "Ukwenza ikholi ye-WPS kuzonqamula ikholi yakho ekhona." "Qhubeka" + + diff --git a/java/com/android/dialer/util/res/values/strings.xml b/java/com/android/dialer/util/res/values/strings.xml index 43ea6e31a..a4d944c19 100644 --- a/java/com/android/dialer/util/res/values/strings.xml +++ b/java/com/android/dialer/util/res/values/strings.xml @@ -39,4 +39,6 @@ Continue + + Camera permission enabled diff --git a/java/com/android/dialer/voicemailstatus/VisualVoicemailEnabledChecker.java b/java/com/android/dialer/voicemailstatus/VisualVoicemailEnabledChecker.java index a1fc29edf..3f519ad82 100644 --- a/java/com/android/dialer/voicemailstatus/VisualVoicemailEnabledChecker.java +++ b/java/com/android/dialer/voicemailstatus/VisualVoicemailEnabledChecker.java @@ -45,7 +45,6 @@ public class VisualVoicemailEnabledChecker implements CallLogQueryHandler.Listen private SharedPreferences mPrefs; private boolean mHasActiveVoicemailProvider; private CallLogQueryHandler mCallLogQueryHandler; - private VoicemailStatusHelper mVoicemailStatusHelper; private Context mContext; private Callback mCallback; @@ -53,7 +52,6 @@ public class VisualVoicemailEnabledChecker implements CallLogQueryHandler.Listen mContext = context; mCallback = callback; mPrefs = PreferenceManager.getDefaultSharedPreferences(mContext); - mVoicemailStatusHelper = new VoicemailStatusHelper(); mHasActiveVoicemailProvider = mPrefs.getBoolean(PREF_KEY_HAS_ACTIVE_VOICEMAIL_PROVIDER, false); } @@ -77,7 +75,7 @@ public class VisualVoicemailEnabledChecker implements CallLogQueryHandler.Listen @Override public void onVoicemailStatusFetched(Cursor statusCursor) { boolean hasActiveVoicemailProvider = - mVoicemailStatusHelper.getNumberActivityVoicemailSources(statusCursor) > 0; + VoicemailStatusHelper.getNumberActivityVoicemailSources(statusCursor) > 0; if (hasActiveVoicemailProvider != mHasActiveVoicemailProvider) { mHasActiveVoicemailProvider = hasActiveVoicemailProvider; mPrefs diff --git a/java/com/android/dialer/voicemailstatus/VoicemailStatusHelper.java b/java/com/android/dialer/voicemailstatus/VoicemailStatusHelper.java index 9df45c211..313fc1be1 100644 --- a/java/com/android/dialer/voicemailstatus/VoicemailStatusHelper.java +++ b/java/com/android/dialer/voicemailstatus/VoicemailStatusHelper.java @@ -21,15 +21,17 @@ import android.provider.VoicemailContract.Status; import com.android.dialer.database.VoicemailStatusQuery; /** - * Interface used by the call log UI to determine what user message, if any, related to voicemail + * Utility used by the call log UI to determine what user message, if any, related to voicemail * source status needs to be shown. The messages are returned in the order of importance. * - *

The implementation of this interface interacts with the voicemail content provider to fetch - * statuses of all the registered voicemail sources and determines if any status message needs to be - * shown. The user of this interface must observe/listen to provider changes and invoke this class - * to check if any message needs to be shown. + *

This class interacts with the voicemail content provider to fetch statuses of all the + * registered voicemail sources and determines if any status message needs to be shown. The user of + * this class must observe/listen to provider changes and invoke this class to check if any message + * needs to be shown. */ -public class VoicemailStatusHelper { +public final class VoicemailStatusHelper { + + private VoicemailStatusHelper() {} /** * Returns the number of active voicemail sources installed. @@ -39,7 +41,7 @@ public class VoicemailStatusHelper { * @param cursor The caller is responsible for the life cycle of the cursor and resetting the * position */ - public int getNumberActivityVoicemailSources(Cursor cursor) { + public static int getNumberActivityVoicemailSources(Cursor cursor) { int count = 0; if (!cursor.moveToFirst()) { return 0; @@ -60,8 +62,10 @@ public class VoicemailStatusHelper { * activation is attempted, it will transition into CONFIGURING then into OK or other error state, * NOT_CONFIGURED is never set through an error. */ - private boolean isVoicemailSourceActive(Cursor cursor) { + private static boolean isVoicemailSourceActive(Cursor cursor) { return cursor.getString(VoicemailStatusQuery.SOURCE_PACKAGE_INDEX) != null + // getInt() returns 0 when null + && !cursor.isNull(VoicemailStatusQuery.CONFIGURATION_STATE_INDEX) && cursor.getInt(VoicemailStatusQuery.CONFIGURATION_STATE_INDEX) != Status.CONFIGURATION_STATE_NOT_CONFIGURED; } diff --git a/java/com/android/dialer/widget/res/layout/fragment_message.xml b/java/com/android/dialer/widget/res/layout/fragment_message.xml index bdb85fa81..5b0bab536 100644 --- a/java/com/android/dialer/widget/res/layout/fragment_message.xml +++ b/java/com/android/dialer/widget/res/layout/fragment_message.xml @@ -14,36 +14,28 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> - - - - - + + android:background="#12000000"/> + android:layout_height="wrap_content"> + android:imeOptions="actionSend"/> - \ No newline at end of file + \ No newline at end of file diff --git a/java/com/android/incallui/CallButtonPresenter.java b/java/com/android/incallui/CallButtonPresenter.java index dbb6a1c18..30877ffa5 100644 --- a/java/com/android/incallui/CallButtonPresenter.java +++ b/java/com/android/incallui/CallButtonPresenter.java @@ -365,7 +365,7 @@ public class CallButtonPresenter } private void updateUi(InCallState state, DialerCall call) { - LogUtil.v("CallButtonPresenter", "updating call UI for call: %s", call); + LogUtil.v("CallButtonPresenter", "updating call UI for call: ", call); if (mInCallButtonUi == null) { return; @@ -414,7 +414,7 @@ public class CallButtonPresenter final boolean showMute = call.can(android.telecom.Call.Details.CAPABILITY_MUTE); final boolean hasCameraPermission = - isVideo && VideoUtils.hasCameraPermissionAndAllowedByUser(mContext); + isVideo && VideoUtils.hasCameraPermissionAndShownPrivacyToast(mContext); // Disabling local video doesn't seem to work when dialing. See b/30256571. final boolean showPauseVideo = isVideo diff --git a/java/com/android/incallui/ContactInfoCache.java b/java/com/android/incallui/ContactInfoCache.java index fdfba3b9f..d50a5c26d 100644 --- a/java/com/android/incallui/ContactInfoCache.java +++ b/java/com/android/incallui/ContactInfoCache.java @@ -266,6 +266,8 @@ public class ContactInfoCache implements OnImageLoadCompleteListener { cce.userType = info.userType; cce.originalPhoneNumber = info.phoneNumber; cce.shouldShowLocation = info.shouldShowGeoDescription; + cce.isEmergencyNumber = info.isEmergencyNumber(); + cce.isVoicemailNumber = info.isVoiceMailNumber(); if (info.contactExists) { cce.contactLookupResult = ContactLookupResult.Type.LOCAL_CONTACT; @@ -428,6 +430,19 @@ public class ContactInfoCache implements OnImageLoadCompleteListener { + "; didLocalLookup = " + didLocalLookup); + ContactCacheEntry existingCacheEntry = mInfoMap.get(callId); + Log.d(TAG, "Existing cacheEntry in hashMap " + existingCacheEntry); + + // Mark it as emergency/voicemail if the cache exists and was emergency/voicemail before the + // number changed. + if (existingCacheEntry != null) { + if (existingCacheEntry.isEmergencyNumber) { + callerInfo.markAsEmergency(mContext); + } else if (existingCacheEntry.isVoicemailNumber) { + callerInfo.markAsVoiceMail(mContext); + } + } + int presentationMode = numberPresentation; if (callerInfo.contactExists || callerInfo.isEmergencyNumber() @@ -439,9 +454,6 @@ public class ContactInfoCache implements OnImageLoadCompleteListener { ContactCacheEntry cacheEntry = buildEntry(mContext, callerInfo, presentationMode); cacheEntry.queryId = queryToken.mQueryId; - ContactCacheEntry existingCacheEntry = mInfoMap.get(callId); - Log.d(TAG, "Existing cacheEntry in hashMap " + existingCacheEntry); - if (didLocalLookup) { if (cacheEntry.displayPhotoUri != null) { // When the difference between 2 numbers is only the prefix (e.g. + or IDD), @@ -704,6 +716,8 @@ public class ContactInfoCache implements OnImageLoadCompleteListener { boolean shouldShowLocation; boolean isBusiness; + boolean isEmergencyNumber; + boolean isVoicemailNumber; @Override public String toString() { @@ -743,6 +757,10 @@ public class ContactInfoCache implements OnImageLoadCompleteListener { + originalPhoneNumber + ", shouldShowLocation=" + shouldShowLocation + + ", isEmergencyNumber=" + + isEmergencyNumber + + ", isVoicemailNumber=" + + isVoicemailNumber + '}'; } } diff --git a/java/com/android/incallui/DialpadFragment.java b/java/com/android/incallui/DialpadFragment.java index c614d8412..7f494aa61 100644 --- a/java/com/android/incallui/DialpadFragment.java +++ b/java/com/android/incallui/DialpadFragment.java @@ -125,7 +125,7 @@ public class DialpadFragment extends BaseFragment return this; } - // TODO(klp) Adds hardware keyboard listener + // TODO Adds hardware keyboard listener @Override public View onCreateView( diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java index 0dd654903..563468e84 100644 --- a/java/com/android/incallui/InCallPresenter.java +++ b/java/com/android/incallui/InCallPresenter.java @@ -189,6 +189,8 @@ public class InCallPresenter implements CallList.Listener { /** Determines if the InCall UI is in fullscreen mode or not. */ private boolean mIsFullScreen = false; + private boolean mScreenTimeoutEnabled = true; + private PhoneStateListener mPhoneStateListener = new PhoneStateListener() { @Override @@ -395,6 +397,7 @@ public class InCallPresenter implements CallList.Listener { } private void attemptFinishActivity() { + mScreenTimeoutEnabled = true; final boolean doFinish = (mInCallActivity != null && isActivityStarted()); LogUtil.i("InCallPresenter.attemptFinishActivity", "Hide in call UI: " + doFinish); if (doFinish) { @@ -852,7 +855,7 @@ public class InCallPresenter implements CallList.Listener { if (newState == InCallState.NO_CALLS) { if (mBoundAndWaitingForOutgoingCall) { - return InCallState.PENDING_OUTGOING; + return InCallState.OUTGOING; } } @@ -870,7 +873,7 @@ public class InCallPresenter implements CallList.Listener { mBoundAndWaitingForOutgoingCall = isBound; mThemeColorManager.setPendingPhoneAccountHandle(handle); if (isBound && mInCallState == InCallState.NO_CALLS) { - mInCallState = InCallState.PENDING_OUTGOING; + mInCallState = InCallState.OUTGOING; } } @@ -1061,9 +1064,10 @@ public class InCallPresenter implements CallList.Listener { LogUtil.d("InCallPresenter.onActivityStarted", "onActivityStarted"); notifyVideoPauseController(true); if (mStatusBarNotifier != null) { - // TODO(maxwelb) - b/36649622: Investigate this redundant call + // TODO - b/36649622: Investigate this redundant call mStatusBarNotifier.updateNotification(mCallList); } + applyScreenTimeout(); } /*package*/ @@ -1577,13 +1581,18 @@ public class InCallPresenter implements CallList.Listener { public void enableScreenTimeout(boolean enable) { LogUtil.v("InCallPresenter.enableScreenTimeout", "enableScreenTimeout: value=" + enable); + mScreenTimeoutEnabled = enable; + applyScreenTimeout(); + } + + private void applyScreenTimeout() { if (mInCallActivity == null) { - LogUtil.e("InCallPresenter.enableScreenTimeout", "InCallActivity is null."); + LogUtil.e("InCallPresenter.applyScreenTimeout", "InCallActivity is null."); return; } final Window window = mInCallActivity.getWindow(); - if (enable) { + if (mScreenTimeoutEnabled) { window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); } else { window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); diff --git a/java/com/android/incallui/ProximitySensor.java b/java/com/android/incallui/ProximitySensor.java index db538abdc..653d85be9 100644 --- a/java/com/android/incallui/ProximitySensor.java +++ b/java/com/android/incallui/ProximitySensor.java @@ -102,10 +102,7 @@ public class ProximitySensor // sensor during incoming call screen. We check hasLiveCall() because a disconnected call // can also put the in-call screen in the INCALL state. boolean hasOngoingCall = InCallState.INCALL == newState && callList.hasLiveCall(); - boolean isOffhook = - InCallState.PENDING_OUTGOING == newState - || InCallState.OUTGOING == newState - || hasOngoingCall; + boolean isOffhook = (InCallState.OUTGOING == newState) || hasOngoingCall; DialerCall activeCall = callList.getActiveCall(); boolean isVideoCall = activeCall != null && activeCall.isVideoCall(); diff --git a/java/com/android/incallui/VideoCallPresenter.java b/java/com/android/incallui/VideoCallPresenter.java index 70f95e082..5b4178d45 100644 --- a/java/com/android/incallui/VideoCallPresenter.java +++ b/java/com/android/incallui/VideoCallPresenter.java @@ -30,6 +30,7 @@ import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; import com.android.dialer.compat.CompatUtils; import com.android.dialer.configprovider.ConfigProviderBindings; +import com.android.dialer.util.PermissionsUtil; import com.android.incallui.InCallPresenter.InCallDetailsListener; import com.android.incallui.InCallPresenter.InCallOrientationListener; import com.android.incallui.InCallPresenter.InCallStateListener; @@ -186,7 +187,7 @@ public class VideoCallPresenter */ public static boolean showOutgoingVideo( Context context, int videoState, int sessionModificationState) { - if (!VideoUtils.hasCameraPermissionAndAllowedByUser(context)) { + if (!VideoUtils.hasCameraPermissionAndShownPrivacyToast(context)) { LogUtil.i("VideoCallPresenter.showOutgoingVideo", "Camera permission is disabled by user."); return false; } @@ -421,7 +422,7 @@ public class VideoCallPresenter @Override public void onCameraPermissionGranted() { LogUtil.i("VideoCallPresenter.onCameraPermissionGranted", ""); - VideoUtils.setCameraAllowedByUser(mContext); + PermissionsUtil.setCameraPrivacyToastShown(mContext); enableCamera(mPrimaryCall.getVideoCall(), isCameraRequired()); showVideoUi( mPrimaryCall.getVideoState(), @@ -761,7 +762,7 @@ public class VideoCallPresenter /** * Adjusts the current video mode by setting up the preview and display surfaces as necessary. * Expected to be called whenever the video state associated with a call changes (e.g. a user - * turns their camera on or off) to ensure the correct surfaces are shown/hidden. TODO(vt): Need + * turns their camera on or off) to ensure the correct surfaces are shown/hidden. TODO: Need * to adjust size and orientation of preview surface here. */ private void adjustVideoMode(DialerCall call) { @@ -839,11 +840,11 @@ public class VideoCallPresenter return; } - boolean hasCameraPermission = VideoUtils.hasCameraPermissionAndAllowedByUser(mContext); + boolean hasCameraPermission = VideoUtils.hasCameraPermissionAndShownPrivacyToast(mContext); if (!hasCameraPermission) { videoCall.setCamera(null); mPreviewSurfaceState = PreviewSurfaceState.NONE; - // TODO(wangqi): Inform remote party that the video is off. This is similar to b/30256571. + // TODO: Inform remote party that the video is off. This is similar to b/30256571. } else if (isCameraRequired) { InCallCameraManager cameraManager = InCallPresenter.getInstance().getInCallCameraManager(); videoCall.setCamera(cameraManager.getActiveCameraId()); @@ -866,7 +867,7 @@ public class VideoCallPresenter false /* isRemotelyHeld */); enableCamera(mVideoCall, false); InCallPresenter.getInstance().setFullScreen(false); - + InCallPresenter.getInstance().enableScreenTimeout(false); mIsVideoMode = false; } @@ -1081,22 +1082,23 @@ public class VideoCallPresenter } @Override - public boolean shouldShowCameraPermissionDialog() { + public boolean shouldShowCameraPermissionToast() { if (mPrimaryCall == null) { - LogUtil.i("VideoCallPresenter.shouldShowCameraPermissionDialog", "null call"); + LogUtil.i("VideoCallPresenter.shouldShowCameraPermissionToast", "null call"); return false; } if (mPrimaryCall.didShowCameraPermission()) { LogUtil.i( - "VideoCallPresenter.shouldShowCameraPermissionDialog", "already shown for this call"); + "VideoCallPresenter.shouldShowCameraPermissionToast", "already shown for this call"); return false; } if (!ConfigProviderBindings.get(mContext) .getBoolean("camera_permission_dialog_allowed", true)) { - LogUtil.i("VideoCallPresenter.shouldShowCameraPermissionDialog", "disabled by config"); + LogUtil.i("VideoCallPresenter.shouldShowCameraPermissionToast", "disabled by config"); return false; } - return !VideoUtils.hasCameraPermission(mContext) || !VideoUtils.isCameraAllowedByUser(mContext); + return !VideoUtils.hasCameraPermission(mContext) + || !PermissionsUtil.hasCameraPrivacyToastShown(mContext); } @Override diff --git a/java/com/android/incallui/answer/impl/AnswerFragment.java b/java/com/android/incallui/answer/impl/AnswerFragment.java index 44310536d..b5dd1175b 100644 --- a/java/com/android/incallui/answer/impl/AnswerFragment.java +++ b/java/com/android/incallui/answer/impl/AnswerFragment.java @@ -718,7 +718,7 @@ public class AnswerFragment extends Fragment } view.setSystemUiVisibility(flags); if (isVideoCall() || isVideoUpgradeRequest()) { - if (VideoUtils.hasCameraPermissionAndAllowedByUser(getContext())) { + if (VideoUtils.hasCameraPermissionAndShownPrivacyToast(getContext())) { if (isSelfManagedCamera()) { answerVideoCallScreen = new SelfManagedAnswerVideoCallScreen(getCallId(), this, view); } else { diff --git a/java/com/android/incallui/answer/impl/hint/AnswerHint.java b/java/com/android/incallui/answer/impl/hint/AnswerHint.java index 1e78f50b8..dd3b8228a 100644 --- a/java/com/android/incallui/answer/impl/hint/AnswerHint.java +++ b/java/com/android/incallui/answer/impl/hint/AnswerHint.java @@ -27,7 +27,7 @@ public interface AnswerHint { /** * Inflates the hint's layout into the container. * - *

TODO(twyen): if the hint becomes more dependent on other UI elements of the AnswerFragment, + *

TODO: if the hint becomes more dependent on other UI elements of the AnswerFragment, * should put put and hintText into another data structure. */ void onCreateView(LayoutInflater inflater, ViewGroup container, View puck, TextView hintText); diff --git a/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java b/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java index 16fad8b17..536a470b0 100644 --- a/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java +++ b/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java @@ -80,7 +80,7 @@ public class AnswerProximitySensor .getBoolean(CONFIG_ANSWER_PSEUDO_PROXIMITY_WAKE_LOCK_ENABLED, true)) { answerProximityWakeLock = new PseudoProximityWakeLock(context, pseudoScreenState); } else { - // TODO(twyen): choose a wake lock implementation base on framework/device. + // TODO: choose a wake lock implementation base on framework/device. // These bugs requires the PseudoProximityWakeLock workaround: // b/30439151 Proximity sensor not working on M // b/31499931 fautly touch input when screen is off on marlin/sailfish diff --git a/java/com/android/incallui/autoresizetext/AutoResizeTextView.java b/java/com/android/incallui/autoresizetext/AutoResizeTextView.java index 5a22b93dc..eedcbe5bb 100644 --- a/java/com/android/incallui/autoresizetext/AutoResizeTextView.java +++ b/java/com/android/incallui/autoresizetext/AutoResizeTextView.java @@ -146,7 +146,7 @@ public class AutoResizeTextView extends TextView { float maxTextSize = TypedValue.applyDimension(unit, size, displayMetrics); if (this.maxTextSize != maxTextSize) { this.maxTextSize = maxTextSize; - // TODO(tobyj): It's not actually necessary to clear the whole cache here. To optimize cache + // TODO: It's not actually necessary to clear the whole cache here. To optimize cache // deletion we'd have to delete all entries in the cache with a value equal or larger than // MIN(old_max_size, new_max_size) when changing maxTextSize; and all entries with a value // equal or smaller than MAX(old_min_size, new_min_size) when changing minTextSize. diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java index 2e15264a5..88e0dbb5e 100644 --- a/java/com/android/incallui/call/DialerCall.java +++ b/java/com/android/incallui/call/DialerCall.java @@ -152,7 +152,6 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa // Times when a second call is received but AnswerAndRelease button is not shown // since it's not supported. private int secondCallWithoutAnswerAndReleasedButtonTimes = 0; - private VideoTech videoTech; public static String getNumberFromHandle(Uri handle) { return handle == null ? "" : handle.getSchemeSpecificPart(); @@ -195,15 +194,14 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa @Override public void onDetailsChanged(Call call, Call.Details details) { - LogUtil.v( - "TelecomCallCallback.onDetailsChanged", " call=" + call + " details=" + details); + LogUtil.v("TelecomCallCallback.onStateChanged", " call=" + call + " details=" + details); update(); } @Override public void onCannedTextResponsesLoaded(Call call, List cannedTextResponses) { LogUtil.v( - "TelecomCallCallback.onCannedTextResponsesLoaded", + "TelecomCallCallback.onStateChanged", "call=" + call + " cannedTextResponses=" + cannedTextResponses); for (CannedTextResponsesLoadedListener listener : mCannedTextResponsesLoadedListeners) { listener.onCannedTextResponsesLoaded(DialerCall.this); @@ -213,7 +211,7 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa @Override public void onPostDialWait(Call call, String remainingPostDialSequence) { LogUtil.v( - "TelecomCallCallback.onPostDialWait", + "TelecomCallCallback.onStateChanged", "call=" + call + " remainingPostDialSequence=" + remainingPostDialSequence); update(); } @@ -221,20 +219,20 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa @Override public void onVideoCallChanged(Call call, VideoCall videoCall) { LogUtil.v( - "TelecomCallCallback.onVideoCallChanged", "call=" + call + " videoCall=" + videoCall); + "TelecomCallCallback.onStateChanged", "call=" + call + " videoCall=" + videoCall); update(); } @Override public void onCallDestroyed(Call call) { - LogUtil.v("TelecomCallCallback.onCallDestroyed", "call=" + call); + LogUtil.v("TelecomCallCallback.onStateChanged", "call=" + call); unregisterCallback(); } @Override public void onConferenceableCallsChanged(Call call, List conferenceableCalls) { LogUtil.v( - "TelecomCallCallback.onConferenceableCallsChanged", + "DialerCall.onConferenceableCallsChanged", "call %s, conferenceable calls: %d", call, conferenceableCalls.size()); @@ -244,7 +242,7 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa @Override public void onConnectionEvent(android.telecom.Call call, String event, Bundle extras) { LogUtil.v( - "TelecomCallCallback.onConnectionEvent", + "DialerCall.onConnectionEvent", "Call: " + call + ", Event: " + event + ", Extras: " + extras); switch (event) { // The Previous attempt to Merge two calls together has failed in Telecom. We must @@ -432,8 +430,6 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa private void update() { Trace.beginSection("Update"); int oldState = getState(); - // Clear any cache here that could potentially change on update. - videoTech = null; // We want to potentially register a video call callback here. updateFromTelecomCall(); if (oldState != getState() && getState() == DialerCall.State.DISCONNECTED) { @@ -445,7 +441,7 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa .unregisterCapabilitiesListener(this); EnrichedCallComponent.get(mContext) .getEnrichedCallManager() - .unregisterStateChangedListener(this); + .unregisterCapabilitiesListener(this); } else { for (DialerCallListener listener : mListeners) { listener.onDialerCallUpdate(); @@ -1118,10 +1114,7 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa } public VideoTech getVideoTech() { - if (videoTech == null) { - videoTech = mVideoTechManager.getVideoTech(); - } - return videoTech; + return mVideoTechManager.getVideoTech(); } public String getCallbackNumber() { diff --git a/java/com/android/incallui/calllocation/impl/AndroidManifest.xml b/java/com/android/incallui/calllocation/impl/AndroidManifest.xml index fda940483..550c5808c 100644 --- a/java/com/android/incallui/calllocation/impl/AndroidManifest.xml +++ b/java/com/android/incallui/calllocation/impl/AndroidManifest.xml @@ -19,7 +19,6 @@ package="com.android.incallui.calllocation.impl"> - diff --git a/java/com/android/incallui/calllocation/impl/LocationUrlBuilder.java b/java/com/android/incallui/calllocation/impl/LocationUrlBuilder.java index 14a9c76b9..a57bdf613 100644 --- a/java/com/android/incallui/calllocation/impl/LocationUrlBuilder.java +++ b/java/com/android/incallui/calllocation/impl/LocationUrlBuilder.java @@ -134,7 +134,7 @@ class LocationUrlBuilder { url += String.format(Locale.US, "(%s)", addressLine1.toString()); } } else { - // TODO(mdooley): i18n + // TODO: i18n url += String.format( Locale.US, diff --git a/java/com/android/incallui/contactgrid/ContactGridManager.java b/java/com/android/incallui/contactgrid/ContactGridManager.java index 502cc52b8..708bfab4e 100644 --- a/java/com/android/incallui/contactgrid/ContactGridManager.java +++ b/java/com/android/incallui/contactgrid/ContactGridManager.java @@ -32,6 +32,7 @@ import android.widget.ViewAnimator; import com.android.contacts.common.compat.PhoneNumberUtilsCompat; import com.android.contacts.common.lettertiles.LetterTileDrawable; import com.android.dialer.common.Assert; +import com.android.dialer.common.LogUtil; import com.android.dialer.util.DrawableConverter; import com.android.incallui.incall.protocol.ContactPhotoType; import com.android.incallui.incall.protocol.PrimaryCallState; @@ -347,12 +348,16 @@ public class ContactGridManager { } if (info.isTimerVisible) { + bottomTextSwitcher.setDisplayedChild(1); + bottomTimerView.setBase( + primaryCallState.connectTimeMillis + - System.currentTimeMillis() + + SystemClock.elapsedRealtime()); if (!isTimerStarted) { - bottomTextSwitcher.setDisplayedChild(1); - bottomTimerView.setBase( - primaryCallState.connectTimeMillis - - System.currentTimeMillis() - + SystemClock.elapsedRealtime()); + LogUtil.i( + "ContactGridManager.updateBottomRow", + "starting timer with base: %d", + bottomTimerView.getBase()); bottomTimerView.start(); isTimerStarted = 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/res/values-af/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-af/strings.xml new file mode 100644 index 000000000..5f07dfc1c --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-af/strings.xml @@ -0,0 +1,24 @@ + + + + + "Aktiveer" + "Video-oproepe is nie nou beskikbaar nie" + "Probeer weer later bel of gaan voort met die oproep as \'n stemoproep." + "Stemoproep" + 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..62a77e482 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-am/strings.xml @@ -0,0 +1,24 @@ + + + + + "አንቃ" + "የቪዲዮ ጥሪ ለጊዜው አይገኝም" + "በኋላ እንደገና ለመደወል ይሞክሩ ወይም ጥሪውን እንደ የድምጽ ጥሪ ይቀጥሉ።" + "የድምጽ ጥሪ" + 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..e29ee2f96 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-ar/strings.xml @@ -0,0 +1,24 @@ + + + + + "تمكين" + "اتصال الفيديو غير متوفر حاليًا" + "حاول الاتصال مرة أخرى لاحقًا أو أكمل المكالمة كمكالمة صوتية." + "مكالمة صوتية" + 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..d4cab2640 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-be/strings.xml @@ -0,0 +1,24 @@ + + + + + "Уключыць" + "Відэавыклікі зараз недаступныя" + "Паспрабуйце зрабіць выклік пазней або працягніце выклік як галасавы." + "Галасавы выклік" + 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..e9211abee --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-bg/strings.xml @@ -0,0 +1,24 @@ + + + + + "Активиране" + "В момента не е възможно видеообаждане" + "Опитайте да се обадите отново по-късно или продължете обаждането като гласово." + "Гласово обаждане" + 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..502434ae3 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-cs/strings.xml @@ -0,0 +1,24 @@ + + + + + "Zapnout" + "Videohovory momentálně nejsou dostupné" + "Zkuste zavolat později nebo v hovoru pokračujte bez videa." + "Hlasový hovor" + 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..817226eeb --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-da/strings.xml @@ -0,0 +1,24 @@ + + + + + "Aktivér" + "Det er ikke muligt at foretage videoopkald i øjeblikket" + "Prøv at ringe igen senere, eller fortsæt med et taleopkald." + "Taleopkald" + 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..8ebc527fc --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-de/strings.xml @@ -0,0 +1,24 @@ + + + + + "Aktivieren" + "Videoanrufe sind momentan nicht verfügbar" + "Versuche es später noch einmal oder setze den Anruf als Sprachanruf fort." + "Sprachanruf" + 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..98afb12bb --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-es-rUS/strings.xml @@ -0,0 +1,24 @@ + + + + + "Habilitar" + "La videollamada no está disponible en este momento" + "Prueba llamando de nuevo más tarde o continúa la llamada como una llamada de voz." + "Llamada de voz" + 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..580ac8b11 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-es/strings.xml @@ -0,0 +1,24 @@ + + + + + "Habilitar" + "No se pueden hacer videollamadas en estos momentos" + "Prueba a llamar de nuevo más tarde o haz una llamada de voz." + "Llamada de voz" + 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..c207d39d5 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-eu/strings.xml @@ -0,0 +1,24 @@ + + + + + "Gaitu" + "Une honetan, bideo-deiak ez daude erabilgarri" + "Saiatu geroago berriro deitzen, edo aldatu ahots-deira." + "Ahots-deia" + 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..73c2a8693 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-fa/strings.xml @@ -0,0 +1,24 @@ + + + + + "فعال کردن" + "تماس ویدیویی درحال حاضر امکان‌پذیر نیست" + "بعداً دوباره تماس بگیرید یا با تماس صوتی ادامه دهید." + "تماس صوتی" + 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..93d4cc7ca --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-fi/strings.xml @@ -0,0 +1,24 @@ + + + + + "Ota käyttöön" + "Videopuhelut ei ole tällä hetkellä saatavilla" + "Yritä soittaa myöhemmin uudelleen tai jatka puhelua äänipuheluna." + "Puhelu" + 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..f9dfdfad4 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-fr/strings.xml @@ -0,0 +1,24 @@ + + + + + "Activer" + "La fonction d\'appel vidéo est momentanément indisponible" + "Réessayez plus tard ou reprenez l\'appel en mode vocal." + "Appel vocal" + 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..3313c4436 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-gl/strings.xml @@ -0,0 +1,24 @@ + + + + + "Activar" + "As videochamadas non están dispoñibles actualmente" + "Proba a chamar de novo máis tarde ou continuar a chamada como unha chamada de voz." + "Chamada de voz" + 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..820153922 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-hi/strings.xml @@ -0,0 +1,24 @@ + + + + + "सक्षम करें" + "इस समय वीडियो कॉलिंग की सुविधा उपलब्ध नहीं है" + "बाद में दोबारा कॉल करने की कोशिश करें या कॉल को वॉइस कॉल के रूप में जारी रखें." + "वॉइस कॉल" + 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..c1b56b7f7 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-hr/strings.xml @@ -0,0 +1,24 @@ + + + + + "Omogući" + "Videopozivanje trenutačno nije dostupno" + "Pokušajte ponovno nazvati kasnije ili nastavite poziv kao glasovni." + "Glasovni poziv" + 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..e1f9bd9d1 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-hu/strings.xml @@ -0,0 +1,24 @@ + + + + + "Engedélyezés" + "A videohívás jelenleg nem érhető el" + "Indítson hívást később, vagy folytassa hanghívásként." + "Hanghívás" + 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..d2c10be1f --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-hy/strings.xml @@ -0,0 +1,24 @@ + + + + + "Միացնել" + "Տեսազանգը ներկայումս հասանելի չէ" + "Ավելի ուշ նորից փորձեք զանգել կամ շարունակեք զանգն առանց տեսապատկերի:" + "Զանգ" + 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..8b895bc2a --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-in/strings.xml @@ -0,0 +1,24 @@ + + + + + "Aktifkan" + "Video call saat ini tidak tersedia" + "Coba lagi nanti atau lanjutkan sebagai panggilan suara." + "Panggilan suara" + 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..1b862f766 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-it/strings.xml @@ -0,0 +1,24 @@ + + + + + "Abilita" + "Le videochiamate non sono disponibili in questo momento" + "Prova a chiamare di nuovo più tardi o continua la chiamata come chiamata vocale." + "Chiamata vocale" + 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..91af8a9e5 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-iw/strings.xml @@ -0,0 +1,24 @@ + + + + + "הפעלה" + "לא ניתן לשוחח בשיחת וידאו כרגע" + "מומלץ לנסות להתקשר מאוחר יותר או להמשיך לשוחח בשיחה קולית." + "שיחה קולית" + 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..804597972 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-ka/strings.xml @@ -0,0 +1,24 @@ + + + + + "ჩართვა" + "ვიდეოზარი ამჟამად მიუწვდომელია" + "სცადეთ, დარეკოთ მოგვიანებით ან გააგრძელოთ ხმოვანი ზარით." + "ხმოვანი ზარი" + 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..47294f9ff --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-kk/strings.xml @@ -0,0 +1,24 @@ + + + + + "Қосу" + "Бейне қоңырау қазір қолжетімді емес" + "Кейінірек қайталап көріңіз немесе дасуыстық қоңырау ретінде жалғастырыңыз." + "Дауыстық қоңырау" + 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..6e1c0fea1 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-km/strings.xml @@ -0,0 +1,24 @@ + + + + + "បើក" + "ការហៅ​វីដេអូ​មិន​អាច​ធ្វើ​បាន​ទេ​នៅពេល​នេះ" + "សាកល្បងហៅ​ម្ដងទៀត​នៅពេលក្រោយ ឬ​បន្ត​ការហៅ​ជា​សំឡេង។" + "ការ​ហៅ​ជា​សំឡេង" + 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..15531690a --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-ky/strings.xml @@ -0,0 +1,24 @@ + + + + + "Иштетүү" + "Видео режиминде чалуу учурда жеткиликсиз" + "Кийинчерээк кайра чалыңыз же үн режиминде чалып көрүңүз." + "Үн чалуусу" + 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..3c061df22 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-mk/strings.xml @@ -0,0 +1,24 @@ + + + + + "Овозможи" + "Видеоповикувањето е недостапно во моментов." + "Обидете се да повикате повторно подоцна или продолжете со гласовен повик." + "Гласовен повик" + 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..efe87996e --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-ms/strings.xml @@ -0,0 +1,24 @@ + + + + + "Dayakan" + "Panggilan video tidak tersedia pada masa ini" + "Cuba hubungi semula kemudian atau teruskan panggilan sebagai panggilan suara." + "Panggilan suara" + 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..04a4f3a26 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-my/strings.xml @@ -0,0 +1,24 @@ + + + + + "ဖွင့်ရန်" + "ဗီဒီယိုခေါ်ဆိုမှုကို လက်ရှိတွင် မရရှိနိုင်ပါ" + "နောက်မှ ထပ်မံခေါ်ဆိုကြည့်ပါ (သို့) အသံခေါ်ဆိုမှု ဆက်လုပ်ကြည့်ပါ။" + "အသံခေါ်ဆိုမှု" + 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..fb6980a88 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-pt-rPT/strings.xml @@ -0,0 +1,24 @@ + + + + + "Ativar" + "Neste momento, não é possível efetuar videochamadas" + "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..783619256 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-ro/strings.xml @@ -0,0 +1,24 @@ + + + + + "Activați" + "Apelarea video este indisponibilă momentan" + "Încercați să apelați din nou mai târziu sau continuați ca apel vocal." + "Apel vocal" + 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..ffc3f613b --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-ru/strings.xml @@ -0,0 +1,24 @@ + + + + + "Включить" + "В настоящее время видеовызовы недоступны" + "Повторите попытку позже или продолжайте выполнять вызов как голосовой." + "Голосовой вызов" + 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..694887700 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-si/strings.xml @@ -0,0 +1,24 @@ + + + + + "සබල කරන්න" + "වීඩියෝ ඇමතීම දැනට ලබා ගැනීමට නොහැකිය" + "පසුව නැවත ඇමතීම උත්සාහ කරන්න නැතහොත් ඇමතුම හඬ ඇමතුමක් ලෙස දිගටම කරගෙන යන්න." + "හඬ ඇමතීම" + 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..8f4b059b0 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-sk/strings.xml @@ -0,0 +1,24 @@ + + + + + "Povoliť" + "Videohovor momentálne nie je k dispozícii" + "Skúste zavolať znova neskôr alebo pokračujte v hovore bez videa." + "Hlasový hovor" + 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..cccc83f93 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-sq/strings.xml @@ -0,0 +1,24 @@ + + + + + "Aktivizo" + "Telefonatat me video nuk ofrohen aktualisht" + "Provo të telefonosh përsëri më vonë ose vazhdoje telefonatën si një telefonatë zanore." + "Telefonatë me video" + 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..e6be38418 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-sv/strings.xml @@ -0,0 +1,24 @@ + + + + + "Aktivera" + "Det går inte att ringa videosamtal just nu" + "Försök ringa upp igen senare eller fortsätt samtalet som ett röstsamtal" + "Röstsamtal" + 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..6d6a6a06d --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-sw/strings.xml @@ -0,0 +1,24 @@ + + + + + "Washa" + "Kipengele cha kupiga simu za video hakipatikani kwa sasa" + "Jaribu kupiga simu ya video tena hapo baadaye au uendelee na mazungumzo kama simu ya sauti." + "Simu ya sauti" + 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..17f29af56 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-tl/strings.xml @@ -0,0 +1,24 @@ + + + + + "I-enable" + "Kasalukuyang hindi available ang pakikipag-video call" + "Subukang tumawag muli sa ibang pagkakataon o ipagpatuloy ang tawag bilang isang voice call." + "Voice call" + 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..a0ba4fa8a --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-tr/strings.xml @@ -0,0 +1,24 @@ + + + + + "Etkinleştir" + "Görüntülü görüşme şu anda kullanılamıyor" + "Görüntülü görüşme yapmayı daha sonra tekrar deneyin veya görüşmeye sesli arama olarak devam edin." + "Sesli arama" + 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..4fa8b50d4 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-ur/strings.xml @@ -0,0 +1,24 @@ + + + + + "فعال کریں" + "ویڈیو کالنگ فی الحال دستیاب نہیں ہے" + "بعد میں دوبارہ کال کرنے کی کوشش کریں یا کال کو بطور صوتی کال جاری رکھیں۔" + "صوتی کال" + 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..229e6e798 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-uz/strings.xml @@ -0,0 +1,24 @@ + + + + + "Yoqish" + "Video muloqot funksiyasidan hozirgi vaqtda foydalanib bo‘lmaydi." + "Keyinroq qayta urinib ko‘ring yoki ovozli muloqot rejimida o‘ting." + "Ovozli muloqot" + 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..3e49451b4 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-vi/strings.xml @@ -0,0 +1,24 @@ + + + + + "Bật" + "Hiện không sử dụng được tính năng gọi điện video" + "Hãy thử gọi lại sau hoặc tiếp tục gọi dưới dạng cuộc gọi thoại." + "Cuộc gọi thoại" + 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..3f8cd6d62 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-zh-rCN/strings.xml @@ -0,0 +1,24 @@ + + + + + "启用" + "当前无法使用视频通话功能" + "请稍后再试，或者改用语音通话。" + "语音通话" + 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..5201a341d --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values-zh-rTW/strings.xml @@ -0,0 +1,24 @@ + + + + + "啟用" + "目前無法使用視訊通話功能" + "請稍後再嘗試撥打電話，或以語音方式繼續進行通話。" + "語音通話" + 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/incall/impl/InCallPagerAdapter.java b/java/com/android/incallui/incall/impl/InCallPagerAdapter.java index d4b04feff..bc0c61607 100644 --- a/java/com/android/incallui/incall/impl/InCallPagerAdapter.java +++ b/java/com/android/incallui/incall/impl/InCallPagerAdapter.java @@ -39,7 +39,7 @@ public class InCallPagerAdapter extends FragmentStatePagerAdapter { if (position == getButtonGridPosition()) { return InCallButtonGridFragment.newInstance(); } else { - // TODO(calderwoodra): handle fragment invalidation for when the data changes. + // TODO: handle fragment invalidation for when the data changes. return MultimediaFragment.newInstance(attachments, true, false, false); } } diff --git a/java/com/android/incallui/maps/impl/AndroidManifest.xml b/java/com/android/incallui/maps/impl/AndroidManifest.xml index bc921e906..4ad0b3b7e 100644 --- a/java/com/android/incallui/maps/impl/AndroidManifest.xml +++ b/java/com/android/incallui/maps/impl/AndroidManifest.xml @@ -19,7 +19,6 @@ package="com.android.incallui.maps.impl"> - 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/video/impl/SurfaceViewVideoCallFragment.java b/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java index 489f72b7d..95bdd6b78 100644 --- a/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java +++ b/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java @@ -50,6 +50,7 @@ import com.android.dialer.common.Assert; import com.android.dialer.common.FragmentUtils; import com.android.dialer.common.LogUtil; import com.android.dialer.compat.ActivityCompat; +import com.android.dialer.util.PermissionsUtil; import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment; import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment.AudioRouteSelectorPresenter; import com.android.incallui.contactgrid.ContactGridManager; @@ -65,7 +66,6 @@ import com.android.incallui.incall.protocol.InCallScreenDelegateFactory; import com.android.incallui.incall.protocol.PrimaryCallState; import com.android.incallui.incall.protocol.PrimaryInfo; import com.android.incallui.incall.protocol.SecondaryInfo; -import com.android.incallui.video.impl.CameraPermissionDialogFragment.CameraPermissionDialogCallback; import com.android.incallui.video.impl.CheckableImageButton.OnCheckedChangeListener; import com.android.incallui.video.protocol.VideoCallScreen; import com.android.incallui.video.protocol.VideoCallScreenDelegate; @@ -85,15 +85,12 @@ public class SurfaceViewVideoCallFragment extends Fragment OnClickListener, OnCheckedChangeListener, AudioRouteSelectorPresenter, - OnSystemUiVisibilityChangeListener, - CameraPermissionDialogCallback { + OnSystemUiVisibilityChangeListener { @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) static final String ARG_CALL_ID = "call_id"; private static final int CAMERA_PERMISSION_REQUEST_CODE = 1; - private static final String CAMERA_PERMISSION_DIALOG_FRAMENT_TAG = - "CameraPermissionDialogFragment"; private static final long CAMERA_PERMISSION_DIALOG_DELAY_IN_MILLIS = 2000L; private static final long VIDEO_OFF_VIEW_FADE_OUT_DELAY_IN_MILLIS = 2000L; @@ -131,7 +128,7 @@ public class SurfaceViewVideoCallFragment extends Fragment new Runnable() { @Override public void run() { - if (videoCallScreenDelegate.shouldShowCameraPermissionDialog()) { + if (videoCallScreenDelegate.shouldShowCameraPermissionToast()) { LogUtil.i( "SurfaceViewVideoCallFragment.cameraPermissionDialogRunnable", "showing dialog"); checkCameraPermission(); @@ -612,7 +609,7 @@ public class SurfaceViewVideoCallFragment extends Fragment @Override public void onCheckedChanged(CheckableImageButton button, boolean isChecked) { if (button == cameraOffButton) { - if (!isChecked && !VideoUtils.hasCameraPermissionAndAllowedByUser(getContext())) { + if (!isChecked && !VideoUtils.hasCameraPermissionAndShownPrivacyToast(getContext())) { LogUtil.i("SurfaceViewVideoCallFragment.onCheckedChanged", "show camera permission dialog"); checkCameraPermission(); } else { @@ -1048,24 +1045,19 @@ public class SurfaceViewVideoCallFragment extends Fragment } } - @Override - public void onCameraPermissionGranted() { - videoCallScreenDelegate.onCameraPermissionGranted(); - } - private void checkCameraPermission() { // Checks if user has consent of camera permission and the permission is granted. // If camera permission is revoked, shows system permission dialog. // If camera permission is granted but user doesn't have consent of camera permission // (which means it's first time making video call), shows custom dialog instead. This // will only be shown to user once. - if (!VideoUtils.hasCameraPermissionAndAllowedByUser(getContext())) { + if (!VideoUtils.hasCameraPermissionAndShownPrivacyToast(getContext())) { videoCallScreenDelegate.onCameraPermissionDialogShown(); if (!VideoUtils.hasCameraPermission(getContext())) { requestPermissions(new String[] {permission.CAMERA}, CAMERA_PERMISSION_REQUEST_CODE); } else { - CameraPermissionDialogFragment.newInstance() - .show(getChildFragmentManager(), CAMERA_PERMISSION_DIALOG_FRAMENT_TAG); + PermissionsUtil.showCameraPermissionToast(getContext()); + videoCallScreenDelegate.onCameraPermissionGranted(); } } } diff --git a/java/com/android/incallui/video/impl/VideoCallFragment.java b/java/com/android/incallui/video/impl/VideoCallFragment.java index 4d172235e..203710e5f 100644 --- a/java/com/android/incallui/video/impl/VideoCallFragment.java +++ b/java/com/android/incallui/video/impl/VideoCallFragment.java @@ -61,6 +61,7 @@ import com.android.dialer.common.Assert; import com.android.dialer.common.FragmentUtils; import com.android.dialer.common.LogUtil; import com.android.dialer.compat.ActivityCompat; +import com.android.dialer.util.PermissionsUtil; import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment; import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment.AudioRouteSelectorPresenter; import com.android.incallui.contactgrid.ContactGridManager; @@ -76,7 +77,6 @@ import com.android.incallui.incall.protocol.InCallScreenDelegateFactory; import com.android.incallui.incall.protocol.PrimaryCallState; import com.android.incallui.incall.protocol.PrimaryInfo; import com.android.incallui.incall.protocol.SecondaryInfo; -import com.android.incallui.video.impl.CameraPermissionDialogFragment.CameraPermissionDialogCallback; import com.android.incallui.video.impl.CheckableImageButton.OnCheckedChangeListener; import com.android.incallui.video.protocol.VideoCallScreen; import com.android.incallui.video.protocol.VideoCallScreenDelegate; @@ -94,8 +94,7 @@ public class VideoCallFragment extends Fragment OnClickListener, OnCheckedChangeListener, AudioRouteSelectorPresenter, - OnSystemUiVisibilityChangeListener, - CameraPermissionDialogCallback { + OnSystemUiVisibilityChangeListener { @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) static final String ARG_CALL_ID = "call_id"; @@ -107,8 +106,6 @@ public class VideoCallFragment extends Fragment private static final float ASPECT_RATIO_MATCH_THRESHOLD = 0.2f; private static final int CAMERA_PERMISSION_REQUEST_CODE = 1; - private static final String CAMERA_PERMISSION_DIALOG_FRAMENT_TAG = - "CameraPermissionDialogFragment"; private static final long CAMERA_PERMISSION_DIALOG_DELAY_IN_MILLIS = 2000L; private static final long VIDEO_OFF_VIEW_FADE_OUT_DELAY_IN_MILLIS = 2000L; @@ -158,7 +155,7 @@ public class VideoCallFragment extends Fragment new Runnable() { @Override public void run() { - if (videoCallScreenDelegate.shouldShowCameraPermissionDialog()) { + if (videoCallScreenDelegate.shouldShowCameraPermissionToast()) { LogUtil.i("VideoCallFragment.cameraPermissionDialogRunnable", "showing dialog"); checkCameraPermission(); } @@ -653,7 +650,7 @@ public class VideoCallFragment extends Fragment @Override public void onCheckedChanged(CheckableImageButton button, boolean isChecked) { if (button == cameraOffButton) { - if (!isChecked && !VideoUtils.hasCameraPermissionAndAllowedByUser(getContext())) { + if (!isChecked && !VideoUtils.hasCameraPermissionAndShownPrivacyToast(getContext())) { LogUtil.i("VideoCallFragment.onCheckedChanged", "show camera permission dialog"); checkCameraPermission(); } else { @@ -1151,12 +1148,12 @@ public class VideoCallFragment extends Fragment return; } - // TODO(mdooley): When the view is first displayed after a rotation the bitmap is empty + // TODO: When the view is first displayed after a rotation the bitmap is empty // and thus this blur has no effect. // This call can take 100 milliseconds. blur(getContext(), bitmap, blurRadius); - // TODO(mdooley): Figure out why only have to apply the transform in landscape mode + // TODO: Figure out why only have to apply the transform in landscape mode if (width > height) { bitmap = Bitmap.createBitmap( @@ -1256,24 +1253,19 @@ public class VideoCallFragment extends Fragment videoCallScreenDelegate.onSystemUiVisibilityChange(navBarVisible); } - @Override - public void onCameraPermissionGranted() { - videoCallScreenDelegate.onCameraPermissionGranted(); - } - private void checkCameraPermission() { // Checks if user has consent of camera permission and the permission is granted. // If camera permission is revoked, shows system permission dialog. // If camera permission is granted but user doesn't have consent of camera permission // (which means it's first time making video call), shows custom dialog instead. This // will only be shown to user once. - if (!VideoUtils.hasCameraPermissionAndAllowedByUser(getContext())) { + if (!VideoUtils.hasCameraPermissionAndShownPrivacyToast(getContext())) { videoCallScreenDelegate.onCameraPermissionDialogShown(); if (!VideoUtils.hasCameraPermission(getContext())) { requestPermissions(new String[] {permission.CAMERA}, CAMERA_PERMISSION_REQUEST_CODE); } else { - CameraPermissionDialogFragment.newInstance() - .show(getChildFragmentManager(), CAMERA_PERMISSION_DIALOG_FRAMENT_TAG); + PermissionsUtil.showCameraPermissionToast(getContext()); + videoCallScreenDelegate.onCameraPermissionGranted(); } } } diff --git a/java/com/android/incallui/video/protocol/VideoCallScreenDelegate.java b/java/com/android/incallui/video/protocol/VideoCallScreenDelegate.java index e7e69df2f..55ea23f5e 100644 --- a/java/com/android/incallui/video/protocol/VideoCallScreenDelegate.java +++ b/java/com/android/incallui/video/protocol/VideoCallScreenDelegate.java @@ -37,7 +37,7 @@ public interface VideoCallScreenDelegate { void onCameraPermissionGranted(); - boolean shouldShowCameraPermissionDialog(); + boolean shouldShowCameraPermissionToast(); void onCameraPermissionDialogShown(); diff --git a/java/com/android/incallui/videotech/lightbringer/LightbringerTech.java b/java/com/android/incallui/videotech/lightbringer/LightbringerTech.java index 55ee2db21..961de9e9a 100644 --- a/java/com/android/incallui/videotech/lightbringer/LightbringerTech.java +++ b/java/com/android/incallui/videotech/lightbringer/LightbringerTech.java @@ -91,7 +91,9 @@ public class LightbringerTech implements VideoTech, LightbringerListener { } @Override - public void onRemovedFromCallList() {} + public void onRemovedFromCallList() { + lightbringer.unregisterListener(this); + } @Override public int getSessionModificationState() { diff --git a/java/com/android/incallui/videotech/utils/VideoUtils.java b/java/com/android/incallui/videotech/utils/VideoUtils.java index 527654030..9dfc68728 100644 --- a/java/com/android/incallui/videotech/utils/VideoUtils.java +++ b/java/com/android/incallui/videotech/utils/VideoUtils.java @@ -20,12 +20,10 @@ import android.content.Context; import android.content.pm.PackageManager; import android.support.annotation.NonNull; import android.support.v4.content.ContextCompat; -import com.android.dialer.util.DialerUtils; +import com.android.dialer.util.PermissionsUtil; public class VideoUtils { - private static final String PREFERENCE_CAMERA_ALLOWED_BY_USER = "camera_allowed_by_user"; - public static boolean hasSentVideoUpgradeRequest(@SessionModificationState int state) { return state == SessionModificationState.WAITING_FOR_UPGRADE_TO_VIDEO_RESPONSE || state == SessionModificationState.UPGRADE_TO_VIDEO_REQUEST_FAILED @@ -37,24 +35,12 @@ public class VideoUtils { return state == SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST; } - public static boolean hasCameraPermissionAndAllowedByUser(@NonNull Context context) { - return isCameraAllowedByUser(context) && hasCameraPermission(context); + public static boolean hasCameraPermissionAndShownPrivacyToast(@NonNull Context context) { + return PermissionsUtil.hasCameraPrivacyToastShown(context) && hasCameraPermission(context); } public static boolean hasCameraPermission(@NonNull Context context) { return ContextCompat.checkSelfPermission(context, android.Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED; } - - public static boolean isCameraAllowedByUser(@NonNull Context context) { - return DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context) - .getBoolean(PREFERENCE_CAMERA_ALLOWED_BY_USER, false); - } - - public static void setCameraAllowedByUser(@NonNull Context context) { - DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context) - .edit() - .putBoolean(PREFERENCE_CAMERA_ALLOWED_BY_USER, true) - .apply(); - } } diff --git a/java/com/android/voicemail/AndroidManifest.xml b/java/com/android/voicemail/AndroidManifest.xml index aedfd6fbf..817cf1b55 100644 --- a/java/com/android/voicemail/AndroidManifest.xml +++ b/java/com/android/voicemail/AndroidManifest.xml @@ -14,7 +14,7 @@ ~ limitations under the License --> + package="com.android.voicemail"> - + + + + + + + + + + + + + + + diff --git a/java/com/android/voicemail/VoicemailClient.java b/java/com/android/voicemail/VoicemailClient.java index 97b824b27..28d2bf0ff 100644 --- a/java/com/android/voicemail/VoicemailClient.java +++ b/java/com/android/voicemail/VoicemailClient.java @@ -18,7 +18,10 @@ package com.android.voicemail; import android.content.Context; import android.content.Intent; +import android.os.PersistableBundle; import android.provider.VoicemailContract.Voicemails; +import android.support.annotation.MainThread; +import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.telecom.PhoneAccountHandle; import android.telephony.TelephonyManager; @@ -51,6 +54,12 @@ public interface VoicemailClient { String ACTION_SHOW_LEGACY_VOICEMAIL = "com.android.voicemail.VoicemailClient.ACTION_SHOW_LEGACY_VOICEMAIL"; + /** + * Secret code to launch the voicemail config activity intended for OEMs and Carriers. {@code + * *#*#VVMCONFIG#*#*} + */ + String VOICEMAIL_SECRET_CODE = "886266344"; + /** * Whether the visual voicemail service is enabled for the {@code phoneAccountHandle}. "Enable" * means the user "wants" to have this service on, and does not mean the service is actually @@ -122,4 +131,21 @@ public interface VoicemailClient { * provisioning. Being "activated" means all setup are completed, and VVM is expected to work. */ boolean isActivated(Context context, PhoneAccountHandle phoneAccountHandle); + + /** + * Called when {@link #VOICEMAIL_SECRET_CODE} is dialed. {@code context} will be a broadcast + * receiver context. + */ + @MainThread + void showConfigUi(@NonNull Context context); + + @NonNull + PersistableBundle getConfig( + @NonNull Context context, @Nullable PhoneAccountHandle phoneAccountHandle); + + @MainThread + void onBoot(@NonNull Context context); + + @MainThread + void onShutdown(@NonNull Context context); } diff --git a/java/com/android/voicemail/VoicemailPowerCycleReceiver.java b/java/com/android/voicemail/VoicemailPowerCycleReceiver.java new file mode 100644 index 000000000..e9362b42d --- /dev/null +++ b/java/com/android/voicemail/VoicemailPowerCycleReceiver.java @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.voicemail; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import com.android.dialer.common.Assert; + +/** Receives {@link Intent#ACTION_BOOT_COMPLETED} and {@link Intent#ACTION_SHUTDOWN} */ +public class VoicemailPowerCycleReceiver extends BroadcastReceiver { + + @Override + public void onReceive(Context context, Intent intent) { + VoicemailClient voicemailClient = VoicemailComponent.get(context).getVoicemailClient(); + if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) { + voicemailClient.onBoot(context); + } else if (Intent.ACTION_SHUTDOWN.equals(intent.getAction())) { + voicemailClient.onShutdown(context); + } else { + throw Assert.createAssertionFailException("unexpected action: " + intent.getAction()); + } + } +} diff --git a/java/com/android/voicemail/VoicemailSecretCodeReceiver.java b/java/com/android/voicemail/VoicemailSecretCodeReceiver.java new file mode 100644 index 000000000..6d142410c --- /dev/null +++ b/java/com/android/voicemail/VoicemailSecretCodeReceiver.java @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.voicemail; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import com.android.dialer.common.LogUtil; + +/** Receives android.provider.Telephony.SECRET_CODE */ +public class VoicemailSecretCodeReceiver extends BroadcastReceiver { + + @Override + public void onReceive(Context context, Intent intent) { + String host = intent.getData().getHost(); + if (!VoicemailClient.VOICEMAIL_SECRET_CODE.equals(host)) { + return; + } + LogUtil.i("VoicemailSecretCodeReceiver.onReceive", "secret code received"); + VoicemailComponent.get(context).getVoicemailClient().showConfigUi(context); + } +} diff --git a/java/com/android/voicemail/impl/AndroidManifest.xml b/java/com/android/voicemail/impl/AndroidManifest.xml index 6a7e689d2..49d93f54e 100644 --- a/java/com/android/voicemail/impl/AndroidManifest.xml +++ b/java/com/android/voicemail/impl/AndroidManifest.xml @@ -15,10 +15,14 @@ --> + package="com.android.voicemail.impl"> + android:allowBackup="false" + android:supportsRtl="true" + android:usesCleartextTraffic="true" + android:defaultToDeviceProtectedStorage="true" + android:directBootAware="true"> + + + + + + + + diff --git a/java/com/android/voicemail/impl/configui/ConfigOverrideFragment.java b/java/com/android/voicemail/impl/configui/ConfigOverrideFragment.java new file mode 100644 index 000000000..18b2b9274 --- /dev/null +++ b/java/com/android/voicemail/impl/configui/ConfigOverrideFragment.java @@ -0,0 +1,175 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.voicemail.impl.configui; + +import android.content.Context; +import android.content.SharedPreferences; +import android.os.Bundle; +import android.os.PersistableBundle; +import android.preference.EditTextPreference; +import android.preference.Preference; +import android.preference.Preference.OnPreferenceChangeListener; +import android.preference.PreferenceFragment; +import android.preference.PreferenceManager; +import android.preference.PreferenceScreen; +import android.preference.SwitchPreference; +import android.support.annotation.Nullable; +import android.support.annotation.VisibleForTesting; +import android.telecom.PhoneAccount; +import android.telecom.PhoneAccountHandle; +import android.telecom.TelecomManager; +import android.text.TextUtils; +import com.android.dialer.common.Assert; +import com.android.dialer.common.concurrent.ThreadUtil; +import com.android.voicemail.VoicemailComponent; + +/** + * Fragment to edit the override values for the {@link import + * com.android.voicemail.impl.OmtpVvmCarrierConfigHelper} + */ +public class ConfigOverrideFragment extends PreferenceFragment + implements OnPreferenceChangeListener { + + /** + * Any preference with key that starts with this prefix will be written to the dialer carrier + * config. + */ + @VisibleForTesting static final String CONFIG_OVERRIDE_KEY_PREFIX = "vvm_config_override_key_"; + + @Override + public void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + PreferenceManager.setDefaultValues(getActivity(), R.xml.vvm_config_override, false); + addPreferencesFromResource(R.xml.vvm_config_override); + + // add listener so the value of a EditTextPreference will be updated to the summary. + for (int i = 0; i < getPreferenceScreen().getPreferenceCount(); i++) { + Preference preference = getPreferenceScreen().getPreference(i); + preference.setOnPreferenceChangeListener(this); + updatePreference(preference); + } + } + + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + Assert.isMainThread(); + ThreadUtil.postOnUiThread(() -> updatePreference(preference)); + return true; + } + + private void updatePreference(Preference preference) { + if (preference instanceof EditTextPreference) { + EditTextPreference editTextPreference = (EditTextPreference) preference; + editTextPreference.setSummary(editTextPreference.getText()); + } + } + + @Override + public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) { + if (TextUtils.equals( + preference.getKey(), getString(R.string.vvm_config_override_load_current_key))) { + loadCurrentConfig(); + } + return super.onPreferenceTreeClick(preferenceScreen, preference); + } + + /** + * Loads the config for the currently carrier into the override values, from the dialer or the + * carrier config app. This is a "reset" button to load the defaults. + */ + private void loadCurrentConfig() { + Context context = getActivity(); + PhoneAccountHandle phoneAccountHandle = + context + .getSystemService(TelecomManager.class) + .getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_VOICEMAIL); + + PersistableBundle config = + VoicemailComponent.get(context).getVoicemailClient().getConfig(context, phoneAccountHandle); + + for (int i = 0; i < getPreferenceScreen().getPreferenceCount(); i++) { + Preference preference = getPreferenceScreen().getPreference(i); + String key = preference.getKey(); + if (!key.startsWith(CONFIG_OVERRIDE_KEY_PREFIX)) { + continue; + } + + String configKey = key.substring(CONFIG_OVERRIDE_KEY_PREFIX.length()); + + if (configKey.endsWith("bool")) { + ((SwitchPreference) preference).setChecked(config.getBoolean(configKey)); + } else if (configKey.endsWith("int")) { + ((EditTextPreference) preference).setText(String.valueOf(config.getInt(configKey))); + } else if (configKey.endsWith("string")) { + ((EditTextPreference) preference).setText(config.getString(configKey)); + } else if (configKey.endsWith("string_array")) { + ((EditTextPreference) preference).setText(toCsv(config.getStringArray(configKey))); + } else { + throw Assert.createAssertionFailException("unknown type for key " + configKey); + } + updatePreference(preference); + } + } + + public static boolean isOverridden(Context context) { + return PreferenceManager.getDefaultSharedPreferences(context) + .getBoolean(context.getString(R.string.vvm_config_override_enabled_key), false); + } + + public static PersistableBundle getConfig(Context context) { + Assert.checkState(isOverridden(context)); + PersistableBundle result = new PersistableBundle(); + + SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context); + for (String key : preferences.getAll().keySet()) { + if (!key.startsWith(CONFIG_OVERRIDE_KEY_PREFIX)) { + continue; + } + String configKey = key.substring(CONFIG_OVERRIDE_KEY_PREFIX.length()); + if (configKey.endsWith("bool")) { + result.putBoolean(configKey, preferences.getBoolean(key, false)); + } else if (configKey.endsWith("int")) { + result.putInt(configKey, Integer.valueOf(preferences.getString(key, null))); + } else if (configKey.endsWith("string")) { + result.putString(configKey, preferences.getString(key, null)); + } else if (configKey.endsWith("string_array")) { + result.putStringArray(configKey, fromCsv(preferences.getString(key, null))); + } else { + throw Assert.createAssertionFailException("unknown type for key " + configKey); + } + } + return result; + } + + private static String toCsv(String[] array) { + if (array == null) { + return ""; + } + StringBuilder result = new StringBuilder(); + for (String element : array) { + if (result.length() != 0) { + result.append(","); + } + result.append(element); + } + return result.toString(); + }; + + private static String[] fromCsv(String csv) { + return csv.split(","); + } +} diff --git a/java/com/android/voicemail/impl/configui/VoicemailSecretCodeActivity.java b/java/com/android/voicemail/impl/configui/VoicemailSecretCodeActivity.java new file mode 100644 index 000000000..beeb9564d --- /dev/null +++ b/java/com/android/voicemail/impl/configui/VoicemailSecretCodeActivity.java @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.voicemail.impl.configui; + +import android.content.Intent; +import android.preference.PreferenceActivity; +import android.provider.VoicemailContract; +import java.util.List; + +/** Activity launched by simulator->voicemail, provides debug features. */ +@SuppressWarnings("FragmentInjection") // not exported +public class VoicemailSecretCodeActivity extends PreferenceActivity { + + private Header syncHeader; + + @Override + public void onBuildHeaders(List

target) { + super.onBuildHeaders(target); + syncHeader = new Header(); + syncHeader.title = "Sync"; + target.add(syncHeader); + + Header configOverride = new Header(); + configOverride.fragment = ConfigOverrideFragment.class.getName(); + configOverride.title = "VVM config override"; + target.add(configOverride); + } + + @Override + public void onHeaderClick(Header header, int position) { + if (header == syncHeader) { + Intent intent = new Intent(VoicemailContract.ACTION_SYNC_VOICEMAIL); + intent.setPackage(getPackageName()); + sendBroadcast(intent); + return; + } + super.onHeaderClick(header, position); + } + + @Override + protected boolean isValidFragment(String fragmentName) { + return true; + } +} diff --git a/java/com/android/voicemail/impl/configui/res/values-af/strings.xml b/java/com/android/voicemail/impl/configui/res/values-af/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-af/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-am/strings.xml b/java/com/android/voicemail/impl/configui/res/values-am/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-am/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-ar/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ar/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-ar/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-az/strings.xml b/java/com/android/voicemail/impl/configui/res/values-az/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-az/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-b+sr+Latn/strings.xml b/java/com/android/voicemail/impl/configui/res/values-b+sr+Latn/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-b+sr+Latn/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-be/strings.xml b/java/com/android/voicemail/impl/configui/res/values-be/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-be/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-bg/strings.xml b/java/com/android/voicemail/impl/configui/res/values-bg/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-bg/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-bn/strings.xml b/java/com/android/voicemail/impl/configui/res/values-bn/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-bn/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-bs/strings.xml b/java/com/android/voicemail/impl/configui/res/values-bs/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-bs/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-ca/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ca/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-ca/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-cs/strings.xml b/java/com/android/voicemail/impl/configui/res/values-cs/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-cs/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-da/strings.xml b/java/com/android/voicemail/impl/configui/res/values-da/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-da/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-de/strings.xml b/java/com/android/voicemail/impl/configui/res/values-de/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-de/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-el/strings.xml b/java/com/android/voicemail/impl/configui/res/values-el/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-el/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-en-rAU/strings.xml b/java/com/android/voicemail/impl/configui/res/values-en-rAU/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-en-rAU/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-en-rGB/strings.xml b/java/com/android/voicemail/impl/configui/res/values-en-rGB/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-en-rGB/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-en-rIN/strings.xml b/java/com/android/voicemail/impl/configui/res/values-en-rIN/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-en-rIN/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-es-rUS/strings.xml b/java/com/android/voicemail/impl/configui/res/values-es-rUS/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-es-rUS/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-es/strings.xml b/java/com/android/voicemail/impl/configui/res/values-es/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-es/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-et/strings.xml b/java/com/android/voicemail/impl/configui/res/values-et/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-et/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-eu/strings.xml b/java/com/android/voicemail/impl/configui/res/values-eu/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-eu/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-fa/strings.xml b/java/com/android/voicemail/impl/configui/res/values-fa/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-fa/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-fi/strings.xml b/java/com/android/voicemail/impl/configui/res/values-fi/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-fi/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-fr-rCA/strings.xml b/java/com/android/voicemail/impl/configui/res/values-fr-rCA/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-fr-rCA/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-fr/strings.xml b/java/com/android/voicemail/impl/configui/res/values-fr/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-fr/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-gl/strings.xml b/java/com/android/voicemail/impl/configui/res/values-gl/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-gl/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-gu/strings.xml b/java/com/android/voicemail/impl/configui/res/values-gu/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-gu/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-hi/strings.xml b/java/com/android/voicemail/impl/configui/res/values-hi/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-hi/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-hr/strings.xml b/java/com/android/voicemail/impl/configui/res/values-hr/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-hr/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-hu/strings.xml b/java/com/android/voicemail/impl/configui/res/values-hu/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-hu/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-hy/strings.xml b/java/com/android/voicemail/impl/configui/res/values-hy/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-hy/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-in/strings.xml b/java/com/android/voicemail/impl/configui/res/values-in/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-in/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-is/strings.xml b/java/com/android/voicemail/impl/configui/res/values-is/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-is/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-it/strings.xml b/java/com/android/voicemail/impl/configui/res/values-it/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-it/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-iw/strings.xml b/java/com/android/voicemail/impl/configui/res/values-iw/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-iw/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-ja/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ja/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-ja/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-ka/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ka/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-ka/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-kk/strings.xml b/java/com/android/voicemail/impl/configui/res/values-kk/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-kk/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-km/strings.xml b/java/com/android/voicemail/impl/configui/res/values-km/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-km/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-kn/strings.xml b/java/com/android/voicemail/impl/configui/res/values-kn/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-kn/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-ko/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ko/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-ko/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-ky/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ky/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-ky/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-lo/strings.xml b/java/com/android/voicemail/impl/configui/res/values-lo/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-lo/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-lt/strings.xml b/java/com/android/voicemail/impl/configui/res/values-lt/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-lt/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-lv/strings.xml b/java/com/android/voicemail/impl/configui/res/values-lv/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-lv/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-mk/strings.xml b/java/com/android/voicemail/impl/configui/res/values-mk/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-mk/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-ml/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ml/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-ml/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-mn/strings.xml b/java/com/android/voicemail/impl/configui/res/values-mn/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-mn/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-mr/strings.xml b/java/com/android/voicemail/impl/configui/res/values-mr/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-mr/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-ms/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ms/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-ms/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-my/strings.xml b/java/com/android/voicemail/impl/configui/res/values-my/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-my/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-nb/strings.xml b/java/com/android/voicemail/impl/configui/res/values-nb/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-nb/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-ne/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ne/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-ne/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-nl/strings.xml b/java/com/android/voicemail/impl/configui/res/values-nl/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-nl/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-no/strings.xml b/java/com/android/voicemail/impl/configui/res/values-no/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-no/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-pa/strings.xml b/java/com/android/voicemail/impl/configui/res/values-pa/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-pa/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-pl/strings.xml b/java/com/android/voicemail/impl/configui/res/values-pl/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-pl/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-pt-rBR/strings.xml b/java/com/android/voicemail/impl/configui/res/values-pt-rBR/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-pt-rBR/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-pt-rPT/strings.xml b/java/com/android/voicemail/impl/configui/res/values-pt-rPT/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-pt-rPT/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-pt/strings.xml b/java/com/android/voicemail/impl/configui/res/values-pt/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-pt/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-ro/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ro/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-ro/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-ru/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ru/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-ru/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-si/strings.xml b/java/com/android/voicemail/impl/configui/res/values-si/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-si/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-sk/strings.xml b/java/com/android/voicemail/impl/configui/res/values-sk/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-sk/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-sl/strings.xml b/java/com/android/voicemail/impl/configui/res/values-sl/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-sl/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-sq/strings.xml b/java/com/android/voicemail/impl/configui/res/values-sq/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-sq/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-sr/strings.xml b/java/com/android/voicemail/impl/configui/res/values-sr/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-sr/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-sv/strings.xml b/java/com/android/voicemail/impl/configui/res/values-sv/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-sv/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-sw/strings.xml b/java/com/android/voicemail/impl/configui/res/values-sw/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-sw/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-ta/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ta/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-ta/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-te/strings.xml b/java/com/android/voicemail/impl/configui/res/values-te/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-te/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-th/strings.xml b/java/com/android/voicemail/impl/configui/res/values-th/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-th/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-tl/strings.xml b/java/com/android/voicemail/impl/configui/res/values-tl/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-tl/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-tr/strings.xml b/java/com/android/voicemail/impl/configui/res/values-tr/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-tr/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-uk/strings.xml b/java/com/android/voicemail/impl/configui/res/values-uk/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-uk/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-ur/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ur/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-ur/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-uz/strings.xml b/java/com/android/voicemail/impl/configui/res/values-uz/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-uz/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-vi/strings.xml b/java/com/android/voicemail/impl/configui/res/values-vi/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-vi/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-zh-rCN/strings.xml b/java/com/android/voicemail/impl/configui/res/values-zh-rCN/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-zh-rCN/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-zh-rHK/strings.xml b/java/com/android/voicemail/impl/configui/res/values-zh-rHK/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-zh-rHK/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-zh-rTW/strings.xml b/java/com/android/voicemail/impl/configui/res/values-zh-rTW/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-zh-rTW/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values-zu/strings.xml b/java/com/android/voicemail/impl/configui/res/values-zu/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-zu/strings.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/java/com/android/voicemail/impl/configui/res/values/strings.xml b/java/com/android/voicemail/impl/configui/res/values/strings.xml new file mode 100644 index 000000000..fea76be02 --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values/strings.xml @@ -0,0 +1,21 @@ + + + + + vvm_config_override_load_current + vvm_config_override_enabled + + diff --git a/java/com/android/voicemail/impl/configui/res/xml/vvm_config_override.xml b/java/com/android/voicemail/impl/configui/res/xml/vvm_config_override.xml new file mode 100644 index 000000000..c4a23c789 --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/xml/vvm_config_override.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/java/com/android/voicemail/impl/proguard.flags b/java/com/android/voicemail/impl/proguard.flags deleted file mode 100644 index 9379df322..000000000 --- a/java/com/android/voicemail/impl/proguard.flags +++ /dev/null @@ -1,4 +0,0 @@ --assumenosideeffects class com.android.voicemail.impl.VvmLog { - public static void v(...); - public static void d(...); -} diff --git a/java/com/android/voicemail/impl/res/values/strings.xml b/java/com/android/voicemail/impl/res/values/strings.xml index 375a1e9ba..a846541ea 100644 --- a/java/com/android/voicemail/impl/res/values/strings.xml +++ b/java/com/android/voicemail/impl/res/values/strings.xml @@ -107,4 +107,8 @@ Voicemail PIN updated Unable to set PIN + + vvm_config_override_load_current + vvm_config_override_enabled + diff --git a/java/com/android/voicemail/impl/res/xml/vvm_config.xml b/java/com/android/voicemail/impl/res/xml/vvm_config.xml index c7ed5ca92..2bac66be5 100644 --- a/java/com/android/voicemail/impl/res/xml/vvm_config.xml +++ b/java/com/android/voicemail/impl/res/xml/vvm_config.xml @@ -21,7 +21,6 @@ - diff --git a/java/com/android/voicemail/impl/sms/OmtpMessageSender.java b/java/com/android/voicemail/impl/sms/OmtpMessageSender.java index 19661e99d..e9d145cde 100644 --- a/java/com/android/voicemail/impl/sms/OmtpMessageSender.java +++ b/java/com/android/voicemail/impl/sms/OmtpMessageSender.java @@ -22,7 +22,6 @@ import android.telecom.PhoneAccountHandle; import android.telephony.SmsManager; import com.android.voicemail.impl.OmtpConstants; import com.android.voicemail.impl.TelephonyMangerCompat; -import com.android.voicemail.impl.VvmLog; /** * Send client originated OMTP messages to the OMTP server. @@ -76,11 +75,6 @@ public abstract class OmtpMessageSender { public void requestVvmStatus(@Nullable PendingIntent sentIntent) {} protected void sendSms(String text, PendingIntent sentIntent) { - - VvmLog.v( - TAG, - String.format("Sending sms '%s' to %s:%d", text, mDestinationNumber, mApplicationPort)); - TelephonyMangerCompat.sendVisualVoicemailSms( mContext, mPhoneAccountHandle, mDestinationNumber, mApplicationPort, text, sentIntent); } diff --git a/java/com/android/voicemail/impl/sync/VvmNetworkRequestCallback.java b/java/com/android/voicemail/impl/sync/VvmNetworkRequestCallback.java index 068b19b70..067eff803 100644 --- a/java/com/android/voicemail/impl/sync/VvmNetworkRequestCallback.java +++ b/java/com/android/voicemail/impl/sync/VvmNetworkRequestCallback.java @@ -128,7 +128,7 @@ public abstract class VvmNetworkRequestCallback extends ConnectivityManager.Netw @CallSuper public void onUnavailable() { - // TODO(twyen): b/32637799 this is hidden, do we really need this? + // TODO: b/32637799 this is hidden, do we really need this? mResultReceived = true; onFailed(NETWORK_REQUEST_FAILED_TIMEOUT); } diff --git a/java/com/android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto b/java/com/android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto index dd2170ade..4b1e19b8a 100644 --- a/java/com/android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto +++ b/java/com/android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto @@ -5,9 +5,8 @@ syntax = "proto2"; package google.internal.communications.voicemailtranscription.v1; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; - option java_package = "com.google.internal.communications.voicemailtranscription.v1"; +option optimize_for = LITE_RUNTIME; // Enum that specifies supported audio formats. enum AudioFormat { diff --git a/java/com/android/voicemail/stub/StubVoicemailClient.java b/java/com/android/voicemail/stub/StubVoicemailClient.java index e2b470799..e5d51455c 100644 --- a/java/com/android/voicemail/stub/StubVoicemailClient.java +++ b/java/com/android/voicemail/stub/StubVoicemailClient.java @@ -18,6 +18,9 @@ package com.android.voicemail.stub; import android.content.Context; import android.content.Intent; +import android.os.PersistableBundle; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.telecom.PhoneAccountHandle; import android.telephony.TelephonyManager; import com.android.voicemail.VoicemailClient; @@ -81,4 +84,19 @@ public final class StubVoicemailClient implements VoicemailClient { public boolean isActivated(Context context, PhoneAccountHandle phoneAccountHandle) { return false; } + + @Override + public void showConfigUi(@NonNull Context context) {} + + @Override + public PersistableBundle getConfig( + @NonNull Context context, @Nullable PhoneAccountHandle phoneAccountHandle) { + return new PersistableBundle(); + } + + @Override + public void onBoot(@NonNull Context context) {} + + @Override + public void onShutdown(@NonNull Context context) {} } -- cgit v1.2.3