Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26 Conflicts: res/values-zh-rCN/strings.xml res/values/strings.xml src/com/android/contacts/common/CallUtil.java Change-Id: I7343f010b46987cb5723c1c86bf450af90e3160f
author: Ricardo Cerqueira <ricardo@cyngn.com> 2015-11-05 01:50:28 +0000
committer: Ricardo Cerqueira <ricardo@cyngn.com> 2015-11-05 01:50:28 +0000
commit: 75a493f212f4961cb0ec403fe7c227db4bc415b3 (patch)
tree: 43d3b0e3d1f9ba9f0341fe427d4365dbc5a97ca2
parent: faca3df8f57f70b676604ee7972ec2628b4796dd (diff)
parent: 9a04c48880e2775e331e99a6d3a29ba1834e25ac (diff)
download: packages_apps_ContactsCommon-75a493f212f4961cb0ec403fe7c227db4bc415b3.tar.gz
packages_apps_ContactsCommon-75a493f212f4961cb0ec403fe7c227db4bc415b3.tar.bz2
packages_apps_ContactsCommon-75a493f212f4961cb0ec403fe7c227db4bc415b3.zip
101 files changed, 1380 insertions, 43 deletions
diff --git a/res/drawable-hdpi/ic_call_note_white_24dp.png b/res/drawable-hdpi/ic_call_note_white_24dp.png
new file mode 100644
index 00000000..503e58e2
--- /dev/null
+++ b/res/drawable-hdpi/ic_call_note_white_24dp.png
diff --git a/res/drawable-hdpi/ic_history_white_drawable_24dp.png b/res/drawable-hdpi/ic_history_white_drawable_24dp.png
new file mode 100644
index 00000000..703d30b9
--- /dev/null
+++ b/res/drawable-hdpi/ic_history_white_drawable_24dp.png
diff --git a/res/drawable-mdpi/ic_call_note_white_24dp.png b/res/drawable-mdpi/ic_call_note_white_24dp.png
new file mode 100644
index 00000000..9d359db9
--- /dev/null
+++ b/res/drawable-mdpi/ic_call_note_white_24dp.png
diff --git a/res/drawable-mdpi/ic_history_white_drawable_24dp.png b/res/drawable-mdpi/ic_history_white_drawable_24dp.png
new file mode 100644
index 00000000..b3000d31
--- /dev/null
+++ b/res/drawable-mdpi/ic_history_white_drawable_24dp.png
diff --git a/res/drawable-xhdpi/ic_call_note_white_24dp.png b/res/drawable-xhdpi/ic_call_note_white_24dp.png
new file mode 100644
index 00000000..40eed1d1
--- /dev/null
+++ b/res/drawable-xhdpi/ic_call_note_white_24dp.png
diff --git a/res/drawable-xhdpi/ic_history_white_drawable_24dp.png b/res/drawable-xhdpi/ic_history_white_drawable_24dp.png
new file mode 100644
index 00000000..e188d4a3
--- /dev/null
+++ b/res/drawable-xhdpi/ic_history_white_drawable_24dp.png
diff --git a/res/drawable-xxhdpi/ic_call_note_white_24dp.png b/res/drawable-xxhdpi/ic_call_note_white_24dp.png
new file mode 100644
index 00000000..2656cad1
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_call_note_white_24dp.png
diff --git a/res/drawable-xxhdpi/ic_history_white_drawable_24dp.png b/res/drawable-xxhdpi/ic_history_white_drawable_24dp.png
new file mode 100644
index 00000000..f44df1af
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_history_white_drawable_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_call_note_white_24dp.png b/res/drawable-xxxhdpi/ic_call_note_white_24dp.png
new file mode 100644
index 00000000..903c1623
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_call_note_white_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_history_white_drawable_24dp.png b/res/drawable-xxxhdpi/ic_history_white_drawable_24dp.png
new file mode 100644
index 00000000..5b96af5b
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_history_white_drawable_24dp.png
diff --git a/res/drawable/dialog_background_material.xml b/res/drawable/dialog_background_material.xml
new file mode 100644
index 00000000..fb586a08
--- /dev/null
+++ b/res/drawable/dialog_background_material.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:inset="16dp">
+    <shape android:shape="rectangle">
+        <corners android:radius="2dp" />
+        <solid android:color="@color/call_subject_history_background" />
+    </shape>
+</inset>
diff --git a/res/layout/call_subject_history.xml b/res/layout/call_subject_history.xml
new file mode 100644
index 00000000..5f6ef3a7
--- /dev/null
+++ b/res/layout/call_subject_history.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2015 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
+  -->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/transparent" >
+
+    <ListView
+        android:id="@+id/subject_list"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_alignParentBottom="true"
+        android:background="@color/call_subject_history_background"
+        android:divider="@null"
+        android:elevation="8dp" />
+
+</RelativeLayout>
+\ No newline at end of file
diff --git a/res/layout/call_subject_history_list_item.xml b/res/layout/call_subject_history_list_item.xml
new file mode 100644
index 00000000..b8cce475
--- /dev/null
+++ b/res/layout/call_subject_history_list_item.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2015 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
+  -->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:id="@android:id/text1"
+          android:gravity="center_vertical"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:paddingStart="@dimen/call_subject_dialog_margin"
+          android:paddingEnd="@dimen/call_subject_dialog_margin"
+          android:paddingTop="@dimen/call_subject_history_item_padding"
+          android:paddingBottom="@dimen/call_subject_history_item_padding"
+          android:singleLine="true"
+          android:textColor="@color/dialtacts_primary_text_color"
+          android:textSize="@dimen/call_subject_dialog_primary_text_size" />
diff --git a/res/layout/dialog_call_subject.xml b/res/layout/dialog_call_subject.xml
new file mode 100644
index 00000000..d6365c24
--- /dev/null
+++ b/res/layout/dialog_call_subject.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2015 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
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/transparent"
+    android:id="@+id/call_subject_dialog"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:layout_width="match_parent">
+
+        <!-- The call subject dialog will be centered in the space above the subject list. -->
+        <LinearLayout
+            android:id="@+id/dialog_view"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clickable="true"
+            android:theme="@android:style/Theme.Material.Light.Dialog"
+            android:elevation="16dp"
+            android:layout_centerInParent="true"
+            android:background="@drawable/dialog_background_material">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginStart="@dimen/call_subject_dialog_margin"
+                android:layout_marginEnd="@dimen/call_subject_dialog_margin"
+                android:layout_marginTop="@dimen/call_subject_dialog_margin">
+
+                <QuickContactBadge
+                    android:id="@+id/contact_photo"
+                    android:layout_width="@dimen/call_subject_dialog_contact_photo_size"
+                    android:layout_height="@dimen/call_subject_dialog_contact_photo_size"
+                    android:layout_gravity="top"
+                    android:focusable="true"
+                    android:layout_marginEnd="@dimen/call_subject_dialog_margin" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:gravity="center_vertical">
+
+                    <TextView
+                        android:id="@+id/name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/dialtacts_primary_text_color"
+                        android:textSize="@dimen/call_subject_dialog_secondary_text_size"
+                        android:singleLine="true" />
+
+                    <TextView
+                        android:id="@+id/number"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginTop="@dimen/call_subject_dialog_between_line_margin"
+                        android:textColor="@color/dialtacts_secondary_text_color"
+                        android:textSize="@dimen/call_subject_dialog_secondary_text_size"
+                        android:singleLine="true" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <EditText
+                android:id="@+id/call_subject"
+                android:hint="@string/call_subject_hint"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:layout_gravity="top"
+                android:textColor="@color/dialtacts_secondary_text_color"
+                android:textSize="@dimen/call_subject_dialog_secondary_text_size"
+                android:gravity="top"
+                android:background="@null"
+                android:layout_marginTop="@dimen/call_subject_dialog_edit_spacing"
+                android:layout_marginStart="@dimen/call_subject_dialog_margin"
+                android:layout_marginEnd="@dimen/call_subject_dialog_margin"
+                />
+
+            <TextView
+                android:id="@+id/character_limit"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/dialtacts_secondary_text_color"
+                android:textSize="@dimen/call_subject_dialog_secondary_text_size"
+                android:singleLine="true"
+                android:layout_marginStart="@dimen/call_subject_dialog_margin"
+                android:layout_marginEnd="@dimen/call_subject_dialog_margin"
+                android:layout_marginTop="@dimen/call_subject_dialog_margin"
+                android:layout_marginBottom="@dimen/call_subject_dialog_margin"/>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="1dp"
+                android:background="@color/call_subject_divider"/>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/call_subject_dialog_margin"
+                android:layout_marginEnd="@dimen/call_subject_dialog_margin"
+                android:layout_marginTop="@dimen/call_subject_dialog_margin"
+                android:layout_marginBottom="@dimen/call_subject_dialog_margin">
+
+                <ImageView
+                    android:id="@+id/history_button"
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
+                    android:src="@drawable/ic_history_white_drawable_24dp"
+                    android:tint="@color/call_subject_history_icon"
+                    android:layout_alignParentStart="true"
+                    android:layout_centerVertical="true" />
+
+                <TextView
+                    android:id="@+id/send_and_call_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/send_and_call_button"
+                    android:textColor="@color/call_subject_button"
+                    android:textSize="@dimen/call_subject_dialog_secondary_text_size"
+                    android:singleLine="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_centerVertical="true" />
+
+            </RelativeLayout>
+        </LinearLayout>
+    </RelativeLayout>
+    <!-- The subject list is pinned to the bottom of the screen. -->
+    <ListView
+        android:id="@+id/subject_list"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_below="@id/dialog_view"
+        android:background="@color/call_subject_history_background"
+        android:divider="@null"
+        android:elevation="8dp" />
+
+</LinearLayout>
+\ No newline at end of file
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 8ec4d457..5e3007ff 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Rekening"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Gebruik dit altyd vir oproepe"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Bel met"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Oproep met \'n nota"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Tik \'n nota om saam met oproep te stuur …"</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"STUUR EN BEL"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 6c37fcc0..3e77d797 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"መለያ"</string>
     <string name="set_default_account" msgid="3865970860434642695">"ለጥሪዎች ሁልጊዜ ይህንን ተጠቀም"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"ይደውሉ ከዚህ ጋር"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"ከማስታወሻ ጋር ደውል"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"ከጥሪ ጋር ለመላክ የማስታወሻ ጽሑፍ ይተይቡ ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ላክ እና ደውል"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 5aea8bc7..6e9a6d3c 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -254,4 +254,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"الحساب"</string>
     <string name="set_default_account" msgid="3865970860434642695">"استخدام هذا للمكالمات دائمًا"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"الاتصال باستخدام"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"مكالمة مع ملاحظة"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"اكتب ملاحظة لإرسالها مع المكالمة ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"الإرسال والاتصال"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 09d6fa55..1467398a 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Hesab"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Həmişə bu zənglər üçün istifadə edin"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Çağrı üçün SIM:"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Qeyd ilə zəng edin"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Zəng ilə göndərmək üçün qeyd yazın..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"GÖNDƏRİN &amp; ZƏNG EDİN"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 35ac3139..c4c4c9b7 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Профил"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Винаги да се използва за обаждания"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Обаждане чрез"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Обаждане, включващо бележка"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Напишете придружаваща бележка, която ще се изпрати при извършване на обаждането..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ИЗПРАЩАНЕ И ОБАЖДАНЕ"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 7f256af4..6ad9a639 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"অ্যাকাউন্ট"</string>
     <string name="set_default_account" msgid="3865970860434642695">"কলের জন্য সবসময় এটি ব্যবহার করুন"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"এর মাধ্যমে কল করুন"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"একটি নোট সহ কল করুন"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"কলের সাথে পাঠানোর জন্য একটি নোট লিখুন ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"পাঠান এবং কল করুন"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 687cd90c..e35a0ee6 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Compte"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Utilitza sempre per a les trucades"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Truca mitjançant"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Trucada amb una nota"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Escriu una nota per enviar-la juntament amb la trucada..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ENVIA NOTA I TRUCA"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 773c8813..d9a4fa58 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -252,4 +252,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Účet"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Vždy používat pro hovory"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Volat pomocí"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Volání s poznámkou"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Zadejte poznámku, která se odešle pomocí volání…"</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ODESLAT A ZAVOLAT"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 6d857103..ec8ff2a2 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Konto"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Brug altid ved opkald"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Ring med"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Ring med en note"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Indtast en note, som skal sendes ved opkald..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"SEND, OG RING OP"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 0421bdce..c1494081 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Konto"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Diese SIM für alle Anrufe verwenden"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Anrufen mit"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Mit einer Notiz anrufen"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Notiz eingeben, die beim Anrufen gesendet wird..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"Senden &amp; anrufen"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ab24fe46..231005cf 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Λογαριασμός"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Χρήση πάντα για κλήσεις"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Κλήση με"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Κλήση με σημείωση"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Πληκτρολογήστε μια σημείωση για αποστολή με την κλήση…"</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ΑΠΟΣΤΟΛΗ ΚΑΙ ΚΛΗΣΗ"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index c0ec679a..2b822668 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Account"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Always use this for calls"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Call with"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Call with a note"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Type a note to send with call ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"SEND &amp; CALL"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c0ec679a..2b822668 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Account"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Always use this for calls"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Call with"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Call with a note"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Type a note to send with call ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"SEND &amp; CALL"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index c0ec679a..2b822668 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Account"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Always use this for calls"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Call with"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Call with a note"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Type a note to send with call ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"SEND &amp; CALL"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index a25d8511..873545f3 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Cuenta"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Usar siempre para llamadas"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Llamar con"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Llamada con una nota"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Escribe una nota para enviar con la llamada…"</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ENVIAR Y LLAMAR"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index eae06adf..69b6ebd7 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Cuenta"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Usar siempre esta para llamadas"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Llamar con"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Llamada con una nota"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Escribe una nota para enviarla con la llamada..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ENVIAR Y LLAMAR"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index ccfa03f5..3f862be5 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Konto"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Kasuta helistamiseks alati seda"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Helistamine kontoga"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Kõne koos märkusega"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Sisestage märkus, mis koos kõnega saata ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"SAADA JA HELISTA"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 0e07e71d..dae52c81 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Kontua"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Erabili beti hau deietarako"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Deitu kontu honekin:"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Egin deia oharrarekin"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Idatzi deiarekin batera bidali beharreko oharra…"</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"BIDALI ETA DEITU"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c1e595ab..f932d707 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8327159932780920627">"نوشتار کپی شد"</string>
-    <string name="copy_text" msgid="3424081789297978355">"کپی در کلیپ‌بورد"</string>
+    <string name="copy_text" msgid="3424081789297978355">"کپی در بریده‌دان"</string>
     <string name="call_custom" msgid="2786306789889210756">"تماس با <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="1479549630992276827">"تماس با منزل"</string>
     <string name="call_mobile" msgid="8618334085824709009">"تماس با تلفن همراه"</string>
@@ -155,7 +155,7 @@
     <string name="display_more_groups" msgid="6304997485733158224">"گروه‌های بیشتر..."</string>
     <string name="display_warn_remove_ungrouped" msgid="7297678747857509619">"حذف «<xliff:g id="GROUP">%s</xliff:g>» از همگام‌سازی نیز هر گونه مخاطب گروه‌بندی نشده‌ای را از همگام‌سازی حذف می‌کند."</string>
     <string name="savingDisplayGroups" msgid="6863012138107446030">"در حال ذخیره گزینه‌های نمایش..."</string>
-    <string name="menu_done" msgid="32470053723443112">"انجام شد"</string>
+    <string name="menu_done" msgid="32470053723443112">"تمام"</string>
     <string name="menu_doNotSave" msgid="6012426160993364871">"لغو"</string>
     <string name="listAllContactsInAccount" msgid="755499980092808715">"مخاطبین در <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="1915154113477432033">"مخاطبین در نمای سفارشی"</string>
@@ -217,7 +217,7 @@
     <string name="scanning_sdcard_failed_message" product="default" msgid="1409798274361146091">"‏کارت SD نمی‌تواند بررسی شود. (علت: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
     <string name="progress_notifier_message" msgid="359931715339778107">"وارد کردن <xliff:g id="CURRENT_NUMBER">%s</xliff:g><xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="export_to_vcf_file" product="default" msgid="4142192068495589925">"‏صادر کردن به فایل ‎.vcf"</string>
-    <string name="display_options_sort_list_by" msgid="8635268562263708102">"مرتب‌سازی بر اساس"</string>
+    <string name="display_options_sort_list_by" msgid="8635268562263708102">"مرتب‌سازی براساس"</string>
     <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"نام"</string>
     <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"نام خانوادگی"</string>
     <string name="display_options_view_names_as" msgid="3232196224409242435">"قالب نام"</string>
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"حساب"</string>
     <string name="set_default_account" msgid="3865970860434642695">"همیشه این سیم برای تماس‌ استفاده شود"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"تماس با"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"تماس به همراه یادداشت"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"یادداشتی بنویسید که همراه تماس ارسال شود…"</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ارسال و تماس"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / ‏<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index d2d3a9ad..2cbc9484 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Tili"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Käytä kaikille puheluille"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Valitse puhelinoperaattori:"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Soita ja lähetä muistiinpano"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Kirjoita muistiinpano lähetettäväksi puhelun kanssa…"</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"LÄHETÄ ja SOITA"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index a914f81a..a864ea65 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Compte"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Toujours l\'utiliser pour les appels"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Appeler avec"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Appeler avec une note"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Tapez une note à envoyer avec l\'appel..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ENVOYER ET APPELER"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 0f35f48e..13c85497 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Compte"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Toujours l\'utiliser pour les appels"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Appeler avec"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Appeler avec une note"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Saisissez une note pour accompagner l\'appel..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ENVOYER L\'OBJET ET APPELER"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 98e3a494..ae01ac6f 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Conta"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Usar sempre para as chamadas"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Chamar con"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Chamar cunha nota"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Escribe unha nota para enviala coa chamada…"</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ENVIAR e CHAMAR"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 68d145df..76eb9f02 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"એકાઉન્ટ"</string>
     <string name="set_default_account" msgid="3865970860434642695">"કૉલ્સ માટે આનો ઉપયોગ હંમેશાં કરો"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"આની સાથે કૉલ કરો"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"નોંધ સાથે કૉલ કરો"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"કૉલ સાથે મોકલવા માટે એક નોંધ લખો ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"મોકલો અને કૉલ કરો"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 62dc14b7..5628c28f 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"खाता"</string>
     <string name="set_default_account" msgid="3865970860434642695">"कॉल के लिए हमेशा इसका उपयोग करें"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"इस सिम से कॉल करें"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"नोट के साथ कॉल करें"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"कॉल के साथ भेजने के लिए नोट लिखें ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"भेजें और कॉल करें"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 8deafbaf..bc30d775 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -251,4 +251,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Račun"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Uvijek upotrebljavaj za pozive"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Poziv putem usluge"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Poziv uz bilješku"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Napišite bilješku koju ćete poslati uz poziv..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"POŠALJI I NAZOVI"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 071bacd7..5637fa09 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Fiók"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Mindig ezt használja hívásokhoz"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Hívás a következővel:"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Hívás üzenettel"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Írjon üzenetet, amelyet elküldhetünk a hívással együtt…"</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"KÜLDÉS és HÍVÁS"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="LIMIT">%2$s</xliff:g>/<xliff:g id="COUNT">%1$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 58c300f2..74509b17 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Հաշիվ"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Միշտ օգտագործել սա՝ զանգերի համար"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Զանգահարել հետևյալով"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Գրառումով զանգ"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Մուտքագրեք գրառում՝ զանգի հետ ուղարկելու համար ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ՈՒՂԱՐԿԵԼ ԵՎ ԶԱՆԳԵԼ"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 9fdc9a50..1799c0c0 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Akun"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Selalu gunakan ini untuk telepon"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Telepon dengan"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Telepon dengan catatan"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Ketik catatan untuk dikirim dengan panggilan telepon ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"KIRIM &amp; PANGGILAN"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 538dea26..a1f72bcc 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Reikningur"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Nota þetta alltaf fyrir símtöl"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Hringja með"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Símtal með texta"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Sláðu inn texta til að senda með símtalinu..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"SENDA OG HRINGJA"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index e908d5f6..f3f2efc0 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Account"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Usa sempre questa per chiamare"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Chiama con"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Chiama e invia una nota"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Digita una nota da inviare con la chiamata..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"INVIA E CHIAMA"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 3ab807f3..31f32484 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -252,4 +252,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"חשבון"</string>
     <string name="set_default_account" msgid="3865970860434642695">"השתמש תמיד עבור שיחות"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"התקשר באמצעות"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"התקשר עם הערה"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"הקלד הערה לשליחה עם השיחה..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"שלח והתקשר"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 337d76d2..b382677d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"アカウント"</string>
     <string name="set_default_account" msgid="3865970860434642695">"このSIMを常に通話に使用する"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"発信用の端末アカウントを選択してください"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"メモを添付して発信"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"発信時に送信するメモを入力..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"送信と発信"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g>、<xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index a6e09cc5..4e85dbdb 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"ანგარიში"</string>
     <string name="set_default_account" msgid="3865970860434642695">"ზარებისთვის მუდამ ამის გამოყენება"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"დარეკვა ანგარიშით:"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"ზარი შენიშვნასთან ერთად"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"აკრიფეთ შენიშვნა ზართან ერთად გასაგზავნად ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"გაგზავნა &amp; დარეკვა"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 9b7de2c8..901a3ddd 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Есептік жазба"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Осыны қоңыраулар үшін әрқашан пайд."</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Келесімен қоңырау шалу"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Ескертпе бар қоңырау"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Қоңыраумен жіберу үшін ескертпе теріңіз ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ЖІБЕРУ ЖӘНЕ ҚОҢЫРАУ СОҒУ"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 301d3a46..5677a2ce 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"គណនី"</string>
     <string name="set_default_account" msgid="3865970860434642695">"ប្រើវាសម្រាប់ការហៅជានិច្ច"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"ហៅជាមួយ"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"ការហៅព្រមជាមួយចំណាំ"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"វាយបញ្ចូលចំណាំដែលត្រូវផ្ញើជាមួយការហៅទូរស័ព្ទ ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ផ្ញើ &amp; ហៅទូរស័ព្ទ"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 22203844..76ed95e7 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"ಖಾತೆ"</string>
     <string name="set_default_account" msgid="3865970860434642695">"ಕರೆಗಳನ್ನು ಮಾಡಲು ಯಾವಾಗಲೂ ಇದನ್ನು ಬಳಸಿ"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"ಇದರೊಂದಿಗೆ ಕರೆ ಮಾಡಿ"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"ಟಿಪ್ಪಣಿಯೊಂದಿಗೆ ಕರೆ"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"ಕರೆ ಕಳುಹಿಸಲು ಟಿಪ್ಪಣಿಯನ್ನು ಟೈಪ್ ಮಾಡಿ ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ಕಳುಹಿಸು ಮತ್ತು ಕರೆಮಾಡು"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 6564a29b..716912c8 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"계정"</string>
     <string name="set_default_account" msgid="3865970860434642695">"통화에 항상 사용"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"통화에 사용할 SIM"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"메모가 포함된 통화"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"통화에 함께 전송할 메모를 입력하세요..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"보내기 및 통화"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index a93e8889..b8b13db7 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -255,4 +255,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Каттоо эсеби"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Бул ар дайым чалуулр үчн колдонулсн"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Төмөнкү менен чалуу"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Кыска жазуу менен чалуу"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Чалуу менен жөнөтүлө турган кыска жазууну териңиз …"</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ЖӨНӨТҮҮ ЖАНА ЧАЛУУ"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index ee2ce51d..34bcd797 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"ບັນຊີ"</string>
     <string name="set_default_account" msgid="3865970860434642695">"ໃຊ້ຊິມນີ້ເພື່ອການໂທທຸກເທື່ອ"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"ໂທດ້ວຍ"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"ໂທດ້ວຍບັນທຶກ"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"ພິມບັນທຶກ ເພື່ອສົ່ງກັບການໂທ ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ສົ່ງ ແລະ ໂທ"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 9e1773ee..64a487cd 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -252,4 +252,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Paskyra"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Visada naudoti tai skambučiams"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Skambinkite naudodami"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Skambutis su užrašu"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Įveskite užrašą, kurį galima išsiųsti skambinant..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"SIŲSTI IR SKAMBINTI"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index dd6d29ca..83ebc1ae 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -251,4 +251,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Konts"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Vienmēr izmantot zvaniem"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Zvanīt, izmantojot"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Zvanīt ar piezīmi"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Ierakstiet piezīmi, ko nosūtīt ar zvanu..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"SŪTĪT un ZVANĪT"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> no <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index d535ad36..defae724 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Сметка"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Секогаш користи го ова за повици"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Повикајте со"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Повик со белешка"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Напишете белешка да се испрати со повикот..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ИСПРАТИ И ПОВИКАЈ"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index b56da1a6..394e9e22 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"അക്കൗണ്ട്"</string>
     <string name="set_default_account" msgid="3865970860434642695">"ഇത് എല്ലായ്‌പ്പോഴും കോളുകൾക്കായി ഉപയോഗിക്കുക"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"ഇത് ഉപയോഗിച്ച് വിളിക്കുക"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"കുറിപ്പിനൊപ്പം വിളിക്കുക"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"കോളിനൊപ്പം അയയ്ക്കുന്നതിന് ഒരു കുറിപ്പ് ടൈപ്പുചെയ്യുക ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"അയയ്ക്കുക, വിളിക്കുക"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index f4568d7d..6e2a0096 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -252,4 +252,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Акаунт"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Дуудлагад байнга үүнийг ашиглах"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Залгах"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Тэмдэглэл бүхий дуудлага хийх"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Дуудлаганд илгээх тэмдэглэл бичнэ үү..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ИЛГЭЭХ &amp; ЗАЛГАХ"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 7e83238e..7f5e620e 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"खाते"</string>
     <string name="set_default_account" msgid="3865970860434642695">"कॉलसाठी हे नेहमी वापरा"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"यासह कॉल करा"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"टीपसह कॉल करा"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"कॉलसह पाठविण्‍यासाठी एक टीप टाइप करा..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"पाठवा आणि कॉल करा"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 25573d47..d20f89c2 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -252,4 +252,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Akaun"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Sentiasa gunakan ini untuk panggilan"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Panggil dengan"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Panggilan dengan nota"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Taip nota untuk dihantar dengan panggilan…"</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"HANTAR &amp; PANGGIL"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index b8fb3abd..a7eb5d4e 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"အကောင့်"</string>
     <string name="set_default_account" msgid="3865970860434642695">"ခေါ်ဆိုမှုများ အတွက် အမြဲတမ်း ဒါကို သုံးရန်"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"ဖြင့် ခေါ်ဆိုရန်"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"မှတ်စုတစ်ခုဖြင့် ခေါ်ဆိုမည်"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"ခေါ်ဆိုမှုဖြင့် ပေးပို့ရန် မှတ်စုတစ်ခု ရိုက်ပါ ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ပေးပို့မည် &amp; ခေါ်ဆိုမည်"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 5be2231f..0a205652 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Konto"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Bruk alltid dette for samtaler"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Ring med"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Ring med et notat"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Skriv et notat du vil sende med anropet …"</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"SEND OG RING"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 51b95b91..c83a71d2 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -138,7 +138,7 @@
     <string name="chat_yahoo" msgid="5542489454092719897">"याहुको प्रयोग गरेर च्याट गर्नुहोस्"</string>
     <string name="chat_skype" msgid="3145166404699830256">"स्काइप चलाएर कुराकानी गर्नुहोस्"</string>
     <string name="chat_qq" msgid="2811762660890755082">"QQ चलाएर कुराकानी गर्नुहोस्"</string>
-    <string name="chat_gtalk" msgid="6043734883347741789">"गुगल टक चलाएर कुराकानी गर्नुहोस्"</string>
+    <string name="chat_gtalk" msgid="6043734883347741789">"Google टक चलाएर कुराकानी गर्नुहोस्"</string>
     <string name="chat_icq" msgid="7538190395602030726">"ICQको प्रयोग गरेर च्याट गर्नुहोस्"</string>
     <string name="chat_jabber" msgid="4525546665986350869">"जाब्बरको प्रयोग गरेर च्याट गर्नुहोस्"</string>
     <string name="chat" msgid="6297650784873558837">"कुराकानी"</string>
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"खाता"</string>
     <string name="set_default_account" msgid="3865970860434642695">"कल गर्नका लागि यसको प्रयोग सधैं गर्नुहोस्"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"संग कल"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"टिप्पणीसँगै कल गर्नुहोस्"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"यस कलसँग पठाउन एक टिप्पणी  टाइप गर्नुहोस्"</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"पठाउनुहोस् र कल गर्नुहोस्"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 62bb3295..7318d3f1 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -63,7 +63,7 @@
     <string name="sms_mms" msgid="4887206338311086612">"Sms\'en naar MMS"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Videogesprek starten"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Lijst regelmatige contacten wissen?"</string>
-    <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"U wist de lijst met contacten waarmee u regelmatig contact opneemt in de apps Contacten en Telefoon, en e-mailapps moeten uw voorkeursadressen weer opnieuw leren."</string>
+    <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Je wist de lijst met contacten waarmee je regelmatig contact opneemt in de apps Contacten en Telefoon, en e-mailapps moeten je voorkeursadressen weer opnieuw leren."</string>
     <string name="clearFrequentsProgress_title" msgid="3738406170865048982">"Regelmatige contacten wissen..."</string>
     <string name="status_available" msgid="4832569677396634846">"Beschikbaar"</string>
     <string name="status_away" msgid="6267905184545881094">"Niet beschikbaar"</string>
@@ -153,7 +153,7 @@
     <string name="menu_sync_remove" msgid="6581565236520430269">"Synchronisatiegroep verwijderen"</string>
     <string name="dialog_sync_add" msgid="1795682729089027675">"Synchronisatiegroep toevoegen"</string>
     <string name="display_more_groups" msgid="6304997485733158224">"Meer groepen…"</string>
-    <string name="display_warn_remove_ungrouped" msgid="7297678747857509619">"Als u \'<xliff:g id="GROUP">%s</xliff:g>\' verwijdert uit de synchronisatie, worden ook contacten die niet bij een groep horen uit de synchronisatie verwijderd."</string>
+    <string name="display_warn_remove_ungrouped" msgid="7297678747857509619">"Als je \'<xliff:g id="GROUP">%s</xliff:g>\' verwijdert uit de synchronisatie, worden ook contacten die niet bij een groep horen uit de synchronisatie verwijderd."</string>
     <string name="savingDisplayGroups" msgid="6863012138107446030">"Weergaveopties opslaan..."</string>
     <string name="menu_done" msgid="32470053723443112">"Gereed"</string>
     <string name="menu_doNotSave" msgid="6012426160993364871">"Annuleren"</string>
@@ -172,7 +172,7 @@
     <string name="fail_reason_could_not_open_file" msgid="7041148341788958325">"Kan \'<xliff:g id="FILE_NAME">%s</xliff:g>\' niet openen: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
     <string name="fail_reason_could_not_initialize_exporter" msgid="1231982631020480035">"Kan het exportprogramma niet starten: \'<xliff:g id="EXACT_REASON">%s</xliff:g>\'."</string>
     <string name="fail_reason_no_exportable_contact" msgid="3717046989062541369">"Er is geen contact dat kan worden geëxporteerd."</string>
-    <string name="missing_required_permission" msgid="3120850759881656369">"U heeft een vereist recht uitgeschakeld."</string>
+    <string name="missing_required_permission" msgid="3120850759881656369">"Je hebt een vereist recht uitgeschakeld."</string>
     <string name="fail_reason_error_occurred_during_export" msgid="8426833603664168716">"Er is een fout opgetreden tijdens het exporteren: \'<xliff:g id="EXACT_REASON">%s</xliff:g>\'."</string>
     <string name="fail_reason_too_long_filename" msgid="3996610741248972232">"Vereiste bestandsnaam is te lang (\'<xliff:g id="FILENAME">%s</xliff:g>\')."</string>
     <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="8720294715223591581">"Er staan te veel vCard-bestanden in de opslag."</string>
@@ -187,10 +187,10 @@
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Contacten geëxporteerd."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Exporteren van <xliff:g id="FILENAME">%s</xliff:g> geannuleerd."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Contactgegevens exporteren"</string>
-    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Uw contactgegevens worden geëxporteerd naar: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Je contactgegevens worden geëxporteerd naar: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Kan databasegegevens niet ophalen."</string>
-    <string name="composer_has_no_exportable_contact" product="tablet" msgid="1534625366506752907">"Er zijn geen exporteerbare contacten. Als u wel contacten op uw tablet heeft opgeslagen, staat uw gegevensprovider het exporteren van contacten van de tablet mogelijk niet toe."</string>
-    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Er zijn geen exporteerbare contacten. Als u wel contacten op uw telefoon heeft opgeslagen, staat uw gegevensprovider het exporteren van contacten van de telefoon mogelijk niet toe."</string>
+    <string name="composer_has_no_exportable_contact" product="tablet" msgid="1534625366506752907">"Er zijn geen exporteerbare contacten. Als je wel contacten op je tablet hebt opgeslagen, staat je gegevensprovider het exporteren van contacten van de tablet mogelijk niet toe."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Er zijn geen exporteerbare contacten. Als je wel contacten op je telefoon hebt opgeslagen, staat je gegevensprovider het exporteren van contacten van de telefoon mogelijk niet toe."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"De vCard-editor is niet correct gestart."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Kan niet exporteren"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"De contactgegevens zijn niet geëxporteerd.\nReden: \'<xliff:g id="FAIL_REASON">%s</xliff:g>\'"</string>
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Account"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Altijd gebruiken voor oproepen"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Bellen met"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Oproep met een notitie"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Typ een notitie om te verzenden met de oproep..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"VERZENDEN EN BELLEN"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 3ea636e4..64f6910b 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"ਖਾਤਾ"</string>
     <string name="set_default_account" msgid="3865970860434642695">"ਕਾਲਾਂ ਲਈ ਹਮੇਸ਼ਾਂ ਇਹ ਵਰਤੋ"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"ਇਸਦੇ ਨਾਲ ਕਾਲ ਕਰੋ"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"ਕੋਈ ਨੋਟ ਦੇ ਨਾਲ ਕਾਲ ਕਰੋ"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"ਕਾਲ ਦੇ ਨਾਲ ਭੇਜਣ ਲਈ ਕੋਈ ਨੋਟ ਟਾਈਪ ਕਰੋ ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ਭੇਜੋ ਅਤੇ ਕਾਲ ਕਰੋ"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 607d48ae..895ef56d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -252,4 +252,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Konto"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Zawsze używaj do połączeń"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Zadzwoń, używając"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Połącz i wyślij notatkę"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Wpisz notatkę, którą chcesz wysłać razem z połączeniem..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"WYŚLIJ I POŁĄCZ"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 8d0a728e..9c4590ba 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Conta"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Sempre usar esta opção para chamadas"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Ligar com"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Chamada com uma nota"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Escreva uma nota para enviar com a chamada..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ENVIAR E LIGAR"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 6d80db8e..35f29faa 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Conta"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Utilizar sempre este para chamadas"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Ao telefone com"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Ligar com uma nota"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Escrever uma nota para enviar com a chamada..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ENVIAR E LIGAR"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 8d0a728e..9c4590ba 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Conta"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Sempre usar esta opção para chamadas"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Ligar com"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Chamada com uma nota"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Escreva uma nota para enviar com a chamada..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ENVIAR E LIGAR"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 2521d838..44aea48d 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -40,27 +40,27 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Apelaţi numărul de pager de serviciu"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Apelaţi <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Apelaţi MMS"</string>
-    <string name="sms_custom" msgid="4601748252470175865">"Trimiteţi un mesaj text către <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="7765831490534280540">"Trimiteţi un mesaj text către telefonul de domiciliu"</string>
-    <string name="sms_mobile" msgid="8387632124165893103">"Trimiteţi un mesaj text către numărul de mobil"</string>
-    <string name="sms_work" msgid="3910570578912367742">"Trimiteţi un mesaj text către numărul de serviciu"</string>
-    <string name="sms_fax_work" msgid="909086167151248212">"Trimiteţi un mesaj text către un număr de fax de serviciu"</string>
-    <string name="sms_fax_home" msgid="4145442497939634875">"Trimiteţi un mesaj text către un număr de fax de domiciliu"</string>
-    <string name="sms_pager" msgid="5664381349583724906">"Trimiteţi un mesaj text către un număr de pager"</string>
-    <string name="sms_other" msgid="910895193552957097">"Trimiteţi un mesaj text"</string>
-    <string name="sms_callback" msgid="728414485478941361">"Trimiteţi un mesaj text către un număr cu apelare inversă"</string>
-    <string name="sms_car" msgid="8543669230270954512">"Trimiteţi un mesaj text către un număr de telefon de maşină"</string>
-    <string name="sms_company_main" msgid="5441902128445061862">"Trimiteţi un mesaj text către numărul principal al companiei"</string>
-    <string name="sms_isdn" msgid="7142483128948042667">"Trimiteţi un mesaj text către un număr ISDN"</string>
-    <string name="sms_main" msgid="6815987840926184815">"Trimiteţi un mesaj text către numărul principal"</string>
-    <string name="sms_other_fax" msgid="8649822154879781466">"Trimiteţi un mesaj text către un număr de fax"</string>
-    <string name="sms_radio" msgid="8750339218480745940">"Trimiteţi un mesaj text către un număr radio"</string>
-    <string name="sms_telex" msgid="5469333785775443999">"Trimiteţi un mesaj text către un număr de telex"</string>
-    <string name="sms_tty_tdd" msgid="5057886576150816002">"Trimiteţi un mesaj text către TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="8426872094268475047">"Trimiteţi un mesaj text către numărul de mobil de serviciu"</string>
-    <string name="sms_work_pager" msgid="499303540738557836">"Trimiteţi un mesaj text către un număr de pager de serviciu"</string>
-    <string name="sms_assistant" msgid="2677586547377136683">"Trimiteţi un mesaj text către <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="4887206338311086612">"Trimiteţi un mesaj text către un număr MMS"</string>
+    <string name="sms_custom" msgid="4601748252470175865">"Trimiteți un mesaj text către <xliff:g id="CUSTOM">%s</xliff:g>"</string>
+    <string name="sms_home" msgid="7765831490534280540">"Trimiteți un mesaj text către telefonul de domiciliu"</string>
+    <string name="sms_mobile" msgid="8387632124165893103">"Trimiteți un mesaj text către numărul de mobil"</string>
+    <string name="sms_work" msgid="3910570578912367742">"Trimiteți un mesaj text către numărul de serviciu"</string>
+    <string name="sms_fax_work" msgid="909086167151248212">"Trimiteți un mesaj text către un număr de fax de serviciu"</string>
+    <string name="sms_fax_home" msgid="4145442497939634875">"Trimiteți un mesaj text către un număr de fax de domiciliu"</string>
+    <string name="sms_pager" msgid="5664381349583724906">"Trimiteți un mesaj text către un număr de pager"</string>
+    <string name="sms_other" msgid="910895193552957097">"Trimiteți un mesaj text"</string>
+    <string name="sms_callback" msgid="728414485478941361">"Trimiteți un mesaj text către un număr cu apelare inversă"</string>
+    <string name="sms_car" msgid="8543669230270954512">"Trimiteți un mesaj text către un număr de telefon de maşină"</string>
+    <string name="sms_company_main" msgid="5441902128445061862">"Trimiteți un mesaj text către numărul principal al companiei"</string>
+    <string name="sms_isdn" msgid="7142483128948042667">"Trimiteți un mesaj text către un număr ISDN"</string>
+    <string name="sms_main" msgid="6815987840926184815">"Trimiteți un mesaj text către numărul principal"</string>
+    <string name="sms_other_fax" msgid="8649822154879781466">"Trimiteți un mesaj text către un număr de fax"</string>
+    <string name="sms_radio" msgid="8750339218480745940">"Trimiteți un mesaj text către un număr radio"</string>
+    <string name="sms_telex" msgid="5469333785775443999">"Trimiteți un mesaj text către un număr de telex"</string>
+    <string name="sms_tty_tdd" msgid="5057886576150816002">"Trimiteți un mesaj text către TTY/TDD"</string>
+    <string name="sms_work_mobile" msgid="8426872094268475047">"Trimiteți un mesaj text către numărul de mobil de serviciu"</string>
+    <string name="sms_work_pager" msgid="499303540738557836">"Trimiteți un mesaj text către un număr de pager de serviciu"</string>
+    <string name="sms_assistant" msgid="2677586547377136683">"Trimiteți un mesaj text către <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
+    <string name="sms_mms" msgid="4887206338311086612">"Trimiteți un mesaj text către un număr MMS"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Inițiați un apel video"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Ștergeţi pers. frecvent contactate?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Veți șterge lista persoanelor contactate frecvent din aplicațiile Agendă și Telefon și veți forța aplicațiile de e-mail să vă învețe preferințele pentru adrese de la zero."</string>
@@ -104,9 +104,9 @@
     <string name="name_phonetic_family" msgid="1572398622239414464">"Nume fonetic"</string>
     <string name="phoneLabelsGroup" msgid="7913782787902007482">"Telefon"</string>
     <string name="emailLabelsGroup" msgid="4696310712601184208">"Adrese de e-mail"</string>
-    <string name="postalLabelsGroup" msgid="3727124282406728557">"Adrese poştale"</string>
+    <string name="postalLabelsGroup" msgid="3727124282406728557">"Adrese poștale"</string>
     <string name="imLabelsGroup" msgid="8733603247535725786">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="961008074745871784">"Organizaţie"</string>
+    <string name="organizationLabelsGroup" msgid="961008074745871784">"Organizație"</string>
     <string name="relationLabelsGroup" msgid="3585294036166325520">"Relaţie"</string>
     <string name="eventLabelsGroup" msgid="5633007096910029346">"Date speciale"</string>
     <string name="sms" msgid="8086289395154598654">"Mesaj text"</string>
@@ -117,12 +117,12 @@
     <string name="label_sip_address" msgid="3754551597798479318">"SIP"</string>
     <string name="websiteLabelsGroup" msgid="8620657380165071493">"Site web"</string>
     <string name="groupsLabel" msgid="3574316547053047551">"Grupuri"</string>
-    <string name="email_home" msgid="2230967805906450693">"Trimiteţi un e-mail la o adresă de e-mail de domiciliu"</string>
-    <string name="email_mobile" msgid="7532438378678903685">"Trimiteţi un e-mail către un telefon mobil"</string>
-    <string name="email_work" msgid="7065971921227432400">"Trimiteţi un e-mail la o adresă de e-mail de serviciu"</string>
-    <string name="email_other" msgid="4601881243553289615">"Trimiteţi un e-mail"</string>
-    <string name="email_custom" msgid="5777583741581538870">"Trimiteţi un e-mail la <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="5624424151176351591">"Trimiteţi un e-mail"</string>
+    <string name="email_home" msgid="2230967805906450693">"Trimiteți un e-mail la o adresă de e-mail de domiciliu"</string>
+    <string name="email_mobile" msgid="7532438378678903685">"Trimiteți un e-mail către un telefon mobil"</string>
+    <string name="email_work" msgid="7065971921227432400">"Trimiteți un e-mail la o adresă de e-mail de serviciu"</string>
+    <string name="email_other" msgid="4601881243553289615">"Trimiteți un e-mail"</string>
+    <string name="email_custom" msgid="5777583741581538870">"Trimiteți un e-mail la <xliff:g id="CUSTOM">%s</xliff:g>"</string>
+    <string name="email" msgid="5624424151176351591">"Trimiteți un e-mail"</string>
     <string name="postal_street" msgid="881349814077356134">"Stradă"</string>
     <string name="postal_pobox" msgid="1799978742074885091">"Căsuţă poştală"</string>
     <string name="postal_neighborhood" msgid="3721092668038527674">"Cartier"</string>
@@ -144,7 +144,7 @@
     <string name="chat_jabber" msgid="4525546665986350869">"Conversaţi prin Jabber"</string>
     <string name="chat" msgid="6297650784873558837">"Conversaţi prin chat"</string>
     <string name="description_minus_button" msgid="2142439445814730827">"ştergeţi"</string>
-    <string name="expand_collapse_name_fields_description" msgid="5073419090665464541">"Extindeţi sau restrângeţi câmpurile pentru nume"</string>
+    <string name="expand_collapse_name_fields_description" msgid="5073419090665464541">"Extindeţi sau restrângeți câmpurile pentru nume"</string>
     <string name="list_filter_all_accounts" msgid="4265359896628915784">"Toată agenda"</string>
     <string name="list_filter_all_starred" msgid="9060325494254507806">"Cu stea"</string>
     <string name="list_filter_customize" msgid="2352794292558465089">"Personalizați"</string>
@@ -251,4 +251,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Cont"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Utilizați mereu pentru apeluri"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Apelați cu"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Apelați împreună cu o notă"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Introduceți o notă ca să o trimiteți împreună cu apelul..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"TRIMITEȚI ȘI APELAȚI"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 7e47a1d7..73b640fa 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -252,4 +252,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Аккаунт"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Всегда использовать для звонков"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Аккаунт для звонка"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Написать сообщение абоненту"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Введите текст…"</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ОТПРАВИТЬ СООБЩЕНИЕ И ПОЗВОНИТЬ"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 61e620f4..bc1513e5 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"ගිණුම"</string>
     <string name="set_default_account" msgid="3865970860434642695">"ඇමතුම් සඳහා මෙම එක සැමවිටම භාවිතා කරන්න"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"සමඟ අමතන්න"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"සටහනක් සමගින් අමතන්න"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"ඇමතුම සමග යැවීමට සටහනක් ටයිප් කරන්න ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"යවන්න සහ අමතන්න"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 6fff3d4e..e1810803 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -252,4 +252,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Účet"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Vždy používať pre hovory"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Volať pomocou"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Hovor s poznámkou"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Napíšte poznámku, ktorá sa odošle s hovorom..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ODOSLAŤ A VOLAŤ"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 79c9bf3f..f265ebfb 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -252,4 +252,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Račun"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Vedno uporabi to možnost za klice"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Klicanje z …"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Klic z zapiskom"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Vnesite zapisek, ki ga želite poslati s klicem ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"POŠLJI IN KLIČI"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index 52fbc70e..d0d2d83e 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Llogaria"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Përdor gjithmonë këtë për telefonatat"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Telefono me"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Telefono me shënim"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Shkruaj një shënim për të dërguar një telefonatë..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"DËRGO DHE TELEFONO"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 432efefe..04db8808 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -251,4 +251,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Налог"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Увек користи ово за позиве"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Позови помоћу"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Позив са белешком"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Унесите белешку коју ћете послати уз позив..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ПОШАЉИ И ПОЗОВИ"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index caca111d..9b8e8808 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Konto"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Använd alltid för samtal"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Ring med"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Ring med anteckning"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Gör en anteckning som skickas när du ringer …"</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"SKICKA OCH RING"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index a3d683f3..28115aab 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -252,4 +252,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Akaunti"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Tumia hii kwa simu wakati wote"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Piga simu ukitumia"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Piga simu inayoambatana na dokezo"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Andika dokezo litakaloambatana na simu utakayopiga ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"TUMA na UPIGE SIMU"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 2ff6eef9..8b1534ef 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"கணக்கு"</string>
     <string name="set_default_account" msgid="3865970860434642695">"அழைப்புகளுக்கு எப்போதும் இதைப் பயன்படுத்து"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"இதன் மூலம் அழை"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"குறிப்புடன் அழைக்கவும்"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"அழைப்புடன் சேர்த்து அனுப்ப, குறிப்பை உள்ளிடவும்..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"அனுப்பு &amp; அழை"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 51aaa723..d9a114bd 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"ఖాతా"</string>
     <string name="set_default_account" msgid="3865970860434642695">"కాల్‌ల కోసం ఎల్లప్పుడూ దీన్ని ఉపయోగించు"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"దీనితో కాల్ చేయండి"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"గమనికతో కాల్ చేయి"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"కాల్‌తో పాటు పంపడానికి గమనికను టైప్ చేయండి ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"పంపు &amp; కాల్ చేయి"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 2578afaa..6bdba386 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"บัญชี"</string>
     <string name="set_default_account" msgid="3865970860434642695">"ใช้ในการโทรทุกครั้ง"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"โทรด้วย"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"โทรพร้อมโน้ต"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"พิมพ์โน้ตเพื่อส่งพร้อมการโทร ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ส่งและโทร"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 7ae10469..e7afa813 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Account"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Gamitin ito palagi sa mga tawag"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Tumawag gamit ang"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Tumawag nang may kasamang tala"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Mag-type ng isang tala na ipadadala kasama ng tawag ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"IPADALA &amp; TUMAWAG"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 7db3dff7..9a69d43f 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Hesap"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Çağrılar için her zaman bunu kullan"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Çağrıyı şununla yap:"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Notla telefon et"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Çağrıyla göndermek için bir not yazın..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"GÖNDER VE TELEFON ET"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index d7947cd9..7c0b2e14 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -252,4 +252,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Обліковий запис"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Завжди використовувати для дзвінків"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Телефонувати за допомогою"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Зателефонувати й надіслати нотатку"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Введіть нотатку, яку хочете надіслати під час дзвінка…"</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"ЗАТЕЛЕФОНУВАТИ Й НАДІСЛАТИ"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> з <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 79680c55..351f7b5c 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"اکاؤنٹ"</string>
     <string name="set_default_account" msgid="3865970860434642695">"کالز کیلئے ہمیشہ اس کا استعمال کریں"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"کال کریں مع"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"ایک نوٹ کے ساتھ کال کریں"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"کال کے ساتھ بھیجنے کیلئے ایک نوٹ ٹائپ کریں…"</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"بھیجیں اور کال کریں"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index e3853f42..77652aa8 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -134,7 +134,7 @@
     <string name="map_other" msgid="55098598855607997">"Manzilni ko‘rish"</string>
     <string name="map_custom" msgid="4943554530347163288">"<xliff:g id="CUSTOM">%s</xliff:g> manzillarni ko‘rish"</string>
     <string name="chat_aim" msgid="6479001490307452172">"AIM’da suhbatlashish"</string>
-    <string name="chat_msn" msgid="627481952525245054">"Windows Live’da suhbatlashish"</string>
+    <string name="chat_msn" msgid="627481952525245054">"Windows Live orqali chat"</string>
     <string name="chat_yahoo" msgid="5542489454092719897">"Yahoo’da suhbatlashish"</string>
     <string name="chat_skype" msgid="3145166404699830256">"Skype’da suhbatlashish"</string>
     <string name="chat_qq" msgid="2811762660890755082">"QQ’da suhbatlashish"</string>
@@ -228,7 +228,7 @@
     <string name="dialog_import_export" msgid="1125776851100740858">"Kontaktlarni import/eksport qilish"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Kontaktlarni import qilish"</string>
     <string name="share_error" msgid="665756457151793108">"Kontaktni yuborib bo‘lmadi."</string>
-    <string name="menu_search" msgid="7464453023659824700">"Izlash"</string>
+    <string name="menu_search" msgid="7464453023659824700">"Qidirish"</string>
     <string name="menu_contacts_filter" msgid="586356478145511794">"Kontaktlarni filtrlash"</string>
     <string name="activity_title_contacts_filter" msgid="7689519428197855166">"Kontaktlarni filtrlash"</string>
     <string name="custom_list_filter" msgid="582616656313514803">"Kontaktlar guruhini tanlang"</string>
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Hisob"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Har doim qo‘ng‘iroqlar u-n foyd-sin"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Ushbu bilan qo‘ng‘iroq qilish"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Qo‘ng‘iroq va izoh"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Qo‘ng‘iroqqa qo‘shib yuborish uchun izoh yozing ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"YUBORISH va QO‘NG‘IROQ QILISH"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index a09c714e..1c36be1c 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"Tài khoản"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Luôn sử dụng SIM này để gọi"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Gọi bằng"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Gọi điện kèm theo ghi chú"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Nhập ghi chú để gửi kèm cuộc gọi..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"GỬI VÀ GỌI"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index bc9d5383..6624fa5d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -283,4 +283,9 @@
     <string name="no_ip_number_on_sim_card">SIM卡上没有IP号</string>
     <string name="ipcall_dialog_title">IP电话设置</string>
     <string name="ipcall_dialog_edit_hint">请输入IP电话前缀</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"拨打电话时发送记事"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"输入可在拨打电话时发送的记事…"</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"发送记事并拨打电话"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 2cd0575b..aa292b11 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"帳戶"</string>
     <string name="set_default_account" msgid="3865970860434642695">"永遠使用這張 SIM 卡通話"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"選取用於撥號的 SIM 卡："</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"撥號時傳送筆記"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"撥號時可以書寫和傳送筆記…"</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"傳送和撥號"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 3e5ef1ab..db5e6c86 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -270,4 +270,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"帳戶"</string>
     <string name="set_default_account" msgid="3865970860434642695">"一律使用這張 SIM 卡通話"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"選擇通話帳戶"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"撥號時傳送備註"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"輸入可在撥號時傳送的備註..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"傳送並撥號"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index e5c096a1..42e6ccbf 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -250,4 +250,9 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"I-Akhawunti"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Njalo sebenzisa lokhu kumakholi"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Shaya nge"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"Shaya ngenothi"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"Thayipha inothi ukuthumela nekholi ..."</string>
+    <string name="send_and_call_button" msgid="7459507823002185202">"THUMELA FUTHI USHAYE"</string>
+    <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e50be6a9..0dc85b51 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -151,4 +151,19 @@
     <!-- Color of the background of the contact detail and editor pages -->
     <color name="background_primary">#f9f9f9</color>
     <color name="contact_all_list_background_color">#FFFFFF</color>
+
+    <!-- Text color used for character counter when the max limit has been exceeded -->
+    <color name="call_subject_limit_exceeded">#d1041c</color>
+
+    <!-- Tint color for the call subhect history icon. -->
+    <color name="call_subject_history_icon">#000000</color>
+
+    <!-- Divider line on the call subhect dialog. -->
+    <color name="call_subject_divider">#d8d8d8</color>
+
+    <!-- Text color for the SEND & CALL button on the call subject dialog. -->
+    <color name="call_subject_button">#00c853</color>
+
+    <!-- Background color for the call subject history view. -->
+    <color name="call_subject_history_background">#ffffff</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f06cd215..8d612ff1 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -145,4 +145,20 @@
     <dimen name="search_shortcut_radius">40dp</dimen>
 
     <dimen name="contact_list_card_elevation">2dp</dimen>
+
+    <!-- Padding used around the periphery of the call subject dialog, as well as in between the
+         items. -->
+    <dimen name="call_subject_dialog_margin">20dp</dimen>
+    <!-- Padding used between lines of text in the call subject dialog. -->
+    <dimen name="call_subject_dialog_between_line_margin">8dp</dimen>
+    <!-- Size of the contact photo in the call subject dialog. -->
+    <dimen name="call_subject_dialog_contact_photo_size">50dp</dimen>
+    <!-- Margin above the edit text in the call subject dialog. -->
+    <dimen name="call_subject_dialog_edit_spacing">60dp</dimen>
+    <!-- Size of primary text in the call subject dialog. -->
+    <dimen name="call_subject_dialog_primary_text_size">16sp</dimen>
+    <!-- Size of secondary text in the call subject dialog. -->
+    <dimen name="call_subject_dialog_secondary_text_size">14sp</dimen>
+    <!-- Row padding for call subject history items. -->
+    <dimen name="call_subject_history_item_padding">15dp</dimen>
 </resources>
diff --git a/res/values/integers.xml b/res/values/integers.xml
index fc1209fa..f3d1e748 100644
--- a/res/values/integers.xml
+++ b/res/values/integers.xml
@@ -30,4 +30,7 @@
     <!-- Layout weight of card in contact list view.
     Default to 0 to indicate no padding -->
     <integer name="contact_list_card_layout_weight">0</integer>
+
+    <!-- Duration of the animations on the call subject dialog. -->
+    <integer name="call_subject_animation_duration">250</integer>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index dd5cefbf..57cb7824 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -841,4 +841,24 @@ a        ren't members of any other group. [CHAR LIMIT=25] -->
     <string name="import_contacts_sim">Import contacts from SIM?</string>
     <string name="import_contacts_sim_confirm">Import</string>
     <string name="import_contacts_sim_cancel">Cancel</string>
+
+    <!-- String used for actions in the dialer call log and the quick contact card to initiate
+         a call to an individual.  The user is prompted to enter a note which is sent along with
+         the call (e.g. a call subject). [CHAR LIMIT=40] -->
+    <string name="call_with_a_note">Call with a note</string>
+
+    <!-- Hint text shown in the call subject dialog. [CHAR LIMIT=255] -->
+    <string name="call_subject_hint">Type a note to send with call ...</string>
+
+    <!-- Button used to start a new call with the user entered subject. [CHAR LIMIT=32] -->
+    <string name="send_and_call_button">SEND &amp; CALL</string>
+
+    <!-- String used to represent the total number of characters entered for a call subject,
+         compared to the character limit.  Example: 2 / 64 -->
+    <string name="call_subject_limit"><xliff:g id="count" example="4">%1$s</xliff:g> / <xliff:g id="limit" example="64">%2$s</xliff:g></string>
+
+    <!-- String used to build a phone number bype and phone number string.
+         Example: Mobile • 650-555-1212  -->
+    <string name="call_subject_type_and_number"><xliff:g id="type" example="Mobile">%1$s</xliff:g> • <xliff:g id="number" example="(650) 555-1212">%2$s</xliff:g></string>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7e1127d4..77c4677c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -88,4 +88,19 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar
         <item name="android:windowNoDisplay">false</item>
         <item name="android:windowIsFloating">true</item>
     </style>
+
+    <style name="Theme.CallSubjectDialogTheme" parent="@android:style/Theme.Material.Light.Dialog">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+
+        <!-- No backgrounds, titles or window float -->
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowElevation">0dp</item>
+    </style>
 </resources>
diff --git a/src/com/android/contacts/common/CallUtil.java b/src/com/android/contacts/common/CallUtil.java
index 7d131946..7585ad4a 100644
--- a/src/com/android/contacts/common/CallUtil.java
+++ b/src/com/android/contacts/common/CallUtil.java
@@ -47,6 +47,21 @@ public class CallUtil {
      * Return an Intent for making a phone call. Scheme (e.g. tel, sip) will be determined
      * automatically.
      */
+    public static Intent getCallWithSubjectIntent(String number,
+            PhoneAccountHandle phoneAccountHandle, String callSubject) {
+
+        final Intent intent = getCallIntent(getCallUri(number));
+        intent.putExtra(TelecomManager.EXTRA_CALL_SUBJECT, callSubject);
+        if (phoneAccountHandle != null) {
+            intent.putExtra(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE, phoneAccountHandle);
+        }
+        return intent;
+    }
+
+    /**
+     * Return an Intent for making a phone call. Scheme (e.g. tel, sip) will be determined
+     * automatically.
+     */
     public static Intent getCallIntent(String number) {
         return getCallIntent(number, null);
     }
@@ -146,4 +161,29 @@ public class CallUtil {
         return context.getResources().getInteger(
                 R.integer.config_enable_video_calling);
     }
+
+    /**
+     * Determines if one of the call capable phone accounts defined supports calling with a subject
+     * specified.
+     *
+     * @param context The context.
+     * @return {@code true} if one of the call capable phone accounts supports calling with a
+     *      subject specified, {@code false} otherwise.
+     */
+    public static boolean isCallWithSubjectSupported(Context context) {
+        TelecomManager telecommMgr = (TelecomManager)
+                context.getSystemService(Context.TELECOM_SERVICE);
+        if (telecommMgr == null) {
+            return false;
+        }
+
+        List<PhoneAccountHandle> accountHandles = telecommMgr.getCallCapablePhoneAccounts();
+        for (PhoneAccountHandle accountHandle : accountHandles) {
+            PhoneAccount account = telecommMgr.getPhoneAccount(accountHandle);
+            if (account != null && account.hasCapabilities(PhoneAccount.CAPABILITY_CALL_SUBJECT)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/src/com/android/contacts/common/dialog/CallSubjectDialog.java b/src/com/android/contacts/common/dialog/CallSubjectDialog.java
new file mode 100644
index 00000000..fd041dd9
--- /dev/null
+++ b/src/com/android/contacts/common/dialog/CallSubjectDialog.java
@@ -0,0 +1,561 @@
+/*
+ * Copyright (C) 2015 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.contacts.common.dialog;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.os.ResultReceiver;
+import android.preference.PreferenceManager;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.text.Editable;
+import android.text.InputFilter;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.QuickContactBadge;
+import android.widget.TextView;
+
+import com.android.contacts.common.CallUtil;
+import com.android.contacts.common.ContactPhotoManager;
+import com.android.contacts.common.R;
+import com.android.contacts.common.util.UriUtils;
+import com.android.phone.common.animation.AnimUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Implements a dialog which prompts for a call subject for an outgoing call.  The dialog includes
+ * a pop up list of historical call subjects.
+ */
+public class CallSubjectDialog extends Activity {
+    private static final String TAG = "CallSubjectDialog";
+    private static final int CALL_SUBJECT_LIMIT = 16;
+    private static final int CALL_SUBJECT_HISTORY_SIZE = 5;
+
+    private static final int REQUEST_SUBJECT = 1001;
+
+    public static final String PREF_KEY_SUBJECT_HISTORY_COUNT = "subject_history_count";
+    public static final String PREF_KEY_SUBJECT_HISTORY_ITEM = "subject_history_item";
+
+    /**
+     * Activity intent argument bundle keys:
+     */
+    public static final String ARG_PHOTO_ID = "PHOTO_ID";
+    public static final String ARG_PHOTO_URI = "PHOTO_URI";
+    public static final String ARG_CONTACT_URI = "CONTACT_URI";
+    public static final String ARG_NAME_OR_NUMBER = "NAME_OR_NUMBER";
+    public static final String ARG_IS_BUSINESS = "IS_BUSINESS";
+    public static final String ARG_NUMBER = "NUMBER";
+    public static final String ARG_DISPLAY_NUMBER = "DISPLAY_NUMBER";
+    public static final String ARG_NUMBER_LABEL = "NUMBER_LABEL";
+    public static final String ARG_PHONE_ACCOUNT_HANDLE = "PHONE_ACCOUNT_HANDLE";
+
+    private int mAnimationDuration;
+    private View mBackgroundView;
+    private View mDialogView;
+    private QuickContactBadge mContactPhoto;
+    private TextView mNameView;
+    private TextView mNumberView;
+    private EditText mCallSubjectView;
+    private TextView mCharacterLimitView;
+    private View mHistoryButton;
+    private View mSendAndCallButton;
+    private ListView mSubjectList;
+
+    private int mLimit = CALL_SUBJECT_LIMIT;
+    private int mPhotoSize;
+    private SharedPreferences mPrefs;
+    private List<String> mSubjectHistory;
+
+    private long mPhotoID;
+    private Uri mPhotoUri;
+    private Uri mContactUri;
+    private String mNameOrNumber;
+    private boolean mIsBusiness;
+    private String mNumber;
+    private String mDisplayNumber;
+    private String mNumberLabel;
+    private PhoneAccountHandle mPhoneAccountHandle;
+
+    /**
+     * Handles changes to the text in the subject box.  Ensures the character limit is updated.
+     */
+    private final TextWatcher mTextWatcher = new TextWatcher() {
+        @Override
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            // no-op
+        }
+
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+            updateCharacterLimit();
+        }
+
+        @Override
+        public void afterTextChanged(Editable s) {
+            // no-op
+        }
+    };
+
+    /**
+     * Click listener which handles user clicks outside of the dialog.
+     */
+    private View.OnClickListener mBackgroundListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            finish();
+        }
+    };
+
+    /**
+     * Handles displaying the list of past call subjects.
+     */
+    private final View.OnClickListener mHistoryOnClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            hideSoftKeyboard(CallSubjectDialog.this, mCallSubjectView);
+            showCallHistory(mSubjectList.getVisibility() == View.GONE);
+        }
+    };
+
+    /**
+     * Handles starting a call with a call subject specified.
+     */
+    private final View.OnClickListener mSendAndCallOnClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            String subject = mCallSubjectView.getText().toString();
+            Intent intent = CallUtil.getCallWithSubjectIntent(mNumber, mPhoneAccountHandle,
+                    subject);
+
+            final TelecomManager tm =
+                    (TelecomManager) getSystemService(Context.TELECOM_SERVICE);
+            tm.placeCall(intent.getData(), intent.getExtras());
+
+            mSubjectHistory.add(subject);
+            saveSubjectHistory(mSubjectHistory);
+            finish();
+        }
+    };
+
+    /**
+     * Handles auto-hiding the call history when user clicks in the call subject field to give it
+     * focus.
+     */
+    private final View.OnClickListener mCallSubjectClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            if (mSubjectList.getVisibility() == View.VISIBLE) {
+                showCallHistory(false);
+            }
+        }
+    };
+
+    /**
+     * Item click listener which handles user clicks on the items in the list view.  Dismisses
+     * the activity, returning the subject to the caller and closing the activity with the
+     * {@link Activity#RESULT_OK} result code.
+     */
+    private AdapterView.OnItemClickListener mItemClickListener =
+            new AdapterView.OnItemClickListener() {
+                @Override
+                public void onItemClick(AdapterView<?> arg0, View view, int position, long arg3) {
+                    mCallSubjectView.setText(mSubjectHistory.get(position));
+                    showCallHistory(false);
+                }
+            };
+
+    /**
+     * Show the call subhect dialog given a phone number to dial (e.g. from the dialpad).
+     *
+     * @param activity The activity.
+     * @param number The number to dial.
+     */
+    public static void start(Activity activity, String number) {
+        start(activity,
+                -1 /* photoId */,
+                null /* photoUri */,
+                null /* contactUri */,
+                number /* nameOrNumber */,
+                false /* isBusiness */,
+                number /* number */,
+                null /* displayNumber */,
+                null /* numberLabel */,
+                null /* phoneAccountHandle */);
+    }
+
+    /**
+     * Creates a call subject dialog.
+     *
+     * @param activity The current activity.
+     * @param photoId The photo ID (used to populate contact photo).
+     * @param photoUri The photo Uri (used to populate contact photo).
+     * @param contactUri The Contact URI (used so quick contact can be invoked from contact photo).
+     * @param nameOrNumber The name or number of the callee.
+     * @param isBusiness {@code true} if a business is being called (used for contact photo).
+     * @param number The raw number to dial.
+     * @param displayNumber The number to dial, formatted for display.
+     * @param numberLabel The label for the number (if from a contact).
+     * @param phoneAccountHandle The phone account handle.
+     */
+    public static void start(Activity activity, long photoId, Uri photoUri, Uri contactUri,
+            String nameOrNumber, boolean isBusiness, String number, String displayNumber,
+            String numberLabel, PhoneAccountHandle phoneAccountHandle) {
+        Bundle arguments = new Bundle();
+        arguments.putLong(ARG_PHOTO_ID, photoId);
+        arguments.putParcelable(ARG_PHOTO_URI, photoUri);
+        arguments.putParcelable(ARG_CONTACT_URI, contactUri);
+        arguments.putString(ARG_NAME_OR_NUMBER, nameOrNumber);
+        arguments.putBoolean(ARG_IS_BUSINESS, isBusiness);
+        arguments.putString(ARG_NUMBER, number);
+        arguments.putString(ARG_DISPLAY_NUMBER, displayNumber);
+        arguments.putString(ARG_NUMBER_LABEL, numberLabel);
+        arguments.putParcelable(ARG_PHONE_ACCOUNT_HANDLE, phoneAccountHandle);
+        start(activity, arguments);
+    }
+
+    /**
+     * Shows the call subject dialog given a Bundle containing all the arguments required to
+     * display the dialog (e.g. from Quick Contacts).
+     *
+     * @param activity The activity.
+     * @param arguments The arguments bundle.
+     */
+    public static void start(Activity activity, Bundle arguments) {
+        Intent intent = new Intent(activity, CallSubjectDialog.class);
+        intent.putExtras(arguments);
+        activity.startActivity(intent);
+    }
+
+    /**
+     * Creates the dialog, inflating the layout and populating it with the name and phone number.
+     *
+     * @param savedInstanceState The last saved instance state of the Fragment,
+     * or null if this is a freshly created Fragment.
+     *
+     * @return Dialog instance.
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mAnimationDuration = getResources().getInteger(R.integer.call_subject_animation_duration);
+        mPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+        mPhotoSize = getResources().getDimensionPixelSize(
+                R.dimen.call_subject_dialog_contact_photo_size);
+        readArguments();
+        mSubjectHistory = loadSubjectHistory(mPrefs);
+
+        setContentView(R.layout.dialog_call_subject);
+        getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT);
+        mBackgroundView = findViewById(R.id.call_subject_dialog);
+        mBackgroundView.setOnClickListener(mBackgroundListener);
+        mDialogView = findViewById(R.id.dialog_view);
+        mContactPhoto = (QuickContactBadge) findViewById(R.id.contact_photo);
+        mNameView = (TextView) findViewById(R.id.name);
+        mNumberView = (TextView) findViewById(R.id.number);
+        mCallSubjectView = (EditText) findViewById(R.id.call_subject);
+        mCallSubjectView.addTextChangedListener(mTextWatcher);
+        mCallSubjectView.setOnClickListener(mCallSubjectClickListener);
+        InputFilter[] filters = new InputFilter[1];
+        filters[0] = new InputFilter.LengthFilter(mLimit);
+        mCallSubjectView.setFilters(filters);
+        mCharacterLimitView = (TextView) findViewById(R.id.character_limit);
+        mHistoryButton = findViewById(R.id.history_button);
+        mHistoryButton.setOnClickListener(mHistoryOnClickListener);
+        mHistoryButton.setVisibility(mSubjectHistory.isEmpty() ? View.GONE : View.VISIBLE);
+        mSendAndCallButton = findViewById(R.id.send_and_call_button);
+        mSendAndCallButton.setOnClickListener(mSendAndCallOnClickListener);
+        mSubjectList = (ListView) findViewById(R.id.subject_list);
+        mSubjectList.setOnItemClickListener(mItemClickListener);
+        mSubjectList.setVisibility(View.GONE);
+
+        updateContactInfo();
+        updateCharacterLimit();
+    }
+
+    /**
+     * Populates the contact info fields based on the current contact information.
+     */
+    private void updateContactInfo() {
+        if (mContactUri != null) {
+            setPhoto(mPhotoID, mPhotoUri, mContactUri, mNameOrNumber, mIsBusiness);
+        } else {
+            mContactPhoto.setVisibility(View.GONE);
+        }
+        mNameView.setText(mNameOrNumber);
+        if (!TextUtils.isEmpty(mNumberLabel) && !TextUtils.isEmpty(mDisplayNumber)) {
+            mNumberView.setVisibility(View.VISIBLE);
+            mNumberView.setText(getString(R.string.call_subject_type_and_number,
+                    mNumberLabel, mDisplayNumber));
+        } else {
+            mNumberView.setVisibility(View.GONE);
+            mNumberView.setText(null);
+        }
+    }
+
+    /**
+     * Reads arguments from the fragment arguments and populates the necessary instance variables.
+     */
+    private void readArguments() {
+        Bundle arguments = getIntent().getExtras();
+        if (arguments == null) {
+            Log.e(TAG, "Arguments cannot be null.");
+            return;
+        }
+        mPhotoID = arguments.getLong(ARG_PHOTO_ID);
+        mPhotoUri = arguments.getParcelable(ARG_PHOTO_URI);
+        mContactUri = arguments.getParcelable(ARG_CONTACT_URI);
+        mNameOrNumber = arguments.getString(ARG_NAME_OR_NUMBER);
+        mIsBusiness = arguments.getBoolean(ARG_IS_BUSINESS);
+        mNumber = arguments.getString(ARG_NUMBER);
+        mDisplayNumber = arguments.getString(ARG_DISPLAY_NUMBER);
+        mNumberLabel = arguments.getString(ARG_NUMBER_LABEL);
+        mPhoneAccountHandle = arguments.getParcelable(ARG_PHONE_ACCOUNT_HANDLE);
+    }
+
+    /**
+     * Updates the character limit display, coloring the text RED when the limit is reached or
+     * exceeded.
+     */
+    private void updateCharacterLimit() {
+        int length = mCallSubjectView.length();
+        mCharacterLimitView.setText(
+                getString(R.string.call_subject_limit, length, mLimit));
+        if (length >= mLimit) {
+            mCharacterLimitView.setTextColor(getResources().getColor(
+                    R.color.call_subject_limit_exceeded));
+        } else {
+            mCharacterLimitView.setTextColor(getResources().getColor(
+                    R.color.dialtacts_secondary_text_color));
+        }
+    }
+
+    /**
+     * Sets the photo on the quick contact photo.
+     *
+     * @param photoId
+     * @param photoUri
+     * @param contactUri
+     * @param displayName
+     * @param isBusiness
+     */
+    private void setPhoto(long photoId, Uri photoUri, Uri contactUri, String displayName,
+            boolean isBusiness) {
+        mContactPhoto.assignContactUri(contactUri);
+        mContactPhoto.setOverlay(null);
+
+        int contactType;
+        if (isBusiness) {
+            contactType = ContactPhotoManager.TYPE_BUSINESS;
+        } else {
+            contactType = ContactPhotoManager.TYPE_DEFAULT;
+        }
+
+        String lookupKey = null;
+        if (contactUri != null) {
+            lookupKey = UriUtils.getLookupKeyFromUri(contactUri);
+        }
+
+        ContactPhotoManager.DefaultImageRequest
+                request = new ContactPhotoManager.DefaultImageRequest(
+                displayName, lookupKey, contactType, true /* isCircular */);
+
+        if (photoId == 0 && photoUri != null) {
+            ContactPhotoManager.getInstance(this).loadPhoto(mContactPhoto, photoUri,
+                    mPhotoSize, false /* darkTheme */, true /* isCircular */, request);
+        } else {
+            ContactPhotoManager.getInstance(this).loadThumbnail(mContactPhoto, photoId,
+                    false /* darkTheme */, true /* isCircular */, request);
+        }
+    }
+
+    /**
+     * Loads the subject history from shared preferences.
+     *
+     * @param prefs Shared preferences.
+     * @return List of subject history strings.
+     */
+    public static List<String> loadSubjectHistory(SharedPreferences prefs) {
+        int historySize = prefs.getInt(PREF_KEY_SUBJECT_HISTORY_COUNT, 0);
+        List<String> subjects = new ArrayList(historySize);
+
+        for (int ix = 0 ; ix < historySize; ix++) {
+            String historyItem = prefs.getString(PREF_KEY_SUBJECT_HISTORY_ITEM + ix, null);
+            if (!TextUtils.isEmpty(historyItem)) {
+                subjects.add(historyItem);
+            }
+        }
+
+        return subjects;
+    }
+
+    /**
+     * Saves the subject history list to shared prefs, removing older items so that there are only
+     * {@link #CALL_SUBJECT_HISTORY_SIZE} items at most.
+     *
+     * @param history The history.
+     */
+    private void saveSubjectHistory(List<String> history) {
+        // Remove oldest subject(s).
+        while (history.size() > CALL_SUBJECT_HISTORY_SIZE) {
+            history.remove(0);
+        }
+
+        SharedPreferences.Editor editor = mPrefs.edit();
+        int historyCount = 0;
+        for (String subject : history) {
+            if (!TextUtils.isEmpty(subject)) {
+                editor.putString(PREF_KEY_SUBJECT_HISTORY_ITEM + historyCount,
+                        subject);
+                historyCount++;
+            }
+        }
+        editor.putInt(PREF_KEY_SUBJECT_HISTORY_COUNT, historyCount);
+        editor.apply();
+    }
+
+    /**
+     * Hide software keyboard for the given {@link View}.
+     */
+    public void hideSoftKeyboard(Context context, View view) {
+        InputMethodManager imm = (InputMethodManager) context.getSystemService(
+                Context.INPUT_METHOD_SERVICE);
+        if (imm != null) {
+            imm.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
+        }
+    }
+
+    /**
+     * Hides or shows the call history list.
+     *
+     * @param show {@code true} if the call history should be shown, {@code false} otherwise.
+     */
+    private void showCallHistory(final boolean show) {
+        // Bail early if the visibility has not changed.
+        if ((show && mSubjectList.getVisibility() == View.VISIBLE) ||
+                (!show && mSubjectList.getVisibility() == View.GONE)) {
+            return;
+        }
+
+        final int dialogStartingBottom = mDialogView.getBottom();
+        if (show) {
+            // Showing the subject list; bind the list of history items to the list and show it.
+            ArrayAdapter<String> adapter = new ArrayAdapter<String>(CallSubjectDialog.this,
+                    R.layout.call_subject_history_list_item, mSubjectHistory);
+            mSubjectList.setAdapter(adapter);
+            mSubjectList.setVisibility(View.VISIBLE);
+        } else {
+            // Hiding the subject list.
+            mSubjectList.setVisibility(View.GONE);
+        }
+
+        // Use a ViewTreeObserver so that we can animate between the pre-layout and post-layout
+        // states.
+        final ViewTreeObserver observer = mBackgroundView.getViewTreeObserver();
+        observer.addOnPreDrawListener(
+                new ViewTreeObserver.OnPreDrawListener() {
+                    @Override
+                    public boolean onPreDraw() {
+                        // We don't want to continue getting called.
+                        if (observer.isAlive()) {
+                            observer.removeOnPreDrawListener(this);
+                        }
+
+                        // Determine the amount the dialog has shifted due to the relayout.
+                        int shiftAmount = dialogStartingBottom - mDialogView.getBottom();
+
+                        // If the dialog needs to be shifted, do that now.
+                        if (shiftAmount != 0) {
+                            // Start animation in translated state and animate to translationY 0.
+                            mDialogView.setTranslationY(shiftAmount);
+                            mDialogView.animate()
+                                    .translationY(0)
+                                    .setInterpolator(AnimUtils.EASE_OUT_EASE_IN)
+                                    .setDuration(mAnimationDuration)
+                                    .start();
+                        }
+
+                        if (show) {
+                            // Show the subhect list.
+                            mSubjectList.setTranslationY(mSubjectList.getHeight());
+
+                            mSubjectList.animate()
+                                    .translationY(0)
+                                    .setInterpolator(AnimUtils.EASE_OUT_EASE_IN)
+                                    .setDuration(mAnimationDuration)
+                                    .setListener(new AnimatorListenerAdapter() {
+                                        @Override
+                                        public void onAnimationEnd(Animator animation) {
+                                            super.onAnimationEnd(animation);
+                                        }
+
+                                        @Override
+                                        public void onAnimationStart(Animator animation) {
+                                            super.onAnimationStart(animation);
+                                            mSubjectList.setVisibility(View.VISIBLE);
+                                        }
+                                    })
+                                    .start();
+                        } else {
+                            // Hide the subject list.
+                            mSubjectList.setTranslationY(0);
+
+                            mSubjectList.animate()
+                                    .translationY(mSubjectList.getHeight())
+                                    .setInterpolator(AnimUtils.EASE_OUT_EASE_IN)
+                                    .setDuration(mAnimationDuration)
+                                    .setListener(new AnimatorListenerAdapter() {
+                                        @Override
+                                        public void onAnimationEnd(Animator animation) {
+                                            super.onAnimationEnd(animation);
+                                            mSubjectList.setVisibility(View.GONE);
+                                        }
+
+                                        @Override
+                                        public void onAnimationStart(Animator animation) {
+                                            super.onAnimationStart(animation);
+                                        }
+                                    })
+                                    .start();
+                        }
+                        return true;
+                    }
+                }
+        );
+    }
+}
diff --git a/src/com/android/contacts/common/util/PhoneNumberHelper.java b/src/com/android/contacts/common/util/PhoneNumberHelper.java
index 9d676689..34514024 100644
--- a/src/com/android/contacts/common/util/PhoneNumberHelper.java
+++ b/src/com/android/contacts/common/util/PhoneNumberHelper.java
@@ -36,6 +36,7 @@ public class PhoneNumberHelper {
 
     private static final String LOG_TAG = PhoneNumberHelper.class.getSimpleName();
 
+    private static final String KOREA_ISO_COUNTRY_CODE = "KR";
     /**
      * Determines if the specified number is actually a URI (i.e. a SIP address) rather than a
      * regular PSTN phone number, based on whether or not the number contains an "@" character.
@@ -124,7 +125,19 @@ public class PhoneNumberHelper {
         String result = null;
         try {
             PhoneNumber pn = util.parseAndKeepRawInput(phoneNumber, defaultCountryIso);
-            result = util.formatInOriginalFormat(pn, defaultCountryIso);
+            /**
+             * Need to reformat any local Korean phone numbers (when the user is in Korea) with
+             * country code to corresponding national format which would replace the leading
+             * +82 with 0.
+             */
+            if (KOREA_ISO_COUNTRY_CODE.equals(defaultCountryIso) &&
+                    (pn.getCountryCode() == util.getCountryCodeForRegion(KOREA_ISO_COUNTRY_CODE)) &&
+                    (pn.getCountryCodeSource() ==
+                            PhoneNumber.CountryCodeSource.FROM_NUMBER_WITH_PLUS_SIGN)) {
+                result = util.format(pn, PhoneNumberUtil.PhoneNumberFormat.NATIONAL);
+            } else {
+                result = util.formatInOriginalFormat(pn, defaultCountryIso);
+            }
         } catch (NumberParseException e) {
             Log.w(LOG_TAG, "Number could not be parsed with the given country code!");
         }
diff --git a/src/com/android/contacts/common/util/UriUtils.java b/src/com/android/contacts/common/util/UriUtils.java
index 1ede5f3a..41ef62f6 100644
--- a/src/com/android/contacts/common/util/UriUtils.java
+++ b/src/com/android/contacts/common/util/UriUtils.java
@@ -19,6 +19,8 @@ package com.android.contacts.common.util;
 import android.net.Uri;
 import android.provider.ContactsContract;
 
+import java.util.List;
+
 /**
  * Utility methods for dealing with URIs.
  */
@@ -71,4 +73,22 @@ public class UriUtils {
         }
         return ContactsContract.AUTHORITY.equals(uri.getAuthority()) ? uri : null;
     }
+
+    /**
+     * Parses the given URI to determine the original lookup key of the contact.
+     */
+    public static String getLookupKeyFromUri(Uri lookupUri) {
+        // Would be nice to be able to persist the lookup key somehow to avoid having to parse
+        // the uri entirely just to retrieve the lookup key, but every uri is already parsed
+        // once anyway to check if it is an encoded JSON uri, so this has negligible effect
+        // on performance.
+        if (lookupUri != null && !UriUtils.isEncodedContactUri(lookupUri)) {
+            final List<String> segments = lookupUri.getPathSegments();
+            // This returns the third path segment of the uri, where the lookup key is located.
+            // See {@link android.provider.ContactsContract.Contacts#CONTENT_LOOKUP_URI}.
+            return (segments.size() < 3) ? null : Uri.encode(segments.get(2));
+        } else {
+            return null;
+        }
+    }
 }
author	Ricardo Cerqueira <ricardo@cyngn.com>	2015-11-05 01:50:28 +0000
committer	Ricardo Cerqueira <ricardo@cyngn.com>	2015-11-05 01:50:28 +0000
commit	75a493f212f4961cb0ec403fe7c227db4bc415b3 (patch)
tree	43d3b0e3d1f9ba9f0341fe427d4365dbc5a97ca2
parent	faca3df8f57f70b676604ee7972ec2628b4796dd (diff)
parent	9a04c48880e2775e331e99a6d3a29ba1834e25ac (diff)
download	packages_apps_ContactsCommon-75a493f212f4961cb0ec403fe7c227db4bc415b3.tar.gz packages_apps_ContactsCommon-75a493f212f4961cb0ec403fe7c227db4bc415b3.tar.bz2 packages_apps_ContactsCommon-75a493f212f4961cb0ec403fe7c227db4bc415b3.zip