diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-04-06 09:41:50 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-04-06 09:41:50 -0700 |
| commit | d8046e520a866b9948ee9ba47cf642b441ca8e23 (patch) | |
| tree | 8d08d4f2292aa84dc435d455891e7ab633d95a25 /java/com/android/dialer/blocking/res | |
| parent | cdb1edf966a892abebcba425a85b7d4e47758302 (diff) | |
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
Diffstat (limited to 'java/com/android/dialer/blocking/res')
17 files changed, 3 insertions, 3 deletions
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 Binary files differdeleted file mode 100644 index 2ccc89d24..000000000 --- a/java/com/android/dialer/blocking/res/drawable-hdpi/ic_block_24dp.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index dc0c995c1..000000000 --- a/java/com/android/dialer/blocking/res/drawable-hdpi/ic_report_24dp.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 919a872e0..000000000 --- a/java/com/android/dialer/blocking/res/drawable-hdpi/ic_report_white_36dp.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index ec1b33f0e..000000000 --- a/java/com/android/dialer/blocking/res/drawable-mdpi/ic_block_24dp.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 70b82d6c1..000000000 --- a/java/com/android/dialer/blocking/res/drawable-mdpi/ic_report_24dp.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index dc0c995c1..000000000 --- a/java/com/android/dialer/blocking/res/drawable-mdpi/ic_report_white_36dp.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 7aba97b65..000000000 --- a/java/com/android/dialer/blocking/res/drawable-xhdpi/ic_block_24dp.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 18e7764ab..000000000 --- a/java/com/android/dialer/blocking/res/drawable-xhdpi/ic_report_24dp.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index aed766804..000000000 --- a/java/com/android/dialer/blocking/res/drawable-xhdpi/ic_report_white_36dp.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index fddfa54b8..000000000 --- a/java/com/android/dialer/blocking/res/drawable-xxhdpi/ic_block_24dp.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index aed766804..000000000 --- a/java/com/android/dialer/blocking/res/drawable-xxhdpi/ic_report_24dp.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index f7cfacbd4..000000000 --- a/java/com/android/dialer/blocking/res/drawable-xxhdpi/ic_report_white_36dp.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 0378d1bed..000000000 --- a/java/com/android/dialer/blocking/res/drawable-xxxhdpi/ic_block_24dp.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 855e59015..000000000 --- a/java/com/android/dialer/blocking/res/drawable-xxxhdpi/ic_report_24dp.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 7ef0d7afc..000000000 --- a/java/com/android/dialer/blocking/res/drawable-xxxhdpi/ic_report_white_36dp.png +++ /dev/null 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 @@ </item> <item - android:drawable="@drawable/ic_report_24dp" + android:drawable="@drawable/quantum_ic_report_white_24" android:gravity="center" android:height="18dp" android:width="18dp"/> 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 @@ <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"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."</string> <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Zulassen"</string> <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g> blockieren?"</string> - <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Anrufe von dieser Nummer werden blockiert und Mailbox-Nachrichten automatisch gelöscht."</string> - <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Anrufe von dieser Nummer werden blockiert. Der Anrufer hat aber unter Umständen weiterhin die Möglichkeit, dir Mailbox-Nachrichten zu hinterlassen."</string> + <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Anrufe von dieser Nummer werden blockiert und Mailboxnachrichten automatisch gelöscht."</string> + <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Anrufe von dieser Nummer werden blockiert. Der Anrufer hat aber unter Umständen weiterhin die Möglichkeit, dir Mailboxnachrichten zu hinterlassen."</string> <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Du erhältst von dieser Nummer keine Anrufe oder Nachrichten mehr."</string> <string name="block_number_ok" msgid="739786082788038932">"BLOCKIEREN"</string> <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Blockierung von <xliff:g id="NUMBER">%1$s</xliff:g> aufheben?"</string> |
