From 8369df095a73a77b3715f8ae7ba06089cebca4ce Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Wed, 3 May 2017 10:27:13 -0700 Subject: This change reflects the Dialer V10 RC00 branch. RC00 is based on: branch: dialer-android_release_branch/153304843.1 synced to: 153304843 following the instructions at go/dialer-aosp-release. In this release: * Removes final apache sources. * Uses native lite compilation. More drops will follow with subsequent release candidates until we reach our final v10 release, in cadence with our prebuilt drops. Test: TreeHugger, on device Change-Id: Ic9684057230f9b579c777820c746cd21bf45ec0f --- .../dialer/blocking/BlockNumberDialogFragment.java | 2 +- .../dialer/blocking/FilteredNumbersUtil.java | 2 +- .../blocking/res/drawable-hdpi/ic_block_24dp.png | Bin 0 -> 478 bytes .../blocking/res/drawable-hdpi/ic_report_24dp.png | Bin 0 -> 240 bytes .../res/drawable-hdpi/ic_report_white_36dp.png | Bin 0 -> 312 bytes .../blocking/res/values-b+sr+Latn/strings.xml | 46 +++++++++++++++++++++ 6 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 java/com/android/dialer/blocking/res/drawable-hdpi/ic_block_24dp.png create mode 100644 java/com/android/dialer/blocking/res/drawable-hdpi/ic_report_24dp.png create mode 100644 java/com/android/dialer/blocking/res/drawable-hdpi/ic_report_white_36dp.png create mode 100644 java/com/android/dialer/blocking/res/values-b+sr+Latn/strings.xml (limited to 'java/com/android/dialer/blocking') diff --git a/java/com/android/dialer/blocking/BlockNumberDialogFragment.java b/java/com/android/dialer/blocking/BlockNumberDialogFragment.java index c405b2fe7..7ef77c4b6 100644 --- a/java/com/android/dialer/blocking/BlockNumberDialogFragment.java +++ b/java/com/android/dialer/blocking/BlockNumberDialogFragment.java @@ -33,8 +33,8 @@ import android.widget.Toast; import com.android.contacts.common.util.ContactDisplayUtils; import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler.OnBlockNumberListener; import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler.OnUnblockNumberListener; +import com.android.dialer.logging.InteractionEvent; import com.android.dialer.logging.Logger; -import com.android.dialer.logging.nano.InteractionEvent; import com.android.dialer.voicemailstatus.VisualVoicemailEnabledChecker; /** diff --git a/java/com/android/dialer/blocking/FilteredNumbersUtil.java b/java/com/android/dialer/blocking/FilteredNumbersUtil.java index 8908238ea..cbef73ca5 100644 --- a/java/com/android/dialer/blocking/FilteredNumbersUtil.java +++ b/java/com/android/dialer/blocking/FilteredNumbersUtil.java @@ -34,8 +34,8 @@ import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler.OnHasBlockedN import com.android.dialer.common.LogUtil; import com.android.dialer.database.FilteredNumberContract.FilteredNumber; import com.android.dialer.database.FilteredNumberContract.FilteredNumberColumns; +import com.android.dialer.logging.InteractionEvent; import com.android.dialer.logging.Logger; -import com.android.dialer.logging.nano.InteractionEvent; import com.android.dialer.notification.NotificationChannelManager; import com.android.dialer.notification.NotificationChannelManager.Channel; import com.android.dialer.util.PermissionsUtil; diff --git a/java/com/android/dialer/blocking/res/drawable-hdpi/ic_block_24dp.png b/java/com/android/dialer/blocking/res/drawable-hdpi/ic_block_24dp.png new file mode 100644 index 000000000..2ccc89d24 Binary files /dev/null and b/java/com/android/dialer/blocking/res/drawable-hdpi/ic_block_24dp.png differ diff --git a/java/com/android/dialer/blocking/res/drawable-hdpi/ic_report_24dp.png b/java/com/android/dialer/blocking/res/drawable-hdpi/ic_report_24dp.png new file mode 100644 index 000000000..dc0c995c1 Binary files /dev/null and b/java/com/android/dialer/blocking/res/drawable-hdpi/ic_report_24dp.png differ diff --git a/java/com/android/dialer/blocking/res/drawable-hdpi/ic_report_white_36dp.png b/java/com/android/dialer/blocking/res/drawable-hdpi/ic_report_white_36dp.png new file mode 100644 index 000000000..919a872e0 Binary files /dev/null and b/java/com/android/dialer/blocking/res/drawable-hdpi/ic_report_white_36dp.png differ diff --git a/java/com/android/dialer/blocking/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/blocking/res/values-b+sr+Latn/strings.xml new file mode 100644 index 000000000..238dde0bf --- /dev/null +++ b/java/com/android/dialer/blocking/res/values-b+sr+Latn/strings.xml @@ -0,0 +1,46 @@ + + + + + "Novo, jednostavnije blokiranje" + "Telefon treba da promeni način na koji blokiranje funkcioniše da bi vam pružio bolju zaštitu. Sa blokiranih brojeva više nećete primati ni pozive ni SMS-ove, ali možete da ih delite sa drugim aplikacijama." + "Dozvoli" + "Želite li da blokirate %1$s?" + "Pozivi sa ovog broja će biti blokirani i poruke govorne pošte će se automatski brisati." + "Pozivi sa ovog broja će biti blokirani, ali pozivalac i dalje može da vam ostavlja poruke govorne pošte." + "Više nećete primati pozive ni SMS-ove sa ovog broja." + "BLOKIRAJ" + "Želite li da deblokirate %1$s?" + "DEBLOKIRAJ" + "%1$s je nevažeći." + "%1$s je blokiran" + "%1$s je deblokiran" + "OPOZOVI" + "Uvoz nije uspeo" + "Blokiranje poziva je onemogućeno na 48 sati" + "Onemogućeno je zato što je upućen hitan poziv." + "Želite li da blokirate %1$s?" + "Više nećete primati pozive sa ovog broja." + "%1$s Prijavićemo ovaj poziv kao nepoželjan." + "Deblokiraćemo broj i prijaviti da nije nepoželjan. Budući pozivi neće biti označavani kao nepoželjni." + "Želite li da deblokirate %1$s?" + "Prijavi" + "Želite da prijavite grešku?" + "Budući pozivi sa %1$s više neće biti označavani kao nepoželjni." + "Prijavi poziv kao nepoželjan" + -- cgit v1.2.3