From cded3beaf28a703e1ef8f71bbc6836e6806c3736 Mon Sep 17 00:00:00 2001 From: Tobias Thierer Date: Fri, 9 Jun 2017 14:16:05 +0000 Subject: Revert "Update AOSP Dialer source from internal google3 repository at cl/158012278. am: 91ce7d2a47" This reverts commit c67d658e7daa453fe9ad9fd1a37f81eaf2048c44. Reason for revert: This CL broke the sailfish-userdebug_javac-all target on master. Change-Id: I9b54333a654c00154ca84f4ece84bea4f07cc19b --- java/com/android/incallui/AndroidManifest.xml | 110 +++++------ .../android/incallui/AnswerScreenPresenter.java | 20 -- .../incallui/AnswerScreenPresenterStub.java | 6 - .../incallui/AudioRouteSelectorActivity.java | 47 ----- java/com/android/incallui/CallButtonPresenter.java | 31 ++-- java/com/android/incallui/CallCardPresenter.java | 88 ++++++--- java/com/android/incallui/CallerInfoUtils.java | 7 - java/com/android/incallui/ContactInfoCache.java | 27 ++- .../com/android/incallui/ExternalCallNotifier.java | 9 +- java/com/android/incallui/InCallActivity.java | 11 +- java/com/android/incallui/InCallPresenter.java | 5 +- java/com/android/incallui/InCallServiceImpl.java | 10 - .../incallui/ReturnToCallActionReceiver.java | 132 ------------- .../android/incallui/ReturnToCallController.java | 204 --------------------- java/com/android/incallui/StatusBarNotifier.java | 55 +++--- .../incallui/answer/impl/AnswerFragment.java | 4 +- .../android/incallui/answer/impl/PillDrawable.java | 43 +++++ .../res/layout/swipe_up_down_method.xml | 3 - .../answer/impl/hint/AnswerHintFactory.java | 32 ++-- .../answer/impl/hint/PawImageLoaderImpl.java | 25 +-- .../answer/impl/hint/PawSecretCodeListener.java | 47 ++--- .../incallui/answer/impl/res/values-af/strings.xml | 18 +- .../incallui/answer/impl/res/values-am/strings.xml | 18 +- .../incallui/answer/impl/res/values-ar/strings.xml | 18 +- .../incallui/answer/impl/res/values-az/strings.xml | 18 +- .../answer/impl/res/values-b+sr+Latn/strings.xml | 18 +- .../incallui/answer/impl/res/values-be/strings.xml | 18 +- .../incallui/answer/impl/res/values-bg/strings.xml | 18 +- .../incallui/answer/impl/res/values-bn/strings.xml | 18 +- .../incallui/answer/impl/res/values-bs/strings.xml | 18 +- .../incallui/answer/impl/res/values-ca/strings.xml | 18 +- .../incallui/answer/impl/res/values-cs/strings.xml | 18 +- .../incallui/answer/impl/res/values-da/strings.xml | 18 +- .../incallui/answer/impl/res/values-de/strings.xml | 18 +- .../incallui/answer/impl/res/values-el/strings.xml | 18 +- .../answer/impl/res/values-en-rAU/strings.xml | 18 +- .../answer/impl/res/values-en-rGB/strings.xml | 18 +- .../answer/impl/res/values-en-rIN/strings.xml | 18 +- .../answer/impl/res/values-es-rUS/strings.xml | 18 +- .../incallui/answer/impl/res/values-es/strings.xml | 18 +- .../incallui/answer/impl/res/values-et/strings.xml | 18 +- .../incallui/answer/impl/res/values-eu/strings.xml | 18 +- .../incallui/answer/impl/res/values-fa/strings.xml | 18 +- .../incallui/answer/impl/res/values-fi/strings.xml | 18 +- .../answer/impl/res/values-fr-rCA/strings.xml | 18 +- .../incallui/answer/impl/res/values-fr/strings.xml | 18 +- .../incallui/answer/impl/res/values-gl/strings.xml | 18 +- .../incallui/answer/impl/res/values-gu/strings.xml | 18 +- .../incallui/answer/impl/res/values-hi/strings.xml | 18 +- .../incallui/answer/impl/res/values-hr/strings.xml | 18 +- .../incallui/answer/impl/res/values-hu/strings.xml | 18 +- .../incallui/answer/impl/res/values-hy/strings.xml | 18 +- .../incallui/answer/impl/res/values-in/strings.xml | 18 +- .../incallui/answer/impl/res/values-is/strings.xml | 18 +- .../incallui/answer/impl/res/values-it/strings.xml | 18 +- .../incallui/answer/impl/res/values-iw/strings.xml | 18 +- .../incallui/answer/impl/res/values-ja/strings.xml | 18 +- .../incallui/answer/impl/res/values-ka/strings.xml | 18 +- .../incallui/answer/impl/res/values-kk/strings.xml | 18 +- .../incallui/answer/impl/res/values-km/strings.xml | 18 +- .../incallui/answer/impl/res/values-kn/strings.xml | 18 +- .../incallui/answer/impl/res/values-ko/strings.xml | 18 +- .../incallui/answer/impl/res/values-ky/strings.xml | 18 +- .../incallui/answer/impl/res/values-lo/strings.xml | 18 +- .../incallui/answer/impl/res/values-lt/strings.xml | 18 +- .../incallui/answer/impl/res/values-lv/strings.xml | 18 +- .../incallui/answer/impl/res/values-mk/strings.xml | 18 +- .../incallui/answer/impl/res/values-ml/strings.xml | 18 +- .../incallui/answer/impl/res/values-mn/strings.xml | 18 +- .../incallui/answer/impl/res/values-mr/strings.xml | 18 +- .../incallui/answer/impl/res/values-ms/strings.xml | 18 +- .../incallui/answer/impl/res/values-my/strings.xml | 18 +- .../incallui/answer/impl/res/values-nb/strings.xml | 18 +- .../incallui/answer/impl/res/values-ne/strings.xml | 18 +- .../incallui/answer/impl/res/values-nl/strings.xml | 18 +- .../incallui/answer/impl/res/values-no/strings.xml | 18 +- .../incallui/answer/impl/res/values-pa/strings.xml | 18 +- .../incallui/answer/impl/res/values-pl/strings.xml | 18 +- .../answer/impl/res/values-pt-rBR/strings.xml | 18 +- .../answer/impl/res/values-pt-rPT/strings.xml | 18 +- .../incallui/answer/impl/res/values-pt/strings.xml | 18 +- .../incallui/answer/impl/res/values-ro/strings.xml | 18 +- .../incallui/answer/impl/res/values-ru/strings.xml | 18 +- .../incallui/answer/impl/res/values-si/strings.xml | 18 +- .../incallui/answer/impl/res/values-sk/strings.xml | 18 +- .../incallui/answer/impl/res/values-sl/strings.xml | 18 +- .../incallui/answer/impl/res/values-sq/strings.xml | 18 +- .../incallui/answer/impl/res/values-sr/strings.xml | 18 +- .../incallui/answer/impl/res/values-sv/strings.xml | 18 +- .../incallui/answer/impl/res/values-sw/strings.xml | 18 +- .../incallui/answer/impl/res/values-ta/strings.xml | 18 +- .../incallui/answer/impl/res/values-te/strings.xml | 18 +- .../incallui/answer/impl/res/values-th/strings.xml | 18 +- .../incallui/answer/impl/res/values-tl/strings.xml | 18 +- .../incallui/answer/impl/res/values-tr/strings.xml | 18 +- .../incallui/answer/impl/res/values-uk/strings.xml | 18 +- .../incallui/answer/impl/res/values-ur/strings.xml | 18 +- .../incallui/answer/impl/res/values-uz/strings.xml | 18 +- .../incallui/answer/impl/res/values-vi/strings.xml | 18 +- .../answer/impl/res/values-zh-rCN/strings.xml | 18 +- .../answer/impl/res/values-zh-rHK/strings.xml | 18 +- .../answer/impl/res/values-zh-rTW/strings.xml | 18 +- .../incallui/answer/impl/res/values-zu/strings.xml | 18 +- .../incallui/answer/impl/res/values/strings.xml | 17 +- .../answer/protocol/AnswerScreenDelegate.java | 4 - .../AnswerProximitySensor.java | 3 - .../AudioRouteSelectorDialogFragment.java | 11 -- .../incallui/bindings/InCallUiBindings.java | 9 + .../incallui/bindings/InCallUiBindingsStub.java | 38 ++++ java/com/android/incallui/call/CallList.java | 13 -- java/com/android/incallui/call/DialerCall.java | 105 +---------- .../android/incallui/call/DialerCallListener.java | 2 - java/com/android/incallui/call/TelecomAdapter.java | 8 +- .../calllocation/impl/DownloadMapImageTask.java | 1 - .../incallui/calllocation/impl/LocationHelper.java | 7 - .../calllocation/impl/ReverseGeocodeTask.java | 1 - .../calllocation/impl/TrafficStatsTags.java | 29 +++ .../incallui/commontheme/res/anim/blinking.xml | 10 + .../drawable-hdpi/ic_phone_audio_white_36dp.png | Bin 0 -> 1010 bytes .../drawable-mdpi/ic_phone_audio_white_36dp.png | Bin 0 -> 682 bytes .../drawable-xhdpi/ic_phone_audio_white_36dp.png | Bin 0 -> 1362 bytes .../drawable-xxhdpi/ic_phone_audio_white_36dp.png | Bin 0 -> 2259 bytes .../drawable-xxxhdpi/ic_phone_audio_white_36dp.png | Bin 0 -> 3156 bytes .../incallui/commontheme/res/values-af/strings.xml | 18 -- .../incallui/commontheme/res/values-am/strings.xml | 18 -- .../incallui/commontheme/res/values-ar/strings.xml | 18 -- .../incallui/commontheme/res/values-az/strings.xml | 18 -- .../commontheme/res/values-b+sr+Latn/strings.xml | 18 -- .../incallui/commontheme/res/values-be/strings.xml | 18 -- .../incallui/commontheme/res/values-bg/strings.xml | 18 -- .../incallui/commontheme/res/values-bn/strings.xml | 18 -- .../incallui/commontheme/res/values-bs/strings.xml | 18 -- .../incallui/commontheme/res/values-ca/strings.xml | 18 -- .../incallui/commontheme/res/values-cs/strings.xml | 18 -- .../incallui/commontheme/res/values-da/strings.xml | 18 -- .../incallui/commontheme/res/values-de/strings.xml | 18 -- .../incallui/commontheme/res/values-el/strings.xml | 18 -- .../commontheme/res/values-en-rAU/strings.xml | 18 -- .../commontheme/res/values-en-rGB/strings.xml | 18 -- .../commontheme/res/values-en-rIN/strings.xml | 18 -- .../commontheme/res/values-es-rUS/strings.xml | 18 -- .../incallui/commontheme/res/values-es/strings.xml | 18 -- .../incallui/commontheme/res/values-et/strings.xml | 18 -- .../incallui/commontheme/res/values-eu/strings.xml | 18 -- .../incallui/commontheme/res/values-fa/strings.xml | 18 -- .../incallui/commontheme/res/values-fi/strings.xml | 18 -- .../commontheme/res/values-fr-rCA/strings.xml | 18 -- .../incallui/commontheme/res/values-fr/strings.xml | 18 -- .../incallui/commontheme/res/values-gl/strings.xml | 18 -- .../incallui/commontheme/res/values-gu/strings.xml | 18 -- .../incallui/commontheme/res/values-hi/strings.xml | 18 -- .../incallui/commontheme/res/values-hr/strings.xml | 18 -- .../incallui/commontheme/res/values-hu/strings.xml | 18 -- .../incallui/commontheme/res/values-hy/strings.xml | 18 -- .../incallui/commontheme/res/values-in/strings.xml | 18 -- .../incallui/commontheme/res/values-is/strings.xml | 18 -- .../incallui/commontheme/res/values-it/strings.xml | 18 -- .../incallui/commontheme/res/values-iw/strings.xml | 18 -- .../incallui/commontheme/res/values-ja/strings.xml | 18 -- .../incallui/commontheme/res/values-ka/strings.xml | 18 -- .../incallui/commontheme/res/values-kk/strings.xml | 18 -- .../incallui/commontheme/res/values-km/strings.xml | 18 -- .../incallui/commontheme/res/values-kn/strings.xml | 18 -- .../incallui/commontheme/res/values-ko/strings.xml | 18 -- .../incallui/commontheme/res/values-ky/strings.xml | 18 -- .../incallui/commontheme/res/values-lo/strings.xml | 18 -- .../incallui/commontheme/res/values-lt/strings.xml | 18 -- .../incallui/commontheme/res/values-lv/strings.xml | 18 -- .../incallui/commontheme/res/values-mk/strings.xml | 18 -- .../incallui/commontheme/res/values-ml/strings.xml | 18 -- .../incallui/commontheme/res/values-mn/strings.xml | 18 -- .../incallui/commontheme/res/values-mr/strings.xml | 18 -- .../incallui/commontheme/res/values-ms/strings.xml | 18 -- .../incallui/commontheme/res/values-my/strings.xml | 18 -- .../incallui/commontheme/res/values-nb/strings.xml | 18 -- .../incallui/commontheme/res/values-ne/strings.xml | 18 -- .../incallui/commontheme/res/values-nl/strings.xml | 18 -- .../incallui/commontheme/res/values-no/strings.xml | 18 -- .../incallui/commontheme/res/values-pa/strings.xml | 18 -- .../incallui/commontheme/res/values-pl/strings.xml | 18 -- .../commontheme/res/values-pt-rBR/strings.xml | 18 -- .../commontheme/res/values-pt-rPT/strings.xml | 18 -- .../incallui/commontheme/res/values-pt/strings.xml | 18 -- .../incallui/commontheme/res/values-ro/strings.xml | 18 -- .../incallui/commontheme/res/values-ru/strings.xml | 18 -- .../incallui/commontheme/res/values-si/strings.xml | 18 -- .../incallui/commontheme/res/values-sk/strings.xml | 18 -- .../incallui/commontheme/res/values-sl/strings.xml | 18 -- .../incallui/commontheme/res/values-sq/strings.xml | 18 -- .../incallui/commontheme/res/values-sr/strings.xml | 18 -- .../incallui/commontheme/res/values-sv/strings.xml | 18 -- .../incallui/commontheme/res/values-sw/strings.xml | 18 -- .../incallui/commontheme/res/values-ta/strings.xml | 18 -- .../incallui/commontheme/res/values-te/strings.xml | 18 -- .../incallui/commontheme/res/values-th/strings.xml | 18 -- .../incallui/commontheme/res/values-tl/strings.xml | 18 -- .../incallui/commontheme/res/values-tr/strings.xml | 18 -- .../incallui/commontheme/res/values-uk/strings.xml | 18 -- .../incallui/commontheme/res/values-ur/strings.xml | 18 -- .../incallui/commontheme/res/values-uz/strings.xml | 18 -- .../incallui/commontheme/res/values-vi/strings.xml | 18 -- .../commontheme/res/values-zh-rCN/strings.xml | 18 -- .../commontheme/res/values-zh-rHK/strings.xml | 18 -- .../commontheme/res/values-zh-rTW/strings.xml | 18 -- .../incallui/commontheme/res/values-zu/strings.xml | 18 -- .../incallui/commontheme/res/values/strings.xml | 22 --- .../android/incallui/contactgrid/BottomRow.java | 3 +- .../incallui/contactgrid/ContactGridManager.java | 50 +++-- java/com/android/incallui/contactgrid/TopRow.java | 52 +----- .../incallui/contactgrid/res/values-af/strings.xml | 18 -- .../incallui/contactgrid/res/values-am/strings.xml | 18 -- .../incallui/contactgrid/res/values-ar/strings.xml | 18 -- .../incallui/contactgrid/res/values-az/strings.xml | 18 -- .../contactgrid/res/values-b+sr+Latn/strings.xml | 18 -- .../incallui/contactgrid/res/values-be/strings.xml | 18 -- .../incallui/contactgrid/res/values-bg/strings.xml | 18 -- .../incallui/contactgrid/res/values-bn/strings.xml | 18 -- .../incallui/contactgrid/res/values-bs/strings.xml | 18 -- .../incallui/contactgrid/res/values-ca/strings.xml | 18 -- .../incallui/contactgrid/res/values-cs/strings.xml | 18 -- .../incallui/contactgrid/res/values-da/strings.xml | 18 -- .../incallui/contactgrid/res/values-de/strings.xml | 18 -- .../incallui/contactgrid/res/values-el/strings.xml | 18 -- .../contactgrid/res/values-en-rAU/strings.xml | 18 -- .../contactgrid/res/values-en-rGB/strings.xml | 18 -- .../contactgrid/res/values-en-rIN/strings.xml | 18 -- .../contactgrid/res/values-es-rUS/strings.xml | 18 -- .../incallui/contactgrid/res/values-es/strings.xml | 18 -- .../incallui/contactgrid/res/values-et/strings.xml | 18 -- .../incallui/contactgrid/res/values-eu/strings.xml | 18 -- .../incallui/contactgrid/res/values-fa/strings.xml | 18 -- .../incallui/contactgrid/res/values-fi/strings.xml | 18 -- .../contactgrid/res/values-fr-rCA/strings.xml | 18 -- .../incallui/contactgrid/res/values-fr/strings.xml | 18 -- .../incallui/contactgrid/res/values-gl/strings.xml | 18 -- .../incallui/contactgrid/res/values-gu/strings.xml | 18 -- .../incallui/contactgrid/res/values-hi/strings.xml | 18 -- .../incallui/contactgrid/res/values-hr/strings.xml | 18 -- .../incallui/contactgrid/res/values-hu/strings.xml | 18 -- .../incallui/contactgrid/res/values-hy/strings.xml | 18 -- .../incallui/contactgrid/res/values-in/strings.xml | 18 -- .../incallui/contactgrid/res/values-is/strings.xml | 18 -- .../incallui/contactgrid/res/values-it/strings.xml | 18 -- .../incallui/contactgrid/res/values-iw/strings.xml | 18 -- .../incallui/contactgrid/res/values-ja/strings.xml | 18 -- .../incallui/contactgrid/res/values-ka/strings.xml | 18 -- .../incallui/contactgrid/res/values-kk/strings.xml | 18 -- .../incallui/contactgrid/res/values-km/strings.xml | 18 -- .../incallui/contactgrid/res/values-kn/strings.xml | 18 -- .../incallui/contactgrid/res/values-ko/strings.xml | 18 -- .../incallui/contactgrid/res/values-ky/strings.xml | 18 -- .../incallui/contactgrid/res/values-lo/strings.xml | 18 -- .../incallui/contactgrid/res/values-lt/strings.xml | 18 -- .../incallui/contactgrid/res/values-lv/strings.xml | 18 -- .../incallui/contactgrid/res/values-mk/strings.xml | 18 -- .../incallui/contactgrid/res/values-ml/strings.xml | 18 -- .../incallui/contactgrid/res/values-mn/strings.xml | 18 -- .../incallui/contactgrid/res/values-mr/strings.xml | 18 -- .../incallui/contactgrid/res/values-ms/strings.xml | 18 -- .../incallui/contactgrid/res/values-my/strings.xml | 18 -- .../incallui/contactgrid/res/values-nb/strings.xml | 18 -- .../incallui/contactgrid/res/values-ne/strings.xml | 18 -- .../incallui/contactgrid/res/values-nl/strings.xml | 18 -- .../incallui/contactgrid/res/values-no/strings.xml | 18 -- .../incallui/contactgrid/res/values-pa/strings.xml | 18 -- .../incallui/contactgrid/res/values-pl/strings.xml | 18 -- .../contactgrid/res/values-pt-rBR/strings.xml | 18 -- .../contactgrid/res/values-pt-rPT/strings.xml | 18 -- .../incallui/contactgrid/res/values-pt/strings.xml | 18 -- .../incallui/contactgrid/res/values-ro/strings.xml | 18 -- .../incallui/contactgrid/res/values-ru/strings.xml | 18 -- .../incallui/contactgrid/res/values-si/strings.xml | 18 -- .../incallui/contactgrid/res/values-sk/strings.xml | 18 -- .../incallui/contactgrid/res/values-sl/strings.xml | 18 -- .../incallui/contactgrid/res/values-sq/strings.xml | 18 -- .../incallui/contactgrid/res/values-sr/strings.xml | 18 -- .../incallui/contactgrid/res/values-sv/strings.xml | 18 -- .../incallui/contactgrid/res/values-sw/strings.xml | 18 -- .../incallui/contactgrid/res/values-ta/strings.xml | 18 -- .../incallui/contactgrid/res/values-te/strings.xml | 18 -- .../incallui/contactgrid/res/values-th/strings.xml | 18 -- .../incallui/contactgrid/res/values-tl/strings.xml | 18 -- .../incallui/contactgrid/res/values-tr/strings.xml | 18 -- .../incallui/contactgrid/res/values-uk/strings.xml | 18 -- .../incallui/contactgrid/res/values-ur/strings.xml | 18 -- .../incallui/contactgrid/res/values-uz/strings.xml | 18 -- .../incallui/contactgrid/res/values-vi/strings.xml | 18 -- .../contactgrid/res/values-zh-rCN/strings.xml | 18 -- .../contactgrid/res/values-zh-rHK/strings.xml | 18 -- .../contactgrid/res/values-zh-rTW/strings.xml | 18 -- .../incallui/contactgrid/res/values-zu/strings.xml | 18 -- .../incallui/contactgrid/res/values/strings.xml | 21 --- .../incallui/incall/impl/ButtonChooserFactory.java | 15 +- .../incallui/incall/impl/ButtonController.java | 39 +++- .../incallui/incall/impl/InCallFragment.java | 3 - .../incallui/incall/impl/InCallPagerAdapter.java | 4 +- .../incallui/incall/impl/res/values-af/strings.xml | 19 +- .../incallui/incall/impl/res/values-am/strings.xml | 19 +- .../incallui/incall/impl/res/values-ar/strings.xml | 19 +- .../incallui/incall/impl/res/values-az/strings.xml | 19 +- .../incall/impl/res/values-b+sr+Latn/strings.xml | 19 +- .../incallui/incall/impl/res/values-be/strings.xml | 19 +- .../incallui/incall/impl/res/values-bg/strings.xml | 19 +- .../incallui/incall/impl/res/values-bn/strings.xml | 19 +- .../incallui/incall/impl/res/values-bs/strings.xml | 19 +- .../incallui/incall/impl/res/values-ca/strings.xml | 19 +- .../incallui/incall/impl/res/values-cs/strings.xml | 19 +- .../incallui/incall/impl/res/values-da/strings.xml | 19 +- .../incallui/incall/impl/res/values-de/strings.xml | 19 +- .../incallui/incall/impl/res/values-el/strings.xml | 19 +- .../incall/impl/res/values-en-rAU/strings.xml | 19 +- .../incall/impl/res/values-en-rGB/strings.xml | 19 +- .../incall/impl/res/values-en-rIN/strings.xml | 19 +- .../incall/impl/res/values-es-rUS/strings.xml | 19 +- .../incallui/incall/impl/res/values-es/strings.xml | 19 +- .../incallui/incall/impl/res/values-et/strings.xml | 19 +- .../incallui/incall/impl/res/values-eu/strings.xml | 19 +- .../incallui/incall/impl/res/values-fa/strings.xml | 19 +- .../incallui/incall/impl/res/values-fi/strings.xml | 19 +- .../incall/impl/res/values-fr-rCA/strings.xml | 19 +- .../incallui/incall/impl/res/values-fr/strings.xml | 19 +- .../incallui/incall/impl/res/values-gl/strings.xml | 19 +- .../incallui/incall/impl/res/values-gu/strings.xml | 19 +- .../incall/impl/res/values-h580dp/dimens.xml | 4 + .../incall/impl/res/values-h580dp/styles.xml | 24 +++ .../incall/impl/res/values-h600dp/dimens.xml | 20 -- .../incall/impl/res/values-h650dp/styles.xml | 24 --- .../incallui/incall/impl/res/values-hi/strings.xml | 19 +- .../incallui/incall/impl/res/values-hr/strings.xml | 19 +- .../incallui/incall/impl/res/values-hu/strings.xml | 19 +- .../incallui/incall/impl/res/values-hy/strings.xml | 19 +- .../incallui/incall/impl/res/values-in/strings.xml | 19 +- .../incallui/incall/impl/res/values-is/strings.xml | 19 +- .../incallui/incall/impl/res/values-it/strings.xml | 19 +- .../incallui/incall/impl/res/values-iw/strings.xml | 19 +- .../incallui/incall/impl/res/values-ja/strings.xml | 19 +- .../incallui/incall/impl/res/values-ka/strings.xml | 19 +- .../incallui/incall/impl/res/values-kk/strings.xml | 19 +- .../incallui/incall/impl/res/values-km/strings.xml | 19 +- .../incallui/incall/impl/res/values-kn/strings.xml | 19 +- .../incallui/incall/impl/res/values-ko/strings.xml | 19 +- .../incallui/incall/impl/res/values-ky/strings.xml | 19 +- .../incallui/incall/impl/res/values-lo/strings.xml | 19 +- .../incallui/incall/impl/res/values-lt/strings.xml | 19 +- .../incallui/incall/impl/res/values-lv/strings.xml | 19 +- .../incallui/incall/impl/res/values-mk/strings.xml | 19 +- .../incallui/incall/impl/res/values-ml/strings.xml | 19 +- .../incallui/incall/impl/res/values-mn/strings.xml | 19 +- .../incallui/incall/impl/res/values-mr/strings.xml | 19 +- .../incallui/incall/impl/res/values-ms/strings.xml | 19 +- .../incallui/incall/impl/res/values-my/strings.xml | 19 +- .../incallui/incall/impl/res/values-nb/strings.xml | 19 +- .../incallui/incall/impl/res/values-ne/strings.xml | 19 +- .../incallui/incall/impl/res/values-nl/strings.xml | 19 +- .../incallui/incall/impl/res/values-no/strings.xml | 19 +- .../incallui/incall/impl/res/values-pa/strings.xml | 19 +- .../incallui/incall/impl/res/values-pl/strings.xml | 19 +- .../incall/impl/res/values-pt-rBR/strings.xml | 19 +- .../incall/impl/res/values-pt-rPT/strings.xml | 19 +- .../incallui/incall/impl/res/values-pt/strings.xml | 19 +- .../incallui/incall/impl/res/values-ro/strings.xml | 19 +- .../incallui/incall/impl/res/values-ru/strings.xml | 19 +- .../incallui/incall/impl/res/values-si/strings.xml | 19 +- .../incallui/incall/impl/res/values-sk/strings.xml | 19 +- .../incallui/incall/impl/res/values-sl/strings.xml | 19 +- .../incallui/incall/impl/res/values-sq/strings.xml | 19 +- .../incallui/incall/impl/res/values-sr/strings.xml | 19 +- .../incallui/incall/impl/res/values-sv/strings.xml | 19 +- .../incallui/incall/impl/res/values-sw/strings.xml | 19 +- .../incallui/incall/impl/res/values-ta/strings.xml | 19 +- .../incallui/incall/impl/res/values-te/strings.xml | 19 +- .../incallui/incall/impl/res/values-th/strings.xml | 19 +- .../incallui/incall/impl/res/values-tl/strings.xml | 19 +- .../incallui/incall/impl/res/values-tr/strings.xml | 19 +- .../incallui/incall/impl/res/values-uk/strings.xml | 19 +- .../incallui/incall/impl/res/values-ur/strings.xml | 19 +- .../incallui/incall/impl/res/values-uz/strings.xml | 21 +-- .../incallui/incall/impl/res/values-vi/strings.xml | 19 +- .../impl/res/values-w260dp-h520dp/dimens.xml | 7 + .../impl/res/values-w260dp-h580dp/dimens.xml | 23 --- .../impl/res/values-w300dp-h540dp/dimens.xml | 5 + .../impl/res/values-w300dp-h620dp/dimens.xml | 21 --- .../incall/impl/res/values-zh-rCN/strings.xml | 19 +- .../incall/impl/res/values-zh-rHK/strings.xml | 19 +- .../incall/impl/res/values-zh-rTW/strings.xml | 19 +- .../incallui/incall/impl/res/values-zu/strings.xml | 19 +- .../incallui/incall/impl/res/values/strings.xml | 28 +-- .../incallui/incall/protocol/PrimaryCallState.java | 8 +- .../incallui/res/drawable-hdpi/img_conference.png | Bin 0 -> 7037 bytes .../incallui/res/drawable-mdpi/img_conference.png | Bin 0 -> 4629 bytes .../incallui/res/drawable-xhdpi/img_conference.png | Bin 0 -> 9517 bytes .../res/drawable-xxhdpi/img_conference.png | Bin 0 -> 16306 bytes .../res/drawable-xxxhdpi/img_conference.png | Bin 0 -> 19584 bytes .../res/drawable/img_conference_automirrored.xml | 21 +++ .../com/android/incallui/res/values-ca/strings.xml | 2 +- .../incallui/res/values-mcc262-mnc01/strings.xml | 32 ---- .../com/android/incallui/res/values-uz/strings.xml | 2 +- java/com/android/incallui/res/values/dimens.xml | 2 +- java/com/android/incallui/res/values/styles.xml | 9 - .../res/layout/fragment_composer_image.xml | 6 +- .../speakerbuttonlogic/AndroidManifest.xml | 18 -- .../speakerbuttonlogic/SpeakerButtonInfo.java | 91 --------- .../video/impl/SpeakerButtonController.java | 2 +- .../video/impl/SurfaceViewVideoCallFragment.java | 11 +- .../incallui/video/impl/VideoCallFragment.java | 16 +- .../impl/res/layout/frag_videocall_surfaceview.xml | 33 ++-- .../video/impl/res/values-h580dp/dimens.xml | 2 +- .../incallui/video/impl/res/values-land/dimens.xml | 2 +- .../incallui/video/impl/res/values-land/styles.xml | 3 +- .../video/impl/res/values-w460dp/dimens.xml | 2 +- .../incallui/video/impl/res/values/dimens.xml | 2 +- .../incallui/video/impl/res/values/styles.xml | 3 +- .../incallui/videotech/ims/ImsVideoTech.java | 4 +- .../videotech/lightbringer/LightbringerTech.java | 6 +- 414 files changed, 791 insertions(+), 7013 deletions(-) delete mode 100644 java/com/android/incallui/AudioRouteSelectorActivity.java delete mode 100644 java/com/android/incallui/ReturnToCallActionReceiver.java delete mode 100644 java/com/android/incallui/ReturnToCallController.java create mode 100644 java/com/android/incallui/answer/impl/PillDrawable.java create mode 100644 java/com/android/incallui/calllocation/impl/TrafficStatsTags.java create mode 100644 java/com/android/incallui/commontheme/res/anim/blinking.xml create mode 100644 java/com/android/incallui/commontheme/res/drawable-hdpi/ic_phone_audio_white_36dp.png create mode 100644 java/com/android/incallui/commontheme/res/drawable-mdpi/ic_phone_audio_white_36dp.png create mode 100644 java/com/android/incallui/commontheme/res/drawable-xhdpi/ic_phone_audio_white_36dp.png create mode 100644 java/com/android/incallui/commontheme/res/drawable-xxhdpi/ic_phone_audio_white_36dp.png create mode 100644 java/com/android/incallui/commontheme/res/drawable-xxxhdpi/ic_phone_audio_white_36dp.png create mode 100644 java/com/android/incallui/incall/impl/res/values-h580dp/dimens.xml create mode 100644 java/com/android/incallui/incall/impl/res/values-h580dp/styles.xml delete mode 100644 java/com/android/incallui/incall/impl/res/values-h600dp/dimens.xml delete mode 100644 java/com/android/incallui/incall/impl/res/values-h650dp/styles.xml create mode 100644 java/com/android/incallui/incall/impl/res/values-w260dp-h520dp/dimens.xml delete mode 100644 java/com/android/incallui/incall/impl/res/values-w260dp-h580dp/dimens.xml create mode 100644 java/com/android/incallui/incall/impl/res/values-w300dp-h540dp/dimens.xml delete mode 100644 java/com/android/incallui/incall/impl/res/values-w300dp-h620dp/dimens.xml create mode 100644 java/com/android/incallui/res/drawable-hdpi/img_conference.png create mode 100644 java/com/android/incallui/res/drawable-mdpi/img_conference.png create mode 100644 java/com/android/incallui/res/drawable-xhdpi/img_conference.png create mode 100644 java/com/android/incallui/res/drawable-xxhdpi/img_conference.png create mode 100644 java/com/android/incallui/res/drawable-xxxhdpi/img_conference.png create mode 100644 java/com/android/incallui/res/drawable/img_conference_automirrored.xml delete mode 100644 java/com/android/incallui/res/values-mcc262-mnc01/strings.xml delete mode 100644 java/com/android/incallui/speakerbuttonlogic/AndroidManifest.xml delete mode 100644 java/com/android/incallui/speakerbuttonlogic/SpeakerButtonInfo.java (limited to 'java/com/android/incallui') diff --git a/java/com/android/incallui/AndroidManifest.xml b/java/com/android/incallui/AndroidManifest.xml index 703e5b509..8539bd0cf 100644 --- a/java/com/android/incallui/AndroidManifest.xml +++ b/java/com/android/incallui/AndroidManifest.xml @@ -15,11 +15,11 @@ --> + package="com.android.incallui"> + android:minSdkVersion="23" + android:targetSdkVersion="26"/> + android:name="android.hardware.camera.any" + android:required="false"/> @@ -43,49 +43,47 @@ Set taskAffinity for application is not working because it will be merged and the result is that all activities here still have same taskAffinity as activities under dialer. --> - - + + android:directBootAware="true" + android:excludeFromRecents="true" + android:exported="false" + android:label="@string/phoneAppLabel" + android:taskAffinity="com.android.incallui" + android:launchMode="singleInstance" + android:name="com.android.incallui.InCallActivity" + android:resizeableActivity="true" + android:screenOrientation="nosensor" + android:theme="@style/Theme.InCallScreen"> + android:directBootAware="true" + android:excludeFromRecents="true" + android:noHistory="true" + android:exported="false" + android:label="@string/manageConferenceLabel" + android:taskAffinity="com.android.incallui" + android:launchMode="singleTask" + android:name="com.android.incallui.ManageConferenceActivity" + android:resizeableActivity="true" + android:theme="@style/Theme.InCallScreen.ManageConference"/> + android:directBootAware="true" + android:exported="true" + android:name="com.android.incallui.InCallServiceImpl" + android:permission="android.permission.BIND_INCALL_SERVICE"> + android:name="android.telecom.IN_CALL_SERVICE_UI" + android:value="true"/> + android:name="android.telecom.IN_CALL_SERVICE_RINGING" + android:value="false"/> + android:name="android.telecom.INCLUDE_EXTERNAL_CALLS" + android:value="true"/> @@ -99,35 +97,23 @@ excludeFromRecents="true" -> Don't show in "recent apps" screen --> + android:excludeFromRecents="true" + android:exported="false" + android:name="com.android.incallui.spam.SpamNotificationActivity" + android:noHistory="true" + android:taskAffinity="" + android:theme="@style/AfterCallNotificationTheme"> - - + android:exported="false" + android:name="com.android.incallui.spam.SpamNotificationService"/> - - + android:directBootAware="true" + android:exported="false" + android:name="com.android.incallui.NotificationBroadcastReceiver"/> diff --git a/java/com/android/incallui/AnswerScreenPresenter.java b/java/com/android/incallui/AnswerScreenPresenter.java index ddbe6ccef..ca34aa6aa 100644 --- a/java/com/android/incallui/AnswerScreenPresenter.java +++ b/java/com/android/incallui/AnswerScreenPresenter.java @@ -124,28 +124,11 @@ public class AnswerScreenPresenter LogUtil.i("AnswerScreenPresenter.onAnswerAndReleaseCall", "activeCall == null"); onAnswer(false); } else { - activeCall.setReleasedByAnsweringSecondCall(true); activeCall.addListener(new AnswerOnDisconnected(activeCall)); activeCall.disconnect(); } } - @Override - public void onAnswerAndReleaseButtonDisabled() { - DialerCall activeCall = CallList.getInstance().getActiveCall(); - if (activeCall != null) { - activeCall.increaseSecondCallWithoutAnswerAndReleasedButtonTimes(); - } - } - - @Override - public void onAnswerAndReleaseButtonEnabled() { - DialerCall activeCall = CallList.getInstance().getActiveCall(); - if (activeCall != null) { - activeCall.increaseAnswerAndReleaseButtonDisplayedTimes(); - } - } - @Override public void onCannedTextResponsesLoaded(DialerCall call) { if (isSmsResponseAllowed(call)) { @@ -200,9 +183,6 @@ public class AnswerScreenPresenter @Override public void onInternationalCallOnWifi() {} - - @Override - public void onEnrichedCallSessionUpdate() {} } private boolean isSmsResponseAllowed(DialerCall call) { diff --git a/java/com/android/incallui/AnswerScreenPresenterStub.java b/java/com/android/incallui/AnswerScreenPresenterStub.java index d02a181c1..7bff3299a 100644 --- a/java/com/android/incallui/AnswerScreenPresenterStub.java +++ b/java/com/android/incallui/AnswerScreenPresenterStub.java @@ -42,12 +42,6 @@ public class AnswerScreenPresenterStub implements AnswerScreenDelegate { @Override public void onAnswerAndReleaseCall() {} - @Override - public void onAnswerAndReleaseButtonEnabled() {} - - @Override - public void onAnswerAndReleaseButtonDisabled() {} - @Override public void updateWindowBackgroundColor(@FloatRange(from = -1f, to = 1.0f) float progress) {} } diff --git a/java/com/android/incallui/AudioRouteSelectorActivity.java b/java/com/android/incallui/AudioRouteSelectorActivity.java deleted file mode 100644 index dfd4d1abf..000000000 --- a/java/com/android/incallui/AudioRouteSelectorActivity.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package com.android.incallui; - -import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentActivity; -import com.android.incallui.audiomode.AudioModeProvider; -import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment; -import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment.AudioRouteSelectorPresenter; -import com.android.incallui.call.TelecomAdapter; - -/** Simple activity that just shows the audio route selector fragment */ -public class AudioRouteSelectorActivity extends FragmentActivity - implements AudioRouteSelectorPresenter { - - @Override - protected void onCreate(@Nullable Bundle bundle) { - super.onCreate(bundle); - AudioRouteSelectorDialogFragment.newInstance(AudioModeProvider.getInstance().getAudioState()) - .show(getSupportFragmentManager(), null); - } - - @Override - public void onAudioRouteSelected(int audioRoute) { - TelecomAdapter.getInstance().setAudioRoute(audioRoute); - } - - @Override - public void onAudioRouteSelectorDismiss() { - finish(); - } -} diff --git a/java/com/android/incallui/CallButtonPresenter.java b/java/com/android/incallui/CallButtonPresenter.java index f758a9655..b0c3a99ea 100644 --- a/java/com/android/incallui/CallButtonPresenter.java +++ b/java/com/android/incallui/CallButtonPresenter.java @@ -300,7 +300,18 @@ public class CallButtonPresenter */ @Override public void switchCameraClicked(boolean useFrontFacingCamera) { - updateCamera(useFrontFacingCamera); + InCallCameraManager cameraManager = InCallPresenter.getInstance().getInCallCameraManager(); + cameraManager.setUseFrontFacingCamera(useFrontFacingCamera); + + String cameraId = cameraManager.getActiveCameraId(); + if (cameraId != null) { + final int cameraDir = + cameraManager.isUsingFrontFacingCamera() + ? CameraDirection.CAMERA_DIRECTION_FRONT_FACING + : CameraDirection.CAMERA_DIRECTION_BACK_FACING; + mCall.setCameraDir(cameraDir); + mCall.getVideoTech().setCamera(cameraId); + } } @Override @@ -334,11 +345,8 @@ public class CallButtonPresenter mCall.getTimeAddedMs()); if (pause) { - mCall.getVideoTech().setCamera(null); mCall.getVideoTech().stopTransmission(); } else { - updateCamera( - InCallPresenter.getInstance().getInCallCameraManager().isUsingFrontFacingCamera()); mCall.getVideoTech().resumeTransmission(); } @@ -346,21 +354,6 @@ public class CallButtonPresenter mInCallButtonUi.enableButton(InCallButtonIds.BUTTON_PAUSE_VIDEO, false); } - private void updateCamera(boolean useFrontFacingCamera) { - InCallCameraManager cameraManager = InCallPresenter.getInstance().getInCallCameraManager(); - cameraManager.setUseFrontFacingCamera(useFrontFacingCamera); - - String cameraId = cameraManager.getActiveCameraId(); - if (cameraId != null) { - final int cameraDir = - cameraManager.isUsingFrontFacingCamera() - ? CameraDirection.CAMERA_DIRECTION_FRONT_FACING - : CameraDirection.CAMERA_DIRECTION_BACK_FACING; - mCall.setCameraDir(cameraDir); - mCall.getVideoTech().setCamera(cameraId); - } - } - private void updateUi(InCallState state, DialerCall call) { LogUtil.v("CallButtonPresenter", "updating call UI for call: ", call); diff --git a/java/com/android/incallui/CallCardPresenter.java b/java/com/android/incallui/CallCardPresenter.java index cd06793ce..c2b99c1d1 100644 --- a/java/com/android/incallui/CallCardPresenter.java +++ b/java/com/android/incallui/CallCardPresenter.java @@ -47,6 +47,9 @@ import com.android.dialer.common.Assert; import com.android.dialer.common.ConfigProviderBindings; import com.android.dialer.common.LogUtil; import com.android.dialer.compat.ActivityCompat; +import com.android.dialer.enrichedcall.EnrichedCallComponent; +import com.android.dialer.enrichedcall.EnrichedCallManager; +import com.android.dialer.enrichedcall.Session; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; import com.android.dialer.multimedia.MultimediaData; @@ -82,7 +85,8 @@ public class CallCardPresenter InCallDetailsListener, InCallEventListener, InCallScreenDelegate, - DialerCallListener { + DialerCallListener, + EnrichedCallManager.StateChangedListener { /** * Amount of time to wait before sending an announcement via the accessibility manager. When the @@ -372,11 +376,6 @@ public class CallCardPresenter @Override public void onInternationalCallOnWifi() {} - @Override - public void onEnrichedCallSessionUpdate() { - updatePrimaryDisplayInfo(); - } - /** Handles a change to the child number by refreshing the primary call info. */ @Override public void onDialerCallChildNumberChange() { @@ -419,6 +418,12 @@ public class CallCardPresenter updatePrimaryCallState(); } + @Override + public void onEnrichedCallStateChanged() { + LogUtil.enterBlock("CallCardPresenter.onEnrichedCallStateChanged"); + updatePrimaryDisplayInfo(); + } + private boolean shouldRefreshPrimaryInfo(boolean primaryChanged) { if (mPrimary == null) { return false; @@ -470,8 +475,7 @@ public class CallCardPresenter mPrimary.getConnectTimeMillis(), CallerInfoUtils.isVoiceMailNumber(mContext, mPrimary), mPrimary.isRemotelyHeld(), - isBusiness, - supports2ndCallOnHold())); + isBusiness)); InCallActivity activity = (InCallActivity) (mInCallScreen.getInCallScreenFragment().getActivity()); @@ -501,15 +505,6 @@ public class CallCardPresenter && !mIsFullscreen; } - private boolean supports2ndCallOnHold() { - DialerCall firstCall = CallList.getInstance().getActiveOrBackgroundCall(); - DialerCall incomingCall = CallList.getInstance().getIncomingCall(); - if (firstCall != null && incomingCall != null && firstCall != incomingCall) { - return incomingCall.can(Details.CAPABILITY_HOLD); - } - return true; - } - @Override public void onCallStateButtonClicked() { Intent broadcastIntent = Bindings.get(mContext).getCallStateButtonBroadcastIntent(mContext); @@ -671,8 +666,26 @@ public class CallCardPresenter boolean hasWorkCallProperty = mPrimary.hasProperty(PROPERTY_ENTERPRISE_CALL); MultimediaData multimediaData = null; - if (mPrimary.getEnrichedCallSession() != null) { - multimediaData = mPrimary.getEnrichedCallSession().getMultimediaData(); + if (mPrimary.getNumber() != null) { + EnrichedCallManager manager = EnrichedCallComponent.get(mContext).getEnrichedCallManager(); + + EnrichedCallManager.Filter filter; + if (mPrimary.isIncoming()) { + filter = manager.createIncomingCallComposerFilter(); + } else { + filter = manager.createOutgoingCallComposerFilter(); + } + + Session enrichedCallSession = + manager.getSession(mPrimary.getUniqueCallId(), mPrimary.getNumber(), filter); + + mPrimary.setEnrichedCallSession(enrichedCallSession); + mPrimary.setEnrichedCallCapabilities(manager.getCapabilities(mPrimary.getNumber())); + + if (enrichedCallSession != null) { + enrichedCallSession.setUniqueDialerCallId(mPrimary.getUniqueCallId()); + multimediaData = enrichedCallSession.getMultimediaData(); + } } if (mPrimary.isConferenceCall()) { @@ -683,8 +696,7 @@ public class CallCardPresenter mInCallScreen.setPrimary( new PrimaryInfo( null /* number */, - CallerInfoUtils.getConferenceString( - mContext, mPrimary.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE)), + getConferenceString(mPrimary), false /* nameIsNumber */, null /* location */, null /* label */, @@ -868,8 +880,7 @@ public class CallCardPresenter mInCallScreen.setSecondary( new SecondaryInfo( true /* show */, - CallerInfoUtils.getConferenceString( - mContext, mSecondary.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE)), + getConferenceString(mSecondary), false /* nameIsNumber */, null /* label */, mSecondary.getCallProviderLabel(), @@ -961,7 +972,7 @@ public class CallCardPresenter } /** Gets the name to display for the call. */ - private String getNameForCall(ContactCacheEntry contactInfo) { + String getNameForCall(ContactCacheEntry contactInfo) { String preferredName = ContactDisplayUtils.getPreferredDisplayName( contactInfo.namePrimary, contactInfo.nameAlternative, mContactsPreferences); @@ -971,6 +982,19 @@ public class CallCardPresenter return preferredName; } + /** Gets the number to display for a call. */ + String getNumberForCall(ContactCacheEntry contactInfo) { + // If the name is empty, we use the number for the name...so don't show a second + // number in the number field + String preferredName = + ContactDisplayUtils.getPreferredDisplayName( + contactInfo.namePrimary, contactInfo.nameAlternative, mContactsPreferences); + if (TextUtils.isEmpty(preferredName)) { + return contactInfo.location; + } + return contactInfo.number; + } + @Override public void onSecondaryInfoClicked() { if (mSecondary == null) { @@ -1011,6 +1035,15 @@ public class CallCardPresenter return mPrimary != null && mPrimary.getState() == DialerCall.State.ACTIVE; } + private String getConferenceString(DialerCall call) { + boolean isGenericConference = call.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE); + LogUtil.v("CallCardPresenter.getConferenceString", "" + isGenericConference); + + final int resId = + isGenericConference ? R.string.generic_conference_call_name : R.string.conference_call_name; + return mContext.getResources().getString(resId); + } + private boolean shouldShowEndCallButton(DialerCall primary, int callState) { if (primary == null) { return false; @@ -1030,6 +1063,7 @@ public class CallCardPresenter @Override public void onInCallScreenResumed() { + EnrichedCallComponent.get(mContext).getEnrichedCallManager().registerStateChangedListener(this); updatePrimaryDisplayInfo(); if (shouldSendAccessibilityEvent) { @@ -1038,7 +1072,11 @@ public class CallCardPresenter } @Override - public void onInCallScreenPaused() {} + public void onInCallScreenPaused() { + EnrichedCallComponent.get(mContext) + .getEnrichedCallManager() + .unregisterStateChangedListener(this); + } static boolean sendAccessibilityEvent(Context context, InCallScreen inCallScreen) { AccessibilityManager am = diff --git a/java/com/android/incallui/CallerInfoUtils.java b/java/com/android/incallui/CallerInfoUtils.java index 8f2310760..564446647 100644 --- a/java/com/android/incallui/CallerInfoUtils.java +++ b/java/com/android/incallui/CallerInfoUtils.java @@ -282,11 +282,4 @@ public class CallerInfoUtils { }); loader.startLoading(); } - - /** @return conference name for conference call. */ - public static String getConferenceString(Context context, boolean isGenericConference) { - final int resId = - isGenericConference ? R.string.generic_conference_call_name : R.string.conference_call_name; - return context.getResources().getString(resId); - } } diff --git a/java/com/android/incallui/ContactInfoCache.java b/java/com/android/incallui/ContactInfoCache.java index d7eea79bd..e45eb9746 100644 --- a/java/com/android/incallui/ContactInfoCache.java +++ b/java/com/android/incallui/ContactInfoCache.java @@ -406,7 +406,7 @@ public class ContactInfoCache implements OnImageLoadCompleteListener { } else { ContactCacheEntry initialCacheEntry = updateCallerInfoInCacheOnAnyThread( - callId, call.getNumberPresentation(), callerInfo, false, queryToken); + callId, call.getNumberPresentation(), callerInfo, isIncoming, false, queryToken); sendInfoNotifications(callId, initialCacheEntry); } } @@ -416,6 +416,7 @@ public class ContactInfoCache implements OnImageLoadCompleteListener { String callId, int numberPresentation, CallerInfo callerInfo, + boolean isIncoming, boolean didLocalLookup, CallerInfoQueryToken queryToken) { Log.d( @@ -442,7 +443,16 @@ public class ContactInfoCache implements OnImageLoadCompleteListener { Log.d(TAG, "Existing cacheEntry in hashMap " + existingCacheEntry); if (didLocalLookup) { - if (cacheEntry.displayPhotoUri != null) { + // Before issuing a request for more data from other services, we only check that the + // contact wasn't found in the local DB. We don't check the if the cache entry already + // has a name because we allow overriding cnap data with data from other services. + if (!callerInfo.contactExists && mPhoneNumberService != null) { + Log.d(TAG, "Contact lookup. Local contacts miss, checking remote"); + final PhoneNumberServiceListener listener = + new PhoneNumberServiceListener(callId, queryToken.mQueryId); + cacheEntry.hasPendingQuery = true; + mPhoneNumberService.getPhoneNumberInfo(cacheEntry.number, listener, listener, isIncoming); + } else if (cacheEntry.displayPhotoUri != null) { // When the difference between 2 numbers is only the prefix (e.g. + or IDD), // we will still trigger force query so that the number can be updated on // the calling screen. We need not query the image again if the previous @@ -779,7 +789,7 @@ public class ContactInfoCache implements OnImageLoadCompleteListener { maybeUpdateFromCequintCallerId(ci, cw.cnapName, mIsIncoming); long time = SystemClock.uptimeMillis() - start; Log.d(TAG, "Cequint Caller Id look up takes " + time + " ms."); - updateCallerInfoInCacheOnAnyThread(cw.callId, cw.numberPresentation, ci, true, mQueryToken); + updateCallerInfoInCacheOnAnyThread(cw.callId, cw.numberPresentation, ci, mIsIncoming, true, mQueryToken); } @Override @@ -797,16 +807,6 @@ public class ContactInfoCache implements OnImageLoadCompleteListener { clearCallbacks(callId); return; } - // Before issuing a request for more data from other services, we only check that the - // contact wasn't found in the local DB. We don't check the if the cache entry already - // has a name because we allow overriding cnap data with data from other services. - if (!callerInfo.contactExists && mPhoneNumberService != null) { - Log.d(TAG, "Contact lookup. Local contacts miss, checking remote"); - final PhoneNumberServiceListener listener = - new PhoneNumberServiceListener(callId, mQueryToken.mQueryId); - cacheEntry.hasPendingQuery = true; - mPhoneNumberService.getPhoneNumberInfo(cacheEntry.number, listener, listener, mIsIncoming); - } sendInfoNotifications(callId, cacheEntry); if (!cacheEntry.hasPendingQuery) { if (callerInfo.contactExists) { @@ -870,7 +870,6 @@ public class ContactInfoCache implements OnImageLoadCompleteListener { entry.shouldShowLocation = oldEntry.shouldShowLocation; // Contact specific ringtone is obtained from local lookup. entry.contactRingtoneUri = oldEntry.contactRingtoneUri; - entry.originalPhoneNumber = oldEntry.originalPhoneNumber; } // If no image and it's a business, switch to using the default business avatar. diff --git a/java/com/android/incallui/ExternalCallNotifier.java b/java/com/android/incallui/ExternalCallNotifier.java index 051392e2b..0c2493c60 100644 --- a/java/com/android/incallui/ExternalCallNotifier.java +++ b/java/com/android/incallui/ExternalCallNotifier.java @@ -384,10 +384,11 @@ public class ExternalCallNotifier implements ExternalCallList.ExternalCallListen ContactInfoCache.ContactCacheEntry contactInfo, android.telecom.Call call) { - if (call.getDetails().hasProperty(android.telecom.Call.Details.PROPERTY_CONFERENCE)) { - return CallerInfoUtils.getConferenceString( - context, - call.getDetails().hasProperty(android.telecom.Call.Details.PROPERTY_GENERIC_CONFERENCE)); + if (call.getDetails().hasProperty(android.telecom.Call.Details.PROPERTY_CONFERENCE) + && !call.getDetails() + .hasProperty(android.telecom.Call.Details.PROPERTY_GENERIC_CONFERENCE)) { + + return context.getResources().getString(R.string.conference_call_name); } String preferredName = diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java index bda003ccc..cc9a8e438 100644 --- a/java/com/android/incallui/InCallActivity.java +++ b/java/com/android/incallui/InCallActivity.java @@ -694,8 +694,13 @@ public class InCallActivity extends TransactionSafeFragmentActivity if (didShowInCallScreen) { return false; } - InCallScreen inCallScreen = InCallBindings.createInCallScreen(); - transaction.add(R.id.main, inCallScreen.getInCallScreenFragment(), TAG_IN_CALL_SCREEN); + InCallScreen inCallScreen = getInCallScreen(); + if (inCallScreen == null) { + inCallScreen = InCallBindings.createInCallScreen(); + transaction.add(R.id.main, inCallScreen.getInCallScreenFragment(), TAG_IN_CALL_SCREEN); + } else { + transaction.show(inCallScreen.getInCallScreenFragment()); + } Logger.get(this).logScreenView(ScreenEvent.Type.INCALL, this); didShowInCallScreen = true; return true; @@ -707,7 +712,7 @@ public class InCallActivity extends TransactionSafeFragmentActivity } InCallScreen inCallScreen = getInCallScreen(); if (inCallScreen != null) { - transaction.remove(inCallScreen.getInCallScreenFragment()); + transaction.hide(inCallScreen.getInCallScreenFragment()); } didShowInCallScreen = false; return true; diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java index 7c3000144..2d6d83c3c 100644 --- a/java/com/android/incallui/InCallPresenter.java +++ b/java/com/android/incallui/InCallPresenter.java @@ -695,10 +695,7 @@ public class InCallPresenter implements CallList.Listener { if (newState == InCallState.INCOMING && (waitingForAccountCall = callList.getWaitingForAccountCall()) != null) { waitingForAccountCall.disconnect(); - // The InCallActivity might be destroyed or not started yet at this point. - if (isActivityStarted()) { - mInCallActivity.dismissPendingDialogs(); - } + mInCallActivity.dismissPendingDialogs(); } newState = startOrFinishUi(newState); diff --git a/java/com/android/incallui/InCallServiceImpl.java b/java/com/android/incallui/InCallServiceImpl.java index 1653334a1..4ab92a797 100644 --- a/java/com/android/incallui/InCallServiceImpl.java +++ b/java/com/android/incallui/InCallServiceImpl.java @@ -23,7 +23,6 @@ import android.telecom.Call; import android.telecom.CallAudioState; import android.telecom.InCallService; import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler; -import com.android.dialer.common.ConfigProviderBindings; import com.android.incallui.audiomode.AudioModeProvider; import com.android.incallui.call.CallList; import com.android.incallui.call.ExternalCallList; @@ -37,8 +36,6 @@ import com.android.incallui.call.TelecomAdapter; */ public class InCallServiceImpl extends InCallService { - private ReturnToCallController returnToCallController; - @Override public void onCallAudioStateChanged(CallAudioState audioState) { AudioModeProvider.getInstance().onAudioStateChanged(audioState); @@ -82,9 +79,6 @@ public class InCallServiceImpl extends InCallService { InCallPresenter.getInstance().onServiceBind(); InCallPresenter.getInstance().maybeStartRevealAnimation(intent); TelecomAdapter.getInstance().setInCallService(this); - if (ConfigProviderBindings.get(this).getBoolean("enable_return_to_call_bubble", false)) { - returnToCallController = new ReturnToCallController(this); - } return super.onBind(intent); } @@ -104,9 +98,5 @@ public class InCallServiceImpl extends InCallService { // Tear down the InCall system TelecomAdapter.getInstance().clearInCallService(); InCallPresenter.getInstance().tearDown(); - if (returnToCallController != null) { - returnToCallController.tearDown(); - returnToCallController = null; - } } } diff --git a/java/com/android/incallui/ReturnToCallActionReceiver.java b/java/com/android/incallui/ReturnToCallActionReceiver.java deleted file mode 100644 index b645c155c..000000000 --- a/java/com/android/incallui/ReturnToCallActionReceiver.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package com.android.incallui; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.telecom.CallAudioState; -import com.android.dialer.common.LogUtil; -import com.android.dialer.logging.DialerImpression; -import com.android.dialer.logging.Logger; -import com.android.incallui.audiomode.AudioModeProvider; -import com.android.incallui.call.CallList; -import com.android.incallui.call.DialerCall; -import com.android.incallui.call.TelecomAdapter; - -/** Handles clicks on the return-to-call bubble */ -public class ReturnToCallActionReceiver extends BroadcastReceiver { - - public static final String ACTION_TOGGLE_SPEAKER = "toggleSpeaker"; - public static final String ACTION_SHOW_AUDIO_ROUTE_SELECTOR = "showAudioRouteSelector"; - public static final String ACTION_TOGGLE_MUTE = "toggleMute"; - public static final String ACTION_END_CALL = "endCall"; - - @Override - public void onReceive(Context context, Intent intent) { - switch (intent.getAction()) { - case ACTION_TOGGLE_SPEAKER: - toggleSpeaker(context); - break; - case ACTION_SHOW_AUDIO_ROUTE_SELECTOR: - showAudioRouteSelector(context); - break; - case ACTION_TOGGLE_MUTE: - toggleMute(context); - break; - case ACTION_END_CALL: - endCall(context); - break; - } - } - - private void toggleSpeaker(Context context) { - CallAudioState audioState = AudioModeProvider.getInstance().getAudioState(); - - if ((audioState.getSupportedRouteMask() & CallAudioState.ROUTE_BLUETOOTH) - == CallAudioState.ROUTE_BLUETOOTH) { - LogUtil.w( - "ReturnToCallActionReceiver.toggleSpeaker", - "toggleSpeaker() called when bluetooth available." - + " Probably should have shown audio route selector"); - } - - DialerCall call = getCall(); - - int newRoute; - if (audioState.getRoute() == CallAudioState.ROUTE_SPEAKER) { - newRoute = CallAudioState.ROUTE_WIRED_OR_EARPIECE; - Logger.get(context) - .logCallImpression( - DialerImpression.Type.BUBBLE_TURN_ON_WIRED_OR_EARPIECE, - call != null ? call.getUniqueCallId() : "", - call != null ? call.getTimeAddedMs() : 0); - } else { - newRoute = CallAudioState.ROUTE_SPEAKER; - Logger.get(context) - .logCallImpression( - DialerImpression.Type.BUBBLE_TURN_ON_SPEAKERPHONE, - call != null ? call.getUniqueCallId() : "", - call != null ? call.getTimeAddedMs() : 0); - } - TelecomAdapter.getInstance().setAudioRoute(newRoute); - } - - public void showAudioRouteSelector(Context context) { - context.startActivity(new Intent(context, AudioRouteSelectorActivity.class)); - } - - private void toggleMute(Context context) { - DialerCall call = getCall(); - boolean shouldMute = !AudioModeProvider.getInstance().getAudioState().isMuted(); - Logger.get(context) - .logCallImpression( - shouldMute - ? DialerImpression.Type.BUBBLE_MUTE_CALL - : DialerImpression.Type.BUBBLE_UNMUTE_CALL, - call != null ? call.getUniqueCallId() : "", - call != null ? call.getTimeAddedMs() : 0); - TelecomAdapter.getInstance().mute(shouldMute); - } - - private void endCall(Context context) { - DialerCall call = getCall(); - - Logger.get(context) - .logCallImpression( - DialerImpression.Type.BUBBLE_END_CALL, - call != null ? call.getUniqueCallId() : "", - call != null ? call.getTimeAddedMs() : 0); - if (call != null) { - call.disconnect(); - } - } - - private DialerCall getCall() { - CallList callList = InCallPresenter.getInstance().getCallList(); - if (callList != null) { - DialerCall call = callList.getOutgoingCall(); - if (call == null) { - call = callList.getActiveOrBackgroundCall(); - } - if (call != null) { - return call; - } - } - return null; - } -} diff --git a/java/com/android/incallui/ReturnToCallController.java b/java/com/android/incallui/ReturnToCallController.java deleted file mode 100644 index 4cb6aaf89..000000000 --- a/java/com/android/incallui/ReturnToCallController.java +++ /dev/null @@ -1,204 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package com.android.incallui; - -import android.app.PendingIntent; -import android.content.Context; -import android.content.Intent; -import android.graphics.drawable.Icon; -import android.support.annotation.NonNull; -import android.support.annotation.VisibleForTesting; -import android.telecom.CallAudioState; -import com.android.dialer.common.LogUtil; -import com.android.dialer.telecom.TelecomUtil; -import com.android.dialershared.bubble.Bubble; -import com.android.dialershared.bubble.BubbleInfo; -import com.android.dialershared.bubble.BubbleInfo.Action; -import com.android.incallui.InCallPresenter.InCallUiListener; -import com.android.incallui.audiomode.AudioModeProvider; -import com.android.incallui.audiomode.AudioModeProvider.AudioModeListener; -import com.android.incallui.call.CallList; -import com.android.incallui.call.CallList.Listener; -import com.android.incallui.call.DialerCall; -import com.android.incallui.speakerbuttonlogic.SpeakerButtonInfo; -import com.android.incallui.speakerbuttonlogic.SpeakerButtonInfo.IconSize; -import java.util.ArrayList; -import java.util.List; - -/** - * Listens for events relevant to the return-to-call bubble and updates the bubble's state as - * necessary - */ -public class ReturnToCallController implements InCallUiListener, Listener, AudioModeListener { - - private final Context context; - - @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) - Bubble bubble; - - private CallAudioState audioState; - - private final PendingIntent toggleSpeaker; - private final PendingIntent showSpeakerSelect; - private final PendingIntent toggleMute; - private final PendingIntent endCall; - - public ReturnToCallController(Context context) { - this.context = context; - - toggleSpeaker = createActionIntent(ReturnToCallActionReceiver.ACTION_TOGGLE_SPEAKER); - showSpeakerSelect = - createActionIntent(ReturnToCallActionReceiver.ACTION_SHOW_AUDIO_ROUTE_SELECTOR); - toggleMute = createActionIntent(ReturnToCallActionReceiver.ACTION_TOGGLE_MUTE); - endCall = createActionIntent(ReturnToCallActionReceiver.ACTION_END_CALL); - - InCallPresenter.getInstance().addInCallUiListener(this); - CallList.getInstance().addListener(this); - AudioModeProvider.getInstance().addListener(this); - audioState = AudioModeProvider.getInstance().getAudioState(); - } - - public void tearDown() { - InCallPresenter.getInstance().removeInCallUiListener(this); - CallList.getInstance().removeListener(this); - AudioModeProvider.getInstance().removeListener(this); - } - - @Override - public void onUiShowing(boolean showing) { - if (showing) { - hide(); - } else { - if (TelecomUtil.isInCall(context)) { - show(); - } - } - } - - private void hide() { - if (bubble != null) { - bubble.hide(); - } else { - LogUtil.i("ReturnToCallController.hide", "hide() called without calling show()"); - } - } - - private void show() { - if (bubble == null) { - bubble = startNewBubble(); - } else { - bubble.show(); - } - } - - private Bubble startNewBubble() { - if (!Bubble.canShowBubbles(context)) { - LogUtil.i("ReturnToCallController.startNewBubble", "can't show bubble, no permission"); - return null; - } - Bubble returnToCallBubble = Bubble.createBubble(context, generateBubbleInfo()); - returnToCallBubble.show(); - return returnToCallBubble; - } - - @Override - public void onIncomingCall(DialerCall call) {} - - @Override - public void onUpgradeToVideo(DialerCall call) {} - - @Override - public void onSessionModificationStateChange(DialerCall call) {} - - @Override - public void onCallListChange(CallList callList) {} - - @Override - public void onDisconnect(DialerCall call) { - if (bubble != null && bubble.isShowing()) { - bubble.showText(context.getText(R.string.incall_call_ended)); - } - - if (!TelecomUtil.isInCall(context)) { - hide(); - } - } - - @Override - public void onWiFiToLteHandover(DialerCall call) {} - - @Override - public void onHandoverToWifiFailed(DialerCall call) {} - - @Override - public void onInternationalCallOnWifi(@NonNull DialerCall call) {} - - @Override - public void onAudioStateChanged(CallAudioState audioState) { - this.audioState = audioState; - if (bubble != null) { - bubble.updateActions(generateActions()); - } - } - - private BubbleInfo generateBubbleInfo() { - return BubbleInfo.builder() - .setPrimaryColor(context.getResources().getColor(R.color.dialer_theme_color, null)) - .setPrimaryIcon(Icon.createWithResource(context, R.drawable.quantum_ic_call_white_24)) - .setPrimaryAction( - PendingIntent.getActivity( - context, 0, InCallActivity.getIntent(context, false, false, false), 0)) - .setActions(generateActions()) - .build(); - } - - @NonNull - private List generateActions() { - List actions = new ArrayList<>(); - SpeakerButtonInfo speakerButtonInfo = new SpeakerButtonInfo(audioState, IconSize.SIZE_24_DP); - - actions.add( - Action.builder() - .setIcon(Icon.createWithResource(context, speakerButtonInfo.icon)) - .setName(context.getText(speakerButtonInfo.label)) - .setChecked(speakerButtonInfo.isChecked) - .setAction(speakerButtonInfo.checkable ? toggleSpeaker : showSpeakerSelect) - .build()); - - actions.add( - Action.builder() - .setIcon(Icon.createWithResource(context, R.drawable.quantum_ic_mic_off_white_24)) - .setName(context.getText(R.string.incall_label_mute)) - .setChecked(audioState.isMuted()) - .setAction(toggleMute) - .build()); - actions.add( - Action.builder() - .setIcon(Icon.createWithResource(context, R.drawable.quantum_ic_call_end_white_24)) - .setName(context.getText(R.string.incall_label_end_call)) - .setAction(endCall) - .build()); - return actions; - } - - @NonNull - private PendingIntent createActionIntent(String actionToggleSpeaker) { - Intent toggleSpeaker = new Intent(context, ReturnToCallActionReceiver.class); - toggleSpeaker.setAction(actionToggleSpeaker); - return PendingIntent.getBroadcast(context, 0, toggleSpeaker, 0); - } -} diff --git a/java/com/android/incallui/StatusBarNotifier.java b/java/com/android/incallui/StatusBarNotifier.java index 229f08c8e..165b30b52 100644 --- a/java/com/android/incallui/StatusBarNotifier.java +++ b/java/com/android/incallui/StatusBarNotifier.java @@ -62,11 +62,11 @@ import android.text.style.ForegroundColorSpan; import com.android.contacts.common.ContactsUtils; import com.android.contacts.common.ContactsUtils.UserType; import com.android.contacts.common.lettertiles.LetterTileDrawable; -import com.android.contacts.common.lettertiles.LetterTileDrawable.ContactType; import com.android.contacts.common.preference.ContactsPreferences; import com.android.contacts.common.util.BitmapUtil; import com.android.contacts.common.util.ContactDisplayUtils; import com.android.dialer.common.LogUtil; +import com.android.dialer.enrichedcall.EnrichedCallComponent; import com.android.dialer.enrichedcall.EnrichedCallManager; import com.android.dialer.enrichedcall.Session; import com.android.dialer.multimedia.MultimediaData; @@ -565,9 +565,8 @@ public class StatusBarNotifier @VisibleForTesting @Nullable String getContentTitle(ContactCacheEntry contactInfo, DialerCall call) { - if (call.isConferenceCall()) { - return CallerInfoUtils.getConferenceString( - mContext, call.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE)); + if (call.isConferenceCall() && !call.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE)) { + return mContext.getResources().getString(R.string.conference_call_name); } String preferredName = @@ -605,16 +604,20 @@ public class StatusBarNotifier if (contactInfo.photo == null) { int width = (int) resources.getDimension(android.R.dimen.notification_large_icon_width); int height = (int) resources.getDimension(android.R.dimen.notification_large_icon_height); - @ContactType - int contactType = - LetterTileDrawable.getContactTypeFromPrimitives( - CallerInfoUtils.isVoiceMailNumber(context, call), - call.isSpam(), - contactInfo.isBusiness, - call.getNumberPresentation(), - call.isConferenceCall() && !call.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE)); + int contactType = LetterTileDrawable.TYPE_DEFAULT; LetterTileDrawable lettertile = new LetterTileDrawable(resources); + // TODO: Deduplicate across Dialer. b/36195917 + if (CallerInfoUtils.isVoiceMailNumber(context, call)) { + contactType = LetterTileDrawable.TYPE_VOICEMAIL; + } else if (contactInfo.isBusiness) { + contactType = LetterTileDrawable.TYPE_BUSINESS; + } else if (call.getNumberPresentation() == TelecomManager.PRESENTATION_RESTRICTED) { + contactType = LetterTileDrawable.TYPE_GENERIC_AVATAR; + } else if (call.isConferenceCall() + && !call.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE)) { + contactType = LetterTileDrawable.TYPE_CONFERENCE; + } lettertile.setCanonicalDialerLetterTileDetails( contactInfo.namePrimary == null ? contactInfo.number : contactInfo.namePrimary, contactInfo.lookupKey, @@ -691,10 +694,20 @@ public class StatusBarNotifier } if (isIncomingOrWaiting) { + EnrichedCallManager manager = EnrichedCallComponent.get(mContext).getEnrichedCallManager(); + Session session = null; + if (call.getNumber() != null) { + session = + manager.getSession( + call.getUniqueCallId(), + call.getNumber(), + manager.createIncomingCallComposerFilter()); + } + if (call.isSpam()) { resId = R.string.notification_incoming_spam_call; - } else if (shouldShowEnrichedCallNotification(call.getEnrichedCallSession())) { - resId = getECIncomingCallText(call.getEnrichedCallSession()); + } else if (session != null) { + resId = getECIncomingCallText(session); } else if (call.hasProperty(Details.PROPERTY_WIFI)) { resId = R.string.notification_incoming_call_wifi; } else { @@ -718,13 +731,6 @@ public class StatusBarNotifier return mContext.getString(resId); } - private boolean shouldShowEnrichedCallNotification(Session session) { - if (session == null) { - return false; - } - return session.getMultimediaData().hasData() || session.getMultimediaData().isImportant(); - } - private int getECIncomingCallText(Session session) { int resId; MultimediaData data = session.getMultimediaData(); @@ -750,10 +756,8 @@ public class StatusBarNotifier } else { resId = R.string.important_notification_incoming_call_with_photo; } - } else if (hasSubject) { - resId = R.string.important_notification_incoming_call_with_message; } else { - resId = R.string.important_notification_incoming_call; + resId = R.string.important_notification_incoming_call_with_message; } if (mContext.getString(resId).length() > 50) { resId = R.string.important_notification_incoming_call_attachments; @@ -1001,9 +1005,6 @@ public class StatusBarNotifier @Override public void onInternationalCallOnWifi() {} - @Override - public void onEnrichedCallSessionUpdate() {} - /** * Responds to changes in the session modification state for the call by dismissing the status * bar notification as required. diff --git a/java/com/android/incallui/answer/impl/AnswerFragment.java b/java/com/android/incallui/answer/impl/AnswerFragment.java index 6be79305d..1f0541c4b 100644 --- a/java/com/android/incallui/answer/impl/AnswerFragment.java +++ b/java/com/android/incallui/answer/impl/AnswerFragment.java @@ -427,10 +427,8 @@ public class AnswerFragment extends Fragment if (allowAnswerAndRelease()) { answerAndReleaseButton.setVisibility(View.VISIBLE); - answerScreenDelegate.onAnswerAndReleaseButtonEnabled(); } else { answerAndReleaseButton.setVisibility(View.INVISIBLE); - answerScreenDelegate.onAnswerAndReleaseButtonDisabled(); } } @@ -932,7 +930,7 @@ public class AnswerFragment extends Fragment if (hasCallOnHold()) { getAnswerMethod() .setHintText(getText(R.string.call_incoming_default_label_answer_and_release_third)); - } else if (primaryCallState.supportsCallOnHold) { + } else { getAnswerMethod() .setHintText(getText(R.string.call_incoming_default_label_answer_and_release_second)); } diff --git a/java/com/android/incallui/answer/impl/PillDrawable.java b/java/com/android/incallui/answer/impl/PillDrawable.java new file mode 100644 index 000000000..57d84c45f --- /dev/null +++ b/java/com/android/incallui/answer/impl/PillDrawable.java @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.incallui.answer.impl; + +import android.graphics.Rect; +import android.graphics.drawable.GradientDrawable; + +/** Draws a pill-shaped background */ +public class PillDrawable extends GradientDrawable { + + public PillDrawable() { + super(); + setShape(RECTANGLE); + } + + @Override + protected void onBoundsChange(Rect r) { + super.onBoundsChange(r); + setCornerRadius(r.height() / 2); + } + + @Override + public void setShape(int shape) { + if (shape != GradientDrawable.RECTANGLE) { + throw new UnsupportedOperationException("PillDrawable must be a rectangle"); + } + super.setShape(shape); + } +} diff --git a/java/com/android/incallui/answer/impl/answermethod/res/layout/swipe_up_down_method.xml b/java/com/android/incallui/answer/impl/answermethod/res/layout/swipe_up_down_method.xml index 600115e27..9a49075b8 100644 --- a/java/com/android/incallui/answer/impl/answermethod/res/layout/swipe_up_down_method.xml +++ b/java/com/android/incallui/answer/impl/answermethod/res/layout/swipe_up_down_method.xml @@ -41,7 +41,6 @@ android:layout_marginBottom="116dp" android:layout_gravity="center_horizontal" android:alpha="0" - android:gravity="center_horizontal" android:text="@string/call_incoming_will_disconnect" android:textColor="@color/blue_grey_100" android:textSize="16sp" @@ -60,7 +59,6 @@ android:layout_marginBottom="18dp" android:layout_gravity="center_horizontal" android:focusable="false" - android:gravity="center_horizontal" android:text="@string/call_incoming_swipe_to_answer" android:textAlignment="center" android:textAppearance="@style/Dialer.Incall.TextAppearance.Hint"/> @@ -112,7 +110,6 @@ android:layout_gravity="center_horizontal" android:alpha="0" android:focusable="false" - android:gravity="center_horizontal" android:text="@string/call_incoming_swipe_to_reject" android:textAppearance="@style/Dialer.Incall.TextAppearance.Hint" tools:alpha="1"/> diff --git a/java/com/android/incallui/answer/impl/hint/AnswerHintFactory.java b/java/com/android/incallui/answer/impl/hint/AnswerHintFactory.java index 9c33b5de6..77b45ec71 100644 --- a/java/com/android/incallui/answer/impl/hint/AnswerHintFactory.java +++ b/java/com/android/incallui/answer/impl/hint/AnswerHintFactory.java @@ -23,6 +23,7 @@ import android.os.Build; import android.support.annotation.NonNull; import android.support.annotation.VisibleForTesting; import com.android.dialer.common.Assert; +import com.android.dialer.common.ConfigProvider; import com.android.dialer.common.ConfigProviderBindings; import com.android.dialer.common.LogUtil; import com.android.dialer.util.DialerUtils; @@ -34,9 +35,8 @@ import com.android.incallui.util.AccessibilityUtil; */ public class AnswerHintFactory { - @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) - static final String CONFIG_ANSWER_HINT_ANSWERED_THRESHOLD_KEY = "answer_hint_answered_threshold"; - + private static final String CONFIG_ANSWER_HINT_ANSWERED_THRESHOLD_KEY = + "answer_hint_answered_threshold"; @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) static final String CONFIG_ANSWER_HINT_WHITELISTED_DEVICES_KEY = "answer_hint_whitelisted_devices"; @@ -58,7 +58,12 @@ public class AnswerHintFactory { @NonNull public AnswerHint create(Context context, long puckUpDuration, long puckUpDelay) { - if (shouldShowAnswerHint(context, Build.PRODUCT)) { + + if (shouldShowAnswerHint( + context, + ConfigProviderBindings.get(context), + DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context), + Build.PRODUCT)) { return new DotAnswerHint(context, puckUpDuration, puckUpDelay); } @@ -79,23 +84,24 @@ public class AnswerHintFactory { } @VisibleForTesting - static boolean shouldShowAnswerHint(Context context, String device) { + static boolean shouldShowAnswerHint( + Context context, + ConfigProvider configProvider, + SharedPreferences sharedPreferences, + String device) { if (AccessibilityUtil.isTouchExplorationEnabled(context)) { return false; } // Devices that has the legacy dialer installed are whitelisted as they are likely to go through // a UX change during updates. - if (!isDeviceWhitelisted(context, device)) { + if (!isDeviceWhitelisted(device, configProvider)) { return false; } // If the user has gone through the process a few times we can assume they have learnt the // method. - int answeredCount = - DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context) - .getInt(ANSWERED_COUNT_PREFERENCE_KEY, 0); - long threshold = - ConfigProviderBindings.get(context).getLong(CONFIG_ANSWER_HINT_ANSWERED_THRESHOLD_KEY, 3); + int answeredCount = sharedPreferences.getInt(ANSWERED_COUNT_PREFERENCE_KEY, 0); + long threshold = configProvider.getLong(CONFIG_ANSWER_HINT_ANSWERED_THRESHOLD_KEY, 3); LogUtil.i( "AnswerHintFactory.shouldShowAnswerHint", "answerCount: %d, threshold: %d", @@ -109,8 +115,8 @@ public class AnswerHintFactory { * @param configProvider should provide a list of devices quoted with '/' concatenated to a * string. */ - private static boolean isDeviceWhitelisted(Context context, String device) { - return ConfigProviderBindings.get(context) + private static boolean isDeviceWhitelisted(String device, ConfigProvider configProvider) { + return configProvider .getString(CONFIG_ANSWER_HINT_WHITELISTED_DEVICES_KEY, DEFAULT_WHITELISTED_DEVICES_CSV) .contains("/" + device + "/"); } diff --git a/java/com/android/incallui/answer/impl/hint/PawImageLoaderImpl.java b/java/com/android/incallui/answer/impl/hint/PawImageLoaderImpl.java index 05358d831..21154cade 100644 --- a/java/com/android/incallui/answer/impl/hint/PawImageLoaderImpl.java +++ b/java/com/android/incallui/answer/impl/hint/PawImageLoaderImpl.java @@ -24,9 +24,7 @@ import android.os.Build.VERSION_CODES; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import com.android.dialer.common.Assert; -import com.android.dialer.common.LogUtil; import com.android.dialer.util.DialerUtils; -import com.android.incallui.answer.impl.hint.PawSecretCodeListener.PawType; /** Decrypt the event payload to be shown if in a specific time range and the key is received. */ @TargetApi(VERSION_CODES.M) @@ -42,25 +40,10 @@ public final class PawImageLoaderImpl implements PawImageLoader { if (!preferences.getBoolean(PawSecretCodeListener.PAW_ENABLED_WITH_SECRET_CODE_KEY, false)) { return null; } - @PawType - int pawType = - preferences.getInt(PawSecretCodeListener.PAW_TYPE, PawSecretCodeListener.PAW_TYPE_INVALID); - - if (pawType == PawSecretCodeListener.PAW_TYPE_INVALID) { - LogUtil.i("PawImageLoaderImpl.loadPayload", "paw type not found, rerolling"); - PawSecretCodeListener.selectPawType(preferences); - pawType = - preferences.getInt( - PawSecretCodeListener.PAW_TYPE, PawSecretCodeListener.PAW_TYPE_INVALID); - } - - switch (pawType) { - case PawSecretCodeListener.PAW_TYPE_CAT: - return context.getDrawable(R.drawable.cat_paw); - case PawSecretCodeListener.PAW_TYPE_DOG: - return context.getDrawable(R.drawable.dog_paw); - default: - throw Assert.createAssertionFailException("unknown paw type " + pawType); + int drawableId = preferences.getInt(PawSecretCodeListener.PAW_DRAWABLE_ID_KEY, 0); + if (drawableId == 0) { + return null; } + return context.getDrawable(drawableId); } } diff --git a/java/com/android/incallui/answer/impl/hint/PawSecretCodeListener.java b/java/com/android/incallui/answer/impl/hint/PawSecretCodeListener.java index 3b4512c4f..a8737c363 100644 --- a/java/com/android/incallui/answer/impl/hint/PawSecretCodeListener.java +++ b/java/com/android/incallui/answer/impl/hint/PawSecretCodeListener.java @@ -20,7 +20,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.support.annotation.IntDef; +import android.preference.PreferenceManager; import android.support.annotation.VisibleForTesting; import android.text.TextUtils; import android.widget.Toast; @@ -29,7 +29,6 @@ import com.android.dialer.common.ConfigProviderBindings; import com.android.dialer.common.LogUtil; import com.android.dialer.logging.DialerImpression.Type; import com.android.dialer.logging.Logger; -import com.android.dialer.util.DialerUtils; import java.util.Random; /** @@ -41,20 +40,7 @@ public class PawSecretCodeListener extends BroadcastReceiver { static final String CONFIG_PAW_SECRET_CODE = "paw_secret_code"; public static final String PAW_ENABLED_WITH_SECRET_CODE_KEY = "paw_enabled_with_secret_code"; - - /** Which paw to show, must be {@link PawType} */ - public static final String PAW_TYPE = "paw_type"; - - /** Resource id is not stable across app versions. Use {@link #PAW_TYPE} instead. */ - @Deprecated public static final String PAW_DRAWABLE_ID_KEY = "paw_drawable_id"; - - /** Enum for all paws. */ - @IntDef({PAW_TYPE_INVALID, PAW_TYPE_CAT, PAW_TYPE_DOG}) - @interface PawType {} - - public static final int PAW_TYPE_INVALID = 0; - public static final int PAW_TYPE_CAT = 1; - public static final int PAW_TYPE_DOG = 2; + public static final String PAW_DRAWABLE_ID_KEY = "paw_drawable_id"; @Override public void onReceive(Context context, Intent intent) { @@ -68,8 +54,7 @@ public class PawSecretCodeListener extends BroadcastReceiver { if (!TextUtils.equals(secretCode, host)) { return; } - SharedPreferences preferences = - DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context); + SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context); boolean wasEnabled = preferences.getBoolean(PAW_ENABLED_WITH_SECRET_CODE_KEY, false); if (wasEnabled) { preferences.edit().putBoolean(PAW_ENABLED_WITH_SECRET_CODE_KEY, false).apply(); @@ -77,24 +62,20 @@ public class PawSecretCodeListener extends BroadcastReceiver { Logger.get(context).logImpression(Type.EVENT_ANSWER_HINT_DEACTIVATED); LogUtil.i("PawSecretCodeListener.onReceive", "PawAnswerHint disabled"); } else { - selectPawType(preferences); + int drawableId; + if (new Random().nextBoolean()) { + drawableId = R.drawable.cat_paw; + } else { + drawableId = R.drawable.dog_paw; + } + preferences + .edit() + .putBoolean(PAW_ENABLED_WITH_SECRET_CODE_KEY, true) + .putInt(PAW_DRAWABLE_ID_KEY, drawableId) + .apply(); Toast.makeText(context, R.string.event_activated, Toast.LENGTH_SHORT).show(); Logger.get(context).logImpression(Type.EVENT_ANSWER_HINT_ACTIVATED); LogUtil.i("PawSecretCodeListener.onReceive", "PawAnswerHint enabled"); } } - - public static void selectPawType(SharedPreferences preferences) { - @PawType int pawType; - if (new Random().nextBoolean()) { - pawType = PAW_TYPE_CAT; - } else { - pawType = PAW_TYPE_DOG; - } - preferences - .edit() - .putBoolean(PAW_ENABLED_WITH_SECRET_CODE_KEY, true) - .putInt(PAW_TYPE, pawType) - .apply(); - } } diff --git a/java/com/android/incallui/answer/impl/res/values-af/strings.xml b/java/com/android/incallui/answer/impl/res/values-af/strings.xml index b155ee874..82a87963d 100644 --- a/java/com/android/incallui/answer/impl/res/values-af/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-af/strings.xml @@ -1,20 +1,4 @@ - - "Swiep vanaf ikoon om met boodskap af te wys" @@ -36,5 +20,5 @@ "Antwoord en beëindig die voortgesette oproep" "Video is af" "Swiep op met twee vingers om te antwoord. Swiep af met twee vingers om af te wys." - "Belangrik" + "Dringend" diff --git a/java/com/android/incallui/answer/impl/res/values-am/strings.xml b/java/com/android/incallui/answer/impl/res/values-am/strings.xml index c27705fd2..40869773e 100644 --- a/java/com/android/incallui/answer/impl/res/values-am/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-am/strings.xml @@ -1,20 +1,4 @@ - - "በመልዕክት ላለመቀበል ከአዶ ያንሸራቱ" @@ -36,5 +20,5 @@ "ይመልሱ እና በመካሄድ ላይ ያለ ጥሪን ይጨርሱ" "ቪዲዮ ጠፍቷል" "ለመመለስ በሁለት ጣት ወደ ላይ ያንሸራቱ። ላለመቀበል በሁለት ጣት ወደ ታች ያንሸራቱ።" - "አስፈላጊ" + "አስቸኳይ" diff --git a/java/com/android/incallui/answer/impl/res/values-ar/strings.xml b/java/com/android/incallui/answer/impl/res/values-ar/strings.xml index e3f84fff5..fc29c16fa 100644 --- a/java/com/android/incallui/answer/impl/res/values-ar/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-ar/strings.xml @@ -1,20 +1,4 @@ - - "تمرير سريع من الرمز للرفض مع إرسال رسالة" @@ -36,5 +20,5 @@ "الرد وإنهاء مكالمة جارية" "الفيديو قيد إيقاف التشغيل" "مرر بأصبعين لأعلى للرد. مرر بأصبعين لأسفل للرفض." - "مهم" + "عاجل" diff --git a/java/com/android/incallui/answer/impl/res/values-az/strings.xml b/java/com/android/incallui/answer/impl/res/values-az/strings.xml index 5d113b48d..fff561de3 100644 --- a/java/com/android/incallui/answer/impl/res/values-az/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-az/strings.xml @@ -1,20 +1,4 @@ - - "Mesaj göndərərək imtina etmək üçün ikonadan sürüşdürün" @@ -36,5 +20,5 @@ "Cavab verin və gedən zəngi bitirin" "Videoları deaktivdir" "Cavab vermək üçün iki barmaq ilə yuxarı sürüşdürün. İmtina etmək üçün iki barmaq ilə aşağı sürüşdürün." - "Önəmli" + "Vacib" diff --git a/java/com/android/incallui/answer/impl/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/answer/impl/res/values-b+sr+Latn/strings.xml index 3acc576d9..7b29bfa66 100644 --- a/java/com/android/incallui/answer/impl/res/values-b+sr+Latn/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-b+sr+Latn/strings.xml @@ -1,20 +1,4 @@ - - "Prevucite od ikone da biste odbili porukom" @@ -36,5 +20,5 @@ "Javite se i završite poziv koji je u toku" "Kamera je isključena" "Prevucite nagore pomoću dva prsta da biste odgovorili. Prevucite nadole pomoću dva prsta da biste odbili." - "Važno" + "Hitno" diff --git a/java/com/android/incallui/answer/impl/res/values-be/strings.xml b/java/com/android/incallui/answer/impl/res/values-be/strings.xml index 4f34150e6..228a80f7f 100644 --- a/java/com/android/incallui/answer/impl/res/values-be/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-be/strings.xml @@ -1,20 +1,4 @@ - - "Правядзіце ад значка, каб адхіліць, адправіўшы SMS" @@ -36,5 +20,5 @@ "Адказаць і скончыць бягучы выклік" "Відэа адключана" "Правядзіце двума пальцамі ўверх, каб адказаць; двума пальцамі ўніз – каб адхіліць." - "Важны" + "Тэрмінова" diff --git a/java/com/android/incallui/answer/impl/res/values-bg/strings.xml b/java/com/android/incallui/answer/impl/res/values-bg/strings.xml index 54a5ab946..4e9422f00 100644 --- a/java/com/android/incallui/answer/impl/res/values-bg/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-bg/strings.xml @@ -1,20 +1,4 @@ - - "Прекарайте пръст от иконата, за да отхвърлите със съобщение" @@ -36,5 +20,5 @@ "Отговор и завършване на текущото обаждане" "Видеото е изключено" "Прекарайте два пръста нагоре за отговаряне, надолу за отхвърляне." - "Важно" + "Спешно" diff --git a/java/com/android/incallui/answer/impl/res/values-bn/strings.xml b/java/com/android/incallui/answer/impl/res/values-bn/strings.xml index d2aa4c3f3..869f7b9ae 100644 --- a/java/com/android/incallui/answer/impl/res/values-bn/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-bn/strings.xml @@ -1,20 +1,4 @@ - - "বার্তা সহ প্রত্যাখ্যান করতে আইকন থেকে সোয়াইপ করুন" @@ -36,5 +20,5 @@ "উত্তর দিন এবং চলছে এমন কল কেটে দিন" "ভিডিও বন্ধ আছে" "উত্তর দিতে উপরের দিকে, প্রত্যাখ্যান করতে নিচের দিকে দুই আঙুল দিয়ে সোয়াইপ করুন৷" - "গুরুত্বপূর্ণ" + "জরুরি" diff --git a/java/com/android/incallui/answer/impl/res/values-bs/strings.xml b/java/com/android/incallui/answer/impl/res/values-bs/strings.xml index e17588750..b36e178f4 100644 --- a/java/com/android/incallui/answer/impl/res/values-bs/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-bs/strings.xml @@ -1,20 +1,4 @@ - - "Prevucite preko ikone da odbijete porukom" @@ -36,5 +20,5 @@ "Odgovorite na poziv i završite ga" "Kamera je isključena" "Prevucite pomoću dva prsta prema gore da odgovorite. Prevucite pomoću dva prsta prema dolje da odbijete." - "Važno" + "Hitno" diff --git a/java/com/android/incallui/answer/impl/res/values-ca/strings.xml b/java/com/android/incallui/answer/impl/res/values-ca/strings.xml index 538e0d3e0..13b3b321a 100644 --- a/java/com/android/incallui/answer/impl/res/values-ca/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-ca/strings.xml @@ -1,20 +1,4 @@ - - "Llisca des de la icona per rebutjar la trucada amb un missatge" @@ -36,5 +20,5 @@ "Respon a la trucada i finalitza l\'actual" "El vídeo està desactivat" "Llisca amb dos dits cap amunt per respondre a la trucada i cap avall per rebutjar-la." - "Important" + "Urgent" diff --git a/java/com/android/incallui/answer/impl/res/values-cs/strings.xml b/java/com/android/incallui/answer/impl/res/values-cs/strings.xml index 626409ead..6c6903041 100644 --- a/java/com/android/incallui/answer/impl/res/values-cs/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-cs/strings.xml @@ -1,20 +1,4 @@ - - "Přejetím prstem od ikony hovor odmítnete a pošlete zprávu" @@ -36,5 +20,5 @@ "Přijmout hovor a ukončit probíhající hovor" "Video je vypnuté" "Přejetím dvěma prsty nahoru hovor přijmete. Přejetím dvěma prsty dolů jej odmítnete." - "Důležité" + "Naléhavé" diff --git a/java/com/android/incallui/answer/impl/res/values-da/strings.xml b/java/com/android/incallui/answer/impl/res/values-da/strings.xml index 387089116..3a87d44fe 100644 --- a/java/com/android/incallui/answer/impl/res/values-da/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-da/strings.xml @@ -1,20 +1,4 @@ - - "Stryg fra ikonet for at afvise med en besked" @@ -36,5 +20,5 @@ "Besvar, og afslut det igangværende opkald" "Video er deaktiveret" "Stryg op med to fingre for at besvare. Stryg ned med to fingre for at afvise." - "Vigtigt" + "Haster" diff --git a/java/com/android/incallui/answer/impl/res/values-de/strings.xml b/java/com/android/incallui/answer/impl/res/values-de/strings.xml index ab3c33cc5..f4356d29f 100644 --- a/java/com/android/incallui/answer/impl/res/values-de/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-de/strings.xml @@ -1,20 +1,4 @@ - - "Zum Ablehnen mit Nachricht vom Symbol wegwischen" @@ -36,5 +20,5 @@ "Nimm den Anruf an und beende den aktuellen Anruf" "Video deaktiviert" "Zum Annehmen mit zwei Fingern nach oben wischen. Zum Ablehnen mit zwei Fingern nach unten wischen." - "Wichtig" + "Dringend" diff --git a/java/com/android/incallui/answer/impl/res/values-el/strings.xml b/java/com/android/incallui/answer/impl/res/values-el/strings.xml index d847aac54..9c9a0f35f 100644 --- a/java/com/android/incallui/answer/impl/res/values-el/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-el/strings.xml @@ -1,20 +1,4 @@ - - "Σύρετε από το εικονίδιο προς τα έξω για απόρριψη του μηνύματος" @@ -36,5 +20,5 @@ "Απάντηση και τερματισμός κλήσης σε εξέλιξη" "Το βίντεο είναι ανενεργό" "Σύρετε με δύο δάχτυλα, προς τα επάνω για απάντηση και προς τα κάτω για απόρριψη." - "Σημαντικό" + "Επείγον" diff --git a/java/com/android/incallui/answer/impl/res/values-en-rAU/strings.xml b/java/com/android/incallui/answer/impl/res/values-en-rAU/strings.xml index fe6aa4607..fb8d15682 100644 --- a/java/com/android/incallui/answer/impl/res/values-en-rAU/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-en-rAU/strings.xml @@ -1,20 +1,4 @@ - - "Swipe from icon to decline with a message" @@ -36,5 +20,5 @@ "Answer and end ongoing call" "Video is off" "Swipe up with two fingers to answer. Swipe down with two fingers to decline." - "Important" + "Urgent" diff --git a/java/com/android/incallui/answer/impl/res/values-en-rGB/strings.xml b/java/com/android/incallui/answer/impl/res/values-en-rGB/strings.xml index fe6aa4607..fb8d15682 100644 --- a/java/com/android/incallui/answer/impl/res/values-en-rGB/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-en-rGB/strings.xml @@ -1,20 +1,4 @@ - - "Swipe from icon to decline with a message" @@ -36,5 +20,5 @@ "Answer and end ongoing call" "Video is off" "Swipe up with two fingers to answer. Swipe down with two fingers to decline." - "Important" + "Urgent" diff --git a/java/com/android/incallui/answer/impl/res/values-en-rIN/strings.xml b/java/com/android/incallui/answer/impl/res/values-en-rIN/strings.xml index fe6aa4607..fb8d15682 100644 --- a/java/com/android/incallui/answer/impl/res/values-en-rIN/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-en-rIN/strings.xml @@ -1,20 +1,4 @@ - - "Swipe from icon to decline with a message" @@ -36,5 +20,5 @@ "Answer and end ongoing call" "Video is off" "Swipe up with two fingers to answer. Swipe down with two fingers to decline." - "Important" + "Urgent" diff --git a/java/com/android/incallui/answer/impl/res/values-es-rUS/strings.xml b/java/com/android/incallui/answer/impl/res/values-es-rUS/strings.xml index 60fcd014e..14928eeb6 100644 --- a/java/com/android/incallui/answer/impl/res/values-es-rUS/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-es-rUS/strings.xml @@ -1,20 +1,4 @@ - - "Desliza desde el ícono para rechazar la llamada con un mensaje" @@ -36,5 +20,5 @@ "Responder y finalizar la llamada en curso" "El video está desactivado" "Desliza dos dedos hacia arriba para responder la llamada o hacia abajo para rechazarla." - "Importante" + "Urgente" diff --git a/java/com/android/incallui/answer/impl/res/values-es/strings.xml b/java/com/android/incallui/answer/impl/res/values-es/strings.xml index 7b2f19a81..972bbc503 100644 --- a/java/com/android/incallui/answer/impl/res/values-es/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-es/strings.xml @@ -1,20 +1,4 @@ - - "Desliza desde el icono para rechazar con mensaje" @@ -36,5 +20,5 @@ "Responder a una llamada y finalizar otra en curso" "El vídeo está desconectado" "Desliza dos dedos hacia arriba para responder o hacia abajo para rechazar la llamada." - "Importante" + "Urgente" diff --git a/java/com/android/incallui/answer/impl/res/values-et/strings.xml b/java/com/android/incallui/answer/impl/res/values-et/strings.xml index b4632d184..9e303bb16 100644 --- a/java/com/android/incallui/answer/impl/res/values-et/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-et/strings.xml @@ -1,20 +1,4 @@ - - "Sõnumiga keeldumiseks pühkige ikoonilt eemale" @@ -36,5 +20,5 @@ "Vastake ja lõpetage käimasolev kõne" "Video on välja lülitatud" "Vastamiseks pühkige kahe sõrmega üles. Keeldumiseks pühkige kahe sõrmega alla." - "Tähtis" + "Kiireloomuline" diff --git a/java/com/android/incallui/answer/impl/res/values-eu/strings.xml b/java/com/android/incallui/answer/impl/res/values-eu/strings.xml index 118a2c74d..a1f6d717d 100644 --- a/java/com/android/incallui/answer/impl/res/values-eu/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-eu/strings.xml @@ -1,20 +1,4 @@ - - "Pasatu hatza ikonotik baztertzeko eta mezu bat bidaltzeko" @@ -36,5 +20,5 @@ "Erantzun eta amaitu uneko deia" "Desaktibatuta dago kamera" "Pasatu bi hatz gora erantzuteko; eta behera, baztertzeko." - "Garrantzitsua" + "Premiazkoa" diff --git a/java/com/android/incallui/answer/impl/res/values-fa/strings.xml b/java/com/android/incallui/answer/impl/res/values-fa/strings.xml index 971b172ef..28cf82619 100644 --- a/java/com/android/incallui/answer/impl/res/values-fa/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-fa/strings.xml @@ -1,20 +1,4 @@ - - "برای رد کردن با ارسال پیام، انگشتتان را تند از روی نماد بکشید" @@ -36,5 +20,5 @@ "پاسخ دادن به تماس درحال انجام و پایان دادن به آن" "ویدیو خاموش است" "برای پاسخ‌گویی، دو انگشتتان را تند به بالا بکشید و برای رد کردن به پایین بکشید." - "مهم" + "فوری" diff --git a/java/com/android/incallui/answer/impl/res/values-fi/strings.xml b/java/com/android/incallui/answer/impl/res/values-fi/strings.xml index 7ae9a1f87..8b8eac942 100644 --- a/java/com/android/incallui/answer/impl/res/values-fi/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-fi/strings.xml @@ -1,20 +1,4 @@ - - "Hylkää ja kirjoita viesti pyyhkäisemällä kuvaketta." @@ -36,5 +20,5 @@ "Vastaa puheluun ja lopeta nykyinen puhelu" "Videokuva ei ole käytössä." "Vastaa pyyhkäisemällä ylös kahdella sormella. Hylkää pyyhkäisemällä alas kahdella sormella." - "Tärkeä" + "Kiireellinen" diff --git a/java/com/android/incallui/answer/impl/res/values-fr-rCA/strings.xml b/java/com/android/incallui/answer/impl/res/values-fr-rCA/strings.xml index ce454b5ce..9ea27b89c 100644 --- a/java/com/android/incallui/answer/impl/res/values-fr-rCA/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-fr-rCA/strings.xml @@ -1,20 +1,4 @@ - - "Balayez à partir de l\'icône pour refuser avec un message" @@ -36,5 +20,5 @@ "Répondre et mettre fin à l\'appel en cours" "La vidéo est désactivée" "Balayez vers le haut avec deux doigts pour répondre. Balayez vers le bas avec deux doigts pour refuser." - "Important" + "Urgent" diff --git a/java/com/android/incallui/answer/impl/res/values-fr/strings.xml b/java/com/android/incallui/answer/impl/res/values-fr/strings.xml index 7f77ed0c8..3aa3c12c9 100644 --- a/java/com/android/incallui/answer/impl/res/values-fr/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-fr/strings.xml @@ -1,20 +1,4 @@ - - "Appuyer sur l\'icône, puis balayer l\'écran pour refuser l\'appel en envoyant un message" @@ -36,5 +20,5 @@ "Répondre ou mettre fin à l\'appel en cours" "La vidéo est désactivée." "Balayez l\'écran avec deux doigts vers le haut pour répondre, ou vers le bas pour refuser l\'appel." - "Importants" + "Urgent" diff --git a/java/com/android/incallui/answer/impl/res/values-gl/strings.xml b/java/com/android/incallui/answer/impl/res/values-gl/strings.xml index 07e0c516d..16c0f6969 100644 --- a/java/com/android/incallui/answer/impl/res/values-gl/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-gl/strings.xml @@ -1,20 +1,4 @@ - - "Pasar o dedo desde a icona para rexeitar cunha mensaxe" @@ -36,5 +20,5 @@ "Responde á chamada entrante e finaliza a chamada en curso" "O vídeo está desactivado" "Pasa dous dedos cara arriba para responder a chamada ou cara abaixo para rexeitala." - "Importante" + "Urxente" diff --git a/java/com/android/incallui/answer/impl/res/values-gu/strings.xml b/java/com/android/incallui/answer/impl/res/values-gu/strings.xml index 845e9def8..3f99c7108 100644 --- a/java/com/android/incallui/answer/impl/res/values-gu/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-gu/strings.xml @@ -1,20 +1,4 @@ - - "સંદેશ સાથે નકારવા માટે આઇકનથી સ્વાઇપ કરો" @@ -36,5 +20,5 @@ "જવાબ આપો અને ચાલુ કૉલ સમાપ્ત કરો" "વિડિઓ બંધ છે" "જવાબ આપવા માટે બે આંગળી ઉપર સ્વાઇપ કરો. નકારવા માટે બે આંગળી નીચે સ્વાઇપ કરો." - "મહત્વપૂર્ણ" + "તાત્કાલિક" diff --git a/java/com/android/incallui/answer/impl/res/values-hi/strings.xml b/java/com/android/incallui/answer/impl/res/values-hi/strings.xml index e8e3c75c4..f28505f7c 100644 --- a/java/com/android/incallui/answer/impl/res/values-hi/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-hi/strings.xml @@ -1,20 +1,4 @@ - - "संदेश के साथ अस्वीकार करने के लिए आइकन से स्वाइप करें" @@ -36,5 +20,5 @@ "कॉल का जवाब दें और जारी कॉल समाप्त करें" "वीडियो बंद है" "जवाब देने के लिए दो अंगुलियों से ऊपर स्वाइप करें. अस्वीकार करने के लिए दो अंगुलियों से नीचे स्वाइप करें." - "महत्वपूर्ण" + "बहुत ज़रूरी" diff --git a/java/com/android/incallui/answer/impl/res/values-hr/strings.xml b/java/com/android/incallui/answer/impl/res/values-hr/strings.xml index ffd0c9b8c..280743976 100644 --- a/java/com/android/incallui/answer/impl/res/values-hr/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-hr/strings.xml @@ -1,20 +1,4 @@ - - "Prijeđite prstom od ikone da biste odbili poruku" @@ -36,5 +20,5 @@ "Odgovorite na poziv i prekinite poziv u tijeku" "Videokamera je isključena" "Prijeđite dvama prstima prema gore za odgovor, a dvama prstima prema dolje za odbijanje." - "Važno" + "Hitno" diff --git a/java/com/android/incallui/answer/impl/res/values-hu/strings.xml b/java/com/android/incallui/answer/impl/res/values-hu/strings.xml index 13ec7da17..d7dacbfe0 100644 --- a/java/com/android/incallui/answer/impl/res/values-hu/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-hu/strings.xml @@ -1,20 +1,4 @@ - - "Csúsztassa el az ujját az ikonról az üzenettel való elutasításhoz" @@ -36,5 +20,5 @@ "Hívásfogadás és a folyamatban lévő hívás befejezése" "A videokép ki van kapcsolva" "Csúsztassa felfelé két ujját a hívás fogadásához. Csúsztassa lefelé két ujját a hívás elutasításához." - "Fontos" + "Sürgős" diff --git a/java/com/android/incallui/answer/impl/res/values-hy/strings.xml b/java/com/android/incallui/answer/impl/res/values-hy/strings.xml index 7fb7ef45f..4492833d9 100644 --- a/java/com/android/incallui/answer/impl/res/values-hy/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-hy/strings.xml @@ -1,20 +1,4 @@ - - "Զանգը մերժելու և հաղորդագրություն ուղարկելու համար պատկերակից մատով մի կողմ սահեցրեք" @@ -36,5 +20,5 @@ "Պատասխանել և ավարտել ընթացիկ զանգը" "Տեսախցիկն անջատած է" "Պատասխանելու համար երկու մատով սահեցրեք վերև, մերժելու համար՝ ներքև:" - "Կարևոր" + "Շտապ" diff --git a/java/com/android/incallui/answer/impl/res/values-in/strings.xml b/java/com/android/incallui/answer/impl/res/values-in/strings.xml index 48d71af9a..a1fd19f6e 100644 --- a/java/com/android/incallui/answer/impl/res/values-in/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-in/strings.xml @@ -1,20 +1,4 @@ - - "Gesek dari ikon untuk menolak dengan pesan" @@ -36,5 +20,5 @@ "Menjawab dan mengakhiri panggilan yang sedang berlangsung" "Video nonaktif" "Geser ke atas dengan dua jari untuk menjawab. Geser ke bawah dengan dua jari untuk menolak." - "Penting" + "Penting" diff --git a/java/com/android/incallui/answer/impl/res/values-is/strings.xml b/java/com/android/incallui/answer/impl/res/values-is/strings.xml index a92a411ee..c4f9eb40c 100644 --- a/java/com/android/incallui/answer/impl/res/values-is/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-is/strings.xml @@ -1,20 +1,4 @@ - - "Strjúktu frá tákninu til að hafna með skilaboðum" @@ -36,5 +20,5 @@ "Svara og ljúka yfirstandandi símtali" "Slökkt á myndavél" "Strjúktu upp með tveimur fingrum til að svara. Strjúktu niður með tveimur fingrum til að hafna." - "Mikilvægt" + "Áríðandi" diff --git a/java/com/android/incallui/answer/impl/res/values-it/strings.xml b/java/com/android/incallui/answer/impl/res/values-it/strings.xml index b29bca7c8..70e972212 100644 --- a/java/com/android/incallui/answer/impl/res/values-it/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-it/strings.xml @@ -1,20 +1,4 @@ - - "Fai scorrere dall\'icona per rifiutare e inviare un messaggio" @@ -36,5 +20,5 @@ "Rispondi e termina la chiamata in corso" "Il video è disattivato" "Fai scorrere con due dita verso l\'alto per rispondere e verso il basso per rifiutare." - "Importante" + "Urgente" diff --git a/java/com/android/incallui/answer/impl/res/values-iw/strings.xml b/java/com/android/incallui/answer/impl/res/values-iw/strings.xml index 6544e8f3c..08c02e389 100644 --- a/java/com/android/incallui/answer/impl/res/values-iw/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-iw/strings.xml @@ -1,20 +1,4 @@ - - "החלק מהסמל כדי לדחות עם הודעה" @@ -36,5 +20,5 @@ "מענה וסיום שיחה" "הווידאו מושבת" "החלק עם שתי אצבעות למעלה כדי לענות או למטה כדי לדחות." - "חשוב" + "דחופה" diff --git a/java/com/android/incallui/answer/impl/res/values-ja/strings.xml b/java/com/android/incallui/answer/impl/res/values-ja/strings.xml index 83f8f094a..b7bd65bc4 100644 --- a/java/com/android/incallui/answer/impl/res/values-ja/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-ja/strings.xml @@ -1,20 +1,4 @@ - - "アイコンをスワイプして着信を拒否し、メッセージを送信" @@ -36,5 +20,5 @@ "通話に応答し、進行中の通話を終了" "ビデオ: OFF" "応答するには 2 本の指で上にスワイプ、拒否するには 2 本の指で下にスワイプします。" - "重要" + "緊急" diff --git a/java/com/android/incallui/answer/impl/res/values-ka/strings.xml b/java/com/android/incallui/answer/impl/res/values-ka/strings.xml index 4a1120c69..681306776 100644 --- a/java/com/android/incallui/answer/impl/res/values-ka/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-ka/strings.xml @@ -1,20 +1,4 @@ - - "გადაუსვით ხატულადან შეტყობინებით უარყოფისთვის" @@ -36,5 +20,5 @@ "პასუხი და მიმდინარე ზარის დასრულება" "ვიდეო გამორთულია" "საპასუხოდ გადაფურცლეთ ზემოთ ორი თითით. უარყოფისთვის გადაფურცლეთ ქვემოთ ორი თითით." - "მნიშვნელოვანი" + "სასწრაფო" diff --git a/java/com/android/incallui/answer/impl/res/values-kk/strings.xml b/java/com/android/incallui/answer/impl/res/values-kk/strings.xml index 69cf9497d..3d1863323 100644 --- a/java/com/android/incallui/answer/impl/res/values-kk/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-kk/strings.xml @@ -1,20 +1,4 @@ - - "Қабылдамай, жай хабар жіберу үшін, белгішеден әрі қарай сырғытыңыз" @@ -36,5 +20,5 @@ "Қоңырауға жауап беру және ағымдағы қоңырауды аяқтау" "Бейне өшірулі" "Жауап беру үшін екі саусақпен жоғары сырғытылады. Қабылдамау үшін екі саусақпен төмен сырғытылады." - "Маңызды" + "Шұғыл" diff --git a/java/com/android/incallui/answer/impl/res/values-km/strings.xml b/java/com/android/incallui/answer/impl/res/values-km/strings.xml index db65a97f5..89f9031e9 100644 --- a/java/com/android/incallui/answer/impl/res/values-km/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-km/strings.xml @@ -1,20 +1,4 @@ - - "អូស​ចេញ​ពី​រូបតំណាង​ដើម្បី​បដិសេធ​​ដោយ​មាន​សារ" @@ -36,5 +20,5 @@ "ឆ្លើយ និង​បញ្ចប់​ការ​ហៅ​ទូរសព្ទ​ដែល​កំពុង​ដំណើរការ" "វីដេអូត្រូវបានបិទ" "អូស​ម្រាម​ដៃ​ពីរ​ឡើងលើ​ ដើម្បី​ឆ្លើយ។ អូស​ម្រាមដៃ​ពីរ​ចុះ​ក្រោម​ ដើម្បី​បដិសេធ។" - "សំខាន់" + "បន្ទាន់" diff --git a/java/com/android/incallui/answer/impl/res/values-kn/strings.xml b/java/com/android/incallui/answer/impl/res/values-kn/strings.xml index 8426aef46..f02a6b8a3 100644 --- a/java/com/android/incallui/answer/impl/res/values-kn/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-kn/strings.xml @@ -1,20 +1,4 @@ - - "ಸಂದೇಶದ ಜೊತೆಗೆ ನಿರಾಕರಿಸಲು ಐಕಾನ್‌ನಿಂದ ಸ್ವೈಪ್ ಮಾಡಿ" @@ -36,5 +20,5 @@ "ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆಗೆ ಉತ್ತರಿಸಿ ಮತ್ತು ಅಂತ್ಯಗೊಳಿಸಿ" "ವೀಡಿಯೊ ಆಫ್ ಆಗಿದೆ" "ಉತ್ತರಿಸಲು ಎರಡು ಬೆರಳಿನಿಂದ ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ. ನಿರಾಕರಿಸಲು ಎರಡು ಬೆರಳಿನಿಂದ ಕೆಳಗೆ ಸ್ವೈಪ್ ಮಾಡಿ." - "ಪ್ರಮುಖ" + "ತುರ್ತು" diff --git a/java/com/android/incallui/answer/impl/res/values-ko/strings.xml b/java/com/android/incallui/answer/impl/res/values-ko/strings.xml index 6b6beff85..850b44007 100644 --- a/java/com/android/incallui/answer/impl/res/values-ko/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-ko/strings.xml @@ -1,20 +1,4 @@ - - "메시지를 거부하려면 아이콘에서 스와이프하세요." @@ -36,5 +20,5 @@ "현재 통화를 종료하고 전화 받기" "동영상이 꺼져 있습니다." "받으려면 두 손가락을 위로 스와이프하고 거부하려면 두 손가락을 아래로 스와이프하세요." - "중요" + "긴급" diff --git a/java/com/android/incallui/answer/impl/res/values-ky/strings.xml b/java/com/android/incallui/answer/impl/res/values-ky/strings.xml index 6dd5a2dd7..dc08e8449 100644 --- a/java/com/android/incallui/answer/impl/res/values-ky/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-ky/strings.xml @@ -1,20 +1,4 @@ - - "Чалууну билдирүү менен четке кагуу үчүн сүрөтчөнү сүрүңүз" @@ -36,5 +20,5 @@ "Чалууга жооп бериңиз же учурдагы чалууну аяктаңыз" "Видео өчүк" "Жооп берүү үчүн экранды өйдө сүрүп, четке кагуу үчүн ылдый сүрүп коюңуз." - "Маанилүү" + "Шашылыш" diff --git a/java/com/android/incallui/answer/impl/res/values-lo/strings.xml b/java/com/android/incallui/answer/impl/res/values-lo/strings.xml index 776c027b5..06ad00c88 100644 --- a/java/com/android/incallui/answer/impl/res/values-lo/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-lo/strings.xml @@ -1,20 +1,4 @@ - - "ປັດຈາກໄອຄອນເພື່ອປະຕິເສດຂໍ້ຄວາມ" @@ -36,5 +20,5 @@ "ຮັບສາຍ ແລະ ວາງສາຍທີ່ກຳລັງໂທອອກ" "ວິດີໂອປິດຢູ່" "ປັດສອງນິ້ວຂຶ້ນເພື່ອຮັບສາຍ. ປັດສອງນິ້ວລົງເພື່ອປະຕິເສດ." - "ສຳຄັນ" + "ດ່ວນ" diff --git a/java/com/android/incallui/answer/impl/res/values-lt/strings.xml b/java/com/android/incallui/answer/impl/res/values-lt/strings.xml index 2ef70eaff..3366e337b 100644 --- a/java/com/android/incallui/answer/impl/res/values-lt/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-lt/strings.xml @@ -1,20 +1,4 @@ - - "Perbraukite iš piktogramos, kad atmestumėte išsiųsdami pranešimą" @@ -36,5 +20,5 @@ "Atsakykite ir užbaikite vykstantį skambutį" "Vaizdas išjungtas" "Perbraukite dviem pirštais aukštyn, kad atsakytumėte. Perbraukite dviem pirštais žemyn, kad atmestumėte." - "Svarbu" + "Skubus" diff --git a/java/com/android/incallui/answer/impl/res/values-lv/strings.xml b/java/com/android/incallui/answer/impl/res/values-lv/strings.xml index 3fc754db4..49d1dc9f4 100644 --- a/java/com/android/incallui/answer/impl/res/values-lv/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-lv/strings.xml @@ -1,20 +1,4 @@ - - "Lai noraidītu, izmantojot ziņojumu, velciet no ikonas" @@ -36,5 +20,5 @@ "Atbildiet un beidziet notiekošo zvanu" "Video ir izslēgts" "Ar diviem pirkstiem velciet augšup, lai atbildētu. Ar diviem pirkstiem velciet lejup, lai noraidītu." - "Svarīgs" + "Steidzams" diff --git a/java/com/android/incallui/answer/impl/res/values-mk/strings.xml b/java/com/android/incallui/answer/impl/res/values-mk/strings.xml index deeba45e6..c068f665b 100644 --- a/java/com/android/incallui/answer/impl/res/values-mk/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-mk/strings.xml @@ -1,20 +1,4 @@ - - "Повлечете од иконата за да одбиете со порака" @@ -36,5 +20,5 @@ "Одговорете и завршете го тековниот повик" "Видеото е исклучено" "Повлечете нагоре со два прста за да одговорите. Повлечете надолу со два прста за да одбиете." - "Важно" + "Итно" diff --git a/java/com/android/incallui/answer/impl/res/values-ml/strings.xml b/java/com/android/incallui/answer/impl/res/values-ml/strings.xml index d8ce90dab..8e1d492e7 100644 --- a/java/com/android/incallui/answer/impl/res/values-ml/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-ml/strings.xml @@ -1,20 +1,4 @@ - - "സന്ദേശമയച്ചുകൊണ്ട് നിരസിക്കാൻ ഐക്കണിൽ നിന്ന് സ്വൈപ്പുചെയ്യുക" @@ -36,5 +20,5 @@ "മറുപടി നൽകുകയും നിലവിലുള്ള കോൾ അവസാനിപ്പിക്കുകയും ചെയ്യൂ" "വീഡിയോ ഓഫാണ്" "മറുപടി നൽകാൻ രണ്ടുവിരലുകൾ ഉപയോഗിച്ച് മുകളിലേക്ക് സ്വൈപ്പുചെയ്യുക. നിരസിക്കാൻ രണ്ടുവിരലുകൾ ഉപയോഗിച്ച് താഴേക്ക് സ്വൈപ്പുചെയ്യുക." - "പ്രധാനപ്പെട്ടവ" + "അടിയന്തിര പ്രാധാന്യം" diff --git a/java/com/android/incallui/answer/impl/res/values-mn/strings.xml b/java/com/android/incallui/answer/impl/res/values-mn/strings.xml index aaa16213a..4bdd912ad 100644 --- a/java/com/android/incallui/answer/impl/res/values-mn/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-mn/strings.xml @@ -1,20 +1,4 @@ - - "Зурвас явуулангаа татгалзах бол дүрснээс шударна уу" @@ -36,5 +20,5 @@ "Ирсэн дуудлагыг авч, одоогийн дуудлагыг таслах" "Видео идэвхгүй байна" "Хариулах бол хоёр хуруугаар дээш шударна уу. Таслах бол хоёр хуруугаар доош шударна уу." - "Чухал" + "Яаралтай" diff --git a/java/com/android/incallui/answer/impl/res/values-mr/strings.xml b/java/com/android/incallui/answer/impl/res/values-mr/strings.xml index eea662fa1..11c826896 100644 --- a/java/com/android/incallui/answer/impl/res/values-mr/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-mr/strings.xml @@ -1,20 +1,4 @@ - - "संदेशासह नाकारण्यासाठी आयकॉनपासून स्वाइप करा" @@ -36,5 +20,5 @@ "उत्तर द्या आणि सुरु असलेला कॉल बंद करा" "व्हिडिओ बंद आहे" "उत्तर देण्यासाठी दोन बोटांनी वर स्वाइप करा. नकार देण्यासाठी दोन बोटांनी खाली स्वाइप करा." - "महत्त्वाचे" + "त्वरित" diff --git a/java/com/android/incallui/answer/impl/res/values-ms/strings.xml b/java/com/android/incallui/answer/impl/res/values-ms/strings.xml index 04b054e4e..36ede7568 100644 --- a/java/com/android/incallui/answer/impl/res/values-ms/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-ms/strings.xml @@ -1,20 +1,4 @@ - - "Leret dari ikon untuk menolak dengan mesej" @@ -36,5 +20,5 @@ "Jawab dan tamatkan panggilan yang sedang berlangsung" "Video dimatikan" "Leret dua jari ke atas untuk menjawab. Leret dua jari ke bawah untuk menolak." - "Penting" + "Segera" diff --git a/java/com/android/incallui/answer/impl/res/values-my/strings.xml b/java/com/android/incallui/answer/impl/res/values-my/strings.xml index f3d6a2e38..5ad7a8284 100644 --- a/java/com/android/incallui/answer/impl/res/values-my/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-my/strings.xml @@ -1,20 +1,4 @@ - - "မက်ဆေ့ဂျ်ဖြင့်ငြင်းပယ်ရန် သင်္ကေတမှ ပွတ်ဆွဲပါ" @@ -36,5 +20,5 @@ "ဖြေကြားပြီး လက်ရှိခေါ်ဆိုမှုကို အပြီးသတ်ပါ" "ဗီဒီယို ပိတ်ထားပါသည်" "ဖြေကြားရန် လက်နှစ်ချောင်းဖြင့် အပေါ်သို့ ပွတ်ဆွဲပါ။ ငြင်းပယ်ရန် လက်နှစ်ချောင်းဖြင့် အောက်သို့ ပွတ်ဆွဲပါ။" - "အရေးကြီး" + "အရေးတကြီး" diff --git a/java/com/android/incallui/answer/impl/res/values-nb/strings.xml b/java/com/android/incallui/answer/impl/res/values-nb/strings.xml index 42ff3d0af..b1c32bea4 100644 --- a/java/com/android/incallui/answer/impl/res/values-nb/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-nb/strings.xml @@ -1,20 +1,4 @@ - - "Sveip fra ikonet for å avslå med en melding" @@ -36,5 +20,5 @@ "Svar, og avslutt samtalen som er i gang" "Video er av" "Sveip oppover med to fingre for å svare. Sveip nedover med to fingre for å avvise." - "Viktig" + "Haster" diff --git a/java/com/android/incallui/answer/impl/res/values-ne/strings.xml b/java/com/android/incallui/answer/impl/res/values-ne/strings.xml index f0b8641af..40ef7b6e3 100644 --- a/java/com/android/incallui/answer/impl/res/values-ne/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-ne/strings.xml @@ -1,20 +1,4 @@ - - "सन्देश सहित अस्वीकार गर्न आइकनबाट स्वाइप गर्नुहोस्" @@ -36,5 +20,5 @@ "जवाफ फर्काउनुहोस् र जारी कललाई अन्त्य गर्नुहोस्" "भिडियो निष्क्रिय छ" "जवाफ दिन दुई औंलाले माथितिर स्वाइप गर्नुहोस्। अस्वीकार गर्न दुई औंलाले तलतिर स्वाइप गर्नुहोस्।" - "महत्त्वपूर्ण" + "जरुरी" diff --git a/java/com/android/incallui/answer/impl/res/values-nl/strings.xml b/java/com/android/incallui/answer/impl/res/values-nl/strings.xml index 89c956a9f..b2f619fa3 100644 --- a/java/com/android/incallui/answer/impl/res/values-nl/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-nl/strings.xml @@ -1,20 +1,4 @@ - - "Veeg vanaf pictogram om te weigeren met bericht" @@ -36,5 +20,5 @@ "Opnemen en actieve oproep beëindigen" "Video is uit" "Veeg met twee vingers omhoog om te beantwoorden. Veeg met twee vingers omlaag om te weigeren." - "Belangrijk" + "Urgent" diff --git a/java/com/android/incallui/answer/impl/res/values-no/strings.xml b/java/com/android/incallui/answer/impl/res/values-no/strings.xml index 42ff3d0af..b1c32bea4 100644 --- a/java/com/android/incallui/answer/impl/res/values-no/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-no/strings.xml @@ -1,20 +1,4 @@ - - "Sveip fra ikonet for å avslå med en melding" @@ -36,5 +20,5 @@ "Svar, og avslutt samtalen som er i gang" "Video er av" "Sveip oppover med to fingre for å svare. Sveip nedover med to fingre for å avvise." - "Viktig" + "Haster" diff --git a/java/com/android/incallui/answer/impl/res/values-pa/strings.xml b/java/com/android/incallui/answer/impl/res/values-pa/strings.xml index 3772f291f..d2b14523c 100644 --- a/java/com/android/incallui/answer/impl/res/values-pa/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-pa/strings.xml @@ -1,20 +1,4 @@ - - "ਸੁਨੇਹੇ ਦੇ ਨਾਲ ਅਸਵੀਕਾਰ ਕਰਨ ਲਈ ਚਿੰਨ੍ਹ ਤੋਂ ਸਵਾਈਪ ਕਰੋ" @@ -36,5 +20,5 @@ "ਜਵਾਬ ਦਿਓ ਅਤੇ ਜਾਰੀ ਕਾਲ ਨੂੰ ਸਮਾਪਤ ਕਰੋ" "ਵੀਡੀਓ ਬੰਦ ਹੈ" "ਜਵਾਬ ਦੇਣ ਲਈ ਦੋ ਉਂਗਲਾਂ ਨਾਲ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ। ਅਸਵੀਕਾਰ ਕਰਨ ਲਈ ਦੋ ਉਂਗਲਾਂ ਨਾਲ ਹੇਠਾਂ ਵੱਲ ਸਵਾਈਪ ਕਰੋ।" - "ਮਹੱਤਵਪੂਰਨ" + "ਜ਼ਰੂਰੀ" diff --git a/java/com/android/incallui/answer/impl/res/values-pl/strings.xml b/java/com/android/incallui/answer/impl/res/values-pl/strings.xml index f6e1f1ba4..b0c44e72a 100644 --- a/java/com/android/incallui/answer/impl/res/values-pl/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-pl/strings.xml @@ -1,20 +1,4 @@ - - "Przesuń palcem od ikony, aby odrzucić połączenie i wysłać wiadomość" @@ -36,5 +20,5 @@ "Odbierz połączenie i zakończ trwającą rozmowę" "Wideo jest wyłączone" "Przesuń dwoma palcami w górę, aby odebrać. Przesuń dwoma palcami w dół, aby odrzucić." - "Ważne" + "Pilne" diff --git a/java/com/android/incallui/answer/impl/res/values-pt-rBR/strings.xml b/java/com/android/incallui/answer/impl/res/values-pt-rBR/strings.xml index 1ed245140..fe1c89de4 100644 --- a/java/com/android/incallui/answer/impl/res/values-pt-rBR/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-pt-rBR/strings.xml @@ -1,20 +1,4 @@ - - "Deslize a partir do ícone para recusar com uma mensagem" @@ -36,5 +20,5 @@ "Atender e encerrar a chamada em andamento" "O vídeo está desativado" "Deslize com dois dedos para cima para atender. Deslize com dois dedos para baixo para recusar." - "Importante" + "Urgente" diff --git a/java/com/android/incallui/answer/impl/res/values-pt-rPT/strings.xml b/java/com/android/incallui/answer/impl/res/values-pt-rPT/strings.xml index f1e17a1d9..1a23a4a9d 100644 --- a/java/com/android/incallui/answer/impl/res/values-pt-rPT/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-pt-rPT/strings.xml @@ -1,20 +1,4 @@ - - "Deslize rapidamente a partir do ícone para recusar com uma mensagem" @@ -36,5 +20,5 @@ "Atender e terminar uma chamada em curso" "O vídeo está desativado" "Deslize rapidamente com dois dedos para cima para responder. Deslize rapidamente com dois dedos para baixo para recusar." - "Importante" + "Urgente" diff --git a/java/com/android/incallui/answer/impl/res/values-pt/strings.xml b/java/com/android/incallui/answer/impl/res/values-pt/strings.xml index 1ed245140..fe1c89de4 100644 --- a/java/com/android/incallui/answer/impl/res/values-pt/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-pt/strings.xml @@ -1,20 +1,4 @@ - - "Deslize a partir do ícone para recusar com uma mensagem" @@ -36,5 +20,5 @@ "Atender e encerrar a chamada em andamento" "O vídeo está desativado" "Deslize com dois dedos para cima para atender. Deslize com dois dedos para baixo para recusar." - "Importante" + "Urgente" diff --git a/java/com/android/incallui/answer/impl/res/values-ro/strings.xml b/java/com/android/incallui/answer/impl/res/values-ro/strings.xml index 0b1f4f481..6c8bafa28 100644 --- a/java/com/android/incallui/answer/impl/res/values-ro/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-ro/strings.xml @@ -1,20 +1,4 @@ - - "Glisați de pe pictogramă pentru a respinge cu un mesaj" @@ -36,5 +20,5 @@ "Răspundeți și încheiați apelul în curs" "Camera video este dezactivată." "Glisați cu două degete în sus pentru a răspunde și în jos pentru a respinge." - "Important" + "Urgent" diff --git a/java/com/android/incallui/answer/impl/res/values-ru/strings.xml b/java/com/android/incallui/answer/impl/res/values-ru/strings.xml index d1fdcf73e..67ff06a34 100644 --- a/java/com/android/incallui/answer/impl/res/values-ru/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-ru/strings.xml @@ -1,20 +1,4 @@ - - "Чтобы отклонить вызов и отправить SMS, проведите пальцем от значка" @@ -36,5 +20,5 @@ "Ответить и завершить текущий вызов" "Камера выключена" "Проведите двумя пальцами по экрану вверх, чтобы ответить, или вниз, чтобы отклонить вызов." - "Важный звонок" + "Срочно" diff --git a/java/com/android/incallui/answer/impl/res/values-si/strings.xml b/java/com/android/incallui/answer/impl/res/values-si/strings.xml index 99f4989aa..ae3c08008 100644 --- a/java/com/android/incallui/answer/impl/res/values-si/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-si/strings.xml @@ -1,20 +1,4 @@ - - "පණිවිඩය සහිතව ප්‍රතික්ෂේප කිරීමට නිරූපකයේ සිට ස්වයිප් කරන්න" @@ -36,5 +20,5 @@ "යන අැමතුමට පිළිතරු දී අවසන් කරන්න" "වීඩියෝව ක්‍රියාවිරහිතයි" "පිළිතුරු දීමට ඇඟිලි දෙකකින් ඉහළට ස්වයිප් කරන්න, ප්‍රතික්ෂේප කිරීමට ඇඟිලි දෙකකින් පහළට ස්වයිප් කරන්න." - "වැදගත්" + "හදිසි" diff --git a/java/com/android/incallui/answer/impl/res/values-sk/strings.xml b/java/com/android/incallui/answer/impl/res/values-sk/strings.xml index fa00ac4c6..179be7b08 100644 --- a/java/com/android/incallui/answer/impl/res/values-sk/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-sk/strings.xml @@ -1,20 +1,4 @@ - - "Prejdením prstom od ikony odmietnuť so správou" @@ -36,5 +20,5 @@ "Prijať hovor a ukončiť prebiehajúci hovor" "Video je vypnuté" "Ak chcete hovor prijať, prejdite dvomi prstami nahor. Ak ho chcete odmietnuť, prejdite dvomi prstami nadol." - "Dôležité" + "Naliehavé" diff --git a/java/com/android/incallui/answer/impl/res/values-sl/strings.xml b/java/com/android/incallui/answer/impl/res/values-sl/strings.xml index 147a09835..5f658be9d 100644 --- a/java/com/android/incallui/answer/impl/res/values-sl/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-sl/strings.xml @@ -1,20 +1,4 @@ - - "Povlecite z ikone, da klic zavrnete s sporočilom" @@ -36,5 +20,5 @@ "Sprejmi klic in končaj aktivni klic" "Video je izklopljen" "Z dvema prstoma povlecite navzgor, da sprejmete klic. Z dvema prstoma povlecite navzdol, da zavrnete klic." - "Pomembno" + "Nujno" diff --git a/java/com/android/incallui/answer/impl/res/values-sq/strings.xml b/java/com/android/incallui/answer/impl/res/values-sq/strings.xml index e71691af8..1de60c9c9 100644 --- a/java/com/android/incallui/answer/impl/res/values-sq/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-sq/strings.xml @@ -1,20 +1,4 @@ - - "Rrëshqit nga ikona për të refuzuar me mesazh" @@ -36,5 +20,5 @@ "Përgjigju dhe mbyll telefonatën në vazhdim" "Videoja është joaktive" "Rrëshqit dy gishta lart për t\'u përgjigjur. Rrëshqit dy gishta poshtë për të refuzuar." - "E rëndësishme" + "Urgjente" diff --git a/java/com/android/incallui/answer/impl/res/values-sr/strings.xml b/java/com/android/incallui/answer/impl/res/values-sr/strings.xml index c802b0e97..4d6ef5636 100644 --- a/java/com/android/incallui/answer/impl/res/values-sr/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-sr/strings.xml @@ -1,20 +1,4 @@ - - "Превуците од иконе да бисте одбили поруком" @@ -36,5 +20,5 @@ "Јавите се и завршите позив који је у току" "Камера је искључена" "Превуците нагоре помоћу два прста да бисте одговорили. Превуците надоле помоћу два прста да бисте одбили." - "Важно" + "Хитно" diff --git a/java/com/android/incallui/answer/impl/res/values-sv/strings.xml b/java/com/android/incallui/answer/impl/res/values-sv/strings.xml index 2265dc4c2..e47b4e0a3 100644 --- a/java/com/android/incallui/answer/impl/res/values-sv/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-sv/strings.xml @@ -1,20 +1,4 @@ - - "Svep från ikonen för att avvisa med meddelande" @@ -36,5 +20,5 @@ "Svara och avsluta pågående samtal" "Video avstängd" "Dra två fingrar uppåt för att svara och två nedåt för att avvisa." - "Viktigt" + "Brådskande" diff --git a/java/com/android/incallui/answer/impl/res/values-sw/strings.xml b/java/com/android/incallui/answer/impl/res/values-sw/strings.xml index 26e1b7ab5..1e5896662 100644 --- a/java/com/android/incallui/answer/impl/res/values-sw/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-sw/strings.xml @@ -1,20 +1,4 @@ - - "Telezesha kidole ukianzia kwenye aikoni ili utume ujumbe wa kukataa" @@ -36,5 +20,5 @@ "Jibu na ukate simu inayoendelea" "Video imezimwa" "Telezesha juu kwa vidole viwili ili uijibu. Telezesha chini kwa vidole viwili ili uikate." - "Muhimu" + "Dharura" diff --git a/java/com/android/incallui/answer/impl/res/values-ta/strings.xml b/java/com/android/incallui/answer/impl/res/values-ta/strings.xml index 453781dae..847936f5b 100644 --- a/java/com/android/incallui/answer/impl/res/values-ta/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-ta/strings.xml @@ -1,20 +1,4 @@ - - "செய்தியுடன் நிராகரிக்க, ஐகானிலிருந்து ஸ்வைப் செய்யவும்" @@ -36,5 +20,5 @@ "உள்வரும் அழைப்பிற்குப் பதிலளித்து, செயலில் உள்ள அழைப்பை முடிக்கும்" "வீடியோ முடக்கப்பட்டுள்ளது" "பதிலளிக்க, இரு விரல்களால் மேலே ஸ்வைப் செய்யவும். நிராகரிக்க, இரு விரல்களால் கீழே ஸ்வைப் செய்யவும்." - "முக்கிய அழைப்பு" + "அவசரம்" diff --git a/java/com/android/incallui/answer/impl/res/values-te/strings.xml b/java/com/android/incallui/answer/impl/res/values-te/strings.xml index e0e508768..abc390294 100644 --- a/java/com/android/incallui/answer/impl/res/values-te/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-te/strings.xml @@ -1,20 +1,4 @@ - - "సందేశంతో తిరస్కరించడానికి చిహ్నం నుండి స్వైప్ చేయండి" @@ -36,5 +20,5 @@ "సమాధానం ఇస్తుంది మరియు కొనసాగుతున్న కాల్‌ను ముగిస్తుంది" "వీడియో ఆఫ్‌లో ఉంది" "సమాధానం ఇవ్వడానికి రెండు వేళ్లతో పైకి స్వైప్ చేయండి. తిరస్కరించడానికి రెండు వేళ్లతో క్రిందికి స్వైప్ చేయండి." - "ముఖ్యమైనది" + "అత్యవసరం" diff --git a/java/com/android/incallui/answer/impl/res/values-th/strings.xml b/java/com/android/incallui/answer/impl/res/values-th/strings.xml index 695da74f7..54069b3d8 100644 --- a/java/com/android/incallui/answer/impl/res/values-th/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-th/strings.xml @@ -1,20 +1,4 @@ - - "เลื่อนไอคอนเพื่อปฏิเสธสายด้วยข้อความ" @@ -36,5 +20,5 @@ "รับและวางสาย" "วิดีโอปิดอยู่" "ใช้สองนิ้วเลื่อนขึ้นเพื่อรับสายและเลื่อนลงเพื่อตัดสาย" - "สำคัญ" + "ด่วน" diff --git a/java/com/android/incallui/answer/impl/res/values-tl/strings.xml b/java/com/android/incallui/answer/impl/res/values-tl/strings.xml index 6128d6fad..8f87b5605 100644 --- a/java/com/android/incallui/answer/impl/res/values-tl/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-tl/strings.xml @@ -1,20 +1,4 @@ - - "I-swipe mula sa icon upang tanggihan gamit ang mensahe" @@ -36,5 +20,5 @@ "Sagutin at tapusin ang kasalukuyang tawag" "Naka-off ang video" "I-swipe nang pataas gamit ang dalawang daliri upang sagutin. I-swipe nang pababa gamit ang dalawang daliri upang tanggihan." - "Mahalaga" + "Apurahan" diff --git a/java/com/android/incallui/answer/impl/res/values-tr/strings.xml b/java/com/android/incallui/answer/impl/res/values-tr/strings.xml index 87583c03d..53f5eb9a9 100644 --- a/java/com/android/incallui/answer/impl/res/values-tr/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-tr/strings.xml @@ -1,20 +1,4 @@ - - "Mesajla reddetmek için, simgeden hızlıca kaydırın" @@ -36,5 +20,5 @@ "Bir çağrı cevaplanır ve devam eden çağrı sona erdirilir" "Video kapalı" "Cevaplamak için iki parmağınızla hızlıca yukarı kaydırın. Reddetmek içinse iki parmağınızla hızlıca aşağı kaydırın." - "Önemli" + "Acil" diff --git a/java/com/android/incallui/answer/impl/res/values-uk/strings.xml b/java/com/android/incallui/answer/impl/res/values-uk/strings.xml index 76eb2b0a2..a0332d377 100644 --- a/java/com/android/incallui/answer/impl/res/values-uk/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-uk/strings.xml @@ -1,20 +1,4 @@ - - "Проведіть пальцем убік від значка, щоб відхилити з повідомленням" @@ -36,5 +20,5 @@ "Відповісти на виклик, завершивши поточний" "Відео вимкнено" "Проведіть двома пальцями вгору, щоб відповісти, або вниз, щоб відхилити дзвінок." - "Важливо" + "Терміново" diff --git a/java/com/android/incallui/answer/impl/res/values-ur/strings.xml b/java/com/android/incallui/answer/impl/res/values-ur/strings.xml index 2a44e9083..e1813cbf7 100644 --- a/java/com/android/incallui/answer/impl/res/values-ur/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-ur/strings.xml @@ -1,20 +1,4 @@ - - "پیغام کے ساتھ رد کرنے کیلئے آئیکن سے سوائپ کریں" @@ -36,5 +20,5 @@ "جواب دیں اور جاری کال ختم کریں" "ویڈیو آف ہے" "جواب دینے کیلئے دوانگلیوں کے ساتھ اوپر سوائپ کریں۔ مسترد کرنے کیلئے دو انگلیوں کے ساتھ نیچے سوائپ کریں۔" - "اہم" + "ارجنٹ" diff --git a/java/com/android/incallui/answer/impl/res/values-uz/strings.xml b/java/com/android/incallui/answer/impl/res/values-uz/strings.xml index f348a499d..b83abcce0 100644 --- a/java/com/android/incallui/answer/impl/res/values-uz/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-uz/strings.xml @@ -1,20 +1,4 @@ - - "Qo‘ng‘iroqni SMS bilan rad etish uchun nishonchadan suring." @@ -36,5 +20,5 @@ "Kiruvchi chaqiruvga javob berish va joriy qo‘ng‘iroqni tugatish" "Kamera o‘chiq" "Chaqiruvga javob berish uchun ikki barmoq bilan tepaga, rad etish uchun ikki barmoq bilan pastga suring." - "Muhim qo‘ng‘iroq" + "Juda muhim" diff --git a/java/com/android/incallui/answer/impl/res/values-vi/strings.xml b/java/com/android/incallui/answer/impl/res/values-vi/strings.xml index f4dfa5b1d..94dd1c386 100644 --- a/java/com/android/incallui/answer/impl/res/values-vi/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-vi/strings.xml @@ -1,20 +1,4 @@ - - "Vuốt từ biểu tượng để từ chối kèm thông báo" @@ -36,5 +20,5 @@ "Trả lời và kết thúc cuộc gọi đang diễn ra" "Video đã tắt" "Vuốt hai ngón tay lên để trả lời. Vuốt hai ngón tay xuống để từ chối." - "Quan trọng" + "Khẩn cấp" diff --git a/java/com/android/incallui/answer/impl/res/values-zh-rCN/strings.xml b/java/com/android/incallui/answer/impl/res/values-zh-rCN/strings.xml index 9698aa06d..fc7ce6409 100644 --- a/java/com/android/incallui/answer/impl/res/values-zh-rCN/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-zh-rCN/strings.xml @@ -1,20 +1,4 @@ - - "滑动图标即可拒接来电并发送信息" @@ -36,5 +20,5 @@ "接听并结束当前通话" "摄像头处于关闭状态" "双指向上滑动即可接听，向下滑动则可拒接。" - "重要" + "紧急" diff --git a/java/com/android/incallui/answer/impl/res/values-zh-rHK/strings.xml b/java/com/android/incallui/answer/impl/res/values-zh-rHK/strings.xml index 81a88151b..97955396f 100644 --- a/java/com/android/incallui/answer/impl/res/values-zh-rHK/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-zh-rHK/strings.xml @@ -1,20 +1,4 @@ - - "從圖示快速滑動即可透過訊息拒絕" @@ -36,5 +20,5 @@ "接聽及結束進行中的通話" "視像已關閉" "兩指向上滑動可接聽，向下滑動則可拒接。" - "重要事項" + "緊急" diff --git a/java/com/android/incallui/answer/impl/res/values-zh-rTW/strings.xml b/java/com/android/incallui/answer/impl/res/values-zh-rTW/strings.xml index 8f04992d1..f27e5ae5b 100644 --- a/java/com/android/incallui/answer/impl/res/values-zh-rTW/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-zh-rTW/strings.xml @@ -1,20 +1,4 @@ - - "滑動圖示即可拒接來電並傳送簡訊" @@ -36,5 +20,5 @@ "接聽來電及結束進行中的通話" "已關閉攝影機" "用雙指向上滑動可接聽，向下滑動可拒接。" - "重要" + "緊急" diff --git a/java/com/android/incallui/answer/impl/res/values-zu/strings.xml b/java/com/android/incallui/answer/impl/res/values-zu/strings.xml index 23c988eaa..52f2400eb 100644 --- a/java/com/android/incallui/answer/impl/res/values-zu/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-zu/strings.xml @@ -1,20 +1,4 @@ - - "Swayipha isithonjana ukuze wenqabe ngomlayezo" @@ -36,5 +20,5 @@ "Phendula uphinde uqede ikholi eqhubekayo" "Ividiyo ivaliwe" "Swayiphela iminwe emibili phezulu ukuze uphendule. Swayiphela iminwe emibili phansi ukuze wenqabe." - "Kubalulekile" + "Okuphuthumayo" diff --git a/java/com/android/incallui/answer/impl/res/values/strings.xml b/java/com/android/incallui/answer/impl/res/values/strings.xml index de5ee6e69..235922047 100644 --- a/java/com/android/incallui/answer/impl/res/values/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values/strings.xml @@ -1,19 +1,4 @@ - Swipe from icon to decline with message Swipe from icon to answer as an audio call @@ -41,5 +26,5 @@ Two finger swipe up to answer. Two finger swipe down to decline. - Important + Urgent diff --git a/java/com/android/incallui/answer/protocol/AnswerScreenDelegate.java b/java/com/android/incallui/answer/protocol/AnswerScreenDelegate.java index 10a3413af..9815981ca 100644 --- a/java/com/android/incallui/answer/protocol/AnswerScreenDelegate.java +++ b/java/com/android/incallui/answer/protocol/AnswerScreenDelegate.java @@ -32,10 +32,6 @@ public interface AnswerScreenDelegate { void onReject(); void onAnswerAndReleaseCall(); - - void onAnswerAndReleaseButtonEnabled(); - - void onAnswerAndReleaseButtonDisabled(); /** * Sets the window background color based on foreground call's theme and the given progress. This * is called from the answer UI to animate the accept and reject action. diff --git a/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java b/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java index fe4ae9f96..24fbfc428 100644 --- a/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java +++ b/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java @@ -142,9 +142,6 @@ public class AnswerProximitySensor @Override public void onInternationalCallOnWifi() {} - @Override - public void onEnrichedCallSessionUpdate() {} - @Override public void onDialerCallSessionModificationStateChange() {} diff --git a/java/com/android/incallui/audioroute/AudioRouteSelectorDialogFragment.java b/java/com/android/incallui/audioroute/AudioRouteSelectorDialogFragment.java index c7a9d6332..c757477f1 100644 --- a/java/com/android/incallui/audioroute/AudioRouteSelectorDialogFragment.java +++ b/java/com/android/incallui/audioroute/AudioRouteSelectorDialogFragment.java @@ -18,7 +18,6 @@ package com.android.incallui.audioroute; import android.app.Dialog; import android.content.Context; -import android.content.DialogInterface; import android.content.res.ColorStateList; import android.graphics.PorterDuff.Mode; import android.os.Bundle; @@ -42,8 +41,6 @@ public class AudioRouteSelectorDialogFragment extends BottomSheetDialogFragment /** Called when an audio route is picked */ public interface AudioRouteSelectorPresenter { void onAudioRouteSelected(int audioRoute); - - void onAudioRouteSelectorDismiss(); } public static AudioRouteSelectorDialogFragment newInstance(CallAudioState audioState) { @@ -94,14 +91,6 @@ public class AudioRouteSelectorDialogFragment extends BottomSheetDialogFragment return view; } - @Override - public void onDismiss(DialogInterface dialogInterface) { - super.onDismiss(dialogInterface); - FragmentUtils.getParentUnsafe( - AudioRouteSelectorDialogFragment.this, AudioRouteSelectorPresenter.class) - .onAudioRouteSelectorDismiss(); - } - private void initItem(TextView item, final int itemRoute, CallAudioState audioState) { int selectedColor = getResources().getColor(R.color.dialer_theme_color); if ((audioState.getSupportedRouteMask() & itemRoute) == 0) { diff --git a/java/com/android/incallui/bindings/InCallUiBindings.java b/java/com/android/incallui/bindings/InCallUiBindings.java index 5c6aef4be..d3d3a8b37 100644 --- a/java/com/android/incallui/bindings/InCallUiBindings.java +++ b/java/com/android/incallui/bindings/InCallUiBindings.java @@ -19,6 +19,7 @@ package com.android.incallui.bindings; import android.content.Context; import android.content.Intent; import android.support.annotation.Nullable; +import com.android.dialer.common.ConfigProvider; /** This interface allows the container application to customize the in call UI. */ public interface InCallUiBindings { @@ -36,4 +37,12 @@ public interface InCallUiBindings { */ @Nullable Intent getCallStateButtonBroadcastIntent(Context context); + + @Nullable + DistanceHelper newDistanceHelper(Context context, DistanceHelper.Listener listener); + + @Nullable + ContactUtils getContactUtilsInstance(Context context); + + ConfigProvider getConfigProvider(); } diff --git a/java/com/android/incallui/bindings/InCallUiBindingsStub.java b/java/com/android/incallui/bindings/InCallUiBindingsStub.java index 3a005b0fb..7b42fb375 100644 --- a/java/com/android/incallui/bindings/InCallUiBindingsStub.java +++ b/java/com/android/incallui/bindings/InCallUiBindingsStub.java @@ -19,9 +19,11 @@ package com.android.incallui.bindings; import android.content.Context; import android.content.Intent; import android.support.annotation.Nullable; +import com.android.dialer.common.ConfigProvider; /** Default implementation for InCallUi bindings. */ public class InCallUiBindingsStub implements InCallUiBindings { + private ConfigProvider configProvider; @Override @Nullable @@ -40,4 +42,40 @@ public class InCallUiBindingsStub implements InCallUiBindings { public Intent getCallStateButtonBroadcastIntent(Context context) { return null; } + + @Override + @Nullable + public DistanceHelper newDistanceHelper(Context context, DistanceHelper.Listener listener) { + return null; + } + + @Override + @Nullable + public ContactUtils getContactUtilsInstance(Context context) { + return null; + } + + @Override + public ConfigProvider getConfigProvider() { + if (configProvider == null) { + configProvider = + new ConfigProvider() { + @Override + public String getString(String key, String defaultValue) { + return defaultValue; + } + + @Override + public long getLong(String key, long defaultValue) { + return defaultValue; + } + + @Override + public boolean getBoolean(String key, boolean defaultValue) { + return defaultValue; + } + }; + } + return configProvider; + } } diff --git a/java/com/android/incallui/call/CallList.java b/java/com/android/incallui/call/CallList.java index 3876ca64d..34f0cc0d7 100644 --- a/java/com/android/incallui/call/CallList.java +++ b/java/com/android/incallui/call/CallList.java @@ -32,8 +32,6 @@ import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler; import com.android.dialer.blocking.FilteredNumbersUtil; import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; -import com.android.dialer.enrichedcall.EnrichedCallComponent; -import com.android.dialer.enrichedcall.EnrichedCallManager; import com.android.dialer.location.GeoUtil; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; @@ -119,10 +117,6 @@ public class CallList implements DialerCallDelegate { new DialerCall(context, this, telecomCall, latencyReport, true /* registerCallback */); logSecondIncomingCall(context, call); - EnrichedCallManager manager = EnrichedCallComponent.get(context).getEnrichedCallManager(); - manager.registerCapabilitiesListener(call); - manager.registerStateChangedListener(call); - final DialerCallListenerImpl dialerCallListener = new DialerCallListenerImpl(call); call.addListener(dialerCallListener); LogUtil.d("CallList.onCallAdded", "callState=" + call.getState()); @@ -284,10 +278,6 @@ public class CallList implements DialerCallDelegate { DialerCall call = mCallByTelecomCall.get(telecomCall); Assert.checkArgument(!call.isExternalCall()); - EnrichedCallManager manager = EnrichedCallComponent.get(context).getEnrichedCallManager(); - manager.unregisterCapabilitiesListener(call); - manager.unregisterStateChangedListener(call); - // Don't log an already logged call. logCall() might be called multiple times // for the same call due to b/24109437. if (call.getLogState() != null && !call.getLogState().isLogged) { @@ -802,9 +792,6 @@ public class CallList implements DialerCallDelegate { } } - @Override - public void onEnrichedCallSessionUpdate() {} - @Override public void onDialerCallSessionModificationStateChange() { for (Listener listener : mListeners) { diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java index 12edb07e6..acedf41f1 100644 --- a/java/com/android/incallui/call/DialerCall.java +++ b/java/com/android/incallui/call/DialerCall.java @@ -51,10 +51,6 @@ import com.android.dialer.common.ConfigProviderBindings; import com.android.dialer.common.LogUtil; import com.android.dialer.enrichedcall.EnrichedCallCapabilities; import com.android.dialer.enrichedcall.EnrichedCallComponent; -import com.android.dialer.enrichedcall.EnrichedCallManager; -import com.android.dialer.enrichedcall.EnrichedCallManager.CapabilitiesListener; -import com.android.dialer.enrichedcall.EnrichedCallManager.Filter; -import com.android.dialer.enrichedcall.EnrichedCallManager.StateChangedListener; import com.android.dialer.enrichedcall.Session; import com.android.dialer.lightbringer.LightbringerComponent; import com.android.dialer.logging.ContactLookupResult; @@ -81,7 +77,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.TimeUnit; /** Describes a single call and its state. */ -public class DialerCall implements VideoTechListener, StateChangedListener, CapabilitiesListener { +public class DialerCall implements VideoTechListener { public static final int CALL_HISTORY_STATUS_UNKNOWN = 0; public static final int CALL_HISTORY_STATUS_PRESENT = 1; @@ -147,12 +143,6 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa private EnrichedCallCapabilities mEnrichedCallCapabilities; private Session mEnrichedCallSession; - private int answerAndReleaseButtonDisplayedTimes = 0; - private boolean releasedByAnsweringSecondCall = false; - // Times when a second call is received but AnswerAndRelease button is not shown - // since it's not supported. - private int secondCallWithoutAnswerAndReleasedButtonTimes = 0; - public static String getNumberFromHandle(Uri handle) { return handle == null ? "" : handle.getSchemeSpecificPart(); } @@ -302,8 +292,6 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa mTimeAddedMs = System.currentTimeMillis(); parseCallSpecificAppData(); - - updateEnrichedCallSession(); } private static int translateState(int state) { @@ -425,12 +413,6 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa for (DialerCallListener listener : mListeners) { listener.onDialerCallDisconnect(); } - EnrichedCallComponent.get(mContext) - .getEnrichedCallManager() - .unregisterCapabilitiesListener(this); - EnrichedCallComponent.get(mContext) - .getEnrichedCallManager() - .unregisterCapabilitiesListener(this); } else { for (DialerCallListener listener : mListeners) { listener.onDialerCallUpdate(); @@ -978,30 +960,6 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa return mLatencyReport; } - public int getAnswerAndReleaseButtonDisplayedTimes() { - return answerAndReleaseButtonDisplayedTimes; - } - - public void increaseAnswerAndReleaseButtonDisplayedTimes() { - answerAndReleaseButtonDisplayedTimes++; - } - - public boolean getReleasedByAnsweringSecondCall() { - return releasedByAnsweringSecondCall; - } - - public void setReleasedByAnsweringSecondCall(boolean releasedByAnsweringSecondCall) { - this.releasedByAnsweringSecondCall = releasedByAnsweringSecondCall; - } - - public int getSecondCallWithoutAnswerAndReleasedButtonTimes() { - return secondCallWithoutAnswerAndReleasedButtonTimes; - } - - public void increaseSecondCallWithoutAnswerAndReleasedButtonTimes() { - secondCallWithoutAnswerAndReleasedButtonTimes++; - } - @Nullable public EnrichedCallCapabilities getEnrichedCallCapabilities() { return mEnrichedCallCapabilities; @@ -1214,66 +1172,6 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa TelecomAdapter.getInstance().setAudioRoute(CallAudioState.ROUTE_SPEAKER); } - @Override - public void onCapabilitiesUpdated() { - if (getNumber() == null) { - return; - } - EnrichedCallCapabilities capabilities = - EnrichedCallComponent.get(mContext).getEnrichedCallManager().getCapabilities(getNumber()); - if (capabilities != null) { - setEnrichedCallCapabilities(capabilities); - update(); - } - } - - @Override - public void onEnrichedCallStateChanged() { - updateEnrichedCallSession(); - } - - private void updateEnrichedCallSession() { - if (getNumber() == null) { - return; - } - if (getEnrichedCallSession() != null) { - // State changes to existing sessions are currently handled by the UI components (which have - // their own listeners). Someday instead we could remove those and just call update() here and - // have the usual onDialerCallUpdate update the UI. - dispatchOnEnrichedCallSessionUpdate(); - return; - } - - EnrichedCallManager manager = EnrichedCallComponent.get(mContext).getEnrichedCallManager(); - - Filter filter = - isIncoming() - ? manager.createIncomingCallComposerFilter() - : manager.createOutgoingCallComposerFilter(); - - Session session = manager.getSession(getUniqueCallId(), getNumber(), filter); - if (session == null) { - return; - } - - session.setUniqueDialerCallId(getUniqueCallId()); - setEnrichedCallSession(session); - - LogUtil.i( - "DialerCall.updateEnrichedCallSession", - "setting session %d's dialer id to %s", - session.getSessionId(), - getUniqueCallId()); - - dispatchOnEnrichedCallSessionUpdate(); - } - - private void dispatchOnEnrichedCallSessionUpdate() { - for (DialerCallListener listener : mListeners) { - listener.onEnrichedCallSessionUpdate(); - } - } - /** * Specifies whether a number is in the call history or not. {@link #CALL_HISTORY_STATUS_UNKNOWN} * means there is no result. @@ -1474,7 +1372,6 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa String phoneNumber = call.getNumber(); phoneNumber = phoneNumber != null ? phoneNumber : ""; - phoneNumber = phoneNumber.replaceAll("[^+0-9]", ""); // Insert order here determines the priority of that video tech option videoTechs = new ArrayList<>(); diff --git a/java/com/android/incallui/call/DialerCallListener.java b/java/com/android/incallui/call/DialerCallListener.java index 5d24a4d4b..ed321be05 100644 --- a/java/com/android/incallui/call/DialerCallListener.java +++ b/java/com/android/incallui/call/DialerCallListener.java @@ -36,6 +36,4 @@ public interface DialerCallListener { void onHandoverToWifiFailure(); void onInternationalCallOnWifi(); - - void onEnrichedCallSessionUpdate(); } diff --git a/java/com/android/incallui/call/TelecomAdapter.java b/java/com/android/incallui/call/TelecomAdapter.java index 4fc9f81eb..ebf4ecf4f 100644 --- a/java/com/android/incallui/call/TelecomAdapter.java +++ b/java/com/android/incallui/call/TelecomAdapter.java @@ -20,13 +20,12 @@ import android.content.ActivityNotFoundException; import android.content.Intent; import android.os.Looper; import android.support.annotation.MainThread; -import android.support.annotation.VisibleForTesting; import android.telecom.InCallService; import com.android.dialer.common.LogUtil; import java.util.List; /** Wrapper around Telecom APIs. */ -public class TelecomAdapter implements InCallServiceListener { +public final class TelecomAdapter implements InCallServiceListener { private static final String ADD_CALL_MODE_KEY = "add_call_mode"; @@ -46,11 +45,6 @@ public class TelecomAdapter implements InCallServiceListener { return sInstance; } - @VisibleForTesting(otherwise = VisibleForTesting.NONE) - public static void setInstanceForTesting(TelecomAdapter telecomAdapter) { - sInstance = telecomAdapter; - } - @Override public void setInCallService(InCallService inCallService) { mInCallService = inCallService; diff --git a/java/com/android/incallui/calllocation/impl/DownloadMapImageTask.java b/java/com/android/incallui/calllocation/impl/DownloadMapImageTask.java index b093a1b15..801b0d35c 100644 --- a/java/com/android/incallui/calllocation/impl/DownloadMapImageTask.java +++ b/java/com/android/incallui/calllocation/impl/DownloadMapImageTask.java @@ -21,7 +21,6 @@ import android.location.Location; import android.net.TrafficStats; import android.os.AsyncTask; import com.android.dialer.common.LogUtil; -import com.android.dialer.constants.TrafficStatsTags; import com.android.incallui.calllocation.impl.LocationPresenter.LocationUi; import java.io.InputStream; import java.lang.ref.WeakReference; diff --git a/java/com/android/incallui/calllocation/impl/LocationHelper.java b/java/com/android/incallui/calllocation/impl/LocationHelper.java index 99a759bbb..3a1478945 100644 --- a/java/com/android/incallui/calllocation/impl/LocationHelper.java +++ b/java/com/android/incallui/calllocation/impl/LocationHelper.java @@ -24,7 +24,6 @@ import android.os.Bundle; import android.os.Handler; import android.support.annotation.IntDef; import android.support.annotation.MainThread; -import android.support.v4.os.UserManagerCompat; import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; import com.android.dialer.util.PermissionsUtil; @@ -88,12 +87,6 @@ public class LocationHelper { LogUtil.i("LocationHelper.canGetLocation", "location service is disabled."); return false; } - - if (!UserManagerCompat.isUserUnlocked(context)) { - LogUtil.i("LocationHelper.canGetLocation", "location unavailable in FBE mode."); - return false; - } - return true; } diff --git a/java/com/android/incallui/calllocation/impl/ReverseGeocodeTask.java b/java/com/android/incallui/calllocation/impl/ReverseGeocodeTask.java index 060ec0b4f..eb5957b05 100644 --- a/java/com/android/incallui/calllocation/impl/ReverseGeocodeTask.java +++ b/java/com/android/incallui/calllocation/impl/ReverseGeocodeTask.java @@ -20,7 +20,6 @@ import android.location.Location; import android.net.TrafficStats; import android.os.AsyncTask; import com.android.dialer.common.LogUtil; -import com.android.dialer.constants.TrafficStatsTags; import com.android.incallui.calllocation.impl.LocationPresenter.LocationUi; import java.lang.ref.WeakReference; import org.json.JSONArray; diff --git a/java/com/android/incallui/calllocation/impl/TrafficStatsTags.java b/java/com/android/incallui/calllocation/impl/TrafficStatsTags.java new file mode 100644 index 000000000..02cc2e083 --- /dev/null +++ b/java/com/android/incallui/calllocation/impl/TrafficStatsTags.java @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.incallui.calllocation.impl; + +/** Constants used for logging */ +public class TrafficStatsTags { + + /** + * Must be greater than {@link com.android.contacts.common.util.TrafficStatsTags#TAG_MAX}, to + * respect the namespace of the tags in ContactsCommon. + */ + public static final int DOWNLOAD_LOCATION_MAP_TAG = 0xd000; + + public static final int REVERSE_GEOCODE_TAG = 0xd001; +} diff --git a/java/com/android/incallui/commontheme/res/anim/blinking.xml b/java/com/android/incallui/commontheme/res/anim/blinking.xml new file mode 100644 index 000000000..4b921c611 --- /dev/null +++ b/java/com/android/incallui/commontheme/res/anim/blinking.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/java/com/android/incallui/commontheme/res/drawable-hdpi/ic_phone_audio_white_36dp.png b/java/com/android/incallui/commontheme/res/drawable-hdpi/ic_phone_audio_white_36dp.png new file mode 100644 index 000000000..26f3fe001 Binary files /dev/null and b/java/com/android/incallui/commontheme/res/drawable-hdpi/ic_phone_audio_white_36dp.png differ diff --git a/java/com/android/incallui/commontheme/res/drawable-mdpi/ic_phone_audio_white_36dp.png b/java/com/android/incallui/commontheme/res/drawable-mdpi/ic_phone_audio_white_36dp.png new file mode 100644 index 000000000..5b0a9d663 Binary files /dev/null and b/java/com/android/incallui/commontheme/res/drawable-mdpi/ic_phone_audio_white_36dp.png differ diff --git a/java/com/android/incallui/commontheme/res/drawable-xhdpi/ic_phone_audio_white_36dp.png b/java/com/android/incallui/commontheme/res/drawable-xhdpi/ic_phone_audio_white_36dp.png new file mode 100644 index 000000000..d595b190d Binary files /dev/null and b/java/com/android/incallui/commontheme/res/drawable-xhdpi/ic_phone_audio_white_36dp.png differ diff --git a/java/com/android/incallui/commontheme/res/drawable-xxhdpi/ic_phone_audio_white_36dp.png b/java/com/android/incallui/commontheme/res/drawable-xxhdpi/ic_phone_audio_white_36dp.png new file mode 100644 index 000000000..fb7cf161b Binary files /dev/null and b/java/com/android/incallui/commontheme/res/drawable-xxhdpi/ic_phone_audio_white_36dp.png differ diff --git a/java/com/android/incallui/commontheme/res/drawable-xxxhdpi/ic_phone_audio_white_36dp.png b/java/com/android/incallui/commontheme/res/drawable-xxxhdpi/ic_phone_audio_white_36dp.png new file mode 100644 index 000000000..4bb58d9f5 Binary files /dev/null and b/java/com/android/incallui/commontheme/res/drawable-xxxhdpi/ic_phone_audio_white_36dp.png differ diff --git a/java/com/android/incallui/commontheme/res/values-af/strings.xml b/java/com/android/incallui/commontheme/res/values-af/strings.xml index 0721869bb..0dfdbc7d5 100644 --- a/java/com/android/incallui/commontheme/res/values-af/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-af/strings.xml @@ -1,20 +1,4 @@ - - "Beëindig oproep" @@ -31,6 +15,4 @@ "Video aan" "Video af" "Verwissel video" - "Luidspreker" - "Klank" diff --git a/java/com/android/incallui/commontheme/res/values-am/strings.xml b/java/com/android/incallui/commontheme/res/values-am/strings.xml index 9d748e380..3155c39be 100644 --- a/java/com/android/incallui/commontheme/res/values-am/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-am/strings.xml @@ -1,20 +1,4 @@ - - "ጥሪ ጨርስ" @@ -31,6 +15,4 @@ "ቪዲዮ በርቷል" "ቪዲዮ ጠፍቷል" "ቪዲዮ አገላብጥ" - "የድምጽ ማጉያ" - "ድምፅ" diff --git a/java/com/android/incallui/commontheme/res/values-ar/strings.xml b/java/com/android/incallui/commontheme/res/values-ar/strings.xml index 693bfc57a..ecb3608bd 100644 --- a/java/com/android/incallui/commontheme/res/values-ar/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-ar/strings.xml @@ -1,20 +1,4 @@ - - "إنهاء المكالمة" @@ -31,6 +15,4 @@ "الفيديو قيد التشغيل" "الفيديو ليس قيد التشغيل" "تبديل الفيديو" - "مكبر الصوت" - "صوت" diff --git a/java/com/android/incallui/commontheme/res/values-az/strings.xml b/java/com/android/incallui/commontheme/res/values-az/strings.xml index a1d88ceef..d935a6c93 100644 --- a/java/com/android/incallui/commontheme/res/values-az/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-az/strings.xml @@ -1,20 +1,4 @@ - - "Zəngi sonlandırın" @@ -31,6 +15,4 @@ "Video aktivdir" "Video deaktivdir" "Videonu dəyişdirin" - "Dinamik" - "Səs" diff --git a/java/com/android/incallui/commontheme/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/commontheme/res/values-b+sr+Latn/strings.xml index 05ae59cdd..36430c42b 100644 --- a/java/com/android/incallui/commontheme/res/values-b+sr+Latn/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-b+sr+Latn/strings.xml @@ -1,20 +1,4 @@ - - "Završi poziv" @@ -31,6 +15,4 @@ "Uključi video" "Isključi video" "Zameni video" - "Zvučnik" - "Zvuk" diff --git a/java/com/android/incallui/commontheme/res/values-be/strings.xml b/java/com/android/incallui/commontheme/res/values-be/strings.xml index e772e2795..9609a6346 100644 --- a/java/com/android/incallui/commontheme/res/values-be/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-be/strings.xml @@ -1,20 +1,4 @@ - - "Завяршыць выклік" @@ -31,6 +15,4 @@ "Відэа ўкл." "Відэа выкл." "Пераключыць відэа" - "Вонк.дынамік" - "Гук" diff --git a/java/com/android/incallui/commontheme/res/values-bg/strings.xml b/java/com/android/incallui/commontheme/res/values-bg/strings.xml index 63364f8e6..1a0f3e312 100644 --- a/java/com/android/incallui/commontheme/res/values-bg/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-bg/strings.xml @@ -1,20 +1,4 @@ - - "Край на обаждането" @@ -31,6 +15,4 @@ "Видеото е включено" "Видеото е изключено" "Размяна на видеото" - "Високогов." - "Звук" diff --git a/java/com/android/incallui/commontheme/res/values-bn/strings.xml b/java/com/android/incallui/commontheme/res/values-bn/strings.xml index 9871ea447..ef2408f64 100644 --- a/java/com/android/incallui/commontheme/res/values-bn/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-bn/strings.xml @@ -1,20 +1,4 @@ - - "কল কেটে দিন" @@ -31,6 +15,4 @@ "ভিডিও চালু আছে" "ভিডিও বন্ধ আছে" "ভিডিও অদল বদল করুন" - "স্পিকার" - "শব্দ" diff --git a/java/com/android/incallui/commontheme/res/values-bs/strings.xml b/java/com/android/incallui/commontheme/res/values-bs/strings.xml index 76f991d64..bfaff983f 100644 --- a/java/com/android/incallui/commontheme/res/values-bs/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-bs/strings.xml @@ -1,20 +1,4 @@ - - "Prekini poziv" @@ -31,6 +15,4 @@ "Kamera je uključena" "Kamera je isključena" "Zamijeni kameru" - "Zvučnik" - "Zvuk" diff --git a/java/com/android/incallui/commontheme/res/values-ca/strings.xml b/java/com/android/incallui/commontheme/res/values-ca/strings.xml index 832027d39..1b6ed4492 100644 --- a/java/com/android/incallui/commontheme/res/values-ca/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-ca/strings.xml @@ -1,20 +1,4 @@ - - "Finalitza la trucada" @@ -31,6 +15,4 @@ "Vídeo activat" "Vídeo desactivat" "Canvia de vídeo" - "Altaveu" - "So" diff --git a/java/com/android/incallui/commontheme/res/values-cs/strings.xml b/java/com/android/incallui/commontheme/res/values-cs/strings.xml index 7afdcba0b..1f10d85fe 100644 --- a/java/com/android/incallui/commontheme/res/values-cs/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-cs/strings.xml @@ -1,20 +1,4 @@ - - "Ukončit hovor" @@ -31,6 +15,4 @@ "Zapnuté video" "Vypnuté video" "Přepnout video" - "Reproduktor" - "Zvuk" diff --git a/java/com/android/incallui/commontheme/res/values-da/strings.xml b/java/com/android/incallui/commontheme/res/values-da/strings.xml index bd26e90e5..35d01e317 100644 --- a/java/com/android/incallui/commontheme/res/values-da/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-da/strings.xml @@ -1,20 +1,4 @@ - - "Afslut opkald" @@ -31,6 +15,4 @@ "Video til" "Video fra" "Byt video" - "Højttaler" - "Lyd" diff --git a/java/com/android/incallui/commontheme/res/values-de/strings.xml b/java/com/android/incallui/commontheme/res/values-de/strings.xml index 3fd10f0e6..57a95b7f3 100644 --- a/java/com/android/incallui/commontheme/res/values-de/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-de/strings.xml @@ -1,20 +1,4 @@ - - "Anruf beenden" @@ -31,6 +15,4 @@ "Video an" "Video aus" "Video wechseln" - "Lautsprecher" - "Tonausgabe" diff --git a/java/com/android/incallui/commontheme/res/values-el/strings.xml b/java/com/android/incallui/commontheme/res/values-el/strings.xml index 71c0be9a7..6bb9edcd1 100644 --- a/java/com/android/incallui/commontheme/res/values-el/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-el/strings.xml @@ -1,20 +1,4 @@ - - "Τερματισμός" @@ -31,6 +15,4 @@ "Εικόνα βίντεο ενεργοποιημένη" "Εικόνα βίντεο απενεργοποιημένη" "Εναλλαγή βίντεο" - "Ηχείο" - "Ήχος" diff --git a/java/com/android/incallui/commontheme/res/values-en-rAU/strings.xml b/java/com/android/incallui/commontheme/res/values-en-rAU/strings.xml index 4869c3fa3..8133185b5 100644 --- a/java/com/android/incallui/commontheme/res/values-en-rAU/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-en-rAU/strings.xml @@ -1,20 +1,4 @@ - - "End call" @@ -31,6 +15,4 @@ "Video on" "Video off" "Swap video" - "Speaker" - "Sound" diff --git a/java/com/android/incallui/commontheme/res/values-en-rGB/strings.xml b/java/com/android/incallui/commontheme/res/values-en-rGB/strings.xml index 4869c3fa3..8133185b5 100644 --- a/java/com/android/incallui/commontheme/res/values-en-rGB/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-en-rGB/strings.xml @@ -1,20 +1,4 @@ - - "End call" @@ -31,6 +15,4 @@ "Video on" "Video off" "Swap video" - "Speaker" - "Sound" diff --git a/java/com/android/incallui/commontheme/res/values-en-rIN/strings.xml b/java/com/android/incallui/commontheme/res/values-en-rIN/strings.xml index 4869c3fa3..8133185b5 100644 --- a/java/com/android/incallui/commontheme/res/values-en-rIN/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-en-rIN/strings.xml @@ -1,20 +1,4 @@ - - "End call" @@ -31,6 +15,4 @@ "Video on" "Video off" "Swap video" - "Speaker" - "Sound" diff --git a/java/com/android/incallui/commontheme/res/values-es-rUS/strings.xml b/java/com/android/incallui/commontheme/res/values-es-rUS/strings.xml index a9596d9e6..45f2e2f42 100644 --- a/java/com/android/incallui/commontheme/res/values-es-rUS/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-es-rUS/strings.xml @@ -1,20 +1,4 @@ - - "Finalizar llamada" @@ -31,6 +15,4 @@ "Video activado" "Video desactivado" "Intercambiar video" - "Altavoz" - "Sonido" diff --git a/java/com/android/incallui/commontheme/res/values-es/strings.xml b/java/com/android/incallui/commontheme/res/values-es/strings.xml index aa84c625b..56c8b2852 100644 --- a/java/com/android/incallui/commontheme/res/values-es/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-es/strings.xml @@ -1,20 +1,4 @@ - - "Finalizar llamada" @@ -31,6 +15,4 @@ "Vídeo activado" "Vídeo desactivado" "Cambiar de vídeo" - "Altavoz" - "Sonido" diff --git a/java/com/android/incallui/commontheme/res/values-et/strings.xml b/java/com/android/incallui/commontheme/res/values-et/strings.xml index ae2e1ba53..069f3b5fd 100644 --- a/java/com/android/incallui/commontheme/res/values-et/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-et/strings.xml @@ -1,20 +1,4 @@ - - "Kõne lõpetamine" @@ -31,6 +15,4 @@ "Video on sees" "Video on väljas" "Video vahetamine" - "Kõlar" - "Heli" diff --git a/java/com/android/incallui/commontheme/res/values-eu/strings.xml b/java/com/android/incallui/commontheme/res/values-eu/strings.xml index 0dd126c5a..bbcf5dc6e 100644 --- a/java/com/android/incallui/commontheme/res/values-eu/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-eu/strings.xml @@ -1,20 +1,4 @@ - - "Amaitu deia" @@ -31,6 +15,4 @@ "Aktibatuta dago bideoa" "Desaktibatuta dago bideoa" "Aldatu bideoa" - "Bozgorailua" - "Soinua" diff --git a/java/com/android/incallui/commontheme/res/values-fa/strings.xml b/java/com/android/incallui/commontheme/res/values-fa/strings.xml index 1996ad47b..ea967bb7e 100644 --- a/java/com/android/incallui/commontheme/res/values-fa/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-fa/strings.xml @@ -1,20 +1,4 @@ - - "پایان تماس" @@ -31,6 +15,4 @@ "ویدئو فعال" "ویدئو غیرفعال" "جابه‌جایی ویدئو" - "بلندگو" - "صدا" diff --git a/java/com/android/incallui/commontheme/res/values-fi/strings.xml b/java/com/android/incallui/commontheme/res/values-fi/strings.xml index 5a579816b..f0da44f07 100644 --- a/java/com/android/incallui/commontheme/res/values-fi/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-fi/strings.xml @@ -1,20 +1,4 @@ - - "Päätä puhelu" @@ -31,6 +15,4 @@ "Videokuva käytössä" "Videokuva poissa käytöstä" "Vaihda videota" - "Kaiutin" - "Ääni" diff --git a/java/com/android/incallui/commontheme/res/values-fr-rCA/strings.xml b/java/com/android/incallui/commontheme/res/values-fr-rCA/strings.xml index a1db3065a..bf74dfbef 100644 --- a/java/com/android/incallui/commontheme/res/values-fr-rCA/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-fr-rCA/strings.xml @@ -1,20 +1,4 @@ - - "Mettre fin à l\'appel" @@ -31,6 +15,4 @@ "Vidéo activée" "Vidéo désactivée" "Permuter la vidéo" - "Haut-parleur" - "Son" diff --git a/java/com/android/incallui/commontheme/res/values-fr/strings.xml b/java/com/android/incallui/commontheme/res/values-fr/strings.xml index e169a3d7a..fb674a483 100644 --- a/java/com/android/incallui/commontheme/res/values-fr/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-fr/strings.xml @@ -1,20 +1,4 @@ - - "Mettre fin à l\'appel" @@ -31,6 +15,4 @@ "Vidéo activée" "Vidéo désactivée" "Permuter la vidéo" - "Haut-parleur" - "Audio" diff --git a/java/com/android/incallui/commontheme/res/values-gl/strings.xml b/java/com/android/incallui/commontheme/res/values-gl/strings.xml index ba98a98a7..c7e221416 100644 --- a/java/com/android/incallui/commontheme/res/values-gl/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-gl/strings.xml @@ -1,20 +1,4 @@ - - "Finalizar chamada" @@ -31,6 +15,4 @@ "Vídeo activado" "Vídeo desactivado" "Alternar vídeo" - "Altofalante" - "Son" diff --git a/java/com/android/incallui/commontheme/res/values-gu/strings.xml b/java/com/android/incallui/commontheme/res/values-gu/strings.xml index 194590cec..75584ea0d 100644 --- a/java/com/android/incallui/commontheme/res/values-gu/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-gu/strings.xml @@ -1,20 +1,4 @@ - - "કૉલ સમાપ્ત કરો" @@ -31,6 +15,4 @@ "વિડિઓ ચાલુ" "વિડિઓ બંધ" "વિડિઓ સ્વેપ કરો" - "સ્પીકર" - "ધ્વનિ" diff --git a/java/com/android/incallui/commontheme/res/values-hi/strings.xml b/java/com/android/incallui/commontheme/res/values-hi/strings.xml index 207bbf2be..f7ea68ad8 100644 --- a/java/com/android/incallui/commontheme/res/values-hi/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-hi/strings.xml @@ -1,20 +1,4 @@ - - "कॉल समाप्त करें" @@ -31,6 +15,4 @@ "वीडियो चालू" "वीडियो बंद" "वीडियो स्वैप करें" - "स्‍पीकर" - "ध्वनि" diff --git a/java/com/android/incallui/commontheme/res/values-hr/strings.xml b/java/com/android/incallui/commontheme/res/values-hr/strings.xml index c58ab852f..c30f3977e 100644 --- a/java/com/android/incallui/commontheme/res/values-hr/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-hr/strings.xml @@ -1,20 +1,4 @@ - - "Prekid poziva" @@ -31,6 +15,4 @@ "Videopoziv uključen" "Videopoziv isključen" "Zamijeni videopoziv" - "Zvučnik" - "Zvuk" diff --git a/java/com/android/incallui/commontheme/res/values-hu/strings.xml b/java/com/android/incallui/commontheme/res/values-hu/strings.xml index ba7fec7d5..9ee2300e2 100644 --- a/java/com/android/incallui/commontheme/res/values-hu/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-hu/strings.xml @@ -1,20 +1,4 @@ - - "Hívás befejezése" @@ -31,6 +15,4 @@ "Videó be" "Videó ki" "Videó cseréje" - "Hangszóró" - "Hang" diff --git a/java/com/android/incallui/commontheme/res/values-hy/strings.xml b/java/com/android/incallui/commontheme/res/values-hy/strings.xml index 81262e4c6..96a0cab6f 100644 --- a/java/com/android/incallui/commontheme/res/values-hy/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-hy/strings.xml @@ -1,20 +1,4 @@ - - "Ավարտել զանգը" @@ -31,6 +15,4 @@ "Տեսախցիկը միացած է" "Տեսախցիկն անջատած է" "Փոխարկել խցիկը" - "Բարձրախոս" - "Ձայն" diff --git a/java/com/android/incallui/commontheme/res/values-in/strings.xml b/java/com/android/incallui/commontheme/res/values-in/strings.xml index fb3fc56ec..4536f5db0 100644 --- a/java/com/android/incallui/commontheme/res/values-in/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-in/strings.xml @@ -1,20 +1,4 @@ - - "Akhiri panggilan" @@ -31,6 +15,4 @@ "Video aktif" "Video nonaktif" "Tukar Video" - "Speaker" - "Suara" diff --git a/java/com/android/incallui/commontheme/res/values-is/strings.xml b/java/com/android/incallui/commontheme/res/values-is/strings.xml index 438b143e4..357f90eee 100644 --- a/java/com/android/incallui/commontheme/res/values-is/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-is/strings.xml @@ -1,20 +1,4 @@ - - "Ljúka símtali" @@ -31,6 +15,4 @@ "Kveikja á mynd" "Slökkva á mynd" "Skipta um mynd" - "Hátalari" - "Hljóð" diff --git a/java/com/android/incallui/commontheme/res/values-it/strings.xml b/java/com/android/incallui/commontheme/res/values-it/strings.xml index b7c1d3f4e..a63d3140a 100644 --- a/java/com/android/incallui/commontheme/res/values-it/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-it/strings.xml @@ -1,20 +1,4 @@ - - "Termina chiamata" @@ -31,6 +15,4 @@ "Video attivo" "Video non attivo" "Scambia video" - "Altoparlante" - "Suono" diff --git a/java/com/android/incallui/commontheme/res/values-iw/strings.xml b/java/com/android/incallui/commontheme/res/values-iw/strings.xml index cbd6d7573..1e2b7f2b1 100644 --- a/java/com/android/incallui/commontheme/res/values-iw/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-iw/strings.xml @@ -1,20 +1,4 @@ - - "סיים שיחה" @@ -31,6 +15,4 @@ "הווידאו מופעל" "הווידאו מושבת" "החלף וידאו" - "רמקול" - "קול" diff --git a/java/com/android/incallui/commontheme/res/values-ja/strings.xml b/java/com/android/incallui/commontheme/res/values-ja/strings.xml index 4ea949581..658b51349 100644 --- a/java/com/android/incallui/commontheme/res/values-ja/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-ja/strings.xml @@ -1,20 +1,4 @@ - - "通話を終了" @@ -31,6 +15,4 @@ "ビデオが ON になっています" "ビデオが OFF になっています" "ビデオを切り替える" - "スピーカー" - "音声" diff --git a/java/com/android/incallui/commontheme/res/values-ka/strings.xml b/java/com/android/incallui/commontheme/res/values-ka/strings.xml index 3163476b6..ffba7cede 100644 --- a/java/com/android/incallui/commontheme/res/values-ka/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-ka/strings.xml @@ -1,20 +1,4 @@ - - "ზარის დასრულება" @@ -31,6 +15,4 @@ "ვიდეო ჩართულია" "ვიდეო გამორთულია" "ვიდეოს შენაცვლება" - "სპიკერი" - "ხმა" diff --git a/java/com/android/incallui/commontheme/res/values-kk/strings.xml b/java/com/android/incallui/commontheme/res/values-kk/strings.xml index 23b3a2ad6..ace83ecee 100644 --- a/java/com/android/incallui/commontheme/res/values-kk/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-kk/strings.xml @@ -1,20 +1,4 @@ - - "Қоңырауды аяқтау" @@ -31,6 +15,4 @@ "Бейне қосулы" "Бейне өшірулі" "Бейнені ауыстыру" - "Динамик" - "Дыбыс" diff --git a/java/com/android/incallui/commontheme/res/values-km/strings.xml b/java/com/android/incallui/commontheme/res/values-km/strings.xml index 55cfa0a16..e28f12029 100644 --- a/java/com/android/incallui/commontheme/res/values-km/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-km/strings.xml @@ -1,20 +1,4 @@ - - "បញ្ចប់​ការ​ហៅ" @@ -31,6 +15,4 @@ "បើក​វីដេអូ​" "បិទ​វីដេអូ" "ប្ដូរ​វីដេអូ" - "ឧបករណ៍​បំពង​សំឡេង" - "សំឡេង" diff --git a/java/com/android/incallui/commontheme/res/values-kn/strings.xml b/java/com/android/incallui/commontheme/res/values-kn/strings.xml index 685ef642f..59186e0a3 100644 --- a/java/com/android/incallui/commontheme/res/values-kn/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-kn/strings.xml @@ -1,20 +1,4 @@ - - "ಕರೆ ಅಂತ್ಯಗೊಳಿಸಿ" @@ -31,6 +15,4 @@ "ವೀಡಿಯೊ ಆನ್" "ವೀಡಿಯೊ ಆಫ್" "ವೀಡಿಯೊ ಬದಲಾಯಿಸಿ" - "ಸ್ಪೀಕರ್‌" - "ಶಬ್ದ" diff --git a/java/com/android/incallui/commontheme/res/values-ko/strings.xml b/java/com/android/incallui/commontheme/res/values-ko/strings.xml index 088746ddd..0a0e3c9aa 100644 --- a/java/com/android/incallui/commontheme/res/values-ko/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-ko/strings.xml @@ -1,20 +1,4 @@ - - "통화 종료" @@ -31,6 +15,4 @@ "동영상 켜짐" "동영상 꺼짐" "동영상 전환" - "스피커" - "소리" diff --git a/java/com/android/incallui/commontheme/res/values-ky/strings.xml b/java/com/android/incallui/commontheme/res/values-ky/strings.xml index 5dd4d0c21..ac697e4fe 100644 --- a/java/com/android/incallui/commontheme/res/values-ky/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-ky/strings.xml @@ -1,20 +1,4 @@ - - "Чалууну бүтүрүү" @@ -31,6 +15,4 @@ "Видео күйүк" "Видео өчүк" "Видеону иштетүү/өчүрүү" - "Катуу сүйлөткүч" - "Добуш" diff --git a/java/com/android/incallui/commontheme/res/values-lo/strings.xml b/java/com/android/incallui/commontheme/res/values-lo/strings.xml index 2f0b94b54..da2050ac2 100644 --- a/java/com/android/incallui/commontheme/res/values-lo/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-lo/strings.xml @@ -1,20 +1,4 @@ - - "ວາງສາຍ" @@ -31,6 +15,4 @@ "ວິດີໂອເປີດ" "ວິດີໂອປິດ" "ສະຫຼັບວິດີໂອ" - "ລຳໂພງ" - "ສຽງ" diff --git a/java/com/android/incallui/commontheme/res/values-lt/strings.xml b/java/com/android/incallui/commontheme/res/values-lt/strings.xml index d0a5e0d9c..bda53d6f6 100644 --- a/java/com/android/incallui/commontheme/res/values-lt/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-lt/strings.xml @@ -1,20 +1,4 @@ - - "Baigti skambutį" @@ -31,6 +15,4 @@ "Vaizdas įjungtas" "Vaizdas išjungtas" "Sukeisti vaizdą" - "Garsiakalbis" - "Garsas" diff --git a/java/com/android/incallui/commontheme/res/values-lv/strings.xml b/java/com/android/incallui/commontheme/res/values-lv/strings.xml index 443ac5e80..beaf35c58 100644 --- a/java/com/android/incallui/commontheme/res/values-lv/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-lv/strings.xml @@ -1,20 +1,4 @@ - - "Beigt zvanu" @@ -31,6 +15,4 @@ "Video ieslēgts" "Video izslēgts" "Mainīt video" - "Skaļrunis" - "Skaņa" diff --git a/java/com/android/incallui/commontheme/res/values-mk/strings.xml b/java/com/android/incallui/commontheme/res/values-mk/strings.xml index d9a339eab..5b4f6d0c5 100644 --- a/java/com/android/incallui/commontheme/res/values-mk/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-mk/strings.xml @@ -1,20 +1,4 @@ - - "Завршете го повикот" @@ -31,6 +15,4 @@ "Видеото е вклучено" "Видеото е исклучено" "Заменете го видеото" - "Звучник" - "Звук" diff --git a/java/com/android/incallui/commontheme/res/values-ml/strings.xml b/java/com/android/incallui/commontheme/res/values-ml/strings.xml index 0f2d88968..024266736 100644 --- a/java/com/android/incallui/commontheme/res/values-ml/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-ml/strings.xml @@ -1,20 +1,4 @@ - - "കോള്‍ അവസാനിപ്പിക്കൂ" @@ -31,6 +15,4 @@ "വീഡിയോ ഓണാണ്" "വീഡിയോ ഓഫാണ്" "വീഡിയോ സ്വാപ്പുചെയ്യുക" - "സ്പീക്കർ" - "ശബ്‌ദം" diff --git a/java/com/android/incallui/commontheme/res/values-mn/strings.xml b/java/com/android/incallui/commontheme/res/values-mn/strings.xml index 3665fcfa6..cd286edb9 100644 --- a/java/com/android/incallui/commontheme/res/values-mn/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-mn/strings.xml @@ -1,20 +1,4 @@ - - "Дуудлагыг таслах" @@ -31,6 +15,4 @@ "Видео идэвхтэй" "Видео идэвхгүй" "Видеог солих" - "Чанга яригч" - "Дуу" diff --git a/java/com/android/incallui/commontheme/res/values-mr/strings.xml b/java/com/android/incallui/commontheme/res/values-mr/strings.xml index f7498097f..2c626edbd 100644 --- a/java/com/android/incallui/commontheme/res/values-mr/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-mr/strings.xml @@ -1,20 +1,4 @@ - - "कॉल समाप्त करा" @@ -31,6 +15,4 @@ "व्हिडिओ चालू" "व्हिडिओ बंद" "व्हिडिओ बदला" - "स्पीकर" - "ध्वनी" diff --git a/java/com/android/incallui/commontheme/res/values-ms/strings.xml b/java/com/android/incallui/commontheme/res/values-ms/strings.xml index fb38fa9d1..f6c358d79 100644 --- a/java/com/android/incallui/commontheme/res/values-ms/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-ms/strings.xml @@ -1,20 +1,4 @@ - - "Tamatkan panggilan" @@ -31,6 +15,4 @@ "Video dihidupkan" "Video dimatikan" "Silih video" - "Pmbsr suara" - "Bunyi" diff --git a/java/com/android/incallui/commontheme/res/values-my/strings.xml b/java/com/android/incallui/commontheme/res/values-my/strings.xml index 5b396be59..6b6614c36 100644 --- a/java/com/android/incallui/commontheme/res/values-my/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-my/strings.xml @@ -1,20 +1,4 @@ - - "ခေါ်ဆိုမှုအပြီးသတ်ရန်" @@ -31,6 +15,4 @@ "ဗီဒီယိုဖွင့်ထားသည်" "ဗီဒီယိုပိတ်ထားသည်" "ဗီဒီယိုဖလှယ်ရန်" - "စပီကာ" - "အသံ" diff --git a/java/com/android/incallui/commontheme/res/values-nb/strings.xml b/java/com/android/incallui/commontheme/res/values-nb/strings.xml index 506b15e31..4974411bc 100644 --- a/java/com/android/incallui/commontheme/res/values-nb/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-nb/strings.xml @@ -1,20 +1,4 @@ - - "Avslutt samtalen" @@ -31,6 +15,4 @@ "Video på" "Video av" "Bytt video" - "Høyttaler" - "Lyd" diff --git a/java/com/android/incallui/commontheme/res/values-ne/strings.xml b/java/com/android/incallui/commontheme/res/values-ne/strings.xml index fa9d87fb7..5cd91b336 100644 --- a/java/com/android/incallui/commontheme/res/values-ne/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-ne/strings.xml @@ -1,20 +1,4 @@ - - "कल अन्त्य गर्नुहोस्" @@ -31,6 +15,4 @@ "सक्रिय भिडियो" "निष्क्रिय भिडियो" "भिडियो साट्नुहोस्" - "स्पिकर" - "आवाज" diff --git a/java/com/android/incallui/commontheme/res/values-nl/strings.xml b/java/com/android/incallui/commontheme/res/values-nl/strings.xml index 192c47b97..d33d60075 100644 --- a/java/com/android/incallui/commontheme/res/values-nl/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-nl/strings.xml @@ -1,20 +1,4 @@ - - "Oproep beëindigen" @@ -31,6 +15,4 @@ "Video aan" "Video uit" "Video wisselen" - "Luidspreker" - "Geluid" diff --git a/java/com/android/incallui/commontheme/res/values-no/strings.xml b/java/com/android/incallui/commontheme/res/values-no/strings.xml index 506b15e31..4974411bc 100644 --- a/java/com/android/incallui/commontheme/res/values-no/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-no/strings.xml @@ -1,20 +1,4 @@ - - "Avslutt samtalen" @@ -31,6 +15,4 @@ "Video på" "Video av" "Bytt video" - "Høyttaler" - "Lyd" diff --git a/java/com/android/incallui/commontheme/res/values-pa/strings.xml b/java/com/android/incallui/commontheme/res/values-pa/strings.xml index 77ceb252a..7e59e6114 100644 --- a/java/com/android/incallui/commontheme/res/values-pa/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-pa/strings.xml @@ -1,20 +1,4 @@ - - "ਕਾਲ ਸਮਾਪਤ ਕਰੋ" @@ -31,6 +15,4 @@ "ਵੀਡੀਓ ਚਾਲੂ" "ਵੀਡੀਓ ਬੰਦ" "ਵੀਡੀਓ ਦੀ ਅਦਲਾ ਬਦਲੀ ਕਰੋ" - "ਸਪੀਕਰ" - "ਧੁਨੀ" diff --git a/java/com/android/incallui/commontheme/res/values-pl/strings.xml b/java/com/android/incallui/commontheme/res/values-pl/strings.xml index d9b037e8d..4ab1d244d 100644 --- a/java/com/android/incallui/commontheme/res/values-pl/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-pl/strings.xml @@ -1,20 +1,4 @@ - - "Zakończ połączenie" @@ -31,6 +15,4 @@ "Wideo włączone" "Wideo wyłączone" "Przełącz wideo" - "Głośnik" - "Dźwięk" diff --git a/java/com/android/incallui/commontheme/res/values-pt-rBR/strings.xml b/java/com/android/incallui/commontheme/res/values-pt-rBR/strings.xml index 2c1834e0f..67f367466 100644 --- a/java/com/android/incallui/commontheme/res/values-pt-rBR/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-pt-rBR/strings.xml @@ -1,20 +1,4 @@ - - "Encerrar chamada" @@ -31,6 +15,4 @@ "Vídeo ativado" "Vídeo desativado" "Trocar vídeo" - "Alto-falante" - "Som" diff --git a/java/com/android/incallui/commontheme/res/values-pt-rPT/strings.xml b/java/com/android/incallui/commontheme/res/values-pt-rPT/strings.xml index f0c14d027..27c564928 100644 --- a/java/com/android/incallui/commontheme/res/values-pt-rPT/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-pt-rPT/strings.xml @@ -1,20 +1,4 @@ - - "Terminar chamada" @@ -31,6 +15,4 @@ "Vídeo ativado" "Vídeo desativado" "Alternar vídeo" - "Altifalante" - "Som" diff --git a/java/com/android/incallui/commontheme/res/values-pt/strings.xml b/java/com/android/incallui/commontheme/res/values-pt/strings.xml index 2c1834e0f..67f367466 100644 --- a/java/com/android/incallui/commontheme/res/values-pt/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-pt/strings.xml @@ -1,20 +1,4 @@ - - "Encerrar chamada" @@ -31,6 +15,4 @@ "Vídeo ativado" "Vídeo desativado" "Trocar vídeo" - "Alto-falante" - "Som" diff --git a/java/com/android/incallui/commontheme/res/values-ro/strings.xml b/java/com/android/incallui/commontheme/res/values-ro/strings.xml index f7c8f7257..b7fec9a58 100644 --- a/java/com/android/incallui/commontheme/res/values-ro/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-ro/strings.xml @@ -1,20 +1,4 @@ - - "Încheiați apelul" @@ -31,6 +15,4 @@ "Imaginea video este activată" "Imaginea video este dezactivată" "Schimbați imaginea video" - "Difuzor" - "Sunet" diff --git a/java/com/android/incallui/commontheme/res/values-ru/strings.xml b/java/com/android/incallui/commontheme/res/values-ru/strings.xml index 1853ad23f..5d1807f7a 100644 --- a/java/com/android/incallui/commontheme/res/values-ru/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-ru/strings.xml @@ -1,20 +1,4 @@ - - "Завершить вызов" @@ -31,6 +15,4 @@ "Камера включена" "Камера выключена" "Включить/выключить камеру" - "Динамик" - "Звук" diff --git a/java/com/android/incallui/commontheme/res/values-si/strings.xml b/java/com/android/incallui/commontheme/res/values-si/strings.xml index ae13cc424..0a0f35c47 100644 --- a/java/com/android/incallui/commontheme/res/values-si/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-si/strings.xml @@ -1,20 +1,4 @@ - - "ඇමතුම අවසන් කරන්න" @@ -31,6 +15,4 @@ "වීඩියෝව ක්‍රියාත්මකයි" "වීඩියෝව ක්‍රියාවිරහිතයි" "වීඩියෝව මාරු කරන්න" - "ස්පීකරය" - "හඬ" diff --git a/java/com/android/incallui/commontheme/res/values-sk/strings.xml b/java/com/android/incallui/commontheme/res/values-sk/strings.xml index cd9aa9912..97eabebb4 100644 --- a/java/com/android/incallui/commontheme/res/values-sk/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-sk/strings.xml @@ -1,20 +1,4 @@ - - "Ukončiť hovor" @@ -31,6 +15,4 @@ "Video je zapnuté" "Video je vypnuté" "Zameniť video" - "Reproduktor" - "Zvuk" diff --git a/java/com/android/incallui/commontheme/res/values-sl/strings.xml b/java/com/android/incallui/commontheme/res/values-sl/strings.xml index 0aa6e699a..46cf2e8ee 100644 --- a/java/com/android/incallui/commontheme/res/values-sl/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-sl/strings.xml @@ -1,20 +1,4 @@ - - "Končaj klic" @@ -31,6 +15,4 @@ "Vklopi video" "Izklopi video" "Zamenjaj video" - "Zvočnik" - "Zvok" diff --git a/java/com/android/incallui/commontheme/res/values-sq/strings.xml b/java/com/android/incallui/commontheme/res/values-sq/strings.xml index b9c97d1dd..17ec08167 100644 --- a/java/com/android/incallui/commontheme/res/values-sq/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-sq/strings.xml @@ -1,20 +1,4 @@ - - "Mbylle telefonatën" @@ -31,6 +15,4 @@ "Videoja aktive" "Videoja joaktive" "Shkëmbe video" - "Altoparlanti" - "Tingulli" diff --git a/java/com/android/incallui/commontheme/res/values-sr/strings.xml b/java/com/android/incallui/commontheme/res/values-sr/strings.xml index 67586b72e..2928bc992 100644 --- a/java/com/android/incallui/commontheme/res/values-sr/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-sr/strings.xml @@ -1,20 +1,4 @@ - - "Заврши позив" @@ -31,6 +15,4 @@ "Укључи видео" "Искључи видео" "Замени видео" - "Звучник" - "Звук" diff --git a/java/com/android/incallui/commontheme/res/values-sv/strings.xml b/java/com/android/incallui/commontheme/res/values-sv/strings.xml index 957a2f85a..17b5d3745 100644 --- a/java/com/android/incallui/commontheme/res/values-sv/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-sv/strings.xml @@ -1,20 +1,4 @@ - - "Avsluta samtal" @@ -31,6 +15,4 @@ "Video på" "Video av" "Byt video" - "Högtalare" - "Ljud" diff --git a/java/com/android/incallui/commontheme/res/values-sw/strings.xml b/java/com/android/incallui/commontheme/res/values-sw/strings.xml index 8752c2d37..165d57622 100644 --- a/java/com/android/incallui/commontheme/res/values-sw/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-sw/strings.xml @@ -1,20 +1,4 @@ - - "Kata simu" @@ -31,6 +15,4 @@ "Washa video" "Zima video" "Badilisha video" - "Spika" - "Sauti" diff --git a/java/com/android/incallui/commontheme/res/values-ta/strings.xml b/java/com/android/incallui/commontheme/res/values-ta/strings.xml index 69258d2e6..fa2dfb280 100644 --- a/java/com/android/incallui/commontheme/res/values-ta/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-ta/strings.xml @@ -1,20 +1,4 @@ - - "அழைப்பைத் துண்டிக்கும்" @@ -31,6 +15,4 @@ "வீடியோ இயக்கப்பட்டது" "வீடியோ முடக்கப்பட்டது" "வீடியோவிற்கு மாற்றும்" - "ஸ்பீக்கர்" - "ஒலி" diff --git a/java/com/android/incallui/commontheme/res/values-te/strings.xml b/java/com/android/incallui/commontheme/res/values-te/strings.xml index 9454e15b7..3ce431cd1 100644 --- a/java/com/android/incallui/commontheme/res/values-te/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-te/strings.xml @@ -1,20 +1,4 @@ - - "కాల్‌ను ముగిస్తుంది" @@ -31,6 +15,4 @@ "వీడియో ఆన్‌లో ఉంది" "వీడియో ఆఫ్‌లో ఉంది" "వీడియోను మారుస్తుంది" - "స్పీకర్" - "ధ్వని" diff --git a/java/com/android/incallui/commontheme/res/values-th/strings.xml b/java/com/android/incallui/commontheme/res/values-th/strings.xml index 823531000..1fa145c02 100644 --- a/java/com/android/incallui/commontheme/res/values-th/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-th/strings.xml @@ -1,20 +1,4 @@ - - "วางสาย" @@ -31,6 +15,4 @@ "เปิดวิดีโอ" "ปิดวิดีโอ" "สลับวิดีโอ" - "ลำโพง" - "เสียง" diff --git a/java/com/android/incallui/commontheme/res/values-tl/strings.xml b/java/com/android/incallui/commontheme/res/values-tl/strings.xml index f368e3a68..a53e11c7d 100644 --- a/java/com/android/incallui/commontheme/res/values-tl/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-tl/strings.xml @@ -1,20 +1,4 @@ - - "Tapusin ang tawag" @@ -31,6 +15,4 @@ "Naka-on ang video" "Naka-off ang video" "Pagpalitin ang video" - "Speaker" - "Tunog" diff --git a/java/com/android/incallui/commontheme/res/values-tr/strings.xml b/java/com/android/incallui/commontheme/res/values-tr/strings.xml index cbf550211..09552730a 100644 --- a/java/com/android/incallui/commontheme/res/values-tr/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-tr/strings.xml @@ -1,20 +1,4 @@ - - "Çağrıyı sonlandırın" @@ -31,6 +15,4 @@ "Video açık" "Video kapalı" "Videoyu değiştirin" - "Hoparlör" - "Ses" diff --git a/java/com/android/incallui/commontheme/res/values-uk/strings.xml b/java/com/android/incallui/commontheme/res/values-uk/strings.xml index 2bcd04c0e..e17e781b3 100644 --- a/java/com/android/incallui/commontheme/res/values-uk/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-uk/strings.xml @@ -1,20 +1,4 @@ - - "Завершити виклик" @@ -31,6 +15,4 @@ "Відео ввімкнено" "Відео вимкнено" "Поміняти відео" - "Динамік" - "Звук" diff --git a/java/com/android/incallui/commontheme/res/values-ur/strings.xml b/java/com/android/incallui/commontheme/res/values-ur/strings.xml index bd8cf6807..5082e9d11 100644 --- a/java/com/android/incallui/commontheme/res/values-ur/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-ur/strings.xml @@ -1,20 +1,4 @@ - - "کال ختم کریں" @@ -31,6 +15,4 @@ "ویڈیو آن ہے" "ویڈیو آف ہے" "ویڈیو کا تبادلہ کریں" - "اسپیکر" - "آواز" diff --git a/java/com/android/incallui/commontheme/res/values-uz/strings.xml b/java/com/android/incallui/commontheme/res/values-uz/strings.xml index 9bc995de2..d349d3f9a 100644 --- a/java/com/android/incallui/commontheme/res/values-uz/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-uz/strings.xml @@ -1,20 +1,4 @@ - - "Qo‘ng‘iroqni tugatish" @@ -31,6 +15,4 @@ "Video yoniq" "Video o‘chiq" "Videoni yoqish/ochirish" - "Karnay" - "Tovush" diff --git a/java/com/android/incallui/commontheme/res/values-vi/strings.xml b/java/com/android/incallui/commontheme/res/values-vi/strings.xml index caf8f3434..3bd39ae4d 100644 --- a/java/com/android/incallui/commontheme/res/values-vi/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-vi/strings.xml @@ -1,20 +1,4 @@ - - "Kết thúc cuộc gọi" @@ -31,6 +15,4 @@ "Bật video" "Tắt video" "Hoán đổi video" - "Loa" - "Âm báo" diff --git a/java/com/android/incallui/commontheme/res/values-zh-rCN/strings.xml b/java/com/android/incallui/commontheme/res/values-zh-rCN/strings.xml index 4d8bda6bc..0f57120e2 100644 --- a/java/com/android/incallui/commontheme/res/values-zh-rCN/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-zh-rCN/strings.xml @@ -1,20 +1,4 @@ - - "结束通话" @@ -31,6 +15,4 @@ "视频已开启" "视频已关闭" "切换视频" - "免提" - "音频路径" diff --git a/java/com/android/incallui/commontheme/res/values-zh-rHK/strings.xml b/java/com/android/incallui/commontheme/res/values-zh-rHK/strings.xml index 175b3e657..a3809ebca 100644 --- a/java/com/android/incallui/commontheme/res/values-zh-rHK/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-zh-rHK/strings.xml @@ -1,20 +1,4 @@ - - "結束通話" @@ -31,6 +15,4 @@ "視像已開啟" "視像已關閉" "切換視像" - "喇叭" - "音效" diff --git a/java/com/android/incallui/commontheme/res/values-zh-rTW/strings.xml b/java/com/android/incallui/commontheme/res/values-zh-rTW/strings.xml index dee1b9c95..983dddda7 100644 --- a/java/com/android/incallui/commontheme/res/values-zh-rTW/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-zh-rTW/strings.xml @@ -1,20 +1,4 @@ - - "結束通話" @@ -31,6 +15,4 @@ "開啟視訊畫面" "關閉視訊畫面" "切換視訊畫面" - "擴音" - "音訊" diff --git a/java/com/android/incallui/commontheme/res/values-zu/strings.xml b/java/com/android/incallui/commontheme/res/values-zu/strings.xml index 953596231..2dd2c897e 100644 --- a/java/com/android/incallui/commontheme/res/values-zu/strings.xml +++ b/java/com/android/incallui/commontheme/res/values-zu/strings.xml @@ -1,20 +1,4 @@ - - "Qeda ikholi" @@ -31,6 +15,4 @@ "Ividiyo ivuliwe" "Ividiyo ivaliwe" "Shintsha ividiyo" - "Isipikha" - "Umsindo" diff --git a/java/com/android/incallui/commontheme/res/values/strings.xml b/java/com/android/incallui/commontheme/res/values/strings.xml index 94a8c901b..6f346a34d 100644 --- a/java/com/android/incallui/commontheme/res/values/strings.xml +++ b/java/com/android/incallui/commontheme/res/values/strings.xml @@ -1,19 +1,4 @@ - End call @@ -47,11 +32,4 @@ Swap video - - Speaker - - Sound - diff --git a/java/com/android/incallui/contactgrid/BottomRow.java b/java/com/android/incallui/contactgrid/BottomRow.java index d0ff1926a..228c786a0 100644 --- a/java/com/android/incallui/contactgrid/BottomRow.java +++ b/java/com/android/incallui/contactgrid/BottomRow.java @@ -22,6 +22,7 @@ import android.telephony.PhoneNumberUtils; import android.text.BidiFormatter; import android.text.TextDirectionHeuristics; import android.text.TextUtils; +import com.android.contacts.common.compat.PhoneNumberUtilsCompat; import com.android.incallui.call.DialerCall.State; import com.android.incallui.incall.protocol.PrimaryCallState; import com.android.incallui.incall.protocol.PrimaryInfo; @@ -136,7 +137,7 @@ public class BottomRow { } private static CharSequence spanDisplayNumber(String displayNumber) { - return PhoneNumberUtils.createTtsSpannable( + return PhoneNumberUtilsCompat.createTtsSpannable( BidiFormatter.getInstance().unicodeWrap(displayNumber, TextDirectionHeuristics.LTR)); } diff --git a/java/com/android/incallui/contactgrid/ContactGridManager.java b/java/com/android/incallui/contactgrid/ContactGridManager.java index 502cc52b8..1322d58ea 100644 --- a/java/com/android/incallui/contactgrid/ContactGridManager.java +++ b/java/com/android/incallui/contactgrid/ContactGridManager.java @@ -20,8 +20,10 @@ import android.content.Context; import android.graphics.drawable.Animatable; import android.graphics.drawable.Drawable; import android.os.SystemClock; +import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.view.ViewCompat; +import android.telecom.TelecomManager; import android.text.TextUtils; import android.view.View; import android.view.accessibility.AccessibilityEvent; @@ -76,7 +78,6 @@ public class ContactGridManager { private boolean hideAvatar; private boolean showAnonymousAvatar; private boolean middleRowVisible = true; - private boolean isTimerStarted; private PrimaryInfo primaryInfo = PrimaryInfo.createEmptyPrimaryInfo(); private PrimaryCallState primaryCallState = PrimaryCallState.createEmptyPrimaryCallState(); @@ -104,7 +105,6 @@ public class ContactGridManager { contactGridLayout = (View) contactNameTextView.getParent(); letterTile = new LetterTileDrawable(context.getResources()); - isTimerStarted = false; } public void show() { @@ -213,7 +213,7 @@ public class ContactGridManager { * */ private void updateTopRow() { - TopRow.Info info = TopRow.getInfo(context, primaryCallState, primaryInfo); + TopRow.Info info = TopRow.getInfo(context, primaryCallState); if (TextUtils.isEmpty(info.label)) { // Use INVISIBLE here to prevent the rows below this one from moving up and down. statusTextView.setVisibility(View.INVISIBLE); @@ -232,6 +232,26 @@ public class ContactGridManager { } } + /** + * Returns the appropriate LetterTileDrawable.TYPE_ based on a given call state. + * + *

If no special state is detected, yields TYPE_DEFAULT. + */ + private static @LetterTileDrawable.ContactType int getContactTypeForPrimaryCallState( + @NonNull PrimaryCallState callState, @NonNull PrimaryInfo primaryInfo) { + if (callState.isVoiceMailNumber) { + return LetterTileDrawable.TYPE_VOICEMAIL; + } else if (callState.isBusinessNumber) { + return LetterTileDrawable.TYPE_BUSINESS; + } else if (primaryInfo.numberPresentation == TelecomManager.PRESENTATION_RESTRICTED) { + return LetterTileDrawable.TYPE_GENERIC_AVATAR; + } else if (callState.isConference) { + return LetterTileDrawable.TYPE_CONFERENCE; + } else { + return LetterTileDrawable.TYPE_DEFAULT; + } + } + /** * Updates row 1. For example: * @@ -275,12 +295,8 @@ public class ContactGridManager { primaryInfo.name, primaryInfo.contactInfoLookupKey, LetterTileDrawable.SHAPE_CIRCLE, - LetterTileDrawable.getContactTypeFromPrimitives( - primaryCallState.isVoiceMailNumber, - primaryInfo.isSpam, - primaryCallState.isBusinessNumber, - primaryInfo.numberPresentation, - primaryCallState.isConference)); + getContactTypeForPrimaryCallState(primaryCallState, primaryInfo)); + // By invalidating the avatarImageView we force a redraw of the letter tile. // This is required to properly display the updated letter tile iconography based on the // contact type, because the background drawable reference cached in the view, and the @@ -347,19 +363,15 @@ public class ContactGridManager { } if (info.isTimerVisible) { - if (!isTimerStarted) { - bottomTextSwitcher.setDisplayedChild(1); - bottomTimerView.setBase( - primaryCallState.connectTimeMillis - - System.currentTimeMillis() - + SystemClock.elapsedRealtime()); - bottomTimerView.start(); - isTimerStarted = true; - } + bottomTextSwitcher.setDisplayedChild(1); + bottomTimerView.setBase( + primaryCallState.connectTimeMillis + - System.currentTimeMillis() + + SystemClock.elapsedRealtime()); + bottomTimerView.start(); } else { bottomTextSwitcher.setDisplayedChild(0); bottomTimerView.stop(); - isTimerStarted = false; } } } diff --git a/java/com/android/incallui/contactgrid/TopRow.java b/java/com/android/incallui/contactgrid/TopRow.java index ab003570f..8c3d6b004 100644 --- a/java/com/android/incallui/contactgrid/TopRow.java +++ b/java/com/android/incallui/contactgrid/TopRow.java @@ -19,14 +19,10 @@ package com.android.incallui.contactgrid; import android.content.Context; import android.graphics.drawable.Drawable; import android.support.annotation.Nullable; -import android.telephony.PhoneNumberUtils; -import android.text.BidiFormatter; -import android.text.TextDirectionHeuristics; import android.text.TextUtils; import com.android.dialer.common.Assert; import com.android.incallui.call.DialerCall.State; import com.android.incallui.incall.protocol.PrimaryCallState; -import com.android.incallui.incall.protocol.PrimaryInfo; import com.android.incallui.videotech.utils.SessionModificationState; import com.android.incallui.videotech.utils.VideoUtils; @@ -59,7 +55,7 @@ public class TopRow { private TopRow() {} - public static Info getInfo(Context context, PrimaryCallState state, PrimaryInfo primaryInfo) { + public static Info getInfo(Context context, PrimaryCallState state) { CharSequence label = null; Drawable icon = state.connectionIcon; boolean labelIsSingleLine = true; @@ -77,11 +73,6 @@ public class TopRow { labelIsSingleLine = false; } else { label = getLabelForIncoming(context, state); - // Show phone number if it's not displayed in name (center row) or location field (bottom - // row). - if (shouldShowNumber(primaryInfo)) { - label = TextUtils.concat(label, " ", spanDisplayNumber(primaryInfo.number)); - } } } else if (VideoUtils.hasSentVideoUpgradeRequest(state.sessionModificationState) || VideoUtils.hasReceivedVideoUpgradeRequest(state.sessionModificationState)) { @@ -94,8 +85,6 @@ public class TopRow { label = getLabelForDialing(context, state); } else if (state.state == State.ACTIVE && state.isRemotelyHeld) { label = context.getString(R.string.incall_remotely_held); - } else if (state.state == State.ACTIVE && shouldShowNumber(primaryInfo)) { - label = spanDisplayNumber(primaryInfo.number); } else { // Video calling... // [Wi-Fi icon] Starbucks Wi-Fi @@ -105,27 +94,9 @@ public class TopRow { return new Info(label, icon, labelIsSingleLine); } - private static CharSequence spanDisplayNumber(String displayNumber) { - return PhoneNumberUtils.createTtsSpannable( - BidiFormatter.getInstance().unicodeWrap(displayNumber, TextDirectionHeuristics.LTR)); - } - - private static boolean shouldShowNumber(PrimaryInfo primaryInfo) { - if (primaryInfo.nameIsNumber) { - return false; - } - if (primaryInfo.location == null) { - return false; - } - if (TextUtils.isEmpty(primaryInfo.number)) { - return false; - } - return true; - } - private static CharSequence getLabelForIncoming(Context context, PrimaryCallState state) { if (state.isVideoCall) { - return getLabelForIncomingVideo(context, state.sessionModificationState, state.isWifi); + return getLabelForIncomingVideo(context, state.isWifi); } else if (state.isWifi && !TextUtils.isEmpty(state.connectionLabel)) { return state.connectionLabel; } else if (isAccount(state)) { @@ -137,20 +108,11 @@ public class TopRow { } } - private static CharSequence getLabelForIncomingVideo( - Context context, @SessionModificationState int sessionModificationState, boolean isWifi) { - if (sessionModificationState == SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST) { - if (isWifi) { - return context.getString(R.string.contact_grid_incoming_wifi_video_request); - } else { - return context.getString(R.string.contact_grid_incoming_video_request); - } + private static CharSequence getLabelForIncomingVideo(Context context, boolean isWifi) { + if (isWifi) { + return context.getString(R.string.contact_grid_incoming_wifi_video_call); } else { - if (isWifi) { - return context.getString(R.string.contact_grid_incoming_wifi_video_call); - } else { - return context.getString(R.string.contact_grid_incoming_video_call); - } + return context.getString(R.string.contact_grid_incoming_video_call); } } @@ -192,7 +154,7 @@ public class TopRow { case SessionModificationState.UPGRADE_TO_VIDEO_REQUEST_TIMED_OUT: return context.getString(R.string.incall_video_call_request_timed_out); case SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST: - return getLabelForIncomingVideo(context, state.sessionModificationState, state.isWifi); + return getLabelForIncomingVideo(context, state.isWifi); case SessionModificationState.NO_REQUEST: default: Assert.fail(); diff --git a/java/com/android/incallui/contactgrid/res/values-af/strings.xml b/java/com/android/incallui/contactgrid/res/values-af/strings.xml index 75a8bf37f..95ec39bc3 100644 --- a/java/com/android/incallui/contactgrid/res/values-af/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-af/strings.xml @@ -1,20 +1,4 @@ - - "Bel via %s" @@ -30,8 +14,6 @@ "Hou aan" "Video-oproep vanaf" "Wi-Fi-video-oproep vanaf" - "Versoekvorm vir video-opgradering" - "Versoekvorm vir Wi-Fi-video-opgradering" "Oproep vanaf" "Werkoproep vanaf" "Inkomend via %s" diff --git a/java/com/android/incallui/contactgrid/res/values-am/strings.xml b/java/com/android/incallui/contactgrid/res/values-am/strings.xml index 3d11f73c2..d8060c9c5 100644 --- a/java/com/android/incallui/contactgrid/res/values-am/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-am/strings.xml @@ -1,20 +1,4 @@ - - "በ%s በኩል በመደወል ላይ" @@ -30,8 +14,6 @@ "ያዝና ቆይ" "ቪዲዮ ጥሪ ከ" "Wi-Fi ቪዲዮ ጥሪ ከ" - "የቪዲዮ ማሻሻል ጥያቄ ከ" - "የWi-Fi ቪዲዮ ማሻሻል ጥያቄ ከ" "ጥሪ ከ" "የሥራ ጥሪ ከ" "በ%s በኩል የገባ" diff --git a/java/com/android/incallui/contactgrid/res/values-ar/strings.xml b/java/com/android/incallui/contactgrid/res/values-ar/strings.xml index cddd1eca9..30fd32cfa 100644 --- a/java/com/android/incallui/contactgrid/res/values-ar/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-ar/strings.xml @@ -1,20 +1,4 @@ - - "الاتصال عبر %s" @@ -30,8 +14,6 @@ "معلقة" "مكالمة فيديو من" "‏مكالمة فيديو عبر Wi-Fi من" - "طلب ترقية الفيديو من" - "‏طلب ترقية فيديو Wi-Fi من" "اتصال من" "مكالمة عمل من" "واردة عبر %s" diff --git a/java/com/android/incallui/contactgrid/res/values-az/strings.xml b/java/com/android/incallui/contactgrid/res/values-az/strings.xml index 8c1993dc0..4fe79eeaa 100644 --- a/java/com/android/incallui/contactgrid/res/values-az/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-az/strings.xml @@ -1,20 +1,4 @@ - - "%s vasitəsilə zəng edilir" @@ -30,8 +14,6 @@ "Gözləmədə" "Video zəng edən" "Wi-Fi video zəng edən" - "Video təkmilləşdirilməsi üçün təklif" - "Wi-Fi video təkmilləşdirilməsi üçün təklif" "Zəng edən" "İş zəngi edən" "%s vasitəsilə gələn" diff --git a/java/com/android/incallui/contactgrid/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/contactgrid/res/values-b+sr+Latn/strings.xml index caa61bdac..f1a938ea9 100644 --- a/java/com/android/incallui/contactgrid/res/values-b+sr+Latn/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-b+sr+Latn/strings.xml @@ -1,20 +1,4 @@ - - "Pozivamo preko %s" @@ -30,8 +14,6 @@ "Na čekanju" "Video poziv od" "Wi-Fi video poziv od" - "Zahtev za prelazak na video poziv od" - "Zahtev za prelazak na video poziv preko Wi-Fi-ja od" "Poziv od" "Poslovni poziv od" "Dolazni poziv preko %s" diff --git a/java/com/android/incallui/contactgrid/res/values-be/strings.xml b/java/com/android/incallui/contactgrid/res/values-be/strings.xml index 51f7ea97a..aec3a3106 100644 --- a/java/com/android/incallui/contactgrid/res/values-be/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-be/strings.xml @@ -1,20 +1,4 @@ - - "Званкі праз %s" @@ -30,8 +14,6 @@ "На ўтрыманні" "Відэавыклік ад" "Відэавыклік праз Wi-Fi ад" - "Запыт на абнаўленне да відэавыкліка ад" - "Запыт на абнаўленне да відэавыкліка па Wi-Fi ад" "Выклік ад" "Рабочы выклік ад" "Уваходны выклік праз %s" diff --git a/java/com/android/incallui/contactgrid/res/values-bg/strings.xml b/java/com/android/incallui/contactgrid/res/values-bg/strings.xml index 4e313d408..f162e4cd0 100644 --- a/java/com/android/incallui/contactgrid/res/values-bg/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-bg/strings.xml @@ -1,20 +1,4 @@ - - "Обаждане чрез %s" @@ -30,8 +14,6 @@ "Задържано" "Видеообаждане от" "Видеообаждане по Wi-Fi от" - "Заявка за преминаване към видеообаждане от" - "Заявка за преминаване към видеообаждане през Wi-Fi от" "Обаждане от" "Служебно обаждане от" "Входящо обаждане чрез %s" diff --git a/java/com/android/incallui/contactgrid/res/values-bn/strings.xml b/java/com/android/incallui/contactgrid/res/values-bn/strings.xml index 8fce2e460..6d3a50c61 100644 --- a/java/com/android/incallui/contactgrid/res/values-bn/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-bn/strings.xml @@ -1,20 +1,4 @@ - - "%s এর মাধ্যমে কল করা হচ্ছে" @@ -30,8 +14,6 @@ "হোল্ডে রয়েছে" "এর থেকে আগত ভিডিও কল" "এর থেকে আগত Wi-Fi ভিডিও কল" - "এর থেকে ভিডিও আপগ্রেড করার অনুরোধ" - "এর থেকে ওয়াই-ফাই ভিডিও আপগ্রেড করার অনুরোধ" "এর থেকে আগত কল" "এর থেকে আগত কর্মক্ষেত্রের কল" "%s এর মাধ্যমে আগত কল" diff --git a/java/com/android/incallui/contactgrid/res/values-bs/strings.xml b/java/com/android/incallui/contactgrid/res/values-bs/strings.xml index 0d4dfb3d8..258799215 100644 --- a/java/com/android/incallui/contactgrid/res/values-bs/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-bs/strings.xml @@ -1,20 +1,4 @@ - - "Pozivanje putem mreže %s" @@ -30,8 +14,6 @@ "Na čekanju" "Videopoziv od" "Wi-Fi videopoziv od" - "Zahtjev za nadogradnju na videozapis od pozivaoca" - "Zahtjev za nadogradnju na Wi-Fi videozapis od pozivaoca" "Poziv od" "Poslovni poziv od" "Dolazni poziv putem %s" diff --git a/java/com/android/incallui/contactgrid/res/values-ca/strings.xml b/java/com/android/incallui/contactgrid/res/values-ca/strings.xml index b4aa2ddc0..07598a217 100644 --- a/java/com/android/incallui/contactgrid/res/values-ca/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-ca/strings.xml @@ -1,20 +1,4 @@ - - "S\'està trucant amb %s" @@ -30,8 +14,6 @@ "En espera" "Videotrucada de" "Videotrucada per Wi-Fi de" - "Sol·licitud d\'actualització a videotrucada procedent de:" - "Sol·licitud d\'actualització a videotrucada per Wi-Fi procedent de:" "Trucada de" "Trucada de feina de" "Entrant via %s" diff --git a/java/com/android/incallui/contactgrid/res/values-cs/strings.xml b/java/com/android/incallui/contactgrid/res/values-cs/strings.xml index b8698f071..d27a0283b 100644 --- a/java/com/android/incallui/contactgrid/res/values-cs/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-cs/strings.xml @@ -1,20 +1,4 @@ - - "Volání přes poskytovatele %s" @@ -30,8 +14,6 @@ "Podrženo" "Příchozí videohovor:" "Příchozí videohovor přes Wi-Fi:" - "Žádost o upgrade na videohovor od uživatele" - "Žádost o upgrade na videohovor přes Wi-Fi od uživatele" "Příchozí hovor:" "Příchozí pracovní hovor:" "Příchozí hovor přes poskytovatele %s" diff --git a/java/com/android/incallui/contactgrid/res/values-da/strings.xml b/java/com/android/incallui/contactgrid/res/values-da/strings.xml index 71a651f18..555a2ac5f 100644 --- a/java/com/android/incallui/contactgrid/res/values-da/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-da/strings.xml @@ -1,20 +1,4 @@ - - "Ringer via %s" @@ -30,8 +14,6 @@ "I venteposition" "Videoopkald fra" "Wi-Fi-videoopkald fra" - "Anmodning om opgradering til et videoopkald fra" - "Anmodning om opgradering til et Wi-Fi-videoopkald fra" "Opkald fra" "Arbejdsopkald fra" "Indgående opkald via %s" diff --git a/java/com/android/incallui/contactgrid/res/values-de/strings.xml b/java/com/android/incallui/contactgrid/res/values-de/strings.xml index d69e0f6bb..3d3838ca2 100644 --- a/java/com/android/incallui/contactgrid/res/values-de/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-de/strings.xml @@ -1,20 +1,4 @@ - - "Anruf über %s" @@ -30,8 +14,6 @@ "Anruf wird gehalten" "Videoanruf von" "WLAN-Videoanruf von" - "Anfrage für Upgrade auf Videoanruf von" - "Anfrage für Upgrade auf Videoanruf über WLAN von" "Anruf von" "Geschäftlicher Anruf von" "Eingehender Anruf über %s" diff --git a/java/com/android/incallui/contactgrid/res/values-el/strings.xml b/java/com/android/incallui/contactgrid/res/values-el/strings.xml index 954e7b75d..337da7b03 100644 --- a/java/com/android/incallui/contactgrid/res/values-el/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-el/strings.xml @@ -1,20 +1,4 @@ - - "Κλήση μέσω %s" @@ -30,8 +14,6 @@ "Σε αναμονή" "Βιντεοκλήση από" "Βιντεοκλήση μέσω Wi-Fi από" - "Αίτημα αναβάθμισης βίντεο από" - "Αίτημα αναβάθμισης βίντεο Wi-Fi από" "Κλήση από" "Κλήση από το γραφείο από" "Εισερχόμενη κλήση μέσω %s" diff --git a/java/com/android/incallui/contactgrid/res/values-en-rAU/strings.xml b/java/com/android/incallui/contactgrid/res/values-en-rAU/strings.xml index a1402ff5c..3748db2f4 100644 --- a/java/com/android/incallui/contactgrid/res/values-en-rAU/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-en-rAU/strings.xml @@ -1,20 +1,4 @@ - - "Calling via %s" @@ -30,8 +14,6 @@ "On hold" "Video call from" "Wi-Fi video call from" - "Video upgrade request from" - "Wi-Fi video upgrade request from" "Call from" "Work call from" "Incoming via %s" diff --git a/java/com/android/incallui/contactgrid/res/values-en-rGB/strings.xml b/java/com/android/incallui/contactgrid/res/values-en-rGB/strings.xml index a1402ff5c..3748db2f4 100644 --- a/java/com/android/incallui/contactgrid/res/values-en-rGB/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-en-rGB/strings.xml @@ -1,20 +1,4 @@ - - "Calling via %s" @@ -30,8 +14,6 @@ "On hold" "Video call from" "Wi-Fi video call from" - "Video upgrade request from" - "Wi-Fi video upgrade request from" "Call from" "Work call from" "Incoming via %s" diff --git a/java/com/android/incallui/contactgrid/res/values-en-rIN/strings.xml b/java/com/android/incallui/contactgrid/res/values-en-rIN/strings.xml index a1402ff5c..3748db2f4 100644 --- a/java/com/android/incallui/contactgrid/res/values-en-rIN/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-en-rIN/strings.xml @@ -1,20 +1,4 @@ - - "Calling via %s" @@ -30,8 +14,6 @@ "On hold" "Video call from" "Wi-Fi video call from" - "Video upgrade request from" - "Wi-Fi video upgrade request from" "Call from" "Work call from" "Incoming via %s" diff --git a/java/com/android/incallui/contactgrid/res/values-es-rUS/strings.xml b/java/com/android/incallui/contactgrid/res/values-es-rUS/strings.xml index abb2b01d9..fa5684927 100644 --- a/java/com/android/incallui/contactgrid/res/values-es-rUS/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-es-rUS/strings.xml @@ -1,20 +1,4 @@ - - "Llamada por medio de %s" @@ -30,8 +14,6 @@ "En espera" "Videollamada de" "Videollamada con Wi-Fi de" - "Actualización a video solicitada por" - "Actualización a video con Wi-Fi solicitada por" "Llamada de" "Llamada laboral de" "Entrante por medio de %s" diff --git a/java/com/android/incallui/contactgrid/res/values-es/strings.xml b/java/com/android/incallui/contactgrid/res/values-es/strings.xml index ef7c45774..1d57f9c6f 100644 --- a/java/com/android/incallui/contactgrid/res/values-es/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-es/strings.xml @@ -1,20 +1,4 @@ - - "Llamada a través de %s" @@ -30,8 +14,6 @@ "En espera" "Videollamada de" "Videollamada por Wi-Fi de" - "Solicitud de actualización de videollamada de" - "Solicitud de actualización de videollamada por Wi-Fi de" "Llamada de" "Llamada de trabajo de" "Recibida a través de %s" diff --git a/java/com/android/incallui/contactgrid/res/values-et/strings.xml b/java/com/android/incallui/contactgrid/res/values-et/strings.xml index b91f073d0..2d81062f4 100644 --- a/java/com/android/incallui/contactgrid/res/values-et/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-et/strings.xml @@ -1,20 +1,4 @@ - - "Kõne edastab %s" @@ -30,8 +14,6 @@ "Ootel" "Videokõne kontaktilt" "WiFi-videokõne kontaktilt" - "Video täiendamise taotlus:" - "WiFi kaudu video täiendamise taotlus:" "Kõne kontaktilt" "Töökõne kontaktilt" "Sissetulev kõne teenusepakkuja %s kaudu" diff --git a/java/com/android/incallui/contactgrid/res/values-eu/strings.xml b/java/com/android/incallui/contactgrid/res/values-eu/strings.xml index ba7995ad9..f08347bf0 100644 --- a/java/com/android/incallui/contactgrid/res/values-eu/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-eu/strings.xml @@ -1,20 +1,4 @@ - - "%s bidez deitzen" @@ -30,8 +14,6 @@ "Zain" "Bideo-deia:" "Wi-Fi bidezko bideo-deia:" - "Bideo-dei bat egiteko eskaera bidali dizu erabiltzaile honek:" - "Wi-Fi bidezko bideo-dei bat egiteko eskaera bidali dizu erabiltzaile honek:" "Deia:" "Laneko deia:" "%s bidez jasotzen" diff --git a/java/com/android/incallui/contactgrid/res/values-fa/strings.xml b/java/com/android/incallui/contactgrid/res/values-fa/strings.xml index 40873ca15..0dfc0f41f 100644 --- a/java/com/android/incallui/contactgrid/res/values-fa/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-fa/strings.xml @@ -1,20 +1,4 @@ - - "تماس از طریق %s" @@ -30,8 +14,6 @@ "درانتظار" "تماس ویدئویی از" "‏تماس ویدئویی Wi-Fi از" - "درخواست ارتقای تماس ویدیویی از" - "‏در خواست ارتقای تماس ویدیویی Wi-Fi از" "تماس از" "تماس کاری از" "تماس‌های ورودی ازطریق %s" diff --git a/java/com/android/incallui/contactgrid/res/values-fi/strings.xml b/java/com/android/incallui/contactgrid/res/values-fi/strings.xml index 241fef5a1..00503bf2f 100644 --- a/java/com/android/incallui/contactgrid/res/values-fi/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-fi/strings.xml @@ -1,20 +1,4 @@ - - "Käytetään operaattoria %s" @@ -30,8 +14,6 @@ "Pidossa" "Videopuhelu henkilöltä" "Wi-Fi-videopuhelu henkilöltä" - "Videoon siirtymispyyntö, jonka lähettäjä on" - "Wi-Fi-videopuheluun siirtymispyyntö, jonka lähettäjän on" "Puhelu henkilöltä" "Työpuhelu henkilöltä" "Saapuva puhelu (%s)" diff --git a/java/com/android/incallui/contactgrid/res/values-fr-rCA/strings.xml b/java/com/android/incallui/contactgrid/res/values-fr-rCA/strings.xml index 3ffc1e918..ee0196d98 100644 --- a/java/com/android/incallui/contactgrid/res/values-fr-rCA/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-fr-rCA/strings.xml @@ -1,20 +1,4 @@ - - "Appel par %s en cours…" @@ -30,8 +14,6 @@ "En attente" "Appel vidéo de" "Appel vidéo Wi-Fi de" - "Demande de mise à niveau vidéo de" - "Demande de mise à niveau vidéo Wi-Fi de" "Appel de" "Appel professionnel de" "Appel entrant par %s" diff --git a/java/com/android/incallui/contactgrid/res/values-fr/strings.xml b/java/com/android/incallui/contactgrid/res/values-fr/strings.xml index 0db6ae089..9849ad623 100644 --- a/java/com/android/incallui/contactgrid/res/values-fr/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-fr/strings.xml @@ -1,20 +1,4 @@ - - "Appel via %s" @@ -30,8 +14,6 @@ "En attente" "Appel vidéo de" "Appel vidéo Wi-Fi de" - "Demande de passage en mode vidéo par" - "Demande de passage en mode vidéo Wi-Fi par" "Appel de" "Appel professionnel de" "Appel entrant via %s" diff --git a/java/com/android/incallui/contactgrid/res/values-gl/strings.xml b/java/com/android/incallui/contactgrid/res/values-gl/strings.xml index 297001454..c85f336b8 100644 --- a/java/com/android/incallui/contactgrid/res/values-gl/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-gl/strings.xml @@ -1,20 +1,4 @@ - - "Chamando a través de %s" @@ -30,8 +14,6 @@ "En espera" "Videochamada de" "Videochamada por wifi de" - "Solicitude de actualización a videochamada de" - "Solicitude de actualización a videochamada por wifi de" "Chamada de" "Chamada de traballo de" "Chamada entrante a través de %s" diff --git a/java/com/android/incallui/contactgrid/res/values-gu/strings.xml b/java/com/android/incallui/contactgrid/res/values-gu/strings.xml index 220bebe39..5179cc0cb 100644 --- a/java/com/android/incallui/contactgrid/res/values-gu/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-gu/strings.xml @@ -1,20 +1,4 @@ - - "%s મારફતે કૉલ કરી રહ્યાં છે" @@ -30,8 +14,6 @@ "હોલ્ડ પર" "આમના તરફથી વિડિઓ કૉલ" "આમના તરફથી Wi-Fi વિડિઓ કૉલ" - "આમના તરફથી વિડિઓ અપગ્રેડની વિનંતી" - "આમના તરફથી Wi-Fi વિડિઓ અપગ્રેડની વિનંતી" "આમના તરફથી કૉલ" "આમના તરફથી કાર્ય કૉલ" "%s મારફતે ઇનકમિંગ" diff --git a/java/com/android/incallui/contactgrid/res/values-hi/strings.xml b/java/com/android/incallui/contactgrid/res/values-hi/strings.xml index da128b644..dec7b629d 100644 --- a/java/com/android/incallui/contactgrid/res/values-hi/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-hi/strings.xml @@ -1,20 +1,4 @@ - - "%s के माध्यम से कॉल किया जा रहा है" @@ -30,8 +14,6 @@ "होल्ड पर" "इससे वीडियो कॉल" "इससे वाई-फ़ाई वीडियो कॉल" - "इसकी ओर से वीडियो में अपग्रेड करने का अनुरोध" - "इसकी ओर से वाई-फ़ाई वीडियो में अपग्रेड करने का अनुरोध" "इससे कॉल" "इससे कार्य संबंधी कॉल" "%s की ओर से इनकमिंग" diff --git a/java/com/android/incallui/contactgrid/res/values-hr/strings.xml b/java/com/android/incallui/contactgrid/res/values-hr/strings.xml index 24429a248..d7023ac24 100644 --- a/java/com/android/incallui/contactgrid/res/values-hr/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-hr/strings.xml @@ -1,20 +1,4 @@ - - "Pozivanje putem operatera %s" @@ -30,8 +14,6 @@ "Na čekanju" "Videopoziv s broja" "Videopoziv putem Wi-Fi veze s broja" - "Video upgrade request from" - "Wi-Fi video upgrade request from" "Poziv s broja" "Poslovni poziv s broja" "Dolazni pozivi putem davatelja %s" diff --git a/java/com/android/incallui/contactgrid/res/values-hu/strings.xml b/java/com/android/incallui/contactgrid/res/values-hu/strings.xml index 600b69f6d..f7da92322 100644 --- a/java/com/android/incallui/contactgrid/res/values-hu/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-hu/strings.xml @@ -1,20 +1,4 @@ - - "Hívás a(z) %s szolgáltatón keresztül" @@ -30,8 +14,6 @@ "Várakoztatva" "Videohívás a következőtől:" "Wi-Fi-videohívás a következőtől:" - "Videófrissítési kérelem a következőtől" - "Wi-Fi-videófrissítési kérelem a következőtől" "Hívás a következőtől:" "Munkahelyi hívás a következőről:" "Bejövő hívás a következőn keresztül: %s" diff --git a/java/com/android/incallui/contactgrid/res/values-hy/strings.xml b/java/com/android/incallui/contactgrid/res/values-hy/strings.xml index 88a49eb48..6384fa924 100644 --- a/java/com/android/incallui/contactgrid/res/values-hy/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-hy/strings.xml @@ -1,20 +1,4 @@ - - "Զանգում է %s-ի միջոցով" @@ -30,8 +14,6 @@ "Սպասում" "Տեսազանգ հետևյալ բաժանորդից՝" "Wi-Fi տեսազանգ հետևյալ բաժանորդից՝" - "Տեսազանգին անցնելու խնդրանք հետևյալ օգտատիրոջից՝" - "Wi-Fi-ի միջոցով տեսազանգին անցնելու խնդրանք հետևյալ օգտատիրոջից՝" "Զանգ հետևյալ բաժանորդից՝" "Գործնական զանգ հետևյալ բաժանորդից՝" "Մուտքային զանգ %s ցանցից" diff --git a/java/com/android/incallui/contactgrid/res/values-in/strings.xml b/java/com/android/incallui/contactgrid/res/values-in/strings.xml index f6735832a..75568387b 100644 --- a/java/com/android/incallui/contactgrid/res/values-in/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-in/strings.xml @@ -1,20 +1,4 @@ - - "Menelepon melalui %s" @@ -30,8 +14,6 @@ "Ditangguhkan" "Video call dari" "Video call Wi-Fi dari" - "Permintaan upgrade video dari" - "Permintaan upgrade video Wi-Fi dari" "Telepon dari" "Panggilan telepon kerja dari" "Masuk melalui %s" diff --git a/java/com/android/incallui/contactgrid/res/values-is/strings.xml b/java/com/android/incallui/contactgrid/res/values-is/strings.xml index 9e830312d..86d577c64 100644 --- a/java/com/android/incallui/contactgrid/res/values-is/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-is/strings.xml @@ -1,20 +1,4 @@ - - "Hringt í gegnum %s" @@ -30,8 +14,6 @@ "Í bið" "Myndsímtal berst frá" "Wi-Fi myndsímtal berst frá" - "Beiðni um að uppfæra í myndsímtal frá" - "Beiðni um að uppfæra í Wi-Fi myndsímtal frá" "Símtal berst frá" "Vinnusímtal berst frá" "Berst í gegnum %s" diff --git a/java/com/android/incallui/contactgrid/res/values-it/strings.xml b/java/com/android/incallui/contactgrid/res/values-it/strings.xml index 76958cf72..9576a6d95 100644 --- a/java/com/android/incallui/contactgrid/res/values-it/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-it/strings.xml @@ -1,20 +1,4 @@ - - "Chiamate tramite %s" @@ -30,8 +14,6 @@ "In attesa" "Videochiamata da" "Videochiamata Wi-Fi da" - "Upgrade della videochiamata richiesto da" - "Upgrade della videochiamata Wi-Fi richiesto da" "Chiamata da" "Chiamata di lavoro da" "In arrivo tramite %s" diff --git a/java/com/android/incallui/contactgrid/res/values-iw/strings.xml b/java/com/android/incallui/contactgrid/res/values-iw/strings.xml index b06c3212c..62771d18f 100644 --- a/java/com/android/incallui/contactgrid/res/values-iw/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-iw/strings.xml @@ -1,20 +1,4 @@ - - "שיחה באמצעות %s" @@ -30,8 +14,6 @@ "בהמתנה" "שיחת וידאו מאת" "‏שיחת וידאו ב-Wi-Fi מאת" - "בקשה לשדרוג לשיחת וידאו מאת" - "‏בקשת לשדרוג לשיחת וידאו ברשת Wi-Fi מאת" "שיחה מאת" "שיחת עבודה מאת" "שיחה נכנסת באמצעות %s" diff --git a/java/com/android/incallui/contactgrid/res/values-ja/strings.xml b/java/com/android/incallui/contactgrid/res/values-ja/strings.xml index a2fce09cf..a5d958c60 100644 --- a/java/com/android/incallui/contactgrid/res/values-ja/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-ja/strings.xml @@ -1,20 +1,4 @@ - - "%s で発信中" @@ -30,8 +14,6 @@ "保留中" "ビデオハングアウトの着信" "Wi-Fi ビデオハングアウトの着信" - "ビデオハングアウトへの変更リクエスト" - "Wi-Fi ビデオハングアウトへの変更リクエスト" "着信" "仕事の通話の着信" "%s から着信" diff --git a/java/com/android/incallui/contactgrid/res/values-ka/strings.xml b/java/com/android/incallui/contactgrid/res/values-ka/strings.xml index cb0094d37..7848f595e 100644 --- a/java/com/android/incallui/contactgrid/res/values-ka/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-ka/strings.xml @@ -1,20 +1,4 @@ - - "მიმდინარეობს დარეკვა %s-ის მეშვეობით" @@ -30,8 +14,6 @@ "მოცდის რეჟიმში" "ვიდეოზარი აბონენტისგან" "Wi-Fi ვიდეოზარი აბონენტისგან" - "ვიდეოზარზე გადასვლის მოთხოვნა კონტაქტისგან:" - "Wi-Fi ვიდეოზარზე გადასვლის მოთხოვნა კონტაქტისგან:" "ზარი აბონენტისგან" "სამსახურებრივი ზარი აბონენტისგან" "შემომავალი, %s-იდან" diff --git a/java/com/android/incallui/contactgrid/res/values-kk/strings.xml b/java/com/android/incallui/contactgrid/res/values-kk/strings.xml index 3fc68c2db..aaf260b9a 100644 --- a/java/com/android/incallui/contactgrid/res/values-kk/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-kk/strings.xml @@ -1,20 +1,4 @@ - - "%s арқылы қоңырау шалу" @@ -30,8 +14,6 @@ "Күтуде" "Бейне қоңырау шалушы:" "Wi-Fi бейне қоңырау шалушы:" - "Бейне қоңырауға ауысу өтініші:" - "Wi-Fi арқылы бейне қоңырауға ауысу өтініші:" "Қоңырау шалушы:" "Жұмыстан қоңырау шалушы:" "%s арқылы кіріс" diff --git a/java/com/android/incallui/contactgrid/res/values-km/strings.xml b/java/com/android/incallui/contactgrid/res/values-km/strings.xml index 7ee21ba70..b2bfc9628 100644 --- a/java/com/android/incallui/contactgrid/res/values-km/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-km/strings.xml @@ -1,20 +1,4 @@ - - "កំពុង​ហៅតាម %s" @@ -30,8 +14,6 @@ "កំពុង​រង់ចាំ" "ការ​ហៅ​ជា​វីដេអូ​ពី" "ការ​ហៅ​ជា​វីដេអូ​តាម Wi-Fi ពី" - "ស្នើ​ដំឡើង​កំណែ​វីដេអូ​ពី" - "ស្នើ​ដំឡើង​កំណែ​វីដេអូតាម Wi-Fi ពី" "ការ​ហៅ​ពី" "ការ​ហៅ​ការងារ​ពី" "ការ​ហៅ​ចូល​តាម %s" diff --git a/java/com/android/incallui/contactgrid/res/values-kn/strings.xml b/java/com/android/incallui/contactgrid/res/values-kn/strings.xml index e90bd6b54..0ee73bacc 100644 --- a/java/com/android/incallui/contactgrid/res/values-kn/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-kn/strings.xml @@ -1,20 +1,4 @@ - - "%s ಮೂಲಕ ಕರೆ ಮಾಡಲಾಗುತ್ತಿದೆ" @@ -30,8 +14,6 @@ "ಹೋಲ್ಡ್‌ ಮಾಡಲಾಗಿದೆ" "ಇವರಿಂದ ವೀಡಿಯೊ ಕರೆ" "ಇವರಿಂದ ವೈ-ಫೈ ವೀಡಿಯೊ ಕರೆ" - "ಇದರಿಂದ ವೀಡಿಯೊ ಅಪ್‌ಗ್ರೇಡ್ ವಿನಂತಿ" - "ಇದರಿಂದ ವೈಫೈ ವೀಡಿಯೊ ಅಪ್‌ಗ್ರೇಡ್ ವಿನಂತಿ" "ಇವರಿಂದ ಕರೆ" "ಇವರಿಂದ ಕೆಲಸದ ಕರೆ" "%s ಮೂಲಕ ಒಳಬರುತ್ತಿರುವ ಕರೆ" diff --git a/java/com/android/incallui/contactgrid/res/values-ko/strings.xml b/java/com/android/incallui/contactgrid/res/values-ko/strings.xml index 85dd613bb..a5a34e3d7 100644 --- a/java/com/android/incallui/contactgrid/res/values-ko/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-ko/strings.xml @@ -1,20 +1,4 @@ - - "%s을(를) 통해 거는 전화" @@ -30,8 +14,6 @@ "대기 중" "화상 통화 발신:" "Wi-Fi 화상 통화 발신:" - "화상 통화로의 업그레이드를 요청한 사용자:" - "Wi-Fi 화상 통화로의 업그레이드를 요청한 사용자:" "통화 발신:" "업무 통화 발신:" "%s을(를) 통해 걸려온 전화" diff --git a/java/com/android/incallui/contactgrid/res/values-ky/strings.xml b/java/com/android/incallui/contactgrid/res/values-ky/strings.xml index 6028022e1..a020e70d1 100644 --- a/java/com/android/incallui/contactgrid/res/values-ky/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-ky/strings.xml @@ -1,20 +1,4 @@ - - "%s аркылуу чалуу" @@ -30,8 +14,6 @@ "Күтүү режиминде" "Видео чалуу" "Wi-Fi аркылуу видео чалуу:" - "Видеону кийинки версияга көтөрүү сурамы:" - "Wi-Fi аркылуу видеомаектешүү сурамы:" "Чалып жатат:" "Иш боюнча чалып жатат:" "%s аркылуу чалып жатат" diff --git a/java/com/android/incallui/contactgrid/res/values-lo/strings.xml b/java/com/android/incallui/contactgrid/res/values-lo/strings.xml index 6ad117818..96c1dcf11 100644 --- a/java/com/android/incallui/contactgrid/res/values-lo/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-lo/strings.xml @@ -1,20 +1,4 @@ - - "ກຳລັງໂທຜ່ານ %s" @@ -30,8 +14,6 @@ "ຖືສາຍລໍຖ້າ" "ການໂທວິດີໂອຈາກ" "Wi-Fi video call from" - "ຄຳຮ້ອງອັບເກຣດວິດີໂອຈາກ" - "ຄຳຮ້ອງອັບເກຣດວິດີໂອ Wi-Fi ຈາກ" "ການໂທຈາກ" "Work call from" "ສາຍໂທເຂົ້າ​ຈາກ %s" diff --git a/java/com/android/incallui/contactgrid/res/values-lt/strings.xml b/java/com/android/incallui/contactgrid/res/values-lt/strings.xml index 3cca55c46..e8e42fc9b 100644 --- a/java/com/android/incallui/contactgrid/res/values-lt/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-lt/strings.xml @@ -1,20 +1,4 @@ - - "Skambinama naudojantis „%s“ paslaugomis" @@ -30,8 +14,6 @@ "Sulaikytas" "Vaizdo skambutis nuo" "„Wi-Fi“ vaizdo skambutis nuo" - "Vaizdo skambučio naujovinimo užklausa nuo" - "„Wi-Fi“ vaizdo skambučio naujovinimo užklausa nuo" "Skambutis nuo" "Darbo skambutis nuo" "Gaunama per „%s“" diff --git a/java/com/android/incallui/contactgrid/res/values-lv/strings.xml b/java/com/android/incallui/contactgrid/res/values-lv/strings.xml index 87e5c9049..1b3823f1e 100644 --- a/java/com/android/incallui/contactgrid/res/values-lv/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-lv/strings.xml @@ -1,20 +1,4 @@ - - "Zvanu nodrošina %s" @@ -30,8 +14,6 @@ "Aizturēts" "Videozvans no:" "Wi-Fi videozvans no:" - "Videozvana jaunināšanas pieprasījums no:" - "Wi-Fi videozvana jaunināšanas pieprasījums no:" "Zvans no:" "Darba zvans no:" "Ienākošie zvani, ko nodrošina %s" diff --git a/java/com/android/incallui/contactgrid/res/values-mk/strings.xml b/java/com/android/incallui/contactgrid/res/values-mk/strings.xml index fcab8f452..104468359 100644 --- a/java/com/android/incallui/contactgrid/res/values-mk/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-mk/strings.xml @@ -1,20 +1,4 @@ - - "Повикување преку %s" @@ -30,8 +14,6 @@ "На чекање" "Видеоповик од" "Видеоповик преку Wi-Fi од" - "Барање за надградба на видеоповик од" - "Барање за надградба на видеоповик преку Wi-Fi од" "Повик од" "Работен повик од" "Дојдовни повици преку %s" diff --git a/java/com/android/incallui/contactgrid/res/values-ml/strings.xml b/java/com/android/incallui/contactgrid/res/values-ml/strings.xml index 1dfb46a93..519e9f478 100644 --- a/java/com/android/incallui/contactgrid/res/values-ml/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-ml/strings.xml @@ -1,20 +1,4 @@ - - "%s മുഖേന വിളിക്കുന്നു" @@ -30,8 +14,6 @@ "ഹോള്‍ഡിലാണ്" "ഈ വ്യക്തിയിൽ നിന്നുള്ള വീഡിയോ കോൾ" "ഈ വ്യക്തിയിൽ നിന്നുള്ള Wi-Fi വീഡിയോ കോൾ" - "ഇനിപ്പറയുന്നതിൽ നിന്നുള്ള വീഡിയോ അപ്‌ഗ്രേഡ് അഭ്യർത്ഥന" - "ഇനിപ്പറയുന്നതിൽ നിന്നുള്ള Wi-Fi വീഡിയോ അപ്‌ഗ്രേഡ് അഭ്യർത്ഥന" "ഈ വ്യക്തിയിൽ നിന്നുള്ള കോൾ" "ഈ വ്യക്തിയിൽ നിന്നുള്ള ഔദ്യോഗിക കോൾ" "%s മുഖേനയുള്ള ഇൻകമിംഗ്" diff --git a/java/com/android/incallui/contactgrid/res/values-mn/strings.xml b/java/com/android/incallui/contactgrid/res/values-mn/strings.xml index c93bd468a..c87e07179 100644 --- a/java/com/android/incallui/contactgrid/res/values-mn/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-mn/strings.xml @@ -1,20 +1,4 @@ - - "%s-р залгаж байна" @@ -30,8 +14,6 @@ "Хүлээлгэнд байгаа" "Видео дуудлага" "Wi-Fi видео дуудлага" - "Видеог сайжруулах хүсэлт" - "Wi-Fi видеог сайжруулах хүсэлт" "Дуудлага" "Ажлын дуудлага" "%s-р ирж байна" diff --git a/java/com/android/incallui/contactgrid/res/values-mr/strings.xml b/java/com/android/incallui/contactgrid/res/values-mr/strings.xml index 81d76dd70..6a0181774 100644 --- a/java/com/android/incallui/contactgrid/res/values-mr/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-mr/strings.xml @@ -1,20 +1,4 @@ - - "%s द्वारे कॉल करीत आहे" @@ -30,8 +14,6 @@ "होल्ड वर" "यावरून व्हिडिओ कॉल" "Wi-Fi व्हिडिओ कॉल" - "याकडून व्हिडिओ श्रेणीसुधारणेची विनंती" - "याकडून Wi-Fi व्हिडिओ श्रेणीसुधारणेची विनंती" "यावरील कॉल" "कडून कार्य कॉल" "%s द्वारे येणारे" diff --git a/java/com/android/incallui/contactgrid/res/values-ms/strings.xml b/java/com/android/incallui/contactgrid/res/values-ms/strings.xml index 815df7947..17ca75369 100644 --- a/java/com/android/incallui/contactgrid/res/values-ms/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-ms/strings.xml @@ -1,20 +1,4 @@ - - "Memanggil melalui %s" @@ -30,8 +14,6 @@ "Panggilan ditahan" "Panggilan video daripada" "Panggilan video Wi-Fi daripada" - "Permintaan peningkatan video daripada" - "Permintaan peningkatan video Wi-Fi daripada" "Panggilan daripada" "Panggilan kerja daripada" "Panggilan masuk melalui %s" diff --git a/java/com/android/incallui/contactgrid/res/values-my/strings.xml b/java/com/android/incallui/contactgrid/res/values-my/strings.xml index 3c8a88e41..14770cfaf 100644 --- a/java/com/android/incallui/contactgrid/res/values-my/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-my/strings.xml @@ -1,20 +1,4 @@ - - "%s မှတစ်ဆင့် ခေါ်ဆိုနေသည်" @@ -30,8 +14,6 @@ "ဖုန်းကိုင်ထားသည်" "အောက်ပါထံမှ ဗီဒီယိုခေါ်ဆိုမှု" "အောက်ပါထံမှ Wi-Fi ဗီဒီယိုခေါ်ဆိုမှု" - "အောက်ပါထံမှ ဗီဒီယိုအဆင့်မြှင့်ခြင်းတောင်းဆိုချက်" - "အောက်ပါထံမှ Wi-Fi ဗီဒီယိုအဆင့်မြှင့်ခြင်းတောင်းဆိုချက်" "အောက်ပါထံမှ ခေါ်ဆိုမှု" "အောက်ပါထံမှ အလုပ်ခေါ်ဆိုမှု" "%s မှတစ်ဆင့် အဝင်ခေါ်ဆိုမှု" diff --git a/java/com/android/incallui/contactgrid/res/values-nb/strings.xml b/java/com/android/incallui/contactgrid/res/values-nb/strings.xml index 9ad8d0d6a..fbf98954c 100644 --- a/java/com/android/incallui/contactgrid/res/values-nb/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-nb/strings.xml @@ -1,20 +1,4 @@ - - "Ringer via %s" @@ -30,8 +14,6 @@ "På vent" "Videoanrop fra" "Wi-Fi-videoanrop fra" - "Forespørsel om videooppdatering fra" - "Forespørsel om Wi-Fi-videooppdatering fra" "Anrop fra" "Jobbrelatert anrop fra" "Innkommende via %s" diff --git a/java/com/android/incallui/contactgrid/res/values-ne/strings.xml b/java/com/android/incallui/contactgrid/res/values-ne/strings.xml index e6e65c5fb..d618af43f 100644 --- a/java/com/android/incallui/contactgrid/res/values-ne/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-ne/strings.xml @@ -1,20 +1,4 @@ - - "%s मार्फत कल गर्दै" @@ -30,8 +14,6 @@ "होल्डमा छ" "निम्नबाट भिडियो कल आएको छ" "निम्नबाट Wi-Fi मार्फत गरिएको भिडियो कल आएको छ" - "निम्नबाट आएको भिडियो अपग्रेडसम्बन्धी अनुरोध" - "निम्नबाट आएको Wi-Fi मार्फत भिडियो अपग्रेडसम्बन्धी अनुरोध" "निम्नबाट कल आएको छ" "निम्नबाट कार्य सम्बन्धी कल आएको छ" "%s मार्फत गरिएको आगमन कल" diff --git a/java/com/android/incallui/contactgrid/res/values-nl/strings.xml b/java/com/android/incallui/contactgrid/res/values-nl/strings.xml index 828a7a228..10dcd13f0 100644 --- a/java/com/android/incallui/contactgrid/res/values-nl/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-nl/strings.xml @@ -1,20 +1,4 @@ - - "Bellen via %s" @@ -30,8 +14,6 @@ "In de wacht" "Videogesprek van" "Wifi-videogesprek van" - "Upgradeverzoek voor videogesprek van" - "Upgradeverzoek voor wifi-videogesprek van" "Oproep van" "Zakelijke oproep van" "Inkomend via %s" diff --git a/java/com/android/incallui/contactgrid/res/values-no/strings.xml b/java/com/android/incallui/contactgrid/res/values-no/strings.xml index 9ad8d0d6a..fbf98954c 100644 --- a/java/com/android/incallui/contactgrid/res/values-no/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-no/strings.xml @@ -1,20 +1,4 @@ - - "Ringer via %s" @@ -30,8 +14,6 @@ "På vent" "Videoanrop fra" "Wi-Fi-videoanrop fra" - "Forespørsel om videooppdatering fra" - "Forespørsel om Wi-Fi-videooppdatering fra" "Anrop fra" "Jobbrelatert anrop fra" "Innkommende via %s" diff --git a/java/com/android/incallui/contactgrid/res/values-pa/strings.xml b/java/com/android/incallui/contactgrid/res/values-pa/strings.xml index 1d4801c43..fb261d649 100644 --- a/java/com/android/incallui/contactgrid/res/values-pa/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-pa/strings.xml @@ -1,20 +1,4 @@ - - "%s ਰਾਹੀਂ ਕਾਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" @@ -30,8 +14,6 @@ "ਰੋਕ ਕੇ ਰੱਖੀ ਗਈ" "ਇਸ ਤੋਂ ਵੀਡੀਓ ਕਾਲ" "ਇਸ ਤੋਂ Wi-Fi ਵੀਡੀਓ ਕਾਲ" - "ਇਸ ਤੋਂ ਵੀਡੀਓ ਅੱਪਗ੍ਰੇਡ ਬੇਨਤੀ" - "ਇਸ ਤੋਂ Wi-Fi ਵੀਡੀਓ ਅੱਪਗ੍ਰੇਡ ਬੇਨਤੀ" "ਇਸ ਤੋਂ ਕਾਲ" "ਇਸ ਤੋਂ ਕੰਮ ਸਬੰਧੀ ਕਾਲ" "%s ਰਾਹੀਂ ਇਨਕਮਿੰਗ" diff --git a/java/com/android/incallui/contactgrid/res/values-pl/strings.xml b/java/com/android/incallui/contactgrid/res/values-pl/strings.xml index 586f39e65..998e49e3e 100644 --- a/java/com/android/incallui/contactgrid/res/values-pl/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-pl/strings.xml @@ -1,20 +1,4 @@ - - "Dzwonię przez %s" @@ -30,8 +14,6 @@ "Oczekujące" "Rozmowa wideo z:" "Rozmowa wideo przez Wi-Fi z:" - "Prośba o przejście na rozmowę wideo wysłana przez:" - "Prośba o przejście na rozmowę wideo przez Wi-Fi wysłana przez:" "Połączenie z:" "Połączenie służbowe z:" "Przychodzące z sieci %s" diff --git a/java/com/android/incallui/contactgrid/res/values-pt-rBR/strings.xml b/java/com/android/incallui/contactgrid/res/values-pt-rBR/strings.xml index a445cdf60..4365cba59 100644 --- a/java/com/android/incallui/contactgrid/res/values-pt-rBR/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-pt-rBR/strings.xml @@ -1,20 +1,4 @@ - - "Ligando via %s" @@ -30,8 +14,6 @@ "Em espera" "Videochamada de" "Videochamada via Wi-Fi de" - "Solicitação de upgrade de vídeo de" - "Solicitação de upgrade de vídeo por Wi-Fi de" "Chamada de" "Chamada de trabalho de" "Chamada de %s" diff --git a/java/com/android/incallui/contactgrid/res/values-pt-rPT/strings.xml b/java/com/android/incallui/contactgrid/res/values-pt-rPT/strings.xml index ca07b3fc9..55d3c2695 100644 --- a/java/com/android/incallui/contactgrid/res/values-pt-rPT/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-pt-rPT/strings.xml @@ -1,20 +1,4 @@ - - "A telefonar através de %s…" @@ -30,8 +14,6 @@ "Em espera" "Videochamada de" "Videochamada a partir de rede Wi-Fi de" - "Pedido de atualização para videochamada de" - "Pedido de atualização para videochamada por Wi-Fi de" "Chamada de" "Chamada de trabalho de" "Chamada recebida através de %s" diff --git a/java/com/android/incallui/contactgrid/res/values-pt/strings.xml b/java/com/android/incallui/contactgrid/res/values-pt/strings.xml index a445cdf60..4365cba59 100644 --- a/java/com/android/incallui/contactgrid/res/values-pt/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-pt/strings.xml @@ -1,20 +1,4 @@ - - "Ligando via %s" @@ -30,8 +14,6 @@ "Em espera" "Videochamada de" "Videochamada via Wi-Fi de" - "Solicitação de upgrade de vídeo de" - "Solicitação de upgrade de vídeo por Wi-Fi de" "Chamada de" "Chamada de trabalho de" "Chamada de %s" diff --git a/java/com/android/incallui/contactgrid/res/values-ro/strings.xml b/java/com/android/incallui/contactgrid/res/values-ro/strings.xml index 180a01f4c..f8d1c9b54 100644 --- a/java/com/android/incallui/contactgrid/res/values-ro/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-ro/strings.xml @@ -1,20 +1,4 @@ - - "Se apelează prin %s" @@ -30,8 +14,6 @@ "În așteptare" "Apel video de la" "Apel video prin Wi-Fi de la" - "Solicitare de upgrade la apel video de la" - "Solicitare de upgrade la apel video prin Wi-Fi de la" "Apel primit de la" "Apel de serviciu de la" "Primite prin %s" diff --git a/java/com/android/incallui/contactgrid/res/values-ru/strings.xml b/java/com/android/incallui/contactgrid/res/values-ru/strings.xml index e0a63518f..dfbc08828 100644 --- a/java/com/android/incallui/contactgrid/res/values-ru/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-ru/strings.xml @@ -1,20 +1,4 @@ - - "Вызов через %s" @@ -30,8 +14,6 @@ "На удержании" "Видеовызов от" "Видеовызов по Wi-Fi от" - "Запрос на переход к видеовстрече от:" - "Запрос на переход к видеовстрече через Wi-Fi от:" "Вызов от" "Рабочий вызов от" "Входящий вызов (оператор: %s)" diff --git a/java/com/android/incallui/contactgrid/res/values-si/strings.xml b/java/com/android/incallui/contactgrid/res/values-si/strings.xml index 451dc396c..00ca2aa90 100644 --- a/java/com/android/incallui/contactgrid/res/values-si/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-si/strings.xml @@ -1,20 +1,4 @@ - - "%s හරහා අමතමින්" @@ -30,8 +14,6 @@ "රඳවා ගත්" "වෙතින් වීඩියෝ ඇමතුම" "වෙතින් Wi-Fi වීඩියෝ ඇමතුම" - "වෙතින් වීඩියෝ උත්ශ්‍රේණි කිරීමේ ඉල්ලීම" - "වෙතින් Wi-Fi වීඩියෝ උත්ශ්‍රේණි කිරීමේ ඉල්ලීම" "වෙතින් ඇමතුම" "වෙතින් කාර්යාල ඇමතුම" "%s හරහා එන" diff --git a/java/com/android/incallui/contactgrid/res/values-sk/strings.xml b/java/com/android/incallui/contactgrid/res/values-sk/strings.xml index ae21ec855..40039ee9a 100644 --- a/java/com/android/incallui/contactgrid/res/values-sk/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-sk/strings.xml @@ -1,20 +1,4 @@ - - "Voláte prostredníctvom poskytovateľa %s" @@ -30,8 +14,6 @@ "Podržané" "Videohovor od:" "Videohovor cez Wi-Fi od:" - "Žiadosť o inováciu na videohovor od používateľa" - "Žiadosť o inováciu na videohovor cez Wi-Fi od používateľa" "Hovor od:" "Pracovný hovor od:" "Prichádzajúci hovor prostredníctvom poskytovateľa %s" diff --git a/java/com/android/incallui/contactgrid/res/values-sl/strings.xml b/java/com/android/incallui/contactgrid/res/values-sl/strings.xml index 1d93d21a4..f76b5cdac 100644 --- a/java/com/android/incallui/contactgrid/res/values-sl/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-sl/strings.xml @@ -1,20 +1,4 @@ - - "Klicanje prek ponudnika %s" @@ -30,8 +14,6 @@ "Zadržano" "Videoklic osebe" "Videoklic prek omrežja Wi-Fi osebe" - "Zahteva za nadgradnjo v video – zahteva osebe" - "Zahteva za nadgradnjo v video prek omrežja Wi-Fi – zahteva osebe" "Klic osebe" "Delovni klic osebe" "Dohodni klic prek storitve %s" diff --git a/java/com/android/incallui/contactgrid/res/values-sq/strings.xml b/java/com/android/incallui/contactgrid/res/values-sq/strings.xml index 8c28eb7ea..34ec2d1f6 100644 --- a/java/com/android/incallui/contactgrid/res/values-sq/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-sq/strings.xml @@ -1,20 +1,4 @@ - - "Telefonatë nëpërmjet %s" @@ -30,8 +14,6 @@ "Në pritje" "Telefonatë me video nga" "Telefonatë me video në Wi-Fi nga" - "Kërkesë për përmirësimin me video nga" - "Kërkesë për përmirësimin me video me Wi-Fi nga" "Telefonatë nga" "Telefonatë pune nga" "Telefonatë hyrëse nëpërmjet %s" diff --git a/java/com/android/incallui/contactgrid/res/values-sr/strings.xml b/java/com/android/incallui/contactgrid/res/values-sr/strings.xml index 66ea45d6e..9ad149905 100644 --- a/java/com/android/incallui/contactgrid/res/values-sr/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-sr/strings.xml @@ -1,20 +1,4 @@ - - "Позивамо преко %s" @@ -30,8 +14,6 @@ "На чекању" "Видео позив од" "Wi-Fi видео позив од" - "Захтев за прелазак на видео позив од" - "Захтев за прелазак на видео позив преко Wi-Fi-ја од" "Позив од" "Пословни позив од" "Долазни позив преко %s" diff --git a/java/com/android/incallui/contactgrid/res/values-sv/strings.xml b/java/com/android/incallui/contactgrid/res/values-sv/strings.xml index 931d9c98d..d5dd15953 100644 --- a/java/com/android/incallui/contactgrid/res/values-sv/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-sv/strings.xml @@ -1,20 +1,4 @@ - - "Ringer med %s" @@ -30,8 +14,6 @@ "Parkerat" "Videosamtal från" "Wi-Fi-videosamtal från" - "Begäran om videouppgradering från" - "Begäran om uppgradering av Wi-Fi-video från" "Samtal från" "Jobbsamtal från" "Inkommande via %s" diff --git a/java/com/android/incallui/contactgrid/res/values-sw/strings.xml b/java/com/android/incallui/contactgrid/res/values-sw/strings.xml index 581d7970a..72bc26f58 100644 --- a/java/com/android/incallui/contactgrid/res/values-sw/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-sw/strings.xml @@ -1,20 +1,4 @@ - - "Inapiga simu kupitia %s" @@ -30,8 +14,6 @@ "Imesitishwa" "Simu ya video kutoka kwa" "Simu ya video kupitia Wi-Fi kutoka kwa" - "Umetumiwa ombi ili ubadilishe utumie simu ya video na" - "Umetumiwa ombi ili ubadilishe utumie simu ya video kwenye Wi-Fi na" "Simu kutoka kwa" "Simu ya kazi kutoka kwa" "Simu zinazoingia kupitia %s" diff --git a/java/com/android/incallui/contactgrid/res/values-ta/strings.xml b/java/com/android/incallui/contactgrid/res/values-ta/strings.xml index 37ff87681..2f5b1b81d 100644 --- a/java/com/android/incallui/contactgrid/res/values-ta/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-ta/strings.xml @@ -1,20 +1,4 @@ - - "%s வழியாக அழைக்கிறது" @@ -30,8 +14,6 @@ "ஹோல்டில் உள்ளது" "வீடியோ அழைப்பு:" "வைஃபை வீடியோ அழைப்பு:" - "வீடியோவை மேம்படுத்துவதற்கான கோரிக்கை:" - "வைஃபையில் வீடியோவை மேம்படுத்துவதற்கான கோரிக்கை:" "அழைப்பு:" "அழைப்பு (பணி) :" "%s மூலம் உள்வரும் அழைப்பு" diff --git a/java/com/android/incallui/contactgrid/res/values-te/strings.xml b/java/com/android/incallui/contactgrid/res/values-te/strings.xml index 913c9448a..52038dbf8 100644 --- a/java/com/android/incallui/contactgrid/res/values-te/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-te/strings.xml @@ -1,20 +1,4 @@ - - "%s ద్వారా కాల్ చేస్తోంది" @@ -30,8 +14,6 @@ "హోల్డ్‌లో ఉంది" "వీరి నుండి వీడియో కాల్:" "వీరి నుండి Wi-Fi వీడియో కాల్:" - "వీరి నుండి వీడియో అప్‌గ్రేడ్ అభ్యర్థన" - "వీరి నుండి Wi-Fi వీడియో అప్‌గ్రేడ్ అభ్యర్థన" "వీరి నుండి కాల్:" "వీరి నుండి కార్యాలయ కాల్:" "%s ద్వారా ఇన్‌కమింగ్ కాల్" diff --git a/java/com/android/incallui/contactgrid/res/values-th/strings.xml b/java/com/android/incallui/contactgrid/res/values-th/strings.xml index 6503959e4..419db19cc 100644 --- a/java/com/android/incallui/contactgrid/res/values-th/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-th/strings.xml @@ -1,20 +1,4 @@ - - "โทรผ่าน %s" @@ -30,8 +14,6 @@ "พักสาย" "แฮงเอาท์วิดีโอจาก" "แฮงเอาท์วิดีโอผ่าน Wi-Fi จาก" - "คำขออัปเกรดวิดีโอจาก" - "คำขออัปเกรดวิดีโอผ่าน Wi-Fi จาก" "โทรจาก" "โทรเรื่องงานจาก" "สายเรียกเข้าผ่าน %s" diff --git a/java/com/android/incallui/contactgrid/res/values-tl/strings.xml b/java/com/android/incallui/contactgrid/res/values-tl/strings.xml index 7fa063b61..282ec106f 100644 --- a/java/com/android/incallui/contactgrid/res/values-tl/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-tl/strings.xml @@ -1,20 +1,4 @@ - - "Tumatawag sa pamamagitan ng %s" @@ -30,8 +14,6 @@ "Naka-hold" "Video call mula kay" "Wi-Fi na video call mula kay" - "Kahilingan upang i-upgrade ang video mula kay" - "Kahilingan upang i-upgrade ang video gamit ang Wi-Fi mula kay" "Tawag mula kay" "Tawag sa trabaho mula kay" "Papasok sa pamamagitan ng %s" diff --git a/java/com/android/incallui/contactgrid/res/values-tr/strings.xml b/java/com/android/incallui/contactgrid/res/values-tr/strings.xml index 1ce565dca..5ecbf3543 100644 --- a/java/com/android/incallui/contactgrid/res/values-tr/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-tr/strings.xml @@ -1,20 +1,4 @@ - - "%s üzerinden çağrı yapılıyor" @@ -30,8 +14,6 @@ "Beklemede" "Gelen video görüşmesi isteği:" "Gelen kablosuz video görüşmesi isteği:" - "Görüntülü görüşmeye geçme isteği alındı:" - "Kablosuz görüntülü görüşmeye geçme isteği alındı:" "Gelen çağrı:" "Gelen iş çağrısı:" "%s adlı sağlayıcı üzerinden gelen çağrı" diff --git a/java/com/android/incallui/contactgrid/res/values-uk/strings.xml b/java/com/android/incallui/contactgrid/res/values-uk/strings.xml index 0d4a595ca..7b84fb650 100644 --- a/java/com/android/incallui/contactgrid/res/values-uk/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-uk/strings.xml @@ -1,20 +1,4 @@ - - "Виклик здійснюється через оператора %s" @@ -30,8 +14,6 @@ "Утримується" "Відеодзвінок від:" "Відеодзвінок через Wi-Fi від:" - "Запит на відеодзвінок від користувача" - "Запит на відеодзвінок через Wi-Fi від користувача" "Виклик від:" "Виклик на робочий телефон від:" "Вхідні виклики через оператора %s" diff --git a/java/com/android/incallui/contactgrid/res/values-ur/strings.xml b/java/com/android/incallui/contactgrid/res/values-ur/strings.xml index 793e4879d..6584181fb 100644 --- a/java/com/android/incallui/contactgrid/res/values-ur/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-ur/strings.xml @@ -1,20 +1,4 @@ - - "کالنگ بذریعہ %s" @@ -30,8 +14,6 @@ "ہولڈ پر ہے" "ویڈیو کال منجانب" "‏Wi-Fi ویڈیو کال منجانب" - "ویڈیو اپ گریڈ کی درخواست منجانب" - "‏Wi-Fi ویڈیو اپ گریڈ کی درخواست منجانب" "کال منجانب" "دفتری کال منجانب" "%s کے ذریعے آنے والی کال" 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..db11a1822 100644 --- a/java/com/android/incallui/contactgrid/res/values-uz/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-uz/strings.xml @@ -1,20 +1,4 @@ - - "%s orqali qo‘ng‘rioq qilinmoqda" @@ -30,8 +14,6 @@ "Kutish rejimida" "Kimdan video qo‘ng‘iroq:" "Wi-Fi orqali kimdan video qo‘ng‘iroq:" - "Bu foydalanuvchi video suhbatga o‘tishni so‘ramoqda:" - "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)" diff --git a/java/com/android/incallui/contactgrid/res/values-vi/strings.xml b/java/com/android/incallui/contactgrid/res/values-vi/strings.xml index 9ce0f1838..340a11577 100644 --- a/java/com/android/incallui/contactgrid/res/values-vi/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-vi/strings.xml @@ -1,20 +1,4 @@ - - "Đang gọi điện qua %s" @@ -30,8 +14,6 @@ "Đang chờ" "Cuộc gọi điện video từ" "Cuộc gọi điện video qua Wi-Fi từ" - "Yêu cầu nâng cấp video từ" - "Yêu cầu nâng cấp video Wi-Fi từ" "Cuộc gọi từ" "Cuộc gọi về công việc từ" "Cuộc gọi đến qua %s" diff --git a/java/com/android/incallui/contactgrid/res/values-zh-rCN/strings.xml b/java/com/android/incallui/contactgrid/res/values-zh-rCN/strings.xml index af5008af0..16031b811 100644 --- a/java/com/android/incallui/contactgrid/res/values-zh-rCN/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-zh-rCN/strings.xml @@ -1,20 +1,4 @@ - - "正在通过%s进行通话" @@ -30,8 +14,6 @@ "保持" "视频通话来自：" "WLAN 视频通话来自：" - "视频通话升级请求来自：" - "WLAN 视频通话升级请求来自：" "通话来自：" "工作通话来自：" "有人通过 %s 来电" diff --git a/java/com/android/incallui/contactgrid/res/values-zh-rHK/strings.xml b/java/com/android/incallui/contactgrid/res/values-zh-rHK/strings.xml index 9f4748175..14a444124 100644 --- a/java/com/android/incallui/contactgrid/res/values-zh-rHK/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-zh-rHK/strings.xml @@ -1,20 +1,4 @@ - - "正在透過 %s 撥號" @@ -30,8 +14,6 @@ "保留" "視像通話來自" "Wi-Fi 視像通話來自" - "視像升級要求來自" - "Wi-Fi 視像升級要求來自" "通話來自" "工作通話來自" "透過 %s 的來電" diff --git a/java/com/android/incallui/contactgrid/res/values-zh-rTW/strings.xml b/java/com/android/incallui/contactgrid/res/values-zh-rTW/strings.xml index 563bb2832..bdee41e67 100644 --- a/java/com/android/incallui/contactgrid/res/values-zh-rTW/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-zh-rTW/strings.xml @@ -1,20 +1,4 @@ - - "正在透過 %s 撥號" @@ -30,8 +14,6 @@ "保留中" "視訊通話來電：" "Wi-Fi 視訊通話來電：" - "視訊升級要求，來自：" - "Wi-Fi 視訊升級要求，來自：" "語音來電：" "公司來電：" "有人透過 %s 來電" diff --git a/java/com/android/incallui/contactgrid/res/values-zu/strings.xml b/java/com/android/incallui/contactgrid/res/values-zu/strings.xml index 19951ccf7..150d5cc98 100644 --- a/java/com/android/incallui/contactgrid/res/values-zu/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values-zu/strings.xml @@ -1,20 +1,4 @@ - - "Ishaya ucingo nge-%s" @@ -30,8 +14,6 @@ "Ibambile" "Ikholi yevidiyo kusukela ku-" "Ikholi yevidiyo ye-Wi-Fi kusukela ku-" - "Isicelo sokuthuthukiswa kwevidiyo kusukela" - "Isicelo sokuthuthukiswa kwevidiyo ye-Wi-Fi kusukela" "Ikholi esuka ku-" "Ikholi yomsebenzi kusukela ku-" "Ingena nge-%s" diff --git a/java/com/android/incallui/contactgrid/res/values/strings.xml b/java/com/android/incallui/contactgrid/res/values/strings.xml index 5a9272ca3..385f843b1 100644 --- a/java/com/android/incallui/contactgrid/res/values/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values/strings.xml @@ -1,19 +1,4 @@ - Wi-Fi video call from - - Video upgrade request from - - - Wi-Fi video upgrade request from - Call from diff --git a/java/com/android/incallui/incall/impl/ButtonChooserFactory.java b/java/com/android/incallui/incall/impl/ButtonChooserFactory.java index 99364e22c..0dcfdb5fe 100644 --- a/java/com/android/incallui/incall/impl/ButtonChooserFactory.java +++ b/java/com/android/incallui/incall/impl/ButtonChooserFactory.java @@ -82,19 +82,12 @@ class ButtonChooserFactory { Map mapping = createCommonMapping(); mapping.put( InCallButtonIds.BUTTON_SWITCH_TO_SECONDARY, MappingInfo.builder(4).setSlotOrder(0).build()); - mapping.put( - InCallButtonIds.BUTTON_UPGRADE_TO_VIDEO, MappingInfo.builder(4).setSlotOrder(10).build()); - - /* - * Unlike the other configurations, MANAGE_VOICE_CONFERENCE shares a spot with HOLD for GSM. - * On GSM, pressing hold while there's a background call just swaps to the background call. It - * doesn't make sense to show both SWITCH_TO_SECONDARY and HOLD when they do the same thing, so - * we show MANAGE_VOICE_CONFERENCE instead. Previously MANAGE_VOICE_CONFERENCE would not show. - */ mapping.put( InCallButtonIds.BUTTON_MANAGE_VOICE_CONFERENCE, - MappingInfo.builder(5).setSlotOrder(0).build()); - mapping.put(InCallButtonIds.BUTTON_HOLD, MappingInfo.builder(5).setSlotOrder(5).build()); + MappingInfo.builder(4).setSlotOrder(5).build()); + mapping.put( + InCallButtonIds.BUTTON_UPGRADE_TO_VIDEO, MappingInfo.builder(4).setSlotOrder(10).build()); + mapping.put(InCallButtonIds.BUTTON_HOLD, MappingInfo.builder(5).setSlotOrder(0).build()); return new ButtonChooser(new MappedButtonConfig(mapping)); } diff --git a/java/com/android/incallui/incall/impl/ButtonController.java b/java/com/android/incallui/incall/impl/ButtonController.java index b7a47f08e..8c113649d 100644 --- a/java/com/android/incallui/incall/impl/ButtonController.java +++ b/java/com/android/incallui/incall/impl/ButtonController.java @@ -29,8 +29,6 @@ import com.android.incallui.incall.impl.CheckableLabeledButton.OnCheckedChangeLi import com.android.incallui.incall.protocol.InCallButtonIds; import com.android.incallui.incall.protocol.InCallButtonUiDelegate; import com.android.incallui.incall.protocol.InCallScreenDelegate; -import com.android.incallui.speakerbuttonlogic.SpeakerButtonInfo; -import com.android.incallui.speakerbuttonlogic.SpeakerButtonInfo.IconSize; /** Manages a single button. */ interface ButtonController { @@ -378,13 +376,36 @@ interface ButtonController { } public void setAudioState(CallAudioState audioState) { - SpeakerButtonInfo info = new SpeakerButtonInfo(audioState, IconSize.SIZE_36_DP); - - checkable = info.checkable; - isChecked = info.isChecked; - label = info.label; - icon = info.icon; - @StringRes int contentDescriptionResId = info.contentDescription; + @StringRes int contentDescriptionResId; + if ((audioState.getSupportedRouteMask() & CallAudioState.ROUTE_BLUETOOTH) + == CallAudioState.ROUTE_BLUETOOTH) { + checkable = false; + isChecked = false; + label = R.string.incall_label_audio; + + if ((audioState.getRoute() & CallAudioState.ROUTE_BLUETOOTH) + == CallAudioState.ROUTE_BLUETOOTH) { + icon = R.drawable.quantum_ic_bluetooth_audio_white_36; + contentDescriptionResId = R.string.incall_content_description_bluetooth; + } else if ((audioState.getRoute() & CallAudioState.ROUTE_SPEAKER) + == CallAudioState.ROUTE_SPEAKER) { + icon = R.drawable.quantum_ic_volume_up_white_36; + contentDescriptionResId = R.string.incall_content_description_speaker; + } else if ((audioState.getRoute() & CallAudioState.ROUTE_WIRED_HEADSET) + == CallAudioState.ROUTE_WIRED_HEADSET) { + icon = R.drawable.quantum_ic_headset_white_36; + contentDescriptionResId = R.string.incall_content_description_headset; + } else { + icon = R.drawable.ic_phone_audio_white_36dp; + contentDescriptionResId = R.string.incall_content_description_earpiece; + } + } else { + checkable = true; + isChecked = audioState.getRoute() == CallAudioState.ROUTE_SPEAKER; + label = R.string.incall_label_speaker; + icon = R.drawable.quantum_ic_volume_up_white_36; + contentDescriptionResId = R.string.incall_content_description_speaker; + } contentDescription = delegate.getContext().getText(contentDescriptionResId); checkedContentDescription = diff --git a/java/com/android/incallui/incall/impl/InCallFragment.java b/java/com/android/incallui/incall/impl/InCallFragment.java index d329dc903..c5d75329f 100644 --- a/java/com/android/incallui/incall/impl/InCallFragment.java +++ b/java/com/android/incallui/incall/impl/InCallFragment.java @@ -473,9 +473,6 @@ public class InCallFragment extends Fragment inCallButtonUiDelegate.setAudioRoute(audioRoute); } - @Override - public void onAudioRouteSelectorDismiss() {} - @NonNull @Override public ButtonController getButtonController(@InCallButtonIds int id) { diff --git a/java/com/android/incallui/incall/impl/InCallPagerAdapter.java b/java/com/android/incallui/incall/impl/InCallPagerAdapter.java index bc0c61607..0b1088d2d 100644 --- a/java/com/android/incallui/incall/impl/InCallPagerAdapter.java +++ b/java/com/android/incallui/incall/impl/InCallPagerAdapter.java @@ -21,6 +21,7 @@ import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentStatePagerAdapter; import android.support.v4.view.PagerAdapter; +import android.text.TextUtils; import com.android.dialer.multimedia.MultimediaData; import com.android.incallui.sessiondata.MultimediaFragment; @@ -46,7 +47,8 @@ public class InCallPagerAdapter extends FragmentStatePagerAdapter { @Override public int getCount() { - if (attachments != null && attachments.hasData()) { + if (attachments != null + && (!TextUtils.isEmpty(attachments.getText()) || attachments.hasImageData())) { return 2; } return 1; diff --git a/java/com/android/incallui/incall/impl/res/values-af/strings.xml b/java/com/android/incallui/incall/impl/res/values-af/strings.xml index 64529a51f..fd632fb9a 100644 --- a/java/com/android/incallui/incall/impl/res/values-af/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-af/strings.xml @@ -1,33 +1,18 @@ - - "Video-oproep" "Hou aan" "Voeg oproep by" "Demp" - "Beëindig oproep" "Sleutelblok" + "Luidspreker" ", is aan" ", is af" "Voeg saam" "Bestuur" "Bestuur bellers" "Verwissel" + "Klank" "Nota is gestuur" diff --git a/java/com/android/incallui/incall/impl/res/values-am/strings.xml b/java/com/android/incallui/incall/impl/res/values-am/strings.xml index 66a38680e..9dfd0e61d 100644 --- a/java/com/android/incallui/incall/impl/res/values-am/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-am/strings.xml @@ -1,33 +1,18 @@ - - "የቪዲዮ ጥሪ" "ይዘህ ቆይ" "ጥሪ ያክሉ" "ድምፀ-ከል አድርግ" - "ጥሪ ጨርስ" "ቁልፍ ሰሌዳ" + "የድምጽ ማጉያ" "፣ በርቷል" "፣ ጠፍቷል" "አዋህድ" "አስተዳድር" "ደዋዮችን ያስተዳድሩ" "አገላብጥ" + "ድምፅ" "ማስታወሻ ተልኳል" diff --git a/java/com/android/incallui/incall/impl/res/values-ar/strings.xml b/java/com/android/incallui/incall/impl/res/values-ar/strings.xml index e4dbfe4b6..a5f448a31 100644 --- a/java/com/android/incallui/incall/impl/res/values-ar/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-ar/strings.xml @@ -1,33 +1,18 @@ - - "مكالمة فيديو" "انتظار" "إضافة مكالمة" "كتم" - "إنهاء المكالمة" "لوحة مفاتيح" + "مكبر الصوت" "، مشغل" "، غير مشغل" "دمج" "إدارة" "إدارة المتصلين" "تبديل" + "الصوت" "تم إرسال الملاحظة" diff --git a/java/com/android/incallui/incall/impl/res/values-az/strings.xml b/java/com/android/incallui/incall/impl/res/values-az/strings.xml index 9a1f7f8fe..5f1f8cb98 100644 --- a/java/com/android/incallui/incall/impl/res/values-az/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-az/strings.xml @@ -1,33 +1,18 @@ - - "Video zəng" "Xətdə axlayın" "Zəng əlavə edin" "Susdurun" - "Zəngi bitirin" "Klaviatura" + "Dinamik" ", aktivdir" ", deaktivdir" "Birləşdir" "İdarə edin" "Zəng edənləri idarə edin" "Dəyişdirin" + "Səs" "Qeyd göndərildi" diff --git a/java/com/android/incallui/incall/impl/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/incall/impl/res/values-b+sr+Latn/strings.xml index 02d6b7c96..bff7ed079 100644 --- a/java/com/android/incallui/incall/impl/res/values-b+sr+Latn/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-b+sr+Latn/strings.xml @@ -1,33 +1,18 @@ - - "Video poziv" "Na čekanje" "Dodaj poziv" "Isključi zvuk" - "Završi poziv" "Tastatura" + "Zvučnik" ", uključen" ", isključen" "Objedini" "Upravljaj" "Upravljajte pozivaocima" "Zameni" + "Zvuk" "Beleška je poslata" diff --git a/java/com/android/incallui/incall/impl/res/values-be/strings.xml b/java/com/android/incallui/incall/impl/res/values-be/strings.xml index 45e1e1010..394c7c82e 100644 --- a/java/com/android/incallui/incall/impl/res/values-be/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-be/strings.xml @@ -1,33 +1,18 @@ - - "Відэавыклік" "Утрымліваць" "Дадаць выклік" "Адключыць мікрафон" - "Сконч. выкл." "Клавіятура" + "Вонк.дынамік" ", уключана" ", выключана" "Аб\'яднаць" "Кіраваць" "Кіраваць выклікаючымі абанентамі" "Пераключыць" + "Гук" "Нататка адпраўлена" diff --git a/java/com/android/incallui/incall/impl/res/values-bg/strings.xml b/java/com/android/incallui/incall/impl/res/values-bg/strings.xml index c339d3bca..4f5933be9 100644 --- a/java/com/android/incallui/incall/impl/res/values-bg/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-bg/strings.xml @@ -1,33 +1,18 @@ - - "Видеообажд." "Задържане" "Ново обажд." "Без звук" - "Затваряне" "Клавиатура" + "Високоговорител" "е включено" "е изключено" "Обединяване" "Управление" "Управление на обаждащите се" "Размяна" + "Звук" "Бележката е изпратена" diff --git a/java/com/android/incallui/incall/impl/res/values-bn/strings.xml b/java/com/android/incallui/incall/impl/res/values-bn/strings.xml index ca5837b0e..9453e14bd 100644 --- a/java/com/android/incallui/incall/impl/res/values-bn/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-bn/strings.xml @@ -1,33 +1,18 @@ - - "ভিডিও কল" "ধরে থাকুন" "কল যোগ করুন" "নিঃশব্দ করুন" - "কল শেষ করুন" "কীপ্যাড" + "স্পিকার" ", চালু রয়েছে" ", বন্ধ রয়েছে" "মার্জ করুন" "পরিচালনা করুন" "কলারদের পরিচালনা করুন" "অদল বদল করুন" + "শব্দ" "নোট পাঠানো হয়েছে" diff --git a/java/com/android/incallui/incall/impl/res/values-bs/strings.xml b/java/com/android/incallui/incall/impl/res/values-bs/strings.xml index 26b44ea90..4b4796457 100644 --- a/java/com/android/incallui/incall/impl/res/values-bs/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-bs/strings.xml @@ -1,33 +1,18 @@ - - "Videopoziv" "Na čekanju" "Dodaj poziv" "Isključi" - "Prekini poziv" "Telefonska tastatura" + "Zvučnik" ", uključen" ", isključen" "Spoji" "Upravljaj" "Upravljanje pozivaocima" "Zamijeni" + "Zvuk" "Bilješka je poslana" diff --git a/java/com/android/incallui/incall/impl/res/values-ca/strings.xml b/java/com/android/incallui/incall/impl/res/values-ca/strings.xml index 9c76a3a5f..e10b7bd2d 100644 --- a/java/com/android/incallui/incall/impl/res/values-ca/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-ca/strings.xml @@ -1,33 +1,18 @@ - - "Videotrucada" "Posa en espera" "Afeg. trucada" "Silencia" - "Penja" "Teclat" + "Altaveu" ", activat" ", desactivat" "Combina" "Gestiona" "Gestiona les persones que truquen" "Canvia" + "So" "La nota s\'ha enviat" diff --git a/java/com/android/incallui/incall/impl/res/values-cs/strings.xml b/java/com/android/incallui/incall/impl/res/values-cs/strings.xml index 69f3e53a0..a00c10547 100644 --- a/java/com/android/incallui/incall/impl/res/values-cs/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-cs/strings.xml @@ -1,33 +1,18 @@ - - "Videohovor" "Podržet" "Přidat hovor" "Vyp. mikrof." - "Zavěsit" "Klávesnice" + "Reproduktor" "– zapnuto" "– vypnuto" "Sloučit" "Spravovat" "Spravovat volající" "Přepnout" + "Zvuk" "Poznámka byla odeslána" diff --git a/java/com/android/incallui/incall/impl/res/values-da/strings.xml b/java/com/android/incallui/incall/impl/res/values-da/strings.xml index d9328afe4..08b5cbb8e 100644 --- a/java/com/android/incallui/incall/impl/res/values-da/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-da/strings.xml @@ -1,33 +1,18 @@ - - "Videoopkald" "Parkér" "Tilføj opkald" "Slå lyden fra" - "Slut opkald" "Tastatur" + "Højttaler" ", er til" ", er fra" "Flet" "Administrer" "Administrer opkaldere" "Byt" + "Lyd" "Noten blev sendt" diff --git a/java/com/android/incallui/incall/impl/res/values-de/strings.xml b/java/com/android/incallui/incall/impl/res/values-de/strings.xml index 30eae96b3..5f3f8c1cb 100644 --- a/java/com/android/incallui/incall/impl/res/values-de/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-de/strings.xml @@ -1,33 +1,18 @@ - - "Videoanruf" "Halten" "Hinzufügen" "Stumm" - "Beenden" "Wähltasten" + "Lautsprecher" ", ist an" ", ist aus" "Zusammenf." "Verwalten" "Anrufer verwalten" "Wechseln" + "Audio" "Notiz gesendet" diff --git a/java/com/android/incallui/incall/impl/res/values-el/strings.xml b/java/com/android/incallui/incall/impl/res/values-el/strings.xml index b45314fa7..0f5a14238 100644 --- a/java/com/android/incallui/incall/impl/res/values-el/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-el/strings.xml @@ -1,33 +1,18 @@ - - "Βιντεοκλήση" "Αναμονή" "Προσθ. κλήσ." "Σίγαση" - "Τερματισμός" "Πληκτρολόγιο" + "Ηχείο" ", ενεργό" ", ανενεργό" "Συγχώνευση" "Διαχείριση" "Διαχείριση καλούντων" "Ανταλλαγή" + "Ήχος" "Η σημείωση εστάλη" diff --git a/java/com/android/incallui/incall/impl/res/values-en-rAU/strings.xml b/java/com/android/incallui/incall/impl/res/values-en-rAU/strings.xml index 34323f57a..89b72df54 100644 --- a/java/com/android/incallui/incall/impl/res/values-en-rAU/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-en-rAU/strings.xml @@ -1,33 +1,18 @@ - - "Video call" "Hold" "Add call" "Mute" - "End call" "Keypad" + "Speaker" ", is on" ", is off" "Merge" "Manage" "Manage callers" "Swap" + "Sound" "Note sent" diff --git a/java/com/android/incallui/incall/impl/res/values-en-rGB/strings.xml b/java/com/android/incallui/incall/impl/res/values-en-rGB/strings.xml index 34323f57a..89b72df54 100644 --- a/java/com/android/incallui/incall/impl/res/values-en-rGB/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-en-rGB/strings.xml @@ -1,33 +1,18 @@ - - "Video call" "Hold" "Add call" "Mute" - "End call" "Keypad" + "Speaker" ", is on" ", is off" "Merge" "Manage" "Manage callers" "Swap" + "Sound" "Note sent" diff --git a/java/com/android/incallui/incall/impl/res/values-en-rIN/strings.xml b/java/com/android/incallui/incall/impl/res/values-en-rIN/strings.xml index 34323f57a..89b72df54 100644 --- a/java/com/android/incallui/incall/impl/res/values-en-rIN/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-en-rIN/strings.xml @@ -1,33 +1,18 @@ - - "Video call" "Hold" "Add call" "Mute" - "End call" "Keypad" + "Speaker" ", is on" ", is off" "Merge" "Manage" "Manage callers" "Swap" + "Sound" "Note sent" diff --git a/java/com/android/incallui/incall/impl/res/values-es-rUS/strings.xml b/java/com/android/incallui/incall/impl/res/values-es-rUS/strings.xml index d39cf2f6f..fe9374cb9 100644 --- a/java/com/android/incallui/incall/impl/res/values-es-rUS/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-es-rUS/strings.xml @@ -1,33 +1,18 @@ - - "Videollamada" "Retener" "Agregar llamada" "Silenciar" - "Finalizar" "Teclado" + "Altavoz" ", activado" ", desactivado" "Combinar" "Administrar" "Administrar números" "Cambiar" + "Sonido" "Se envió la nota" diff --git a/java/com/android/incallui/incall/impl/res/values-es/strings.xml b/java/com/android/incallui/incall/impl/res/values-es/strings.xml index db5a7e643..f2dd09bb9 100644 --- a/java/com/android/incallui/incall/impl/res/values-es/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-es/strings.xml @@ -1,33 +1,18 @@ - - "Videollamada" "Retener" "Añadir" "Silenciar" - "Finalizar" "Teclado" + "Altavoz" ", activado" ", desactivado" "Combinar" "Gestionar" "Administrar llamadas" "Cambiar" + "Sonido" "Nota enviada" diff --git a/java/com/android/incallui/incall/impl/res/values-et/strings.xml b/java/com/android/incallui/incall/impl/res/values-et/strings.xml index f4587adaa..03fa7deae 100644 --- a/java/com/android/incallui/incall/impl/res/values-et/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-et/strings.xml @@ -1,33 +1,18 @@ - - "Videokõne" "Ootele" "Lisa kõne" "Vaigista" - "Lõpeta kõne" "Klaviatuur" + "Kõlar" ", on sees" ", on väljas" "Ühenda" "Halda" "Helistajate haldamine" "Vaheta" + "Heli" "Märge on saadetud" diff --git a/java/com/android/incallui/incall/impl/res/values-eu/strings.xml b/java/com/android/incallui/incall/impl/res/values-eu/strings.xml index 28d78a70b..51d300e2e 100644 --- a/java/com/android/incallui/incall/impl/res/values-eu/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-eu/strings.xml @@ -1,33 +1,18 @@ - - "Bideo-deia" "Utzi zain" "Gehitu deia" "Des. audioa" - "Amaitu deia" "Teklatua" + "Bozgorailua" ", aktibatuta" ", desaktib." "Bateratu" "Kudeatu" "Kudeatu deitzaileak" "Aldatu" + "Soinua" "Bidali da oharra" diff --git a/java/com/android/incallui/incall/impl/res/values-fa/strings.xml b/java/com/android/incallui/incall/impl/res/values-fa/strings.xml index a26ac75a2..a0701163e 100644 --- a/java/com/android/incallui/incall/impl/res/values-fa/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-fa/strings.xml @@ -1,33 +1,18 @@ - - "تماس ویدئویی" "درحال انتظار" "افزودن تماس" "بی‌صدا کردن" - "پایان تماس" "صفحه کلید" + "بلندگو" "، فعال است" "، غیرفعال است" "ادغام" "مدیریت" "مدیریت تماس‌گیرندگان" "جابه‌جایی" + "صدا" "یادداشت ارسال شد" diff --git a/java/com/android/incallui/incall/impl/res/values-fi/strings.xml b/java/com/android/incallui/incall/impl/res/values-fi/strings.xml index 9ae53488a..d81bfbf39 100644 --- a/java/com/android/incallui/incall/impl/res/values-fi/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-fi/strings.xml @@ -1,33 +1,18 @@ - - "Videopuhelu" "Pitoon" "Lisää puhelu" "Mykistä" - "Päätä puhelu" "Näppäimistö" + "Kaiutin" ", käytössä" ", ei käytössä" "Yhdistä" "Hallinnoi" "Hallinnoi soittajia" "Vaihda" + "Ääni" "Muistiinpano lähetettiin." diff --git a/java/com/android/incallui/incall/impl/res/values-fr-rCA/strings.xml b/java/com/android/incallui/incall/impl/res/values-fr-rCA/strings.xml index cff6745d1..1278bce2d 100644 --- a/java/com/android/incallui/incall/impl/res/values-fr-rCA/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-fr-rCA/strings.xml @@ -1,33 +1,18 @@ - - "Appel vidéo" "En attente" "Autre appel" "Couper son" - "Raccrocher" "Clavier" + "Haut-parleur" ", activé" ", désactivé" "Fusionner" "Gérer" "Gérer les appels" "Permuter" + "Son" "Note envoyée" diff --git a/java/com/android/incallui/incall/impl/res/values-fr/strings.xml b/java/com/android/incallui/incall/impl/res/values-fr/strings.xml index 14e92beeb..5532032b9 100644 --- a/java/com/android/incallui/incall/impl/res/values-fr/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-fr/strings.xml @@ -1,33 +1,18 @@ - - "Appel vidéo" "En attente" "Autre appel" "Couper micro" - "Raccrocher" "Clavier" + "Haut-parleur" ", activé" ", désactivé" "Fusionner" "Gérer" "Gérer les appelants" "Permuter" + "Son" "Note envoyée" diff --git a/java/com/android/incallui/incall/impl/res/values-gl/strings.xml b/java/com/android/incallui/incall/impl/res/values-gl/strings.xml index 4b399f4ee..ec99b7c75 100644 --- a/java/com/android/incallui/incall/impl/res/values-gl/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-gl/strings.xml @@ -1,33 +1,18 @@ - - "Videochamada" "En espera" "Eng. chamada" "Ignorar" - "Finalizar chamada" "Teclado" + "Altofalante" "activado" "desactivado" "Combinar" "Xestionar" "Xestionar emisores de chamadas" "Cambiar" + "Son" "Enviouse a nota" diff --git a/java/com/android/incallui/incall/impl/res/values-gu/strings.xml b/java/com/android/incallui/incall/impl/res/values-gu/strings.xml index 438f0f351..fb3999c9a 100644 --- a/java/com/android/incallui/incall/impl/res/values-gu/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-gu/strings.xml @@ -1,33 +1,18 @@ - - "વિડિઓ કૉલ" "હોલ્ડ કરો" "કૉલ ઉમેરો" "મ્યૂટ કરો" - "કૉલ સમાપ્ત કરો" "કીપેડ" + "સ્પીકર" ", ચાલુ છે" ", બંધ છે" "મર્જ કરો" "સંચાલિત કરો" "કૉલર્સને સંચાલિત કરો" "સ્વેપ કરો" + "ધ્વનિ" "નોંધ મોકલી" diff --git a/java/com/android/incallui/incall/impl/res/values-h580dp/dimens.xml b/java/com/android/incallui/incall/impl/res/values-h580dp/dimens.xml new file mode 100644 index 000000000..1f37cd504 --- /dev/null +++ b/java/com/android/incallui/incall/impl/res/values-h580dp/dimens.xml @@ -0,0 +1,4 @@ + + + 88dp + diff --git a/java/com/android/incallui/incall/impl/res/values-h580dp/styles.xml b/java/com/android/incallui/incall/impl/res/values-h580dp/styles.xml new file mode 100644 index 000000000..b58ef4819 --- /dev/null +++ b/java/com/android/incallui/incall/impl/res/values-h580dp/styles.xml @@ -0,0 +1,24 @@ + + + + + + + diff --git a/java/com/android/incallui/incall/impl/res/values-h600dp/dimens.xml b/java/com/android/incallui/incall/impl/res/values-h600dp/dimens.xml deleted file mode 100644 index 904aed235..000000000 --- a/java/com/android/incallui/incall/impl/res/values-h600dp/dimens.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - 88dp - diff --git a/java/com/android/incallui/incall/impl/res/values-h650dp/styles.xml b/java/com/android/incallui/incall/impl/res/values-h650dp/styles.xml deleted file mode 100644 index b58ef4819..000000000 --- a/java/com/android/incallui/incall/impl/res/values-h650dp/styles.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/java/com/android/incallui/incall/impl/res/values-hi/strings.xml b/java/com/android/incallui/incall/impl/res/values-hi/strings.xml index 39e6e6b6d..6a7538dea 100644 --- a/java/com/android/incallui/incall/impl/res/values-hi/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-hi/strings.xml @@ -1,33 +1,18 @@ - - "वीडियो कॉल" "होल्ड करें" "कॉल जोड़ें" "म्यूट करें" - "कॉल समाप्त करें" "कीपैड" + "स्‍पीकर" ", चालू है" ", बंद है" "एक बनाएं" "प्रबंधित करें" "कॉलर प्रबंधित करें" "स्वैप करें" + "ध्वनि" "नोट भेज दिया गया है" diff --git a/java/com/android/incallui/incall/impl/res/values-hr/strings.xml b/java/com/android/incallui/incall/impl/res/values-hr/strings.xml index e440028d8..fc431b33b 100644 --- a/java/com/android/incallui/incall/impl/res/values-hr/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-hr/strings.xml @@ -1,33 +1,18 @@ - - "Videopoziv" "Pauziraj" "Dodaj poziv" "Isklj. zvuk" - "Prekini poziv" "Tipkovnica" + "Zvučnik" ", uključeno" ", isključeno" "Spoji" "Upravljanje" "Upravljaj pozivateljima" "Zamijeni" + "Zvuk" "Bilješka je poslana" diff --git a/java/com/android/incallui/incall/impl/res/values-hu/strings.xml b/java/com/android/incallui/incall/impl/res/values-hu/strings.xml index e63ce5946..194c348d9 100644 --- a/java/com/android/incallui/incall/impl/res/values-hu/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-hu/strings.xml @@ -1,33 +1,18 @@ - - "Videohívás" "Várakoztatás" "Hívás felv." "Némítás" - "Hívás vége" "Billentyűzet" + "Hangszóró" ", be" ", ki" "Egyesítés" "Kezelés" "Hívók kezelése" "Csere" + "Hang" "Üzenet elküldve" diff --git a/java/com/android/incallui/incall/impl/res/values-hy/strings.xml b/java/com/android/incallui/incall/impl/res/values-hy/strings.xml index ce395e70c..0e8054ec9 100644 --- a/java/com/android/incallui/incall/impl/res/values-hy/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-hy/strings.xml @@ -1,33 +1,18 @@ - - "Տեսազանգ" "Պահել զանգը" "Ավելացնել զանգ" "Անջատել" - "Ավարտել զանգը" "Ստեղնաշար" + "Բարձրախոս" ", միացած է" ", անջատած է" "Միավորել" "Կառավարել" "Զանգողների կառավարում" "Փոխարկել" + "Ձայն" "Գրառումն ուղարկվեց" diff --git a/java/com/android/incallui/incall/impl/res/values-in/strings.xml b/java/com/android/incallui/incall/impl/res/values-in/strings.xml index e9d738a36..f429cb4b7 100644 --- a/java/com/android/incallui/incall/impl/res/values-in/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-in/strings.xml @@ -1,33 +1,18 @@ - - "Video call" "Tahan" "Tambahkan panggilan" "Bisukan" - "Akhiri panggilan" "Keypad" + "Speaker" ", aktif" ", Nonaktif" "Gabungkan" "Kelola" "Kelola penelepon" "Tukar" + "Suara" "Catatan telah dikirim" diff --git a/java/com/android/incallui/incall/impl/res/values-is/strings.xml b/java/com/android/incallui/incall/impl/res/values-is/strings.xml index f262e3f9f..9c3bf89bf 100644 --- a/java/com/android/incallui/incall/impl/res/values-is/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-is/strings.xml @@ -1,33 +1,18 @@ - - "Myndsímtal" "Setja í bið" "Bæta við" "Hljóð af" - "Ljúka" "Talnaborð" + "Hátalari" ", kveikt" ", slökkt" "Sameina" "Stjórna" "Hafa umsjón með hringjendum" "Skipta milli" + "Hljóð" "Glósa send" diff --git a/java/com/android/incallui/incall/impl/res/values-it/strings.xml b/java/com/android/incallui/incall/impl/res/values-it/strings.xml index f29a70260..1cfb0be67 100644 --- a/java/com/android/incallui/incall/impl/res/values-it/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-it/strings.xml @@ -1,33 +1,18 @@ - - "Videochiamata" "In attesa" "Aggiungi chiamata" "Disattiva" - "Termina chiamata" "Tastierino" + "Altoparlante" ", attivo" ", non attivo" "Unisci" "Gestisci" "Gestisci chiamanti" "Scambia" + "Audio" "Nota inviata" diff --git a/java/com/android/incallui/incall/impl/res/values-iw/strings.xml b/java/com/android/incallui/incall/impl/res/values-iw/strings.xml index bf08e3b06..2426fc868 100644 --- a/java/com/android/incallui/incall/impl/res/values-iw/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-iw/strings.xml @@ -1,33 +1,18 @@ - - "שיחת וידאו" "המתנה" "הוסף שיחה" "השתק" - "סיום השיחה" "לוח חיוג" + "רמקול" ", מופעל" ", מושבת" "מזג" "נהל" "ניהול המתקשרים" "החלף" + "צלילים" "ההערה נשלחה" diff --git a/java/com/android/incallui/incall/impl/res/values-ja/strings.xml b/java/com/android/incallui/incall/impl/res/values-ja/strings.xml index b78ee202e..9e313a072 100644 --- a/java/com/android/incallui/incall/impl/res/values-ja/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-ja/strings.xml @@ -1,33 +1,18 @@ - - "ビデオ通話" "保留" "通話を追加" "ミュート" - "通話を終了" "キーパッド" + "スピーカー" "がオンです" "がオフです" "統合" "管理" "発信者を管理" "切り替え" + "音声" "メモを送信しました" diff --git a/java/com/android/incallui/incall/impl/res/values-ka/strings.xml b/java/com/android/incallui/incall/impl/res/values-ka/strings.xml index f6926f39c..d33af5a46 100644 --- a/java/com/android/incallui/incall/impl/res/values-ka/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-ka/strings.xml @@ -1,33 +1,18 @@ - - "ვიდეოზარი" "შეყოვნება" "ზარის დამატ." "დადუმება" - "ზარის დასრ." "კლავიატურა" + "სპიკერი" ", ჩართულია" ", გამორთულია" "გაერთიანება" "მართვა" "აბონენტების მართვა" "შენაცვლება" + "ხმა" "ჩანიშვნა გაიგზავნა" diff --git a/java/com/android/incallui/incall/impl/res/values-kk/strings.xml b/java/com/android/incallui/incall/impl/res/values-kk/strings.xml index 8da9982d0..db9c4f6ca 100644 --- a/java/com/android/incallui/incall/impl/res/values-kk/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-kk/strings.xml @@ -1,33 +1,18 @@ - - "Бейне қоңырау" "Күттіру" "Қоңырау қосу" "Дыбысын өшіру" - "Қоңырауды аяқтау" "Пернетақта" + "Динамик" ", қосулы" ", өшірулі" "Біріктіру" "Басқару" "Қоңырау шалушыларды басқару" "Ауыстыру" + "Дыбыс" "Ескертпе жіберілді" diff --git a/java/com/android/incallui/incall/impl/res/values-km/strings.xml b/java/com/android/incallui/incall/impl/res/values-km/strings.xml index 88e356a41..6596bdf0c 100644 --- a/java/com/android/incallui/incall/impl/res/values-km/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-km/strings.xml @@ -1,33 +1,18 @@ - - "ហៅ​ជា​វីដេអូ" "រង់ចាំ" "បន្ថែម​ការ​ហៅ" "បិទ​សំឡេង" - "បញ្ចប់​ការ​ហៅ" "បន្ទះ​​ចុច​លេខ" + "ឧបករណ៍​បំពង​សំឡេង" ", បាន​បើក" ", បានបិទ" "បញ្ចូលគ្នា" "គ្រប់គ្រង" "គ្រប់គ្រងអ្នក​ហៅ" "ប្ដូរ" + "សំឡេង" "បានផ្ញើចំណាំ" diff --git a/java/com/android/incallui/incall/impl/res/values-kn/strings.xml b/java/com/android/incallui/incall/impl/res/values-kn/strings.xml index ad29b6d36..c03ec09fa 100644 --- a/java/com/android/incallui/incall/impl/res/values-kn/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-kn/strings.xml @@ -1,33 +1,18 @@ - - "ವೀಡಿಯೊ ಕರೆ" "ಹೋಲ್ಡ್‌‌ ಮಾಡು" "ಕರೆಯನ್ನು ಸೇರಿಸಿ" "ಮ್ಯೂಟ್ ಮಾಡಿ" - "ಕರೆ ಅಂತ್ಯಗೊಳಿಸಿ" "ಕೀಪ್ಯಾಡ್‌" + "ಸ್ಪೀಕರ್‌" ", ಆನ್ ಆಗಿದೆ" ", ಆಫ್ ಆಗಿದೆ" "ವಿಲೀನಗೊಳಿಸು" "ನಿರ್ವಹಿಸು" "ಕರೆದಾತರನ್ನು ನಿರ್ವಹಿಸಿ" "ಸ್ವ್ಯಾಪ್‌ ಮಾಡು" + "ಧ್ವನಿ" "ಟಿಪ್ಪಣಿ ಕಳುಹಿಸಲಾಗಿದೆ" diff --git a/java/com/android/incallui/incall/impl/res/values-ko/strings.xml b/java/com/android/incallui/incall/impl/res/values-ko/strings.xml index f9bb20f8b..e701e772f 100644 --- a/java/com/android/incallui/incall/impl/res/values-ko/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-ko/strings.xml @@ -1,33 +1,18 @@ - - "화상 통화" "대기" "통화 추가" "음소거" - "통화 종료" "키패드" + "스피커" ", 켜짐" ", 꺼짐" "병합" "관리" "발신자 관리" "전환" + "소리" "메모가 전송되었습니다." diff --git a/java/com/android/incallui/incall/impl/res/values-ky/strings.xml b/java/com/android/incallui/incall/impl/res/values-ky/strings.xml index f00264dbe..e51d4c582 100644 --- a/java/com/android/incallui/incall/impl/res/values-ky/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-ky/strings.xml @@ -1,33 +1,18 @@ - - "Видео чалуу" "Күттүрүү" "Чалууну кошуу" "Үнүн өчүрүү" - "Чалууну бүтүрүү" "Ном. тергич" + "Катуу сүйлөткүч" ", күйүк" ", өчүк" "Бириктирүү" "Башкаруу" "Чалуучуларды башкаруу" "Алмаштыруу" + "Добуш" "Билдирүү жөнөтүлдү" diff --git a/java/com/android/incallui/incall/impl/res/values-lo/strings.xml b/java/com/android/incallui/incall/impl/res/values-lo/strings.xml index 2382f3241..52de3ffcc 100644 --- a/java/com/android/incallui/incall/impl/res/values-lo/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-lo/strings.xml @@ -1,33 +1,18 @@ - - "ໂທດ້ວຍວິດີໂອ" "ພັກສາຍຊົ່ວຄາວ" "ເພີ່ມການໂທ" "ປີດສຽງ" - "ວາງສາຍ" "ແປ້ນກົດ" + "ລຳໂພງ" ", ເປີດຢູ່" ", ປິດຢູ່" "ຮວມສາຍ" "ຈັດການ" "ຈັດການຜູ້ໂທ" "ສະຫຼັບສາຍ" + "ສຽງ" "ສົ່ງບັນທຶກແລ້ວ" diff --git a/java/com/android/incallui/incall/impl/res/values-lt/strings.xml b/java/com/android/incallui/incall/impl/res/values-lt/strings.xml index 1a10884cb..4cd0356f3 100644 --- a/java/com/android/incallui/incall/impl/res/values-lt/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-lt/strings.xml @@ -1,33 +1,18 @@ - - "Vaizdo skambutis" "Sulaikyti" "Pr. skambutį" "Nutildyti" - "Baig. skamb." "Klaviatūra" + "Garsiakalbis" ", įjungtas" ", išjungtas" "Sujungti" "Tvarkyti" "Tvarkyti skambintojus" "Sukeisti" + "Garsas" "Užrašas išsiųstas" diff --git a/java/com/android/incallui/incall/impl/res/values-lv/strings.xml b/java/com/android/incallui/incall/impl/res/values-lv/strings.xml index c19e7c0ae..48f9ae032 100644 --- a/java/com/android/incallui/incall/impl/res/values-lv/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-lv/strings.xml @@ -1,33 +1,18 @@ - - "Videozvans" "Aizturēt" "Pievienot zvanu" "Izslēgt" - "Beigt zvanu" "Cipartast." + "Skaļrunis" ", ieslēgts" ", izslēgts" "Apvienot" "Pārvaldīt" "Pārvaldīt zvanītājus" "Pārslēgt" + "Skaņa" "Piezīme nosūtīta" diff --git a/java/com/android/incallui/incall/impl/res/values-mk/strings.xml b/java/com/android/incallui/incall/impl/res/values-mk/strings.xml index 610a30803..5a61de5d3 100644 --- a/java/com/android/incallui/incall/impl/res/values-mk/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-mk/strings.xml @@ -1,33 +1,18 @@ - - "Видеоповик" "На чекање" "Додај повик" "Исклучи звук" - "Заврши повик" "Тастатура" + "Звучник" ", е вклучен" ", е исклучен" "Спои" "Управувај" "Управувајте со повикувачите" "Замени" + "Звук" "Белешката е испратена" diff --git a/java/com/android/incallui/incall/impl/res/values-ml/strings.xml b/java/com/android/incallui/incall/impl/res/values-ml/strings.xml index 83c2989f0..00586ffa7 100644 --- a/java/com/android/incallui/incall/impl/res/values-ml/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-ml/strings.xml @@ -1,33 +1,18 @@ - - "വീഡിയോ കോള്‍" "ഹോള്‍ഡുചെയ്യുക" "കോൾ ചേർക്കുക" "മ്യൂട്ടുചെയ്യുക" - "കോള്‍ അവസാനിപ്പിക്കൂ" "കീപാഡ്" + "സ്പീക്കർ" ", ഓണാണ്" ", ഓഫാണ്" "ലയിപ്പിക്കുക" "മാനേജുചെയ്യുക" "കോൾ ചെയ്യുന്നവരെ മാനേജുചെയ്യുക" "സ്വാപ്പുചെയ്യുക" + "ശബ്‌ദം" "കുറിപ്പ് അയച്ചു" diff --git a/java/com/android/incallui/incall/impl/res/values-mn/strings.xml b/java/com/android/incallui/incall/impl/res/values-mn/strings.xml index 9427d86d2..085a405b0 100644 --- a/java/com/android/incallui/incall/impl/res/values-mn/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-mn/strings.xml @@ -1,33 +1,18 @@ - - "Видео хурал" "Саатуулах" "Дуудлага нэмэх" "Дууг хаах" - "Дуудлагыг таслах" "Товчлуур" + "Чанга яригч" ", асаатай" ", унтраатай" "Нэгтгэх" "Удирдах" "Залгагчдыг удирдах" "Солих" + "Дуу" "Тэмдэглэлийг илгээсэн" diff --git a/java/com/android/incallui/incall/impl/res/values-mr/strings.xml b/java/com/android/incallui/incall/impl/res/values-mr/strings.xml index 194c192bd..841923352 100644 --- a/java/com/android/incallui/incall/impl/res/values-mr/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-mr/strings.xml @@ -1,33 +1,18 @@ - - "व्हिडिओ कॉल" "होल्ड करा" "कॉल जोडा" "नि:शब्द करा" - "कॉल समाप्त करा" "कीपॅड" + "स्पीकर" ", सुरू आहे" ", बंद आहे" "विलीन करा" "व्यवस्थापित करा" "कॉलर व्यवस्थापित करा" "अदलाबदल करा" + "ध्वनी" "टीप पाठविली" diff --git a/java/com/android/incallui/incall/impl/res/values-ms/strings.xml b/java/com/android/incallui/incall/impl/res/values-ms/strings.xml index a918dedb4..c9db8325e 100644 --- a/java/com/android/incallui/incall/impl/res/values-ms/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-ms/strings.xml @@ -1,33 +1,18 @@ - - "Pgln video" "Tunda" "Tambah pgln" "Redam" - "Tamatkn pgln" "Pad kekunci" + "Pmbsr suara" ", dihidupkan" ", Dimatikan" "Gabung" "Urus" "Urus pemanggil" "Silih" + "Bunyi" "Nota dihantar" diff --git a/java/com/android/incallui/incall/impl/res/values-my/strings.xml b/java/com/android/incallui/incall/impl/res/values-my/strings.xml index 80070297b..e0bfb8c71 100644 --- a/java/com/android/incallui/incall/impl/res/values-my/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-my/strings.xml @@ -1,33 +1,18 @@ - - "ဗီဒီယိုခေါ်ဆိုမှု" "ခဏရပ်ထားရန်" "ထပ်ခေါ်ရန်" "အသံပိတ်ရန်" - "ဖုန်းချရန်" "ခလုတ်ခုံ" + "စပီကာ" "၊ ပွင့်နေသည်" "၊ ပိတ်နေသည်" "ပေါင်းရန်" "စီမံရန်" "ခေါ်ဆိုသူများကို စီမံခန့်ခွဲရန်" "ဖလှယ်ရန်" + "အသံ" "မှတ်စုပို့ပြီးပါပြီ" diff --git a/java/com/android/incallui/incall/impl/res/values-nb/strings.xml b/java/com/android/incallui/incall/impl/res/values-nb/strings.xml index 704384ea0..75200869c 100644 --- a/java/com/android/incallui/incall/impl/res/values-nb/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-nb/strings.xml @@ -1,33 +1,18 @@ - - "Videosamtale" "Sett på vent" "Nytt anrop" "Ignorer" - "Avslutt samtalen" "Tastatur" + "Høyttaler" "er på" "er av" "Slå sammen" "Administrer" "Håndter innringere" "Bytt" + "Lyd" "Notatet er sendt" diff --git a/java/com/android/incallui/incall/impl/res/values-ne/strings.xml b/java/com/android/incallui/incall/impl/res/values-ne/strings.xml index beffa3e74..6bcfb6dd2 100644 --- a/java/com/android/incallui/incall/impl/res/values-ne/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-ne/strings.xml @@ -1,33 +1,18 @@ - - "भिडियो कल" "होल्ड गर्ने" "कल थप्नुहोस्" "म्यूट गर्ने" - "कल अन्त्य गर्ने" "किप्याड" + "स्पिकर" ", खुला छ" ", बन्द छ" "मर्ज गर्ने" "प्रबन्ध गर्ने" "कल गर्ने व्यक्तिहरूलाई व्यवस्थित गर्नुहोस्" "साट्नुहोस्" + "आवाज" "टिपोट पठाइयो" diff --git a/java/com/android/incallui/incall/impl/res/values-nl/strings.xml b/java/com/android/incallui/incall/impl/res/values-nl/strings.xml index e3c919e1a..63f1ebd5d 100644 --- a/java/com/android/incallui/incall/impl/res/values-nl/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-nl/strings.xml @@ -1,33 +1,18 @@ - - "Videogespr." "In wacht" "Oproep toev." "Dempen" - "Oproep beëindigen" "Toetsenblok" + "Luidspreker" ", is aan" ", is uit" "Samenvoegen" "Beheren" "Bellers beheren" "Wisselen" + "Geluid" "Notitie verzonden" diff --git a/java/com/android/incallui/incall/impl/res/values-no/strings.xml b/java/com/android/incallui/incall/impl/res/values-no/strings.xml index 704384ea0..75200869c 100644 --- a/java/com/android/incallui/incall/impl/res/values-no/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-no/strings.xml @@ -1,33 +1,18 @@ - - "Videosamtale" "Sett på vent" "Nytt anrop" "Ignorer" - "Avslutt samtalen" "Tastatur" + "Høyttaler" "er på" "er av" "Slå sammen" "Administrer" "Håndter innringere" "Bytt" + "Lyd" "Notatet er sendt" diff --git a/java/com/android/incallui/incall/impl/res/values-pa/strings.xml b/java/com/android/incallui/incall/impl/res/values-pa/strings.xml index d7e74ed83..10a2865a6 100644 --- a/java/com/android/incallui/incall/impl/res/values-pa/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-pa/strings.xml @@ -1,33 +1,18 @@ - - "ਵੀਡੀਓ ਕਾਲ" "ਰੋਕ ਕੇ ਰੱਖੋ" "ਕਾਲ ਸ਼ਾਮਲ ਕਰੋ" "ਮਿਊਟ ਕਰੋ" - "ਕਾਲ ਖਤਮ ਕਰੋ" "ਕੀਪੈਡ" + "ਸਪੀਕਰ" ", ਚਾਲੂ ਹੈ" ", ਬੰਦ ਹੈ" "ਰਲਗੱਡ ਕਰੋ" "ਪ੍ਰਬੰਧਨ ਕਰੋ" "ਕਾਲਰਾਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ" "ਅਦਲੋ-ਬਦਲੋ" + "ਧੁਨੀ" "ਨੋਟ-ਕਥਨ ਭੇਜਿਆ ਗਿਆ" diff --git a/java/com/android/incallui/incall/impl/res/values-pl/strings.xml b/java/com/android/incallui/incall/impl/res/values-pl/strings.xml index 9971d7553..4bf6a5833 100644 --- a/java/com/android/incallui/incall/impl/res/values-pl/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-pl/strings.xml @@ -1,33 +1,18 @@ - - "Rozmowa wid." "Wstrzymaj" "Dodaj poł." "Wycisz" - "Zakończ" "Klawiatura" + "Głośnik" "– włączony" "– wyłączony" "Scal" "Zarządzaj" "Zarządzaj rozmówcami" "Przełącz" + "Dźwięk" "Notatka wysłana" diff --git a/java/com/android/incallui/incall/impl/res/values-pt-rBR/strings.xml b/java/com/android/incallui/incall/impl/res/values-pt-rBR/strings.xml index 538c20c0b..7ca6b6b6b 100644 --- a/java/com/android/incallui/incall/impl/res/values-pt-rBR/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-pt-rBR/strings.xml @@ -1,33 +1,18 @@ - - "Videocham." "Em espera" "Adic chamada" "Desativar" - "Encerrar" "Teclado" + "Alto-falante" "ativado" "desativado" "Mesclar" "Gerenciar" "Gerenciar os autores das chamadas" "Trocar" + "Som" "Nota enviada" diff --git a/java/com/android/incallui/incall/impl/res/values-pt-rPT/strings.xml b/java/com/android/incallui/incall/impl/res/values-pt-rPT/strings.xml index 376ee8443..750e57e37 100644 --- a/java/com/android/incallui/incall/impl/res/values-pt-rPT/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-pt-rPT/strings.xml @@ -1,33 +1,18 @@ - - "Videochamada" "Em espera" "Adic. cham." "Desativ. som" - "Term. cham." "Teclado" + "Altifalante" ", ativado" ", desativado" "Unir" "Gerir" "Gerir autores das chamadas" "Alternar" + "Som" "Nota enviada" diff --git a/java/com/android/incallui/incall/impl/res/values-pt/strings.xml b/java/com/android/incallui/incall/impl/res/values-pt/strings.xml index 538c20c0b..7ca6b6b6b 100644 --- a/java/com/android/incallui/incall/impl/res/values-pt/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-pt/strings.xml @@ -1,33 +1,18 @@ - - "Videocham." "Em espera" "Adic chamada" "Desativar" - "Encerrar" "Teclado" + "Alto-falante" "ativado" "desativado" "Mesclar" "Gerenciar" "Gerenciar os autores das chamadas" "Trocar" + "Som" "Nota enviada" diff --git a/java/com/android/incallui/incall/impl/res/values-ro/strings.xml b/java/com/android/incallui/incall/impl/res/values-ro/strings.xml index 81dcdf3cc..1f93da9be 100644 --- a/java/com/android/incallui/incall/impl/res/values-ro/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-ro/strings.xml @@ -1,33 +1,18 @@ - - "Apel video" "În așteptare" "Încă un apel" "Dezactivați" - "Încheiați" "Tastatură" + "Difuzor" ", e activat" ", dezactivat" "Îmbinați" "Gestionați" "Gestionați apelanții" "Schimbați" + "Sunet" "Nota a fost trimisă" diff --git a/java/com/android/incallui/incall/impl/res/values-ru/strings.xml b/java/com/android/incallui/incall/impl/res/values-ru/strings.xml index 274f8fff7..89192c3ae 100644 --- a/java/com/android/incallui/incall/impl/res/values-ru/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-ru/strings.xml @@ -1,33 +1,18 @@ - - "Видеовызов" "Удерживать" "Добавить вызов" "Выкл. звук" - "Завершить вызов" "Клавиатура" + "Динамик" ", включен" ", отключен" "Объединить" "Управление" "Управление абонентами" "Переключить" + "Звук" "Сообщение отправлено" diff --git a/java/com/android/incallui/incall/impl/res/values-si/strings.xml b/java/com/android/incallui/incall/impl/res/values-si/strings.xml index a600c2193..209bb77b1 100644 --- a/java/com/android/incallui/incall/impl/res/values-si/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-si/strings.xml @@ -1,33 +1,18 @@ - - "වීඩියෝ ඇමතුම" "රඳවා ගන්න" "ඇමතුම එක් ක." "නිහඬ කරන්න" - "ඇමතුම නිම ක." "යතුරු පුවරුව" + "ස්පීකරය" ", සක්‍රියයි" ", අක්‍රියයි" "ඒකාබද්ධ කර." "කළමනාකරණය ක." "අමතන්නන් කළමනාකරණය කරන්න" "මාරු කරන්න" + "හඬ" "සටහන යවන ලදී" diff --git a/java/com/android/incallui/incall/impl/res/values-sk/strings.xml b/java/com/android/incallui/incall/impl/res/values-sk/strings.xml index d74d19e22..4e06aee32 100644 --- a/java/com/android/incallui/incall/impl/res/values-sk/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-sk/strings.xml @@ -1,33 +1,18 @@ - - "Videohovor" "Podržať" "Pridať hovor" "Vypnúť zvuk" - "Ukonč. hovor" "Klávesnica" + "Reproduktor" ", je zapnutý" ", je vypnutý" "Zlúčiť" "Spravovať" "Spravovať volajúcich" "Zameniť" + "Zvuk" "Poznámka bola odoslaná" diff --git a/java/com/android/incallui/incall/impl/res/values-sl/strings.xml b/java/com/android/incallui/incall/impl/res/values-sl/strings.xml index 782ce444b..7cdb6c88c 100644 --- a/java/com/android/incallui/incall/impl/res/values-sl/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-sl/strings.xml @@ -1,33 +1,18 @@ - - "Videoklic" "Zadrži" "Dodaj klic" "Izklopi zvok" - "Končaj klic" "Tipkovnica" + "Zvočnik" ", vklopljen" ", izklopljen" "Združi" "Upravljanje" "Upravljanje klicateljev" "Zamenjaj" + "Zvok" "Opomba je poslana" diff --git a/java/com/android/incallui/incall/impl/res/values-sq/strings.xml b/java/com/android/incallui/incall/impl/res/values-sq/strings.xml index a0fca3668..9ba18b5f4 100644 --- a/java/com/android/incallui/incall/impl/res/values-sq/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-sq/strings.xml @@ -1,33 +1,18 @@ - - "Video tel." "Në pritje" "Shto telef." "Hiqi zërin" - "Mbyll tel." "Blloku i tasteve" + "Altoparlant" ", është aktiv" ", është joaktiv" "Shkri" "Menaxho" "Menaxho telefonuesit" "Shkëmbe" + "Tingulli" "Shënimi u dërgua" diff --git a/java/com/android/incallui/incall/impl/res/values-sr/strings.xml b/java/com/android/incallui/incall/impl/res/values-sr/strings.xml index ec704511b..56a968453 100644 --- a/java/com/android/incallui/incall/impl/res/values-sr/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-sr/strings.xml @@ -1,33 +1,18 @@ - - "Видео позив" "На чекање" "Додај позив" "Искључи звук" - "Заврши позив" "Тастатура" + "Звучник" ", укључен" ", искључен" "Обједини" "Управљај" "Управљајте позиваоцима" "Замени" + "Звук" "Белешка је послата" diff --git a/java/com/android/incallui/incall/impl/res/values-sv/strings.xml b/java/com/android/incallui/incall/impl/res/values-sv/strings.xml index ded45221c..27d83b74b 100644 --- a/java/com/android/incallui/incall/impl/res/values-sv/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-sv/strings.xml @@ -1,33 +1,18 @@ - - "Videosamtal" "Parkera" "Lägg t samt." "Ljud av" - "Avsl. samtal" "Knappsats" + "Högtalare" ", är på" ", är av" "Sammanfoga" "Hantera" "Hantera uppringare" "Växla" + "Ljud" "Anteckning skickad" diff --git a/java/com/android/incallui/incall/impl/res/values-sw/strings.xml b/java/com/android/incallui/incall/impl/res/values-sw/strings.xml index df634f469..136fe1713 100644 --- a/java/com/android/incallui/incall/impl/res/values-sw/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-sw/strings.xml @@ -1,33 +1,18 @@ - - "Hangout ya video" "Shikilia" "Ongeza simu" "Zima maikrofoni" - "Kata simu" "Vitufe vya Simu" + "Spika" ", kimewashwa" ", kimezimwa" "Unganisha" "Dhibiti" "Dhibiti wanaopiga simu" "Badili" + "Sauti" "Dokezo limetumwa" diff --git a/java/com/android/incallui/incall/impl/res/values-ta/strings.xml b/java/com/android/incallui/incall/impl/res/values-ta/strings.xml index 5c94abff4..342f8d041 100644 --- a/java/com/android/incallui/incall/impl/res/values-ta/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-ta/strings.xml @@ -1,33 +1,18 @@ - - "வீடியோ கால்" "ஹோல்டில் வை" "அழைப்பை சேர்" "முடக்கு" - "அழைப்பை முடி" "விசைத்தளம்" + "ஸ்பீக்கர்" ", ஆன்" ", ஆஃப்" "இணை" "நிர்வகி" "அழைப்பாளர்களை நிர்வகிக்கும்" "மாற்று" + "ஒலி" "குறிப்பு அனுப்பப்பட்டது" diff --git a/java/com/android/incallui/incall/impl/res/values-te/strings.xml b/java/com/android/incallui/incall/impl/res/values-te/strings.xml index 0cb3fb837..004895647 100644 --- a/java/com/android/incallui/incall/impl/res/values-te/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-te/strings.xml @@ -1,33 +1,18 @@ - - "వీడియో కాల్" "హోల్డ్ చేయి" "కాల్ జోడించు" "మ్యూట్ చేయి" - "కాల్ ముగించు" "కీప్యాడ్" + "స్పీకర్" ", ఆన్‌లో ఉంది" ", ఆఫ్‌లో ఉంది" "విలీనం చేయి" "నిర్వహించు" "కాలర్‌లను నిర్వహిస్తుంది" "మార్చు" + "శబ్దం" "గమనిక పంపబడింది" diff --git a/java/com/android/incallui/incall/impl/res/values-th/strings.xml b/java/com/android/incallui/incall/impl/res/values-th/strings.xml index 0929cfc23..a74028842 100644 --- a/java/com/android/incallui/incall/impl/res/values-th/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-th/strings.xml @@ -1,33 +1,18 @@ - - "แฮงเอาท์วิดีโอ" "พักสาย" "เพิ่มการโทร" "ปิดเสียง" - "วางสาย" "ปุ่มกด" + "ลำโพง" "เปิดอยู่" "ปิดอยู่" "รวม" "จัดการ" "จัดการผู้โทร" "สลับ" + "เสียง" "ส่งโน้ตแล้ว" diff --git a/java/com/android/incallui/incall/impl/res/values-tl/strings.xml b/java/com/android/incallui/incall/impl/res/values-tl/strings.xml index 1ac2ef88c..46ff79731 100644 --- a/java/com/android/incallui/incall/impl/res/values-tl/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-tl/strings.xml @@ -1,33 +1,18 @@ - - "Video call" "I-hold" "Mag-add: tawag" "I-mute" - "Tapusin ang tawag" "Keypad" + "Speaker" ",ay On" ", ay Off" "I-merge" "Pamahalaan" "Pamahalaan ang mga tumatawag" "Pagpalitin" + "Tunog" "Naipadala ang tala" diff --git a/java/com/android/incallui/incall/impl/res/values-tr/strings.xml b/java/com/android/incallui/incall/impl/res/values-tr/strings.xml index 241b69429..89ca3302f 100644 --- a/java/com/android/incallui/incall/impl/res/values-tr/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-tr/strings.xml @@ -1,33 +1,18 @@ - - "Görü. görüş." "Beklemeye al" "Çağrı ekle" "Sesi kapat" - "Çğryı sonldr" "Tuş takımı" + "Hoparlör" ", Açık" ", Kapalı" "Birleştir" "Yönet" "Arayanları yönetin" "Değiştir" + "Ses" "Not gönderildi" diff --git a/java/com/android/incallui/incall/impl/res/values-uk/strings.xml b/java/com/android/incallui/incall/impl/res/values-uk/strings.xml index 1821556fa..516bcb757 100644 --- a/java/com/android/incallui/incall/impl/res/values-uk/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-uk/strings.xml @@ -1,33 +1,18 @@ - - "Відеодзвінок" "Утримувати" "Дод. виклик" "Без звуку" - "Завер. викл." "Клавіатура" + "Динамік" ", увімкнено" ", вимкнено" "Об’єднати" "Керувати" "Керувати абонентами" "Поміняти" + "Звук" "Нотатку надіслано" diff --git a/java/com/android/incallui/incall/impl/res/values-ur/strings.xml b/java/com/android/incallui/incall/impl/res/values-ur/strings.xml index fed0af6c2..53ba19031 100644 --- a/java/com/android/incallui/incall/impl/res/values-ur/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-ur/strings.xml @@ -1,33 +1,18 @@ - - "ویڈیو کال" "ہولڈ کریں" "کال شامل کریں" "خاموش کریں" - "کال ختم کریں" "کی پیڈ" + "اسپیکر" "، آن ہے" "، آف ہے" "ضم کریں" "نظم کریں" "کالرز کا نظم کریں" "تبادلہ کریں" + "آواز" "نوٹ بھیج دیا گیا" diff --git a/java/com/android/incallui/incall/impl/res/values-uz/strings.xml b/java/com/android/incallui/incall/impl/res/values-uz/strings.xml index 7d6af27b2..881848965 100644 --- a/java/com/android/incallui/incall/impl/res/values-uz/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-uz/strings.xml @@ -1,33 +1,18 @@ - - "Video qo‘n." "Pauza" "Chaqiruv" "Ovozsiz" - "Tugatish" "Klaviatura" + "Karnay" ", yoniq" ", o‘chiq" - "Birlashtirish" + "Birlashtir." "Boshqarish" "Qo‘ng‘iroq qiluvchilarni boshqarish" "Almashish" + "Ovoz" "Qayd yuborildi" diff --git a/java/com/android/incallui/incall/impl/res/values-vi/strings.xml b/java/com/android/incallui/incall/impl/res/values-vi/strings.xml index 42e320a7a..29f85efab 100644 --- a/java/com/android/incallui/incall/impl/res/values-vi/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-vi/strings.xml @@ -1,33 +1,18 @@ - - "Gọi điện video" "Giữ" "Thêm cuộc gọi" "Tắt tiếng" - "Kết thúc cuộc gọi" "Bàn phím" + "Loa" ", đang bật" ", đang tắt" "Hợp nhất" "Quản lý" "Quản lý người gọi" "Hoán đổi" + "Âm thanh" "Đã gửi ghi chú" diff --git a/java/com/android/incallui/incall/impl/res/values-w260dp-h520dp/dimens.xml b/java/com/android/incallui/incall/impl/res/values-w260dp-h520dp/dimens.xml new file mode 100644 index 000000000..e73eb934c --- /dev/null +++ b/java/com/android/incallui/incall/impl/res/values-w260dp-h520dp/dimens.xml @@ -0,0 +1,7 @@ + + + 16dp + 16dp + 64dp + 92dp + diff --git a/java/com/android/incallui/incall/impl/res/values-w260dp-h580dp/dimens.xml b/java/com/android/incallui/incall/impl/res/values-w260dp-h580dp/dimens.xml deleted file mode 100644 index 834ea2f30..000000000 --- a/java/com/android/incallui/incall/impl/res/values-w260dp-h580dp/dimens.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - 16dp - 16dp - 64dp - 92dp - diff --git a/java/com/android/incallui/incall/impl/res/values-w300dp-h540dp/dimens.xml b/java/com/android/incallui/incall/impl/res/values-w300dp-h540dp/dimens.xml new file mode 100644 index 000000000..502ae72dc --- /dev/null +++ b/java/com/android/incallui/incall/impl/res/values-w300dp-h540dp/dimens.xml @@ -0,0 +1,5 @@ + + + 32dp + 32dp + diff --git a/java/com/android/incallui/incall/impl/res/values-w300dp-h620dp/dimens.xml b/java/com/android/incallui/incall/impl/res/values-w300dp-h620dp/dimens.xml deleted file mode 100644 index c7ac35efc..000000000 --- a/java/com/android/incallui/incall/impl/res/values-w300dp-h620dp/dimens.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - 32dp - 32dp - diff --git a/java/com/android/incallui/incall/impl/res/values-zh-rCN/strings.xml b/java/com/android/incallui/incall/impl/res/values-zh-rCN/strings.xml index f0cca9060..ec6404569 100644 --- a/java/com/android/incallui/incall/impl/res/values-zh-rCN/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-zh-rCN/strings.xml @@ -1,33 +1,18 @@ - - "视频通话" "保持" "添加通话" "静音" - "结束通话" "拨号键盘" + "免提" "，已开启" "，已关闭" "合并" "管理" "管理来电者" "切换" + "声音" "已发送备注" diff --git a/java/com/android/incallui/incall/impl/res/values-zh-rHK/strings.xml b/java/com/android/incallui/incall/impl/res/values-zh-rHK/strings.xml index c38ef35a0..63cd6d8c8 100644 --- a/java/com/android/incallui/incall/impl/res/values-zh-rHK/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-zh-rHK/strings.xml @@ -1,33 +1,18 @@ - - "視像通話" "保留" "新增通話" "靜音" - "結束通話" "小鍵盤" + "揚聲器" "，已開啟" "，已關閉" "合併" "管理" "管理來電者" "切換" + "音效" "已傳送筆記" diff --git a/java/com/android/incallui/incall/impl/res/values-zh-rTW/strings.xml b/java/com/android/incallui/incall/impl/res/values-zh-rTW/strings.xml index c04b8309e..be3103ba6 100644 --- a/java/com/android/incallui/incall/impl/res/values-zh-rTW/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-zh-rTW/strings.xml @@ -1,33 +1,18 @@ - - "視訊通話" "保留" "新增通話" "靜音" - "結束通話" "撥號鍵盤" + "擴音模式" "，已開啟" "，已關閉" "合併" "管理" "管理來電者" "切換" + "音訊" "備註已送出" diff --git a/java/com/android/incallui/incall/impl/res/values-zu/strings.xml b/java/com/android/incallui/incall/impl/res/values-zu/strings.xml index a23a1d5e3..df3f79484 100644 --- a/java/com/android/incallui/incall/impl/res/values-zu/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values-zu/strings.xml @@ -1,33 +1,18 @@ - - "Ikholi yevidiyo ye-Hangout" "Bamba" "Engeza ikholi" "Thulisa" - "Qeda ikholi" "Ikhiphedi" + "Isipikha" ", ivuliwe" ", ivaliwe" "Hlanganisa" "Phatha" "Phatha abashayi" "Shintsha" + "Umsindo" "Inothi lithunyelwe" diff --git a/java/com/android/incallui/incall/impl/res/values/strings.xml b/java/com/android/incallui/incall/impl/res/values/strings.xml index 2b30dfa53..054ca9687 100644 --- a/java/com/android/incallui/incall/impl/res/values/strings.xml +++ b/java/com/android/incallui/incall/impl/res/values/strings.xml @@ -1,19 +1,4 @@ - Mute - - End call - Keypad + + Speaker + , is on @@ -60,9 +45,12 @@ [CHAR LIMIT=12] --> Swap + + Sound Note sent - + \ No newline at end of file diff --git a/java/com/android/incallui/incall/protocol/PrimaryCallState.java b/java/com/android/incallui/incall/protocol/PrimaryCallState.java index 26dd3887a..2ae6a18e5 100644 --- a/java/com/android/incallui/incall/protocol/PrimaryCallState.java +++ b/java/com/android/incallui/incall/protocol/PrimaryCallState.java @@ -44,7 +44,6 @@ public class PrimaryCallState { public final boolean isVoiceMailNumber; public final boolean isRemotelyHeld; public final boolean isBusinessNumber; - public final boolean supportsCallOnHold; // TODO: Convert to autovalue. b/34502119 public static PrimaryCallState createEmptyPrimaryCallState() { @@ -68,8 +67,7 @@ public class PrimaryCallState { 0, false /* isVoiceMailNumber */, false /* isRemotelyHeld */, - false /* isBusinessNumber */, - true /* supportsCallOnHold */); + false /* isBusinessNumber */); } public PrimaryCallState( @@ -92,8 +90,7 @@ public class PrimaryCallState { long connectTimeMillis, boolean isVoiceMailNumber, boolean isRemotelyHeld, - boolean isBusinessNumber, - boolean supportsCallOnHold) { + boolean isBusinessNumber) { this.state = state; this.isVideoCall = isVideoCall; this.sessionModificationState = sessionModificationState; @@ -114,7 +111,6 @@ public class PrimaryCallState { this.isVoiceMailNumber = isVoiceMailNumber; this.isRemotelyHeld = isRemotelyHeld; this.isBusinessNumber = isBusinessNumber; - this.supportsCallOnHold = supportsCallOnHold; } @Override diff --git a/java/com/android/incallui/res/drawable-hdpi/img_conference.png b/java/com/android/incallui/res/drawable-hdpi/img_conference.png new file mode 100644 index 000000000..3d9f683a5 Binary files /dev/null and b/java/com/android/incallui/res/drawable-hdpi/img_conference.png differ diff --git a/java/com/android/incallui/res/drawable-mdpi/img_conference.png b/java/com/android/incallui/res/drawable-mdpi/img_conference.png new file mode 100644 index 000000000..0694dbd55 Binary files /dev/null and b/java/com/android/incallui/res/drawable-mdpi/img_conference.png differ diff --git a/java/com/android/incallui/res/drawable-xhdpi/img_conference.png b/java/com/android/incallui/res/drawable-xhdpi/img_conference.png new file mode 100644 index 000000000..b0dbcc2dc Binary files /dev/null and b/java/com/android/incallui/res/drawable-xhdpi/img_conference.png differ diff --git a/java/com/android/incallui/res/drawable-xxhdpi/img_conference.png b/java/com/android/incallui/res/drawable-xxhdpi/img_conference.png new file mode 100644 index 000000000..a8dba5ed0 Binary files /dev/null and b/java/com/android/incallui/res/drawable-xxhdpi/img_conference.png differ diff --git a/java/com/android/incallui/res/drawable-xxxhdpi/img_conference.png b/java/com/android/incallui/res/drawable-xxxhdpi/img_conference.png new file mode 100644 index 000000000..eb42b5552 Binary files /dev/null and b/java/com/android/incallui/res/drawable-xxxhdpi/img_conference.png differ diff --git a/java/com/android/incallui/res/drawable/img_conference_automirrored.xml b/java/com/android/incallui/res/drawable/img_conference_automirrored.xml new file mode 100644 index 000000000..78b2876bc --- /dev/null +++ b/java/com/android/incallui/res/drawable/img_conference_automirrored.xml @@ -0,0 +1,21 @@ + + + + + \ No newline at end of file diff --git a/java/com/android/incallui/res/values-ca/strings.xml b/java/com/android/incallui/res/values-ca/strings.xml index ad34b00ef..5148db540 100644 --- a/java/com/android/incallui/res/values-ca/strings.xml +++ b/java/com/android/incallui/res/values-ca/strings.xml @@ -136,6 +136,6 @@ "En una trucada" "S\'està continuant la trucada mitjançant dades mòbils…" "No s\'ha pogut canviar a la xarxa Wi-Fi" - "La videotrucada es mantindrà a la xarxa mòbil. És possible que s\'hi apliquin càrrecs de dades estàndard." + "La videotrucada es mantindrà a la xarxa mòbil. És possible que s\'apliquin càrrecs de dades estàndard." "No ho tornis a mostrar" diff --git a/java/com/android/incallui/res/values-mcc262-mnc01/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01/strings.xml deleted file mode 100644 index 2679653a7..000000000 --- a/java/com/android/incallui/res/values-mcc262-mnc01/strings.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - Ongoing WLAN Call - - Ongoing WLAN work call - - Incoming WLAN Call - - Incoming WLAN work call - \ No newline at end of file diff --git a/java/com/android/incallui/res/values-uz/strings.xml b/java/com/android/incallui/res/values-uz/strings.xml index b04972ffd..38285015a 100644 --- a/java/com/android/incallui/res/values-uz/strings.xml +++ b/java/com/android/incallui/res/values-uz/strings.xml @@ -36,7 +36,7 @@ "Chiquvchi Wi-Fi qo‘ng‘irog‘i" "Chiquvchi Wi-Fi ishchi qo‘ng‘irog‘i" "Kutmoqda" - "Kiruvchi chaqiruv" + "Kiruvchi qo‘ng‘iroq" "Suratga ega kiruvchi chaqiruv" "Xabarga ega kiruvchi chaqiruv" "Joylashuv axborotiga ega kiruvchi chaqiruv" diff --git a/java/com/android/incallui/res/values/dimens.xml b/java/com/android/incallui/res/values/dimens.xml index fb4934d01..18816f645 100644 --- a/java/com/android/incallui/res/values/dimens.xml +++ b/java/com/android/incallui/res/values/dimens.xml @@ -38,7 +38,7 @@ 0dp 20sp 50dp - 36dp + 36sp 10dp diff --git a/java/com/android/incallui/res/values/styles.xml b/java/com/android/incallui/res/values/styles.xml index 3c036c95f..68a38f0b2 100644 --- a/java/com/android/incallui/res/values/styles.xml +++ b/java/com/android/incallui/res/values/styles.xml @@ -78,13 +78,4 @@ @color/dialer_theme_color - - diff --git a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image.xml b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image.xml index 3b3327d4f..ed29e78c4 100644 --- a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image.xml +++ b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image.xml @@ -24,8 +24,8 @@ + android:scaleType="fitCenter"/> - - diff --git a/java/com/android/incallui/speakerbuttonlogic/SpeakerButtonInfo.java b/java/com/android/incallui/speakerbuttonlogic/SpeakerButtonInfo.java deleted file mode 100644 index 5ab821be0..000000000 --- a/java/com/android/incallui/speakerbuttonlogic/SpeakerButtonInfo.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package com.android.incallui.speakerbuttonlogic; - -import android.support.annotation.DrawableRes; -import android.support.annotation.IntDef; -import android.support.annotation.StringRes; -import android.telecom.CallAudioState; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -/** Info about how a "Speaker" button should be displayed */ -public class SpeakerButtonInfo { - - // Testing note: most of this is exercised in ReturnToCallTest.java - - /** Preferred size for icons */ - @Retention(RetentionPolicy.SOURCE) - @IntDef({IconSize.SIZE_24_DP, IconSize.SIZE_36_DP}) - public @interface IconSize { - int SIZE_24_DP = 1; - int SIZE_36_DP = 2; - } - - @DrawableRes public final int icon; - @StringRes public final int contentDescription; - @StringRes public final int label; - public final boolean checkable; - public final boolean isChecked; - - public SpeakerButtonInfo(CallAudioState audioState, @IconSize int iconSize) { - if ((audioState.getSupportedRouteMask() & CallAudioState.ROUTE_BLUETOOTH) - == CallAudioState.ROUTE_BLUETOOTH) { - checkable = false; - isChecked = false; - label = R.string.incall_label_audio; - - if ((audioState.getRoute() & CallAudioState.ROUTE_BLUETOOTH) - == CallAudioState.ROUTE_BLUETOOTH) { - icon = - iconSize == IconSize.SIZE_36_DP - ? R.drawable.quantum_ic_bluetooth_audio_white_36 - : R.drawable.quantum_ic_bluetooth_audio_white_24; - contentDescription = R.string.incall_content_description_bluetooth; - } else if ((audioState.getRoute() & CallAudioState.ROUTE_SPEAKER) - == CallAudioState.ROUTE_SPEAKER) { - icon = - iconSize == IconSize.SIZE_36_DP - ? R.drawable.quantum_ic_volume_up_white_36 - : R.drawable.quantum_ic_volume_up_white_24; - contentDescription = R.string.incall_content_description_speaker; - } else if ((audioState.getRoute() & CallAudioState.ROUTE_WIRED_HEADSET) - == CallAudioState.ROUTE_WIRED_HEADSET) { - icon = - iconSize == IconSize.SIZE_36_DP - ? R.drawable.quantum_ic_headset_white_36 - : R.drawable.quantum_ic_headset_white_24; - contentDescription = R.string.incall_content_description_headset; - } else { - icon = - iconSize == IconSize.SIZE_36_DP - ? R.drawable.quantum_ic_phone_in_talk_white_36 - : R.drawable.quantum_ic_phone_in_talk_white_24; - contentDescription = R.string.incall_content_description_earpiece; - } - } else { - checkable = true; - isChecked = audioState.getRoute() == CallAudioState.ROUTE_SPEAKER; - label = R.string.incall_label_speaker; - icon = - iconSize == IconSize.SIZE_36_DP - ? R.drawable.quantum_ic_volume_up_white_36 - : R.drawable.quantum_ic_volume_up_white_24; - contentDescription = R.string.incall_content_description_speaker; - } - } -} diff --git a/java/com/android/incallui/video/impl/SpeakerButtonController.java b/java/com/android/incallui/video/impl/SpeakerButtonController.java index d98545feb..e12032abf 100644 --- a/java/com/android/incallui/video/impl/SpeakerButtonController.java +++ b/java/com/android/incallui/video/impl/SpeakerButtonController.java @@ -88,7 +88,7 @@ public class SpeakerButtonController implements OnCheckedChangeListener, OnClick icon = R.drawable.quantum_ic_headset_white_36; contentDescriptionResId = R.string.incall_content_description_headset; } else { - icon = R.drawable.quantum_ic_phone_in_talk_white_36; + icon = R.drawable.ic_phone_audio_white_36dp; contentDescriptionResId = R.string.incall_content_description_earpiece; } } else { diff --git a/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java b/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java index 489f72b7d..b7a960e35 100644 --- a/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java +++ b/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java @@ -495,7 +495,7 @@ public class SurfaceViewVideoCallFragment extends Fragment } private View[] getAllPreviewRelatedViews() { - return new View[] {previewRoot, mutePreviewOverlay}; + return new View[] {previewRoot}; } private int getOffsetTop(View view) { @@ -644,6 +644,12 @@ public class SurfaceViewVideoCallFragment extends Fragment updateVideoOffViews(); } + /** + * This method scales the video feed inside the texture view, it doesn't change the texture view's + * size. In the old UI we would change the view size to match the aspect ratio of the video. In + * the new UI the view is always square (with the circular clip) so we have to do additional work + * to make sure the non-square video doesn't look squished. + */ @Override public void onLocalVideoDimensionsChanged() { LogUtil.i("SurfaceViewVideoCallFragment.onLocalVideoDimensionsChanged", null); @@ -827,9 +833,6 @@ public class SurfaceViewVideoCallFragment extends Fragment inCallButtonUiDelegate.setAudioRoute(audioRoute); } - @Override - public void onAudioRouteSelectorDismiss() {} - @Override public void setPrimary(@NonNull PrimaryInfo primaryInfo) { LogUtil.i("SurfaceViewVideoCallFragment.setPrimary", primaryInfo.toString()); diff --git a/java/com/android/incallui/video/impl/VideoCallFragment.java b/java/com/android/incallui/video/impl/VideoCallFragment.java index 6e45f928a..8e2f5aefd 100644 --- a/java/com/android/incallui/video/impl/VideoCallFragment.java +++ b/java/com/android/incallui/video/impl/VideoCallFragment.java @@ -59,7 +59,6 @@ import android.widget.TextView; import com.android.dialer.common.Assert; import com.android.dialer.common.FragmentUtils; import com.android.dialer.common.LogUtil; -import com.android.dialer.common.concurrent.ThreadUtil; import com.android.dialer.compat.ActivityCompat; import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment; import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment.AudioRouteSelectorPresenter; @@ -666,14 +665,22 @@ public class VideoCallFragment extends Fragment updateRemoteVideoScaling(); } + /** + * This method scales the video feed inside the texture view, it doesn't change the texture view's + * size. In the old UI we would change the view size to match the aspect ratio of the video. In + * the new UI the view is always square (with the circular clip) so we have to do additional work + * to make sure the non-square video doesn't look squished. + */ @Override public void onLocalVideoDimensionsChanged() { LogUtil.i("VideoCallFragment.onLocalVideoDimensionsChanged", null); + updatePreviewVideoScaling(); } @Override public void onLocalVideoOrientationChanged() { LogUtil.i("VideoCallFragment.onLocalVideoOrientationChanged", null); + updatePreviewVideoScaling(); } /** Called when the remote video's dimensions change. */ @@ -845,9 +852,6 @@ public class VideoCallFragment extends Fragment inCallButtonUiDelegate.setAudioRoute(audioRoute); } - @Override - public void onAudioRouteSelectorDismiss() {} - @Override public void setPrimary(@NonNull PrimaryInfo primaryInfo) { LogUtil.i("VideoCallFragment.setPrimary", primaryInfo.toString()); @@ -1041,6 +1045,7 @@ public class VideoCallFragment extends Fragment params.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM); previewTextureView.setLayoutParams(params); previewTextureView.setOutlineProvider(circleOutlineProvider); + updatePreviewVideoScaling(); updateOverlayBackground(); contactGridManager.setIsMiddleRowVisible(false); updateMutePreviewOverlayVisibility(); @@ -1048,9 +1053,6 @@ public class VideoCallFragment extends Fragment previewOffBlurredImageView.setLayoutParams(params); previewOffBlurredImageView.setOutlineProvider(circleOutlineProvider); previewOffBlurredImageView.setClipToOutline(true); - - // Wait until the layout pass has finished before updating the scaling - ThreadUtil.postOnUiThread(this::updatePreviewVideoScaling); } private void updateVideoOffViews() { diff --git a/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml b/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml index 1a2bc2429..c67246675 100644 --- a/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml +++ b/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml @@ -14,7 +14,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> - - - + + - + diff --git a/java/com/android/incallui/video/impl/res/values-h580dp/dimens.xml b/java/com/android/incallui/video/impl/res/values-h580dp/dimens.xml index e9e7f9e8b..a53fb6404 100644 --- a/java/com/android/incallui/video/impl/res/values-h580dp/dimens.xml +++ b/java/com/android/incallui/video/impl/res/values-h580dp/dimens.xml @@ -19,5 +19,5 @@ 72dp 88dp 88dp - 116dp + 104dp diff --git a/java/com/android/incallui/video/impl/res/values-land/dimens.xml b/java/com/android/incallui/video/impl/res/values-land/dimens.xml index d0a5e409a..6485735e2 100644 --- a/java/com/android/incallui/video/impl/res/values-land/dimens.xml +++ b/java/com/android/incallui/video/impl/res/values-land/dimens.xml @@ -15,5 +15,5 @@ ~ limitations under the License --> - 96dp + 92dp diff --git a/java/com/android/incallui/video/impl/res/values-land/styles.xml b/java/com/android/incallui/video/impl/res/values-land/styles.xml index f60dbd1d6..a809708df 100644 --- a/java/com/android/incallui/video/impl/res/values-land/styles.xml +++ b/java/com/android/incallui/video/impl/res/values-land/styles.xml @@ -16,8 +16,7 @@ -->