Update AOSP Dialer source from internal google3 repository at

cl/150756069

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/150392808 (3/16/2017) to cl/150756069 (3/21/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: I0888b5db52efb28eb8194600e0c7804592f975f3

8 files changed, 3 insertions, 3 deletions

diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_person_add_24dp.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_person_add_24dp.png
deleted file mode 100644
index 10ae5a70c..000000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_person_add_24dp.png
+++ /dev/null
diff --git a/java/com/android/contacts/common/res/drawable-mdpi/ic_person_add_24dp.png b/java/com/android/contacts/common/res/drawable-mdpi/ic_person_add_24dp.png
deleted file mode 100644
index 38e0a2882..000000000
--- a/java/com/android/contacts/common/res/drawable-mdpi/ic_person_add_24dp.png
+++ /dev/null
diff --git a/java/com/android/contacts/common/res/drawable-xhdpi/ic_person_add_24dp.png b/java/com/android/contacts/common/res/drawable-xhdpi/ic_person_add_24dp.png
deleted file mode 100644
index 7e7c289d4..000000000
--- a/java/com/android/contacts/common/res/drawable-xhdpi/ic_person_add_24dp.png
+++ /dev/null
diff --git a/java/com/android/contacts/common/res/drawable-xxhdpi/ic_person_add_24dp.png b/java/com/android/contacts/common/res/drawable-xxhdpi/ic_person_add_24dp.png
deleted file mode 100644
index 8f744f039..000000000
--- a/java/com/android/contacts/common/res/drawable-xxhdpi/ic_person_add_24dp.png
+++ /dev/null
diff --git a/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_person_add_24dp.png b/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_person_add_24dp.png
deleted file mode 100644
index 2fa2cca80..000000000
--- a/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_person_add_24dp.png
+++ /dev/null
diff --git a/java/com/android/contacts/common/res/drawable/ic_person_add_tinted_24dp.xml b/java/com/android/contacts/common/res/drawable/ic_person_add_tinted_24dp.xml
index 0af90edb3..c2538cfd1 100644
--- a/java/com/android/contacts/common/res/drawable/ic_person_add_tinted_24dp.xml
+++ b/java/com/android/contacts/common/res/drawable/ic_person_add_tinted_24dp.xml
@@ -16,5 +16,5 @@
   -->
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
   android:autoMirrored="true"
-  android:src="@drawable/ic_person_add_24dp"
+  android:src="@drawable/quantum_ic_person_add_white_24"
   android:tint="@color/actionbar_icon_color"/>
diff --git a/java/com/android/contacts/common/res/drawable/ic_search_add_contact.xml b/java/com/android/contacts/common/res/drawable/ic_search_add_contact.xml
index 801806044..476212d24 100644
--- a/java/com/android/contacts/common/res/drawable/ic_search_add_contact.xml
+++ b/java/com/android/contacts/common/res/drawable/ic_search_add_contact.xml
@@ -17,4 +17,4 @@
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
   android:autoMirrored="true"
-  android:src="@drawable/ic_person_add_24dp"/>
+  android:src="@drawable/quantum_ic_person_add_white_24"/>
diff --git a/java/com/android/contacts/common/res/values-ky/strings.xml b/java/com/android/contacts/common/res/values-ky/strings.xml
index 55a210a0b..ed081ec60 100644
--- a/java/com/android/contacts/common/res/values-ky/strings.xml
+++ b/java/com/android/contacts/common/res/values-ky/strings.xml
@@ -122,7 +122,7 @@
     <string name="email_mobile" msgid="4487686436743741150">"Мобилге эмейлдөө"</string>
     <string name="email_work" msgid="4223487303344613528">"Жумушка эмейлдөө"</string>
     <string name="email_other" msgid="4246411900126012062">"Электрондук кат жазуу"</string>
-    <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> эмейл жөнөтүү"</string>
+    <string name="email_custom" msgid="7246580894327511013">"Кат жазуу (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
     <string name="email" msgid="2807318537887091606">"Электрондук кат жазуу"</string>
     <string name="postal_street" msgid="6918171741240802474">"Көчөсү"</string>
     <string name="postal_pobox" msgid="2962203483168878561">"Абонент кутусу"</string>