am be729e6f: Catch RuntimeException when calling setExcludeFromRecents
* commit 'be729e6fd69f30a97b669b009d608ac7395919c7':
Catch RuntimeException when calling setExcludeFromRecents
diff --git a/InCallUI/res/drawable-hdpi/ic_forward_white_24dp.png b/InCallUI/res/drawable-hdpi/ic_forward_white_24dp.png
new file mode 100644
index 0000000..a0711d3
--- /dev/null
+++ b/InCallUI/res/drawable-hdpi/ic_forward_white_24dp.png
Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/ic_forward_white_24dp.png b/InCallUI/res/drawable-mdpi/ic_forward_white_24dp.png
new file mode 100644
index 0000000..65f7329
--- /dev/null
+++ b/InCallUI/res/drawable-mdpi/ic_forward_white_24dp.png
Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/ic_forward_white_24dp.png b/InCallUI/res/drawable-xhdpi/ic_forward_white_24dp.png
new file mode 100644
index 0000000..7a5df52
--- /dev/null
+++ b/InCallUI/res/drawable-xhdpi/ic_forward_white_24dp.png
Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/ic_forward_white_24dp.png b/InCallUI/res/drawable-xxhdpi/ic_forward_white_24dp.png
new file mode 100644
index 0000000..7bd5b16
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_forward_white_24dp.png
Binary files differ
diff --git a/InCallUI/res/drawable-xxxhdpi/ic_forward_white_24dp.png b/InCallUI/res/drawable-xxxhdpi/ic_forward_white_24dp.png
new file mode 100644
index 0000000..428009c
--- /dev/null
+++ b/InCallUI/res/drawable-xxxhdpi/ic_forward_white_24dp.png
Binary files differ
diff --git a/InCallUI/res/drawable-xxxhdpi/subject_bubble.9.png b/InCallUI/res/drawable-xxxhdpi/subject_bubble.9.png
new file mode 100644
index 0000000..2627bf8
--- /dev/null
+++ b/InCallUI/res/drawable-xxxhdpi/subject_bubble.9.png
Binary files differ
diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml
index 89943df..8f78440 100644
--- a/InCallUI/res/layout/primary_call_info.xml
+++ b/InCallUI/res/layout/primary_call_info.xml
@@ -33,6 +33,27 @@
android:animateLayoutChanges="true"
android:gravity="center">
+ <LinearLayout android:id="@+id/callSubjectLayout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:clipChildren="false"
+ android:clipToPadding="false">
+
+ <TextView android:id="@+id/callSubject"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAlignment="viewStart"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="@color/incall_call_banner_background_color"
+ android:textSize="@dimen/call_label_text_size"
+ android:background="@drawable/subject_bubble"
+ android:maxLines="2"
+ android:ellipsize="end"
+ android:singleLine="false"
+ android:visibility="gone" />
+ </LinearLayout>
+
<LinearLayout android:id="@+id/callStateButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -108,6 +129,15 @@
android:scaleType="fitCenter"
android:visibility="gone" />
+ <ImageView android:id="@+id/forwardIcon"
+ android:src="@drawable/ic_forward_white_24dp"
+ android:layout_width="24dp"
+ android:layout_height="match_parent"
+ android:layout_marginEnd="8dp"
+ android:tint="@color/incall_call_banner_subtext_color"
+ android:scaleType="fitCenter"
+ android:visibility="gone" />
+
<!-- Label (like "Mobile" or "Work", if present) and phone number, side by side -->
<LinearLayout android:id="@+id/labelAndNumber"
android:layout_width="wrap_content"
diff --git a/InCallUI/res/values-af/strings.xml b/InCallUI/res/values-af/strings.xml
index d082586..4dcaa72 100644
--- a/InCallUI/res/values-af/strings.xml
+++ b/InCallUI/res/values-af/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Profielfoto"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Kamera af"</string>
+ <string name="child_number" msgid="7437330400723805538">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-am/strings.xml b/InCallUI/res/values-am/strings.xml
index 6bbb365..99fa5ce 100644
--- a/InCallUI/res/values-am/strings.xml
+++ b/InCallUI/res/values-am/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"መገለጫ ፎቶ"</string>
<string name="camera_off_description" msgid="5689494614359429889">"ካሜራ ጠፍቷል"</string>
+ <string name="child_number" msgid="7437330400723805538">"በ<xliff:g id="CHILD_NUMBER">%s</xliff:g> በኩል"</string>
</resources>
diff --git a/InCallUI/res/values-ar/strings.xml b/InCallUI/res/values-ar/strings.xml
index 58db1e3..46c5cca 100644
--- a/InCallUI/res/values-ar/strings.xml
+++ b/InCallUI/res/values-ar/strings.xml
@@ -181,4 +181,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"صورة الملف الشخصي"</string>
<string name="camera_off_description" msgid="5689494614359429889">"تم إيقاف الكاميرا"</string>
+ <string name="child_number" msgid="7437330400723805538">"عبر <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-az-rAZ/strings.xml b/InCallUI/res/values-az-rAZ/strings.xml
index ea54079..d3947b1 100644
--- a/InCallUI/res/values-az-rAZ/strings.xml
+++ b/InCallUI/res/values-az-rAZ/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Profil fotosu"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Kamera deaktivdir"</string>
+ <string name="child_number" msgid="7437330400723805538">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> vasitəsilə"</string>
</resources>
diff --git a/InCallUI/res/values-bg/strings.xml b/InCallUI/res/values-bg/strings.xml
index cb128cd..6a3c4ac 100644
--- a/InCallUI/res/values-bg/strings.xml
+++ b/InCallUI/res/values-bg/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Снимка на потребителския профил"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Камерата е изключена"</string>
+ <string name="child_number" msgid="7437330400723805538">"чрез <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-bn-rBD/strings.xml b/InCallUI/res/values-bn-rBD/strings.xml
index e739eb5..3d2e980 100644
--- a/InCallUI/res/values-bn-rBD/strings.xml
+++ b/InCallUI/res/values-bn-rBD/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"প্রোফাইল ফটো"</string>
<string name="camera_off_description" msgid="5689494614359429889">"ক্যামেরা বন্ধ"</string>
+ <string name="child_number" msgid="7437330400723805538">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> এর মাধ্যমে"</string>
</resources>
diff --git a/InCallUI/res/values-ca/strings.xml b/InCallUI/res/values-ca/strings.xml
index e695532..da18b08 100644
--- a/InCallUI/res/values-ca/strings.xml
+++ b/InCallUI/res/values-ca/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Foto de perfil"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Càmera desactivada"</string>
+ <string name="child_number" msgid="7437330400723805538">"mitjançant <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-cs/strings.xml b/InCallUI/res/values-cs/strings.xml
index 238378e..0242bee 100644
--- a/InCallUI/res/values-cs/strings.xml
+++ b/InCallUI/res/values-cs/strings.xml
@@ -175,4 +175,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Profilová fotka"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Fotoaparát je vypnutý"</string>
+ <string name="child_number" msgid="7437330400723805538">"pomocí čísla <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-da/strings.xml b/InCallUI/res/values-da/strings.xml
index 7c240e2..2e3d9b2 100644
--- a/InCallUI/res/values-da/strings.xml
+++ b/InCallUI/res/values-da/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Profilfoto"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Sluk kamera"</string>
+ <string name="child_number" msgid="7437330400723805538">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-de/strings.xml b/InCallUI/res/values-de/strings.xml
index eafede3..20a8dc7 100644
--- a/InCallUI/res/values-de/strings.xml
+++ b/InCallUI/res/values-de/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Profilfoto"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Kamera aus"</string>
+ <string name="child_number" msgid="7437330400723805538">"über <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-el/strings.xml b/InCallUI/res/values-el/strings.xml
index 34399c9..757061c 100644
--- a/InCallUI/res/values-el/strings.xml
+++ b/InCallUI/res/values-el/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Φωτογραφία προφίλ"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Απενεργοποίηση κάμερας"</string>
+ <string name="child_number" msgid="7437330400723805538">"μέσω <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-en-rAU/strings.xml b/InCallUI/res/values-en-rAU/strings.xml
index 5d2aa84..ae8fb41 100644
--- a/InCallUI/res/values-en-rAU/strings.xml
+++ b/InCallUI/res/values-en-rAU/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Profile photo"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Camera off"</string>
+ <string name="child_number" msgid="7437330400723805538">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-en-rGB/strings.xml b/InCallUI/res/values-en-rGB/strings.xml
index 5d2aa84..ae8fb41 100644
--- a/InCallUI/res/values-en-rGB/strings.xml
+++ b/InCallUI/res/values-en-rGB/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Profile photo"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Camera off"</string>
+ <string name="child_number" msgid="7437330400723805538">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-en-rIN/strings.xml b/InCallUI/res/values-en-rIN/strings.xml
index 5d2aa84..ae8fb41 100644
--- a/InCallUI/res/values-en-rIN/strings.xml
+++ b/InCallUI/res/values-en-rIN/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Profile photo"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Camera off"</string>
+ <string name="child_number" msgid="7437330400723805538">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-es-rUS/strings.xml b/InCallUI/res/values-es-rUS/strings.xml
index 517acdf..a1d94c8 100644
--- a/InCallUI/res/values-es-rUS/strings.xml
+++ b/InCallUI/res/values-es-rUS/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Foto de perfil"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Cámara desactivada"</string>
+ <string name="child_number" msgid="7437330400723805538">"a través del <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-es/strings.xml b/InCallUI/res/values-es/strings.xml
index 936ad78..be1104a 100644
--- a/InCallUI/res/values-es/strings.xml
+++ b/InCallUI/res/values-es/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Foto de perfil"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Cámara apagada"</string>
+ <string name="child_number" msgid="7437330400723805538">"a través de <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-et-rEE/strings.xml b/InCallUI/res/values-et-rEE/strings.xml
index bf46c8a..4b4c63a 100644
--- a/InCallUI/res/values-et-rEE/strings.xml
+++ b/InCallUI/res/values-et-rEE/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Profiilifoto"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Kaamera lülitatakse välja"</string>
+ <string name="child_number" msgid="7437330400723805538">"numbri <xliff:g id="CHILD_NUMBER">%s</xliff:g> kaudu"</string>
</resources>
diff --git a/InCallUI/res/values-eu-rES/strings.xml b/InCallUI/res/values-eu-rES/strings.xml
index 72c2c11..e991762 100644
--- a/InCallUI/res/values-eu-rES/strings.xml
+++ b/InCallUI/res/values-eu-rES/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Profileko argazkia"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Kamara desaktibatuta dago"</string>
+ <string name="child_number" msgid="7437330400723805538">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> zenbakitik"</string>
</resources>
diff --git a/InCallUI/res/values-fa/strings.xml b/InCallUI/res/values-fa/strings.xml
index d66a954..3d5df75 100644
--- a/InCallUI/res/values-fa/strings.xml
+++ b/InCallUI/res/values-fa/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"عکس نمایه"</string>
<string name="camera_off_description" msgid="5689494614359429889">"دوربین خاموش"</string>
+ <string name="child_number" msgid="7437330400723805538">"از طریق <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-fi/strings.xml b/InCallUI/res/values-fi/strings.xml
index cf68d6b..1d66dd2 100644
--- a/InCallUI/res/values-fi/strings.xml
+++ b/InCallUI/res/values-fi/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Profiilikuva"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Kamera on pois käytöstä."</string>
+ <string name="child_number" msgid="7437330400723805538">"nron <xliff:g id="CHILD_NUMBER">%s</xliff:g> kautta"</string>
</resources>
diff --git a/InCallUI/res/values-fr-rCA/strings.xml b/InCallUI/res/values-fr-rCA/strings.xml
index 002780f..b7b89f5 100644
--- a/InCallUI/res/values-fr-rCA/strings.xml
+++ b/InCallUI/res/values-fr-rCA/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Photo de profil"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Appareil photo désactiver"</string>
+ <string name="child_number" msgid="7437330400723805538">"au moyen du <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-fr/strings.xml b/InCallUI/res/values-fr/strings.xml
index 37d263a..4b25bca 100644
--- a/InCallUI/res/values-fr/strings.xml
+++ b/InCallUI/res/values-fr/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Photo du profil"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Caméra désactivée"</string>
+ <string name="child_number" msgid="7437330400723805538">"via le <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-gl-rES/strings.xml b/InCallUI/res/values-gl-rES/strings.xml
index 22a020b..0803215 100644
--- a/InCallUI/res/values-gl-rES/strings.xml
+++ b/InCallUI/res/values-gl-rES/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Foto de perfil"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Cámara desactivada"</string>
+ <string name="child_number" msgid="7437330400723805538">"a través do <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-gu-rIN/strings.xml b/InCallUI/res/values-gu-rIN/strings.xml
index 318a792..f6b4508 100644
--- a/InCallUI/res/values-gu-rIN/strings.xml
+++ b/InCallUI/res/values-gu-rIN/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"પ્રોફાઇલ ફોટો"</string>
<string name="camera_off_description" msgid="5689494614359429889">"કૅમેરો બંધ"</string>
+ <string name="child_number" msgid="7437330400723805538">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> મારફતે"</string>
</resources>
diff --git a/InCallUI/res/values-hi/strings.xml b/InCallUI/res/values-hi/strings.xml
index 2e29708..da86ad2 100644
--- a/InCallUI/res/values-hi/strings.xml
+++ b/InCallUI/res/values-hi/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"प्रोफ़ाइल फ़ोटो"</string>
<string name="camera_off_description" msgid="5689494614359429889">"कैमरा बंद है"</string>
+ <string name="child_number" msgid="7437330400723805538">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> के द्वारा"</string>
</resources>
diff --git a/InCallUI/res/values-hr/strings.xml b/InCallUI/res/values-hr/strings.xml
index ffcdae7..d28b5cd 100644
--- a/InCallUI/res/values-hr/strings.xml
+++ b/InCallUI/res/values-hr/strings.xml
@@ -172,4 +172,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Fotografija na profilu"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Fotoaparat je isključen"</string>
+ <string name="child_number" msgid="7437330400723805538">"putem <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-hu/strings.xml b/InCallUI/res/values-hu/strings.xml
index f23be5c..ba7fcdd 100644
--- a/InCallUI/res/values-hu/strings.xml
+++ b/InCallUI/res/values-hu/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Profilfotó"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Kamera ki"</string>
+ <string name="child_number" msgid="7437330400723805538">"a következő számon keresztül: <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-hy-rAM/strings.xml b/InCallUI/res/values-hy-rAM/strings.xml
index 9337431..48e6e42 100644
--- a/InCallUI/res/values-hy-rAM/strings.xml
+++ b/InCallUI/res/values-hy-rAM/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Պրոֆիլի լուսանկար"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Խցիկն անջատված է"</string>
+ <string name="child_number" msgid="7437330400723805538">"<xliff:g id="CHILD_NUMBER">%s</xliff:g>-ի միջոցով"</string>
</resources>
diff --git a/InCallUI/res/values-in/strings.xml b/InCallUI/res/values-in/strings.xml
index 26c3cf3..8a3b2d4 100644
--- a/InCallUI/res/values-in/strings.xml
+++ b/InCallUI/res/values-in/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Foto profil"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Kamera tidak aktif"</string>
+ <string name="child_number" msgid="7437330400723805538">"melalui <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-is-rIS/strings.xml b/InCallUI/res/values-is-rIS/strings.xml
index 3b6cfab..ec675a7 100644
--- a/InCallUI/res/values-is-rIS/strings.xml
+++ b/InCallUI/res/values-is-rIS/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Prófílmynd"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Slökkt á myndavél"</string>
+ <string name="child_number" msgid="7437330400723805538">"úr <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-it/strings.xml b/InCallUI/res/values-it/strings.xml
index fef5adb..7b6eafc 100644
--- a/InCallUI/res/values-it/strings.xml
+++ b/InCallUI/res/values-it/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Foto del profilo"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Videocamera disattivata"</string>
+ <string name="child_number" msgid="7437330400723805538">"tramite <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-iw/strings.xml b/InCallUI/res/values-iw/strings.xml
index 843708c..e01a4b4 100644
--- a/InCallUI/res/values-iw/strings.xml
+++ b/InCallUI/res/values-iw/strings.xml
@@ -175,4 +175,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"תמונת פרופיל"</string>
<string name="camera_off_description" msgid="5689494614359429889">"מצלמה כבויה"</string>
+ <string name="child_number" msgid="7437330400723805538">"דרך <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-ja/strings.xml b/InCallUI/res/values-ja/strings.xml
index 2085f23..2522d9e 100644
--- a/InCallUI/res/values-ja/strings.xml
+++ b/InCallUI/res/values-ja/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"プロフィール写真"</string>
<string name="camera_off_description" msgid="5689494614359429889">"カメラをオフ"</string>
+ <string name="child_number" msgid="7437330400723805538">"<xliff:g id="CHILD_NUMBER">%s</xliff:g>に着信"</string>
</resources>
diff --git a/InCallUI/res/values-ka-rGE/strings.xml b/InCallUI/res/values-ka-rGE/strings.xml
index 24a7204..1c7093c 100644
--- a/InCallUI/res/values-ka-rGE/strings.xml
+++ b/InCallUI/res/values-ka-rGE/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"პროფილის ფოტო"</string>
<string name="camera_off_description" msgid="5689494614359429889">"კამერა გამორთულია"</string>
+ <string name="child_number" msgid="7437330400723805538">"<xliff:g id="CHILD_NUMBER">%s</xliff:g>-დან"</string>
</resources>
diff --git a/InCallUI/res/values-kk-rKZ/strings.xml b/InCallUI/res/values-kk-rKZ/strings.xml
index 7bc3a72..ab9ec37 100644
--- a/InCallUI/res/values-kk-rKZ/strings.xml
+++ b/InCallUI/res/values-kk-rKZ/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Профиль фотосуреті"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Камераны өшіру"</string>
+ <string name="child_number" msgid="7437330400723805538">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> арқылы"</string>
</resources>
diff --git a/InCallUI/res/values-km-rKH/strings.xml b/InCallUI/res/values-km-rKH/strings.xml
index bf634bd..32124a9 100644
--- a/InCallUI/res/values-km-rKH/strings.xml
+++ b/InCallUI/res/values-km-rKH/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"រូបថតប្រវត្តិរូប"</string>
<string name="camera_off_description" msgid="5689494614359429889">"បិទកាមេរ៉ា"</string>
+ <string name="child_number" msgid="7437330400723805538">"តាមរយៈ <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-kn-rIN/strings.xml b/InCallUI/res/values-kn-rIN/strings.xml
index 0eeb746..4503a35 100644
--- a/InCallUI/res/values-kn-rIN/strings.xml
+++ b/InCallUI/res/values-kn-rIN/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"ಪ್ರೊಫೈಲ್ ಫೋಟೋ"</string>
<string name="camera_off_description" msgid="5689494614359429889">"ಕ್ಯಾಮರಾ ಆಫ್"</string>
+ <string name="child_number" msgid="7437330400723805538">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> ಮೂಲಕ"</string>
</resources>
diff --git a/InCallUI/res/values-ko/strings.xml b/InCallUI/res/values-ko/strings.xml
index 057ff96..ef3f6d5 100644
--- a/InCallUI/res/values-ko/strings.xml
+++ b/InCallUI/res/values-ko/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"프로필 사진"</string>
<string name="camera_off_description" msgid="5689494614359429889">"카메라 꺼짐"</string>
+ <string name="child_number" msgid="7437330400723805538">"수신 번호: <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-ky-rKG/strings.xml b/InCallUI/res/values-ky-rKG/strings.xml
index d711d9e..bfd8656 100644
--- a/InCallUI/res/values-ky-rKG/strings.xml
+++ b/InCallUI/res/values-ky-rKG/strings.xml
@@ -17,56 +17,34 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- no translation found for phoneAppLabel (906161039445636857) -->
- <skip />
- <!-- no translation found for onHold (9035493194749959955) -->
- <skip />
- <!-- no translation found for unknown (6878797917991465859) -->
- <skip />
- <!-- no translation found for private_num (6713286113000232309) -->
- <skip />
+ <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Телефон"</string>
+ <string name="onHold" msgid="9035493194749959955">"Күтүлүүдө"</string>
+ <string name="unknown" msgid="6878797917991465859">"Белгисиз"</string>
+ <string name="private_num" msgid="6713286113000232309">"Купуя номер"</string>
<string name="payphone" msgid="4793877574636445118">"Таксофон"</string>
- <!-- no translation found for confCall (1904840547188336828) -->
- <skip />
+ <string name="confCall" msgid="1904840547188336828">"Конференц-чалуу"</string>
<string name="call_lost" msgid="6183862117003999578">"Чалуу үзүлдү"</string>
- <!-- no translation found for audio_mode_speaker (27649582100085266) -->
- <skip />
- <!-- no translation found for audio_mode_earpiece (4156527186373869107) -->
- <skip />
+ <string name="audio_mode_speaker" msgid="27649582100085266">"Катуу сүйлөткүч"</string>
+ <string name="audio_mode_earpiece" msgid="4156527186373869107">"Гарнитура"</string>
<string name="audio_mode_wired_headset" msgid="1465350758489175975">"Зымдуу кулакчын"</string>
- <!-- no translation found for audio_mode_bluetooth (3047641300848211128) -->
- <skip />
- <!-- no translation found for wait_prompt_str (7601815427707856238) -->
- <skip />
+ <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
+ <string name="wait_prompt_str" msgid="7601815427707856238">"Төмөнкү номер жөнөтүлсүнбү?\n"</string>
<string name="pause_prompt_str" msgid="1789964702154314806">"Тоналдык жөнөтүү болууда \n"</string>
- <!-- no translation found for send_button (4106860097497818751) -->
- <skip />
- <!-- no translation found for pause_prompt_yes (3564467212025151797) -->
- <skip />
- <!-- no translation found for pause_prompt_no (6686238803236884877) -->
- <skip />
+ <string name="send_button" msgid="4106860097497818751">"Жөнөтүү"</string>
+ <string name="pause_prompt_yes" msgid="3564467212025151797">"Ооба"</string>
+ <string name="pause_prompt_no" msgid="6686238803236884877">"Жок"</string>
<string name="wild_prompt_str" msgid="5543521676355533577">"Атайын белгини муну менен алмаштыр"</string>
- <!-- no translation found for caller_manage_header (3231519674734638786) -->
- <skip />
- <!-- no translation found for voicemail_settings_number_label (8524164258691887790) -->
- <skip />
- <!-- no translation found for card_title_dialing (5769417478498348054) -->
- <skip />
+ <string name="caller_manage_header" msgid="3231519674734638786">"Конференц-чалуу <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
+ <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Үн почтасынын номери"</string>
+ <string name="card_title_dialing" msgid="5769417478498348054">"Терилүүдө"</string>
<string name="card_title_redialing" msgid="8253487008234167266">"Кайра терүү"</string>
- <!-- no translation found for card_title_conf_call (1162980346189744501) -->
- <skip />
- <!-- no translation found for card_title_incoming_call (7364539451234646909) -->
- <skip />
- <!-- no translation found for card_title_call_ended (5544730338889702298) -->
- <skip />
- <!-- no translation found for card_title_on_hold (821463117892339942) -->
- <skip />
- <!-- no translation found for card_title_hanging_up (3999101620995182450) -->
- <skip />
- <!-- no translation found for card_title_in_call (6346543933068225205) -->
- <skip />
- <!-- no translation found for card_title_my_phone_number (112428362494434191) -->
- <skip />
+ <string name="card_title_conf_call" msgid="1162980346189744501">"Конференц-чалуу"</string>
+ <string name="card_title_incoming_call" msgid="7364539451234646909">"Кирүүчү чалуу"</string>
+ <string name="card_title_call_ended" msgid="5544730338889702298">"Чалуу аяктады"</string>
+ <string name="card_title_on_hold" msgid="821463117892339942">"Күтүлүүдө"</string>
+ <string name="card_title_hanging_up" msgid="3999101620995182450">"Телефон коюлууда"</string>
+ <string name="card_title_in_call" msgid="6346543933068225205">"Чалууда"</string>
+ <string name="card_title_my_phone_number" msgid="112428362494434191">"Менин номерим <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
<string name="card_title_video_call_connecting" msgid="297586766381973954">"Видео туташтырылууда"</string>
<string name="card_title_video_call" msgid="5898636679563320218">"Видео чалуу"</string>
<string name="card_title_video_call_requesting" msgid="4587504939739340937">"Видео"</string>
@@ -75,35 +53,23 @@
<string name="card_title_callback_number" msgid="7307938207564217293">"Төмөнкү номерге кайра чалуу\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
<string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Төмөнкү номерге шашылыш кайра чалуу\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
<string name="notification_dialing" msgid="2107666444937350731">"Терилүүдө"</string>
- <!-- no translation found for notification_missedCallTitle (7554385905572364535) -->
- <skip />
- <!-- no translation found for notification_missedCallsTitle (1361677948941502522) -->
- <skip />
- <!-- no translation found for notification_missedCallsMsg (4575787816055205600) -->
- <skip />
- <!-- no translation found for notification_missedCallTicker (504686252427747209) -->
- <skip />
+ <string name="notification_missedCallTitle" msgid="7554385905572364535">"Кабыл алынбаган чалуу"</string>
+ <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Кабыл алынбаган чалуулар"</string>
+ <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> кабыл алынбаган чалуу"</string>
+ <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> дегенден кабыл алынбаган чалуу"</string>
<string name="notification_ongoing_call" msgid="7068688957273482989">"Учурдагы чалуу"</string>
<string name="notification_ongoing_call_wifi" msgid="8521553590606569379">"Аткаруудагы Wi-Fi чалуу"</string>
- <!-- no translation found for notification_on_hold (3480694969511790465) -->
- <skip />
- <!-- no translation found for notification_incoming_call (2820429205043529642) -->
- <skip />
+ <string name="notification_on_hold" msgid="3480694969511790465">"Күтүлүүдө"</string>
+ <string name="notification_incoming_call" msgid="2820429205043529642">"Кирүүчү чалуу"</string>
<string name="notification_incoming_call_wifi" msgid="9210706506594546627">"Кирүүчү Wi-Fi чалуу"</string>
<string name="notification_incoming_video_call" msgid="7356836933934464805">"Келип жаткан видео чалуу"</string>
<string name="notification_requesting_video_call" msgid="1405576812892369451">"Келип жаткан видео сурамы"</string>
- <!-- no translation found for notification_voicemail_title (8933468752045550523) -->
- <skip />
- <!-- no translation found for notification_voicemail_title_count (4366360747660929916) -->
- <skip />
- <!-- no translation found for notification_voicemail_text_format (4447323569453981685) -->
- <skip />
- <!-- no translation found for notification_voicemail_no_vm_number (760963466895609716) -->
- <skip />
- <!-- no translation found for notification_network_selection_title (4224455487793492772) -->
- <skip />
- <!-- no translation found for notification_network_selection_text (2607085729661923269) -->
- <skip />
+ <string name="notification_voicemail_title" msgid="8933468752045550523">"Жаңы үн почтасы"</string>
+ <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Жаңы үн почтасы (<xliff:g id="COUNT">%d</xliff:g>)"</string>
+ <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> номерин терүү"</string>
+ <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Үн почтасынын номери белгисиз"</string>
+ <string name="notification_network_selection_title" msgid="4224455487793492772">"Байланыш жок"</string>
+ <string name="notification_network_selection_text" msgid="2607085729661923269">"Тандалган тармак (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) жеткиликсиз"</string>
<string name="notification_action_answer" msgid="6700362365135365143">"Жооп берүү"</string>
<string name="notification_action_end_call" msgid="6069460915123531620">"Телефонду коюу"</string>
<string name="notification_action_answer_video" msgid="7809271910870211729">"Видео"</string>
@@ -112,15 +78,12 @@
<string name="notification_action_dismiss" msgid="2679969397930852858">"Этибарга албоо"</string>
<string name="notification_missedCall_call_back" msgid="2684890353590890187">"Кайра чалуу"</string>
<string name="notification_missedCall_message" msgid="3049928912736917988">"Билдирүү"</string>
- <!-- no translation found for incall_error_power_off (6550191216405193368) -->
- <skip />
- <!-- no translation found for incall_error_emergency_only (4678640422710818317) -->
- <skip />
+ <string name="incall_error_power_off" msgid="6550191216405193368">"Чалуу үчүн, адегенде учак режимин өчүрүңүз."</string>
+ <string name="incall_error_emergency_only" msgid="4678640422710818317">"Тармакта катталган эмес."</string>
<string name="incall_error_out_of_service" msgid="4100065333878929223">"Уюктук тармак жеткиликтүү эмес."</string>
<string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Чалуу үчүн, жарактуу номер киргизиңиз."</string>
<string name="incall_error_call_failed" msgid="6302746943230078197">"Чалынбай жатат."</string>
- <!-- no translation found for incall_status_dialed_mmi (3672498861336189563) -->
- <skip />
+ <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI кезеги башталууда…"</string>
<string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Кызмат колдоого алынбайт."</string>
<string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Чалуулар которуштурулбай жатат."</string>
<string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Чалуу бөлүнбөй жатат."</string>
@@ -129,33 +92,23 @@
<string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Чалуу четке кагылбай жатат."</string>
<string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Чалуу(лар) бошотулбай жатат."</string>
<string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP чалуу"</string>
- <!-- no translation found for emergency_enable_radio_dialog_title (4627849966634578257) -->
- <skip />
- <!-- no translation found for emergency_enable_radio_dialog_message (207613549344420291) -->
- <skip />
+ <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Шашылыш чалуу"</string>
+ <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Радио күйгүзүлүүдө…"</string>
<string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Кызмат жок. Кайра аракет кылууда…"</string>
<string name="dial_emergency_error" msgid="1509085166367420355">"Чалынбай жатат. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> өзгөчө кырдаал номери эмес."</string>
<string name="dial_emergency_empty_error" msgid="9130194953830414638">"Чалынбай жатат. Өзгөчө кырдаал номерин териңиз."</string>
- <!-- no translation found for dialerKeyboardHintText (9192914825413747792) -->
- <skip />
+ <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Баскычтоп менен териңиз"</string>
<string name="onscreenHoldText_unselected" msgid="7092499303393171276">"Чалууну Кармоо"</string>
<string name="onscreenHoldText_selected" msgid="7127901498507384249">"Чалууну Улантуу"</string>
<string name="onscreenEndCallText" msgid="9039601192595655846">"Чалууну бүтүрүү"</string>
- <!-- no translation found for onscreenShowDialpadText (8561805492659639893) -->
- <skip />
- <!-- no translation found for onscreenMuteText (5011369181754261374) -->
- <skip />
- <!-- no translation found for onscreenAddCallText (5140385634712287403) -->
- <skip />
- <!-- no translation found for onscreenMergeCallsText (6640195098064538950) -->
- <skip />
- <!-- no translation found for onscreenSwapCallsText (1602990689244030047) -->
- <skip />
- <!-- no translation found for onscreenManageCallsText (5473231160123254154) -->
- <skip />
+ <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Тергич"</string>
+ <string name="onscreenMuteText" msgid="5011369181754261374">"Үнсүз"</string>
+ <string name="onscreenAddCallText" msgid="5140385634712287403">"Чалуу кошуу"</string>
+ <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Чалууларды бириктирүү"</string>
+ <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Алмаштыруу"</string>
+ <string name="onscreenManageCallsText" msgid="5473231160123254154">"Чалууларды башкаруу"</string>
<string name="onscreenManageConferenceText" msgid="6801708317570467407">"Конференц-чалууну башкаруу"</string>
- <!-- no translation found for onscreenAudioText (1710087112800041743) -->
- <skip />
+ <string name="onscreenAudioText" msgid="1710087112800041743">"Аудио"</string>
<string name="onscreenVideoCallText" msgid="4800924186056115442">"Видео чалуу"</string>
<string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Үн чалууга өзгөртүү"</string>
<string name="onscreenSwitchCameraText" msgid="5324543493442787798">"Камерага которулуу"</string>
@@ -169,16 +122,12 @@
<string name="voicemail_provider" msgid="5135942703327136909">"Кызмат"</string>
<string name="voicemail_settings" msgid="72448049107749316">"Орнотуу"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<Орнотулган эмес>"</string>
- <!-- no translation found for other_settings (3672912580359716394) -->
- <skip />
+ <string name="other_settings" msgid="3672912580359716394">"Башка чалуу жөндөөлөрү"</string>
<string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> аркылуу чалуу"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> аркылуу келүүдө"</string>
- <!-- no translation found for contactPhoto (4713193418046639466) -->
- <skip />
- <!-- no translation found for goPrivate (865837794424530980) -->
- <skip />
- <!-- no translation found for selectContact (781975788478987237) -->
- <skip />
+ <string name="contactPhoto" msgid="4713193418046639466">"байланыштын сүрөтү"</string>
+ <string name="goPrivate" msgid="865837794424530980">"купуя режимине өтүү"</string>
+ <string name="selectContact" msgid="781975788478987237">"байланыш тандоо"</string>
<string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Каалганыңызды жазыңыз..."</string>
<string name="custom_message_cancel" msgid="7516406059429609296">"Жокко чыгаруу"</string>
<string name="custom_message_send" msgid="5795754217085747742">"Жөнөтүү"</string>
@@ -220,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Профиль сүрөтү"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Камера өчүк"</string>
+ <string name="child_number" msgid="7437330400723805538">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> аркылуу"</string>
</resources>
diff --git a/InCallUI/res/values-lo-rLA/strings.xml b/InCallUI/res/values-lo-rLA/strings.xml
index db3ba0a..0481ac6 100644
--- a/InCallUI/res/values-lo-rLA/strings.xml
+++ b/InCallUI/res/values-lo-rLA/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"ຮູບໂປຣໄຟລ໌"</string>
<string name="camera_off_description" msgid="5689494614359429889">"ກ້ອງຖ່າຍຮູບປິດ"</string>
+ <string name="child_number" msgid="7437330400723805538">"ຜ່ານ <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-lt/strings.xml b/InCallUI/res/values-lt/strings.xml
index 64239e3..ad12d20 100644
--- a/InCallUI/res/values-lt/strings.xml
+++ b/InCallUI/res/values-lt/strings.xml
@@ -175,4 +175,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Profilio nuotrauka"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Fotoaparatas išjungtas"</string>
+ <string name="child_number" msgid="7437330400723805538">"naudojant <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-lv/strings.xml b/InCallUI/res/values-lv/strings.xml
index aef4c23..7d393b3 100644
--- a/InCallUI/res/values-lv/strings.xml
+++ b/InCallUI/res/values-lv/strings.xml
@@ -172,4 +172,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Profila fotoattēls"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Izslēgt kameru"</string>
+ <string name="child_number" msgid="7437330400723805538">"no numura <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-mk-rMK/strings.xml b/InCallUI/res/values-mk-rMK/strings.xml
index bcc1eaa..16f201f 100644
--- a/InCallUI/res/values-mk-rMK/strings.xml
+++ b/InCallUI/res/values-mk-rMK/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Фотографија на профил"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Камерата е исклучена"</string>
+ <string name="child_number" msgid="7437330400723805538">"преку <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-ml-rIN/strings.xml b/InCallUI/res/values-ml-rIN/strings.xml
index 9d47bfb..a1fd81e 100644
--- a/InCallUI/res/values-ml-rIN/strings.xml
+++ b/InCallUI/res/values-ml-rIN/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"പ്രൊഫൈല് ഫോട്ടോ"</string>
<string name="camera_off_description" msgid="5689494614359429889">"ക്യാമറ ഓഫാക്കുക"</string>
+ <string name="child_number" msgid="7437330400723805538">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> വഴി"</string>
</resources>
diff --git a/InCallUI/res/values-mn-rMN/strings.xml b/InCallUI/res/values-mn-rMN/strings.xml
index 743952d..7f69365 100644
--- a/InCallUI/res/values-mn-rMN/strings.xml
+++ b/InCallUI/res/values-mn-rMN/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Профайл зураг"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Камер унтраалттай байна"</string>
+ <string name="child_number" msgid="7437330400723805538">"<xliff:g id="CHILD_NUMBER">%s</xliff:g>-аар"</string>
</resources>
diff --git a/InCallUI/res/values-mr-rIN/strings.xml b/InCallUI/res/values-mr-rIN/strings.xml
index e7da222..1083115 100644
--- a/InCallUI/res/values-mr-rIN/strings.xml
+++ b/InCallUI/res/values-mr-rIN/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"प्रोफाईल फोटो"</string>
<string name="camera_off_description" msgid="5689494614359429889">"कॅमेरा बंद"</string>
+ <string name="child_number" msgid="7437330400723805538">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> द्वारा"</string>
</resources>
diff --git a/InCallUI/res/values-ms-rMY/strings.xml b/InCallUI/res/values-ms-rMY/strings.xml
index ac9c8d9..d0cd7a6 100644
--- a/InCallUI/res/values-ms-rMY/strings.xml
+++ b/InCallUI/res/values-ms-rMY/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Foto profil"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Kamera dimatikan"</string>
+ <string name="child_number" msgid="7437330400723805538">"melalui <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-my-rMM/strings.xml b/InCallUI/res/values-my-rMM/strings.xml
index 0b7bf83..64c61a3 100644
--- a/InCallUI/res/values-my-rMM/strings.xml
+++ b/InCallUI/res/values-my-rMM/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"ပရိုဖိုင် ဓာတ်ပုံ"</string>
<string name="camera_off_description" msgid="5689494614359429889">"ကင်မရာ ပိတ်ရန်"</string>
+ <string name="child_number" msgid="7437330400723805538">"<xliff:g id="CHILD_NUMBER">%s</xliff:g>မှတစ်ဆင့်"</string>
</resources>
diff --git a/InCallUI/res/values-nb/strings.xml b/InCallUI/res/values-nb/strings.xml
index 63c64da..73e6da6 100644
--- a/InCallUI/res/values-nb/strings.xml
+++ b/InCallUI/res/values-nb/strings.xml
@@ -150,7 +150,7 @@
<string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrering"</string>
<string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Lyd"</string>
<string name="default_notification_description" msgid="78174796906240970">"Standardlyd (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
- <string name="ringtone_title" msgid="6374978286202084684">"Telefonringetone"</string>
+ <string name="ringtone_title" msgid="6374978286202084684">"Telefonringelyd"</string>
<string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrering når det ringer"</string>
<string name="preference_category_ringtone" msgid="5197960752529332721">"Ringetone og vibrering"</string>
<string name="manageConferenceLabel" msgid="4691922394301969053">"Administrer konferansesamtale"</string>
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Profilbilde"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Kameraet er slått av"</string>
+ <string name="child_number" msgid="7437330400723805538">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-ne-rNP/strings.xml b/InCallUI/res/values-ne-rNP/strings.xml
index 18228ca..7dbf9b1 100644
--- a/InCallUI/res/values-ne-rNP/strings.xml
+++ b/InCallUI/res/values-ne-rNP/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"प्रोफाइल तस्बिर"</string>
<string name="camera_off_description" msgid="5689494614359429889">"क्यामेरा बन्द"</string>
+ <string name="child_number" msgid="7437330400723805538">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> बाट"</string>
</resources>
diff --git a/InCallUI/res/values-nl/strings.xml b/InCallUI/res/values-nl/strings.xml
index f70598a..3f70154 100644
--- a/InCallUI/res/values-nl/strings.xml
+++ b/InCallUI/res/values-nl/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Profielfoto"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Camera uit"</string>
+ <string name="child_number" msgid="7437330400723805538">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-pa-rIN/strings.xml b/InCallUI/res/values-pa-rIN/strings.xml
index 8661b22..ac55f58 100644
--- a/InCallUI/res/values-pa-rIN/strings.xml
+++ b/InCallUI/res/values-pa-rIN/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"ਪ੍ਰੋਫ਼ਾਈਲ ਫੋਟੋ"</string>
<string name="camera_off_description" msgid="5689494614359429889">"ਕੈਮਰਾ ਬੰਦ"</string>
+ <string name="child_number" msgid="7437330400723805538">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> ਰਾਹੀਂ"</string>
</resources>
diff --git a/InCallUI/res/values-pl/strings.xml b/InCallUI/res/values-pl/strings.xml
index 711e971..a2d1b2a 100644
--- a/InCallUI/res/values-pl/strings.xml
+++ b/InCallUI/res/values-pl/strings.xml
@@ -175,4 +175,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Zdjęcie profilowe"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Kamera wyłączona"</string>
+ <string name="child_number" msgid="7437330400723805538">"z <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-pt-rPT/strings.xml b/InCallUI/res/values-pt-rPT/strings.xml
index 711d442..167af8f 100644
--- a/InCallUI/res/values-pt-rPT/strings.xml
+++ b/InCallUI/res/values-pt-rPT/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Foto do perfil"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Câmara desligada"</string>
+ <string name="child_number" msgid="7437330400723805538">"através de <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-pt/strings.xml b/InCallUI/res/values-pt/strings.xml
index 07d3653..4c9fd20 100644
--- a/InCallUI/res/values-pt/strings.xml
+++ b/InCallUI/res/values-pt/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Foto do perfil"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Câmera desligada"</string>
+ <string name="child_number" msgid="7437330400723805538">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-ro/strings.xml b/InCallUI/res/values-ro/strings.xml
index 6641846..1223476 100644
--- a/InCallUI/res/values-ro/strings.xml
+++ b/InCallUI/res/values-ro/strings.xml
@@ -172,4 +172,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Fotografie de profil"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Camera este oprită"</string>
+ <string name="child_number" msgid="7437330400723805538">"pe <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-ru/strings.xml b/InCallUI/res/values-ru/strings.xml
index 95d7c2c..bf1c0df 100644
--- a/InCallUI/res/values-ru/strings.xml
+++ b/InCallUI/res/values-ru/strings.xml
@@ -175,4 +175,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Фото профиля"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Камера отключена"</string>
+ <string name="child_number" msgid="7437330400723805538">"через <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-si-rLK/strings.xml b/InCallUI/res/values-si-rLK/strings.xml
index c603460..4019500 100644
--- a/InCallUI/res/values-si-rLK/strings.xml
+++ b/InCallUI/res/values-si-rLK/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"පැතිකඩ ඡායාරූපය"</string>
<string name="camera_off_description" msgid="5689494614359429889">"කැමරාව ක්රියාවිරහිතයි"</string>
+ <string name="child_number" msgid="7437330400723805538">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> හරහා"</string>
</resources>
diff --git a/InCallUI/res/values-sk/strings.xml b/InCallUI/res/values-sk/strings.xml
index e8581e1..628ada9 100644
--- a/InCallUI/res/values-sk/strings.xml
+++ b/InCallUI/res/values-sk/strings.xml
@@ -175,4 +175,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Profilová fotka"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Kamera je vypnutá"</string>
+ <string name="child_number" msgid="7437330400723805538">"na čísle <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-sl/strings.xml b/InCallUI/res/values-sl/strings.xml
index f999272..857975c 100644
--- a/InCallUI/res/values-sl/strings.xml
+++ b/InCallUI/res/values-sl/strings.xml
@@ -175,4 +175,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Slika profila"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Kamera je izklopljena"</string>
+ <string name="child_number" msgid="7437330400723805538">"prek <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-sq-rAL/strings.xml b/InCallUI/res/values-sq-rAL/strings.xml
index 606cc0c..72805b7 100644
--- a/InCallUI/res/values-sq-rAL/strings.xml
+++ b/InCallUI/res/values-sq-rAL/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Fotografia e profilit"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Kamera joaktive"</string>
+ <string name="child_number" msgid="7437330400723805538">"përmes <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-sr/strings.xml b/InCallUI/res/values-sr/strings.xml
index 7da2b39..b7703e7 100644
--- a/InCallUI/res/values-sr/strings.xml
+++ b/InCallUI/res/values-sr/strings.xml
@@ -172,4 +172,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Слика профила"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Камера је искључена"</string>
+ <string name="child_number" msgid="7437330400723805538">"на <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-sv/strings.xml b/InCallUI/res/values-sv/strings.xml
index e4cdf6e..4dd221e 100644
--- a/InCallUI/res/values-sv/strings.xml
+++ b/InCallUI/res/values-sv/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Profilfoto"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Kamera av"</string>
+ <string name="child_number" msgid="7437330400723805538">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-sw/strings.xml b/InCallUI/res/values-sw/strings.xml
index f240eb7..128de11 100644
--- a/InCallUI/res/values-sw/strings.xml
+++ b/InCallUI/res/values-sw/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Picha kwenye wasifu"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Kamera imezimwa"</string>
+ <string name="child_number" msgid="7437330400723805538">"kupitia <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-ta-rIN/strings.xml b/InCallUI/res/values-ta-rIN/strings.xml
index 1952563..2db284b 100644
--- a/InCallUI/res/values-ta-rIN/strings.xml
+++ b/InCallUI/res/values-ta-rIN/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"சுயவிவரப் படம்"</string>
<string name="camera_off_description" msgid="5689494614359429889">"கேமராவை முடக்கும்"</string>
+ <string name="child_number" msgid="7437330400723805538">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> வழியாக"</string>
</resources>
diff --git a/InCallUI/res/values-te-rIN/strings.xml b/InCallUI/res/values-te-rIN/strings.xml
index 74a331e..629907b 100644
--- a/InCallUI/res/values-te-rIN/strings.xml
+++ b/InCallUI/res/values-te-rIN/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"ప్రొఫైల్ ఫోటో"</string>
<string name="camera_off_description" msgid="5689494614359429889">"కెమెరా ఆఫ్లో ఉంది"</string>
+ <string name="child_number" msgid="7437330400723805538">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> ద్వారా"</string>
</resources>
diff --git a/InCallUI/res/values-th/strings.xml b/InCallUI/res/values-th/strings.xml
index 8f4a182..62f2573 100644
--- a/InCallUI/res/values-th/strings.xml
+++ b/InCallUI/res/values-th/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"รูปโปรไฟล์"</string>
<string name="camera_off_description" msgid="5689494614359429889">"ปิดกล้อง"</string>
+ <string name="child_number" msgid="7437330400723805538">"ผ่านหมายเลข <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-tl/strings.xml b/InCallUI/res/values-tl/strings.xml
index 072fb39..5a16f3c 100644
--- a/InCallUI/res/values-tl/strings.xml
+++ b/InCallUI/res/values-tl/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Larawan sa profile"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Naka-off ang camera"</string>
+ <string name="child_number" msgid="7437330400723805538">"sa pamamagitan ng <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-tr/strings.xml b/InCallUI/res/values-tr/strings.xml
index 55f0400..8b10006 100644
--- a/InCallUI/res/values-tr/strings.xml
+++ b/InCallUI/res/values-tr/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Profil fotoğrafı"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Kamera kapalı"</string>
+ <string name="child_number" msgid="7437330400723805538">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> ile"</string>
</resources>
diff --git a/InCallUI/res/values-uk/strings.xml b/InCallUI/res/values-uk/strings.xml
index 8111bb2..a7c1f0f 100644
--- a/InCallUI/res/values-uk/strings.xml
+++ b/InCallUI/res/values-uk/strings.xml
@@ -175,4 +175,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Фотографія профілю"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Камеру вимкнено"</string>
+ <string name="child_number" msgid="7437330400723805538">"на номер <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-ur-rPK/strings.xml b/InCallUI/res/values-ur-rPK/strings.xml
index 25785a1..9ddfd8a 100644
--- a/InCallUI/res/values-ur-rPK/strings.xml
+++ b/InCallUI/res/values-ur-rPK/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"پروفائل کی تصویر"</string>
<string name="camera_off_description" msgid="5689494614359429889">"کیمرہ آف ہے"</string>
+ <string name="child_number" msgid="7437330400723805538">"بذریعہ <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-uz-rUZ/strings.xml b/InCallUI/res/values-uz-rUZ/strings.xml
index c27aeba..e6fee1c 100644
--- a/InCallUI/res/values-uz-rUZ/strings.xml
+++ b/InCallUI/res/values-uz-rUZ/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Profil rasmi"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Kamera o‘chiq"</string>
+ <string name="child_number" msgid="7437330400723805538">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> orqali"</string>
</resources>
diff --git a/InCallUI/res/values-vi/strings.xml b/InCallUI/res/values-vi/strings.xml
index 67cef01..22fd39c 100644
--- a/InCallUI/res/values-vi/strings.xml
+++ b/InCallUI/res/values-vi/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Ảnh hồ sơ"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Tắt máy ảnh"</string>
+ <string name="child_number" msgid="7437330400723805538">"qua <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-zh-rCN/strings.xml b/InCallUI/res/values-zh-rCN/strings.xml
index 2b85330..f40b117 100644
--- a/InCallUI/res/values-zh-rCN/strings.xml
+++ b/InCallUI/res/values-zh-rCN/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"个人资料照片"</string>
<string name="camera_off_description" msgid="5689494614359429889">"关闭摄像头"</string>
+ <string name="child_number" msgid="7437330400723805538">"通过 <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-zh-rHK/strings.xml b/InCallUI/res/values-zh-rHK/strings.xml
index 6b68a83..649a56e 100644
--- a/InCallUI/res/values-zh-rHK/strings.xml
+++ b/InCallUI/res/values-zh-rHK/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"個人檔案相片"</string>
<string name="camera_off_description" msgid="5689494614359429889">"攝影機已關閉"</string>
+ <string name="child_number" msgid="7437330400723805538">"透過 <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-zh-rTW/strings.xml b/InCallUI/res/values-zh-rTW/strings.xml
index 1824cd5..9fa7102 100644
--- a/InCallUI/res/values-zh-rTW/strings.xml
+++ b/InCallUI/res/values-zh-rTW/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"個人資料相片"</string>
<string name="camera_off_description" msgid="5689494614359429889">"關閉相機"</string>
+ <string name="child_number" msgid="7437330400723805538">"透過 <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values-zu/strings.xml b/InCallUI/res/values-zu/strings.xml
index e210668..7d1ea15 100644
--- a/InCallUI/res/values-zu/strings.xml
+++ b/InCallUI/res/values-zu/strings.xml
@@ -169,4 +169,5 @@
</plurals>
<string name="profile_photo_description" msgid="5609894336203315400">"Isithombe sephrofayela"</string>
<string name="camera_off_description" msgid="5689494614359429889">"Ikhamela ivaliwe"</string>
+ <string name="child_number" msgid="7437330400723805538">"nge-<xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
</resources>
diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml
index cadef73..15cba1f 100644
--- a/InCallUI/res/values/strings.xml
+++ b/InCallUI/res/values/strings.xml
@@ -456,4 +456,8 @@
<!-- Description of the "camera off" icon displayed when the device's camera is disabled during
a video call. [CHAR LIMIT=NONE] -->
<string name="camera_off_description">Camera off</string>
+
+ <!-- Used to inform the user that a call was received via a number other than the primary
+ phone number associated with their device. [CHAR LIMIT=16] -->
+ <string name="child_number">via <xliff:g id="child_number" example="650-555-1212">%s</xliff:g></string>
</resources>
diff --git a/InCallUI/src/com/android/incallui/AnswerPresenter.java b/InCallUI/src/com/android/incallui/AnswerPresenter.java
index a5a88ff..fc75bf0 100644
--- a/InCallUI/src/com/android/incallui/AnswerPresenter.java
+++ b/InCallUI/src/com/android/incallui/AnswerPresenter.java
@@ -108,6 +108,11 @@
}
}
+ @Override
+ public void onLastForwardedNumberChange() {
+ // no-op
+ }
+
private boolean isVideoUpgradePending(Call call) {
return call.getSessionModificationState()
== Call.SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST;
diff --git a/InCallUI/src/com/android/incallui/Call.java b/InCallUI/src/com/android/incallui/Call.java
index ee73db2..7205b73 100644
--- a/InCallUI/src/com/android/incallui/Call.java
+++ b/InCallUI/src/com/android/incallui/Call.java
@@ -18,16 +18,17 @@
import com.android.contacts.common.CallUtil;
import com.android.contacts.common.testing.NeededForTesting;
-import com.android.incallui.CallList.Listener;
import android.content.Context;
import android.hardware.camera2.CameraCharacteristics;
import android.net.Uri;
import android.os.Bundle;
import android.os.Trace;
+import android.telecom.Connection;
import android.telecom.DisconnectCause;
import android.telecom.GatewayInfo;
import android.telecom.InCallService.VideoCall;
+import android.telecom.PhoneAccount;
import android.telecom.PhoneAccountHandle;
import android.telecom.VideoProfile;
import android.text.TextUtils;
@@ -35,6 +36,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
+import java.util.Objects;
/**
* Describes a single call and its state.
@@ -254,6 +256,9 @@
private int mModifyToVideoState = VideoProfile.STATE_AUDIO_ONLY;
private InCallVideoCallCallback mVideoCallCallback;
+ private String mChildNumber;
+ private String mLastForwardedNumber;
+ private String mCallSubject;
/**
* Used only to create mock calls for testing
@@ -314,6 +319,48 @@
CallList.getInstance().getCallByTelecommCall(
mTelecommCall.getChildren().get(i)).getId());
}
+
+ Bundle callExtras = mTelecommCall.getDetails().getExtras();
+ if (callExtras != null) {
+ // Child address arrives when the call is first set up, so we do not need to notify the
+ // UI of this.
+ if (callExtras.containsKey(Connection.EXTRA_CHILD_ADDRESS)) {
+ String childNumber = callExtras.getString(Connection.EXTRA_CHILD_ADDRESS);
+ if (!Objects.equals(childNumber, mChildNumber)) {
+ mChildNumber = childNumber;
+ }
+ }
+
+ // Last forwarded number comes in as an array of strings. We want to choose the last
+ // item in the array. The forwarding numbers arrive independently of when the call is
+ // originally set up, so we need to notify the the UI of the change.
+ if (callExtras.containsKey(Connection.EXTRA_LAST_FORWARDED_NUMBER)) {
+ ArrayList<String> lastForwardedNumbers =
+ callExtras.getStringArrayList(Connection.EXTRA_LAST_FORWARDED_NUMBER);
+
+ if (lastForwardedNumbers != null) {
+ String lastForwardedNumber = null;
+ if (!lastForwardedNumbers.isEmpty()) {
+ lastForwardedNumber = lastForwardedNumbers.get(
+ lastForwardedNumbers.size() - 1);
+ }
+
+ if (!Objects.equals(lastForwardedNumber, mLastForwardedNumber)) {
+ mLastForwardedNumber = lastForwardedNumber;
+ CallList.getInstance().onLastForwardedNumberChange(this);
+ }
+ }
+ }
+
+ // Call subject is present in the extras at the start of call, so we do not need to
+ // notify any other listeners of this.
+ if (callExtras.containsKey(Connection.EXTRA_CALL_SUBJECT)) {
+ String callSubject = callExtras.getString(Connection.EXTRA_CALL_SUBJECT);
+ if (!Objects.equals(mCallSubject, callSubject)) {
+ mCallSubject = callSubject;
+ }
+ }
+ }
}
private static int translateState(int state) {
@@ -393,6 +440,27 @@
return mTelecommCall == null ? null : mTelecommCall.getDetails().getExtras();
}
+ /**
+ * @return The child number for the call, or {@code null} if none specified.
+ */
+ public String getChildNumber() {
+ return mChildNumber;
+ }
+
+ /**
+ * @return The last forwarded number for the call, or {@code null} if none specified.
+ */
+ public String getLastForwardedNumber() {
+ return mLastForwardedNumber;
+ }
+
+ /**
+ * @return The call subject, or {@code null} if none specified.
+ */
+ public String getCallSubject() {
+ return mCallSubject;
+ }
+
/** Returns call disconnect cause, defined by {@link DisconnectCause}. */
public DisconnectCause getDisconnectCause() {
if (mState == State.DISCONNECTED || mState == State.IDLE) {
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 4121390..5f28960 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -117,10 +117,12 @@
private TextView mCallStateLabel;
private TextView mCallTypeLabel;
private ImageView mHdAudioIcon;
+ private ImageView mForwardIcon;
private View mCallNumberAndLabel;
private ImageView mPhoto;
private TextView mElapsedTime;
private Drawable mPrimaryPhotoDrawable;
+ private TextView mCallSubject;
// Container view that houses the entire primary call card, including the call buttons
private View mPrimaryCallCardContainer;
@@ -231,6 +233,7 @@
mCallStateVideoCallIcon = (ImageView) view.findViewById(R.id.videoCallIcon);
mCallStateLabel = (TextView) view.findViewById(R.id.callStateLabel);
mHdAudioIcon = (ImageView) view.findViewById(R.id.hdAudioIcon);
+ mForwardIcon = (ImageView) view.findViewById(R.id.forwardIcon);
mCallNumberAndLabel = view.findViewById(R.id.labelAndNumber);
mCallTypeLabel = (TextView) view.findViewById(R.id.callTypeLabel);
mElapsedTime = (TextView) view.findViewById(R.id.elapsedTime);
@@ -281,6 +284,7 @@
mPrimaryName.setElegantTextHeight(false);
mCallStateLabel.setElegantTextHeight(false);
+ mCallSubject = (TextView) view.findViewById(R.id.callSubject);
}
@Override
@@ -339,7 +343,7 @@
float videoViewTranslation = 0f;
// Translate the call card to its pre-animation state.
- if (!mIsLandscape){
+ if (!mIsLandscape) {
mPrimaryCallCardContainer.setTranslationY(visible ?
-mPrimaryCallCardContainer.getHeight() : 0);
@@ -553,7 +557,12 @@
Log.v(this, "DisconnectCause " + disconnectCause.toString());
Log.v(this, "gateway " + connectionLabel + gatewayNumber);
- if (TextUtils.equals(callStateLabel.getCallStateLabel(), mCallStateLabel.getText())) {
+ // Check if the call subject is showing -- if it is, we want to bypass showing the call
+ // state.
+ boolean isSubjectShowing = mCallSubject.getVisibility() == View.VISIBLE;
+
+ if (TextUtils.equals(callStateLabel.getCallStateLabel(), mCallStateLabel.getText()) &&
+ !isSubjectShowing) {
// Nothing to do if the labels are the same
if (state == Call.State.ACTIVE || state == Call.State.CONFERENCED) {
mCallStateLabel.clearAnimation();
@@ -562,8 +571,14 @@
return;
}
- // Update the call state label and icon.
- setCallStateLabel(callStateLabel);
+ if (isSubjectShowing) {
+ changeCallStateLabel(null);
+ callStateIcon = null;
+ } else {
+ // Update the call state label and icon.
+ setCallStateLabel(callStateLabel);
+ }
+
if (!TextUtils.isEmpty(callStateLabel.getCallStateLabel())) {
if (state == Call.State.ACTIVE || state == Call.State.CONFERENCED) {
mCallStateLabel.clearAnimation();
@@ -677,6 +692,23 @@
mInCallMessageLabel.setVisibility(View.VISIBLE);
}
+ /**
+ * Sets and shows the call subject if it is not empty. Hides the call subject otherwise.
+ *
+ * @param callSubject The call subject.
+ */
+ @Override
+ public void setCallSubject(String callSubject) {
+ boolean showSubject = !TextUtils.isEmpty(callSubject);
+
+ mCallSubject.setVisibility(showSubject ? View.VISIBLE : View.GONE);
+ if (showSubject) {
+ mCallSubject.setText(callSubject);
+ } else {
+ mCallSubject.setText(null);
+ }
+ }
+
public boolean isAnimating() {
return mIsAnimating;
}
@@ -922,6 +954,17 @@
}
/**
+ * Changes the visibility of the forward icon.
+ *
+ * @param visible {@code true} if the UI should show the forward icon.
+ */
+ @Override
+ public void showForwardIndicator(boolean visible) {
+ mForwardIcon.setVisibility(visible ? View.VISIBLE : View.GONE);
+ }
+
+
+ /**
* Changes the visibility of the "manage conference call" button.
*
* @param visible Whether to set the button to be visible or not.
@@ -942,6 +985,16 @@
}
/**
+ * Determines the current visibility of the call subject.
+ *
+ * @return {@code true} if the subject is visible.
+ */
+ @Override
+ public boolean isCallSubjectVisible() {
+ return mCallSubject.getVisibility() == View.VISIBLE;
+ }
+
+ /**
* Get the overall InCallUI background colors and apply to call card.
*/
public void updateColors() {
@@ -959,6 +1012,7 @@
mPrimaryCallCardContainer.setBackgroundColor(themeColors.mPrimaryColor);
}
mCallButtonsContainer.setBackgroundColor(themeColors.mPrimaryColor);
+ mCallSubject.setTextColor(themeColors.mPrimaryColor);
mCurrentThemeColors = themeColors;
}
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index 3f9c567..7c11b2d 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -66,7 +66,8 @@
private static final String TAG = CallCardPresenter.class.getSimpleName();
private static final long CALL_TIME_UPDATE_INTERVAL_MS = 1000;
- private final EmergencyCallListener mEmergencyCallListener = ObjectFactory.newEmergencyCallListener();
+ private final EmergencyCallListener mEmergencyCallListener =
+ ObjectFactory.newEmergencyCallListener();
private Call mPrimary;
private Call mSecondary;
@@ -206,6 +207,7 @@
Call.areSameNumber(mPrimary, primary));
final boolean secondaryChanged = !(Call.areSame(mSecondary, secondary) &&
Call.areSameNumber(mSecondary, secondary));
+ final boolean shouldShowCallSubject = shouldShowCallSubject(mPrimary);
mSecondary = secondary;
Call previousPrimary = mPrimary;
@@ -215,7 +217,8 @@
// 1. Primary call changed.
// 2. The call's ability to manage conference has changed.
if (mPrimary != null && (primaryChanged ||
- ui.isManageConferenceVisible() != shouldShowManageConference())) {
+ ui.isManageConferenceVisible() != shouldShowManageConference()) ||
+ ui.isCallSubjectVisible() != shouldShowCallSubject) {
// primary call has changed
if (previousPrimary != null) {
CallList.getInstance().removeCallUpdateListener(previousPrimary.getId(), this);
@@ -320,6 +323,19 @@
updatePrimaryCallState();
}
+ /**
+ * Handles a change to the last forwarding number by refreshing the primary call info.
+ */
+ @Override
+ public void onLastForwardedNumberChange() {
+ Log.v(this, "onLastForwardedNumberChange");
+
+ if (mPrimary == null) {
+ return;
+ }
+ updatePrimaryDisplayInfo();
+ }
+
private String getSubscriptionNumber() {
// If it's an emergency call, and they're not populating the callback number,
// then try to fall back to the phone sub info (to hopefully get the SIM's
@@ -348,15 +364,23 @@
mPrimary.hasProperty(Details.PROPERTY_WIFI),
mPrimary.isConferenceCall());
- boolean showHdAudioIndicator =
- isPrimaryCallActive() && mPrimary.hasProperty(Details.PROPERTY_HIGH_DEF_AUDIO);
- getUi().showHdAudioIndicator(showHdAudioIndicator);
-
+ maybeShowHdAudioIcon();
setCallbackNumber();
}
}
/**
+ * Show the HD icon if the call is active and has {@link Details#PROPERTY_HIGH_DEF_AUDIO},
+ * except if the call has a last forwarded number (we will show that icon instead).
+ */
+ private void maybeShowHdAudioIcon() {
+ boolean showHdAudioIndicator =
+ isPrimaryCallActive() && mPrimary.hasProperty(Details.PROPERTY_HIGH_DEF_AUDIO) &&
+ TextUtils.isEmpty(mPrimary.getLastForwardedNumber());
+ getUi().showHdAudioIndicator(showHdAudioIndicator);
+ }
+
+ /**
* Only show the conference call button if we can manage the conference.
*/
private void maybeShowManageConferenceCallButton() {
@@ -582,13 +606,38 @@
Log.d(TAG, "Update primary display info for " + mPrimaryContactInfo);
String name = getNameForCall(mPrimaryContactInfo);
- String number = getNumberForCall(mPrimaryContactInfo);
+ String number;
+
+ boolean isChildNumberShown = !TextUtils.isEmpty(mPrimary.getChildNumber());
+ boolean isForwardedNumberShown = !TextUtils.isEmpty(mPrimary.getLastForwardedNumber());
+ boolean isCallSubjectShown = shouldShowCallSubject(mPrimary);
+
+ if (isCallSubjectShown) {
+ ui.setCallSubject(mPrimary.getCallSubject());
+ } else {
+ ui.setCallSubject(null);
+ }
+
+ if (isCallSubjectShown) {
+ number = null;
+ } else if (isChildNumberShown) {
+ number = mContext.getString(R.string.child_number, mPrimary.getChildNumber());
+ } else if (isForwardedNumberShown) {
+ // Use last forwarded number instead of second line, if present.
+ number = mPrimary.getLastForwardedNumber();
+ } else {
+ number = getNumberForCall(mPrimaryContactInfo);
+ }
+
+ ui.showForwardIndicator(isForwardedNumberShown);
+ maybeShowHdAudioIcon();
+
boolean nameIsNumber = name != null && name.equals(mPrimaryContactInfo.number);
ui.setPrimary(
number,
name,
nameIsNumber,
- mPrimaryContactInfo.label,
+ isChildNumberShown || isCallSubjectShown ? null : mPrimaryContactInfo.label,
mPrimaryContactInfo.photo,
mPrimaryContactInfo.isSipCall);
} else {
@@ -848,6 +897,24 @@
}
}
+ /**
+ * Determines whether the call subject should be visible on the UI. For the call subject to be
+ * visible, the call has to be in an incoming or waiting state, and the subject must not be
+ * empty.
+ *
+ * @param call The call.
+ * @return {@code true} if the subject should be shown, {@code false} otherwise.
+ */
+ private boolean shouldShowCallSubject(Call call) {
+ if (call == null) {
+ return false;
+ }
+
+ boolean isIncomingOrWaiting = mPrimary.getState() == Call.State.INCOMING ||
+ mPrimary.getState() == Call.State.CALL_WAITING;
+ return isIncomingOrWaiting && !TextUtils.isEmpty(call.getCallSubject());
+ }
+
public interface CallCardUi extends Ui {
void setVisible(boolean on);
void setCallCardVisible(boolean visible);
@@ -866,10 +933,13 @@
void setPrimaryLabel(String label);
void setEndCallButtonEnabled(boolean enabled, boolean animate);
void setCallbackNumber(String number, boolean isEmergencyCalls);
+ void setCallSubject(String callSubject);
void setProgressSpinnerVisible(boolean visible);
void showHdAudioIndicator(boolean visible);
+ void showForwardIndicator(boolean visible);
void showManageConferenceCallButton(boolean visible);
boolean isManageConferenceVisible();
+ boolean isCallSubjectVisible();
void animateForNewOutgoingCall();
void sendAccessibilityAnnouncement();
}
diff --git a/InCallUI/src/com/android/incallui/CallList.java b/InCallUI/src/com/android/incallui/CallList.java
index c0014bd..fbcc1cc 100644
--- a/InCallUI/src/com/android/incallui/CallList.java
+++ b/InCallUI/src/com/android/incallui/CallList.java
@@ -160,6 +160,20 @@
}
}
+ /**
+ * Called when a single call has changed session modification state.
+ *
+ * @param call The call.
+ */
+ public void onLastForwardedNumberChange(Call call) {
+ final List<CallUpdateListener> listeners = mCallUpdateListenerMap.get(call.getId());
+ if (listeners != null) {
+ for (CallUpdateListener listener : listeners) {
+ listener.onLastForwardedNumberChange();
+ }
+ }
+ }
+
public void notifyCallUpdateListeners(Call call) {
final List<CallUpdateListener> listeners = mCallUpdateListenerMap.get(call.getId());
if (listeners != null) {
@@ -611,5 +625,10 @@
* @param sessionModificationState The new session modification state.
*/
public void onSessionModificationStateChange(int sessionModificationState);
+
+ /**
+ * Notifies of a change to the last forwarded number for a call.
+ */
+ public void onLastForwardedNumberChange();
}
}
diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
index 8df4520..e583434 100644
--- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java
+++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
@@ -40,6 +40,8 @@
import com.google.common.base.Preconditions;
+import java.util.Objects;
+
/**
* This class adds Notifications to the status bar for the in-call experience.
*/
@@ -60,7 +62,7 @@
private int mCurrentNotification = NOTIFICATION_NONE;
private int mCallState = Call.State.INVALID;
private int mSavedIcon = 0;
- private int mSavedContent = 0;
+ private String mSavedContent = null;
private Bitmap mSavedLargeIcon;
private String mSavedContentTitle;
private String mCallId = null;
@@ -206,7 +208,7 @@
// Check if data has changed; if nothing is different, don't issue another notification.
final int iconResId = getIconToDisplay(call);
Bitmap largeIcon = getLargeIconToDisplay(contactInfo, call);
- final int contentResId = getContentString(call);
+ final String content = getContentString(call);
final String contentTitle = getContentTitle(contactInfo, call);
final int notificationType;
@@ -218,7 +220,7 @@
notificationType = NOTIFICATION_IN_CALL;
}
- if (!checkForChangeAndSaveData(iconResId, contentResId, largeIcon, contentTitle, state,
+ if (!checkForChangeAndSaveData(iconResId, content, largeIcon, contentTitle, state,
notificationType)) {
return;
}
@@ -244,7 +246,7 @@
}
// Set the content
- builder.setContentText(mContext.getString(contentResId));
+ builder.setContentText(content);
builder.setSmallIcon(iconResId);
builder.setContentTitle(contentTitle);
builder.setLargeIcon(largeIcon);
@@ -306,7 +308,7 @@
* are already displaying. If the data is exactly the same, we return false so that
* we do not issue a new notification for the exact same data.
*/
- private boolean checkForChangeAndSaveData(int icon, int content, Bitmap largeIcon,
+ private boolean checkForChangeAndSaveData(int icon, String content, Bitmap largeIcon,
String contentTitle, int state, int notificationType) {
// The two are different:
@@ -317,7 +319,7 @@
(contentTitle == null && mSavedContentTitle != null);
// any change means we are definitely updating
- boolean retval = (mSavedIcon != icon) || (mSavedContent != content) ||
+ boolean retval = (mSavedIcon != icon) || !Objects.equals(mSavedContent, content) ||
(mCallState != state) || (mSavedLargeIcon != largeIcon) ||
contentTitleChanged;
@@ -419,13 +421,20 @@
/**
* Returns the message to use with the notification.
*/
- private int getContentString(Call call) {
+ private String getContentString(Call call) {
+ boolean isIncomingOrWaiting = call.getState() == Call.State.INCOMING ||
+ call.getState() == Call.State.CALL_WAITING;
+
+ if (isIncomingOrWaiting && !TextUtils.isEmpty(call.getCallSubject())) {
+ return call.getCallSubject();
+ }
+
int resId = R.string.notification_ongoing_call;
if (call.hasProperty(Details.PROPERTY_WIFI)) {
resId = R.string.notification_ongoing_call_wifi;
}
- if (call.getState() == Call.State.INCOMING || call.getState() == Call.State.CALL_WAITING) {
+ if (isIncomingOrWaiting) {
if (call.hasProperty(Details.PROPERTY_WIFI)) {
resId = R.string.notification_incoming_call_wifi;
} else {
@@ -440,7 +449,7 @@
resId = R.string.notification_requesting_video_call;
}
- return resId;
+ return mContext.getString(resId);
}
/**
@@ -637,4 +646,9 @@
updateNotification(mInCallState, CallList.getInstance());
}
}
+
+ @Override
+ public void onLastForwardedNumberChange() {
+ // no-op
+ }
}
