From d8046e520a866b9948ee9ba47cf642b441ca8e23 Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Thu, 6 Apr 2017 09:41:50 -0700 Subject: Update AOSP Dialer source from internal google3 repository at cl/152373142. Test: make, treehugger This CL updates the AOSP Dialer source with all the changes that have gone into the private google3 repository. This includes all the changes from cl/151342913 (3/27/2017) to cl/152373142 (4/06/2017). This goal of these drops is to keep the AOSP source in sync with the internal google3 repository. Currently these sync are done by hand with very minor modifications to the internal source code. See the Android.mk file for list of modifications. Our current goal is to do frequent drops (daily if possible) and eventually switched to an automated process. Change-Id: I2fbc88cf6867b90ac8b65f75e5e34468988c7217 --- .../dialer/blocking/res/drawable-hdpi/ic_block_24dp.png | Bin 478 -> 0 bytes .../dialer/blocking/res/drawable-hdpi/ic_report_24dp.png | Bin 240 -> 0 bytes .../blocking/res/drawable-hdpi/ic_report_white_36dp.png | Bin 312 -> 0 bytes .../dialer/blocking/res/drawable-mdpi/ic_block_24dp.png | Bin 335 -> 0 bytes .../dialer/blocking/res/drawable-mdpi/ic_report_24dp.png | Bin 174 -> 0 bytes .../blocking/res/drawable-mdpi/ic_report_white_36dp.png | Bin 240 -> 0 bytes .../dialer/blocking/res/drawable-xhdpi/ic_block_24dp.png | Bin 665 -> 0 bytes .../blocking/res/drawable-xhdpi/ic_report_24dp.png | Bin 272 -> 0 bytes .../blocking/res/drawable-xhdpi/ic_report_white_36dp.png | Bin 340 -> 0 bytes .../blocking/res/drawable-xxhdpi/ic_block_24dp.png | Bin 973 -> 0 bytes .../blocking/res/drawable-xxhdpi/ic_report_24dp.png | Bin 340 -> 0 bytes .../res/drawable-xxhdpi/ic_report_white_36dp.png | Bin 522 -> 0 bytes .../blocking/res/drawable-xxxhdpi/ic_block_24dp.png | Bin 1295 -> 0 bytes .../blocking/res/drawable-xxxhdpi/ic_report_24dp.png | Bin 450 -> 0 bytes .../res/drawable-xxxhdpi/ic_report_white_36dp.png | Bin 649 -> 0 bytes .../dialer/blocking/res/drawable/blocked_contact.xml | 2 +- .../android/dialer/blocking/res/values-de/strings.xml | 4 ++-- 17 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 java/com/android/dialer/blocking/res/drawable-hdpi/ic_block_24dp.png delete mode 100644 java/com/android/dialer/blocking/res/drawable-hdpi/ic_report_24dp.png delete mode 100644 java/com/android/dialer/blocking/res/drawable-hdpi/ic_report_white_36dp.png delete mode 100644 java/com/android/dialer/blocking/res/drawable-mdpi/ic_block_24dp.png delete mode 100644 java/com/android/dialer/blocking/res/drawable-mdpi/ic_report_24dp.png delete mode 100644 java/com/android/dialer/blocking/res/drawable-mdpi/ic_report_white_36dp.png delete mode 100644 java/com/android/dialer/blocking/res/drawable-xhdpi/ic_block_24dp.png delete mode 100644 java/com/android/dialer/blocking/res/drawable-xhdpi/ic_report_24dp.png delete mode 100644 java/com/android/dialer/blocking/res/drawable-xhdpi/ic_report_white_36dp.png delete mode 100644 java/com/android/dialer/blocking/res/drawable-xxhdpi/ic_block_24dp.png delete mode 100644 java/com/android/dialer/blocking/res/drawable-xxhdpi/ic_report_24dp.png delete mode 100644 java/com/android/dialer/blocking/res/drawable-xxhdpi/ic_report_white_36dp.png delete mode 100644 java/com/android/dialer/blocking/res/drawable-xxxhdpi/ic_block_24dp.png delete mode 100644 java/com/android/dialer/blocking/res/drawable-xxxhdpi/ic_report_24dp.png delete mode 100644 java/com/android/dialer/blocking/res/drawable-xxxhdpi/ic_report_white_36dp.png (limited to 'java/com/android/dialer/blocking/res') 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 deleted file mode 100644 index 2ccc89d24..000000000 Binary files a/java/com/android/dialer/blocking/res/drawable-hdpi/ic_block_24dp.png and /dev/null 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 deleted file mode 100644 index dc0c995c1..000000000 Binary files a/java/com/android/dialer/blocking/res/drawable-hdpi/ic_report_24dp.png and /dev/null 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 deleted file mode 100644 index 919a872e0..000000000 Binary files a/java/com/android/dialer/blocking/res/drawable-hdpi/ic_report_white_36dp.png and /dev/null differ diff --git a/java/com/android/dialer/blocking/res/drawable-mdpi/ic_block_24dp.png b/java/com/android/dialer/blocking/res/drawable-mdpi/ic_block_24dp.png deleted file mode 100644 index ec1b33f0e..000000000 Binary files a/java/com/android/dialer/blocking/res/drawable-mdpi/ic_block_24dp.png and /dev/null differ diff --git a/java/com/android/dialer/blocking/res/drawable-mdpi/ic_report_24dp.png b/java/com/android/dialer/blocking/res/drawable-mdpi/ic_report_24dp.png deleted file mode 100644 index 70b82d6c1..000000000 Binary files a/java/com/android/dialer/blocking/res/drawable-mdpi/ic_report_24dp.png and /dev/null differ diff --git a/java/com/android/dialer/blocking/res/drawable-mdpi/ic_report_white_36dp.png b/java/com/android/dialer/blocking/res/drawable-mdpi/ic_report_white_36dp.png deleted file mode 100644 index dc0c995c1..000000000 Binary files a/java/com/android/dialer/blocking/res/drawable-mdpi/ic_report_white_36dp.png and /dev/null differ diff --git a/java/com/android/dialer/blocking/res/drawable-xhdpi/ic_block_24dp.png b/java/com/android/dialer/blocking/res/drawable-xhdpi/ic_block_24dp.png deleted file mode 100644 index 7aba97b65..000000000 Binary files a/java/com/android/dialer/blocking/res/drawable-xhdpi/ic_block_24dp.png and /dev/null differ diff --git a/java/com/android/dialer/blocking/res/drawable-xhdpi/ic_report_24dp.png b/java/com/android/dialer/blocking/res/drawable-xhdpi/ic_report_24dp.png deleted file mode 100644 index 18e7764ab..000000000 Binary files a/java/com/android/dialer/blocking/res/drawable-xhdpi/ic_report_24dp.png and /dev/null differ diff --git a/java/com/android/dialer/blocking/res/drawable-xhdpi/ic_report_white_36dp.png b/java/com/android/dialer/blocking/res/drawable-xhdpi/ic_report_white_36dp.png deleted file mode 100644 index aed766804..000000000 Binary files a/java/com/android/dialer/blocking/res/drawable-xhdpi/ic_report_white_36dp.png and /dev/null differ diff --git a/java/com/android/dialer/blocking/res/drawable-xxhdpi/ic_block_24dp.png b/java/com/android/dialer/blocking/res/drawable-xxhdpi/ic_block_24dp.png deleted file mode 100644 index fddfa54b8..000000000 Binary files a/java/com/android/dialer/blocking/res/drawable-xxhdpi/ic_block_24dp.png and /dev/null differ diff --git a/java/com/android/dialer/blocking/res/drawable-xxhdpi/ic_report_24dp.png b/java/com/android/dialer/blocking/res/drawable-xxhdpi/ic_report_24dp.png deleted file mode 100644 index aed766804..000000000 Binary files a/java/com/android/dialer/blocking/res/drawable-xxhdpi/ic_report_24dp.png and /dev/null differ diff --git a/java/com/android/dialer/blocking/res/drawable-xxhdpi/ic_report_white_36dp.png b/java/com/android/dialer/blocking/res/drawable-xxhdpi/ic_report_white_36dp.png deleted file mode 100644 index f7cfacbd4..000000000 Binary files a/java/com/android/dialer/blocking/res/drawable-xxhdpi/ic_report_white_36dp.png and /dev/null differ diff --git a/java/com/android/dialer/blocking/res/drawable-xxxhdpi/ic_block_24dp.png b/java/com/android/dialer/blocking/res/drawable-xxxhdpi/ic_block_24dp.png deleted file mode 100644 index 0378d1bed..000000000 Binary files a/java/com/android/dialer/blocking/res/drawable-xxxhdpi/ic_block_24dp.png and /dev/null differ diff --git a/java/com/android/dialer/blocking/res/drawable-xxxhdpi/ic_report_24dp.png b/java/com/android/dialer/blocking/res/drawable-xxxhdpi/ic_report_24dp.png deleted file mode 100644 index 855e59015..000000000 Binary files a/java/com/android/dialer/blocking/res/drawable-xxxhdpi/ic_report_24dp.png and /dev/null differ diff --git a/java/com/android/dialer/blocking/res/drawable-xxxhdpi/ic_report_white_36dp.png b/java/com/android/dialer/blocking/res/drawable-xxxhdpi/ic_report_white_36dp.png deleted file mode 100644 index 7ef0d7afc..000000000 Binary files a/java/com/android/dialer/blocking/res/drawable-xxxhdpi/ic_report_white_36dp.png and /dev/null differ diff --git a/java/com/android/dialer/blocking/res/drawable/blocked_contact.xml b/java/com/android/dialer/blocking/res/drawable/blocked_contact.xml index 09d7989e8..905616d4a 100644 --- a/java/com/android/dialer/blocking/res/drawable/blocked_contact.xml +++ b/java/com/android/dialer/blocking/res/drawable/blocked_contact.xml @@ -28,7 +28,7 @@ diff --git a/java/com/android/dialer/blocking/res/values-de/strings.xml b/java/com/android/dialer/blocking/res/values-de/strings.xml index f1677e91f..37507ebbe 100644 --- a/java/com/android/dialer/blocking/res/values-de/strings.xml +++ b/java/com/android/dialer/blocking/res/values-de/strings.xml @@ -21,8 +21,8 @@ "Um dich besser schützen zu können, müssen die Einstellungen der Blockierung beim Telefon geändert werden. Von blockierten Nummern erhältst du jetzt keine Anrufe und Nachrichten mehr und diese Nummern können auch an andere Apps weitergegeben werden." "Zulassen" "%1$s blockieren?" - "Anrufe von dieser Nummer werden blockiert und Mailbox-Nachrichten automatisch gelöscht." - "Anrufe von dieser Nummer werden blockiert. Der Anrufer hat aber unter Umständen weiterhin die Möglichkeit, dir Mailbox-Nachrichten zu hinterlassen." + "Anrufe von dieser Nummer werden blockiert und Mailboxnachrichten automatisch gelöscht." + "Anrufe von dieser Nummer werden blockiert. Der Anrufer hat aber unter Umständen weiterhin die Möglichkeit, dir Mailboxnachrichten zu hinterlassen." "Du erhältst von dieser Nummer keine Anrufe oder Nachrichten mehr." "BLOCKIEREN" "Blockierung von %1$s aufheben?" -- cgit v1.2.3