Merge "Ensure sim color is shown on multi-sim devices when only one sim installed." into lmp-mr1-dev

commit: 6ad502310c2ada18805b678f2e8b3f3ec5b58d35 [log] [tgz]
author: Tyler Gunn <tgunn@google.com> Thu Jan 22 16:42:51 2015 +0000
committer: Android (Google) Code Review <android-gerrit@google.com> Thu Jan 22 16:42:52 2015 +0000
tree: fa84f728924eaa244f19bc885fe69287e2fb9b38
parent: 15110c789df7c1095b9586dff2d04806b10cfae3 [diff]
parent: 7ba84ee61ef5d4284808f77711c7843b4b94a6b8 [diff]
diff --git a/InCallUI/res/drawable/btn_compound_audio.xml b/InCallUI/res/drawable/btn_compound_audio.xml
index 222ff1b..25a64a6 100644
--- a/InCallUI/res/drawable/btn_compound_audio.xml
+++ b/InCallUI/res/drawable/btn_compound_audio.xml

@@ -90,13 +90,4 @@
             android:tint="@color/selectable_icon_tint" />
     </item>
 
-    <!-- Generic "audio mode" icon. -->
-    <!-- TODO: is this actually needed? -->
-    <!--
-        <item android:id="@+id/soundItem">
-            <bitmap android:src="@drawable/ic_sound_holo_dark"
-                    android:gravity="center" />
-        </item>
-    -->
-
 </layer-list>

diff --git a/InCallUI/res/drawable/btn_compound_background.xml b/InCallUI/res/drawable/btn_compound_background.xml
index 36aab0d..20e2a30 100644
--- a/InCallUI/res/drawable/btn_compound_background.xml
+++ b/InCallUI/res/drawable/btn_compound_background.xml

@@ -32,4 +32,4 @@
             <item android:drawable="@drawable/btn_unselected" />
         </selector>
     </item>
-</ripple>
\ No newline at end of file
+</ripple>

diff --git a/InCallUI/res/layout/call_button_fragment.xml b/InCallUI/res/layout/call_button_fragment.xml
index 56d65b0..e8feca6 100644
--- a/InCallUI/res/layout/call_button_fragment.xml
+++ b/InCallUI/res/layout/call_button_fragment.xml

@@ -45,9 +45,8 @@
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="@dimen/button_cluster_horizontal_padding"
-        android:paddingEnd="@dimen/button_cluster_horizontal_padding"
-        android:gravity="bottom|center_horizontal">
+        android:gravity="bottom|center_horizontal"
+        android:baselineAligned="false">
 
         <!-- This row only ever shows either 4 or 5 buttons. This may depend on whether the device
              supports "Hold" (i.e. 4 buttons on CDMA devices, 5 buttons on GSM devices.) or whether
@@ -66,10 +65,10 @@
         <!-- "Audio mode". this is a multi-mode button that can behave either like a simple
              "compound button" with two states *or* like an action button that brings up a popup
              menu; see btn_compound_audio.xml and CallButtonFragment.updateAudioButtons(). -->
-        <ImageButton android:id="@+id/audioButton"
+        <ToggleButton android:id="@+id/audioButton"
             style="@style/InCallCompoundButton"
             android:background="@drawable/btn_compound_audio"
-            android:contentDescription="@string/onscreenAudioText" />
+            android:contentDescription="@string/audio_mode_speaker" />
 
         <!-- "Change to audio call" for video calls. -->
         <ImageButton android:id="@+id/changeToVoiceButton"
@@ -81,7 +80,7 @@
         <!-- MIDDLE LEFT SLOT ================================================================== -->
 
         <!-- "Mute" -->
-        <ImageButton android:id="@+id/muteButton"
+        <ToggleButton android:id="@+id/muteButton"
             style="@style/InCallCompoundButton"
             android:background="@drawable/btn_compound_mute"
             android:contentDescription="@string/onscreenMuteText" />
@@ -89,7 +88,7 @@
         <!-- CENTER SLOT ======================================================================= -->
 
         <!-- "Dialpad" -->
-        <ImageButton android:id="@+id/dialpadButton"
+        <ToggleButton android:id="@+id/dialpadButton"
             style="@style/InCallCompoundButton"
             android:background="@drawable/btn_compound_dialpad"
             android:contentDescription="@string/onscreenShowDialpadText" />
@@ -100,7 +99,7 @@
              other of these must always be set to GONE. -->
 
         <!-- "Hold" -->
-        <ImageButton android:id="@+id/holdButton"
+        <ToggleButton android:id="@+id/holdButton"
             style="@style/InCallCompoundButton"
             android:background="@drawable/btn_compound_hold"
             android:contentDescription="@string/onscreenHoldText" />
@@ -120,7 +119,7 @@
             android:visibility="gone" />
 
         <!-- "Switch camera" for video calls. -->
-        <ImageButton android:id="@+id/switchCameraButton"
+        <ToggleButton android:id="@+id/switchCameraButton"
             style="@style/InCallCompoundButton"
             android:background="@drawable/btn_compound_video_switch"
             android:contentDescription="@string/onscreenSwitchCameraText"
@@ -148,7 +147,7 @@
             android:visibility="gone" />
 
         <!-- "Switch camera" for video calls. -->
-        <ImageButton android:id="@+id/pauseVideoButton"
+        <ToggleButton android:id="@+id/pauseVideoButton"
             style="@style/InCallCompoundButton"
             android:background="@drawable/btn_compound_video_off"
             android:contentDescription="@string/onscreenPauseVideoText"

diff --git a/InCallUI/res/layout/secondary_call_info.xml b/InCallUI/res/layout/secondary_call_info.xml
index a1d12a4..85eef0e 100644
--- a/InCallUI/res/layout/secondary_call_info.xml
+++ b/InCallUI/res/layout/secondary_call_info.xml

@@ -59,6 +59,7 @@
                 android:layout_height="wrap_content"
                 android:textColor="@color/incall_banner_secondary_text_color"
                 android:textSize="@dimen/secondary_call_info_text_size"
+                android:textAlignment="viewStart"
                 android:ellipsize="marquee"
                 android:singleLine="true"/>
 
@@ -74,6 +75,7 @@
                     android:layout_height="wrap_content"
                     android:textColor="@color/incall_banner_secondary_text_color"
                     android:textSize="@dimen/secondary_call_info_text_size"
+                    android:textAlignment="viewStart"
                     android:singleLine="true"/>
 
             </LinearLayout>
@@ -89,7 +91,6 @@
             android:text="@string/onHold"
             android:textColor="@color/incall_banner_secondary_text_color"
             android:textSize="@dimen/secondary_call_info_text_size"
-            android:textAlignment="textEnd"
             android:singleLine="true" />
 
     </LinearLayout>

diff --git a/InCallUI/res/values-af/strings.xml b/InCallUI/res/values-af/strings.xml
index 3050c2f..fc27060 100644
--- a/InCallUI/res/values-af/strings.xml
+++ b/InCallUI/res/values-af/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Skryf jou eie..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Kanselleer"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Stuur"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Luidsprekerfoon gekies"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Oorstuk gekies"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Bedrade kopstuk gekies"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth-kopstuk gekies"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Oproep stilgemaak."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Oproep ontdemp."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Oproep is laat wag."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Oproep word nie meer laat wag nie"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Antwoord"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Stuur SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Wys af"</string>

diff --git a/InCallUI/res/values-am/strings.xml b/InCallUI/res/values-am/strings.xml
index 693d9a8..982a65f 100644
--- a/InCallUI/res/values-am/strings.xml
+++ b/InCallUI/res/values-am/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"የስልክ ድምጽ ማጉያ ተመርጧል"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"የጆሮ ማዳመጫ ተመርጧል"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"ባለገመድ ጆሮ ማዳመጫ ተመርጧል"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"የብሉቱዝ ጆሮ ማዳመጫ ተመርጧል"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"ጥሪ ፀጥ  ብሏል"</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"የጥሪ ድምጸ-ከል ተነስቷል።"</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"ጥሪ በይቆይ ላይ ነው"</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"ጥሪ ከአሁን በኋላ በይቆይ ላይ አይደለም።"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"መልስ"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS ላክ"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"አትቀበል"</string>

diff --git a/InCallUI/res/values-ar/strings.xml b/InCallUI/res/values-ar/strings.xml
index 86e8868..36e5e19 100644
--- a/InCallUI/res/values-ar/strings.xml
+++ b/InCallUI/res/values-ar/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"تم تحديد مكبر الصوت"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"تم تحديد سماعة الأذن"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"تم تحديد سماعة الرأس السلكية"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"تم تحديد سماعة رأس بلوتوث"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"تم كتم صوت المكالمة."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"تمت إعادة صوت المكالمة."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"تم وضع المكالمة قيد الانتظار."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"لم تعد المكالمة قيد الانتظار."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"رد"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"‏إرسال رسائل قصيرة SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"رفض"</string>

diff --git a/InCallUI/res/values-bg/strings.xml b/InCallUI/res/values-bg/strings.xml
index 9a9a9c8..208a27b 100644
--- a/InCallUI/res/values-bg/strings.xml
+++ b/InCallUI/res/values-bg/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Избрахте високоговорител"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Избрахте слушалка"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Избрахте слушалки с кабел"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Избрахте слушалки с Bluetooth"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Обаждането бе спряно."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Звукът на обаждането е включен отново."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Обаждането е задържано."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Обаждането вече не е в режим на изчакване."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Отговор"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Изпращане на SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Отхвърлям"</string>

diff --git a/InCallUI/res/values-bn-rBD/strings.xml b/InCallUI/res/values-bn-rBD/strings.xml
index 662ec06..c7fce65 100644
--- a/InCallUI/res/values-bn-rBD/strings.xml
+++ b/InCallUI/res/values-bn-rBD/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"স্পিকারফোন নির্বাচন করা হয়েছে"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"ইয়ারপিস নির্বাচন করা হয়েছে"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"তারযুক্ত হেডসেট নির্বাচন করা হয়েছে"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth হেডসেট নির্বাচন করা হয়েছে"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"কল নিঃশব্দ করা আছে৷"</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"কল সশব্দ করা হয়েছে।"</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"কলটি সাময়িকভাবে স্থগিত রাখা হয়েছে।"</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"কল আর হোল্ডে নেই৷"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"উত্তর"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS পাঠান"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"অস্বীকার করুন"</string>

diff --git a/InCallUI/res/values-ca/strings.xml b/InCallUI/res/values-ca/strings.xml
index 58efcc4..7058a37 100644
--- a/InCallUI/res/values-ca/strings.xml
+++ b/InCallUI/res/values-ca/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Escriu la teva…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Cancel·la"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Envia"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Altaveu seleccionat"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Auricular seleccionat"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Auriculars amb cable seleccionats"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Auricular Bluetooth seleccionat"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Trucada silenciada."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"S\'ha activat el so de la trucada."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"S\'ha posat la trucada en espera."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"La trucada ja no està en espera."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Resposta"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Envia SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Rebutja"</string>

diff --git a/InCallUI/res/values-cs/strings.xml b/InCallUI/res/values-cs/strings.xml
index 9bbb034..57135e1 100644
--- a/InCallUI/res/values-cs/strings.xml
+++ b/InCallUI/res/values-cs/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Napsat vlastní odpověď..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Zrušit"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Odeslat"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Vybrán reproduktor"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Vybráno sluchátko"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Vybrána kabelová náhlavní souprava"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Vybrána náhlavní souprava Bluetooth"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Hovor ztlumen."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Zvuk hovoru byl zapnut."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Hovor byl přidržen."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Hovor už není přidržený."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Odpověď"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Odeslat SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Odmítnout"</string>

diff --git a/InCallUI/res/values-da/strings.xml b/InCallUI/res/values-da/strings.xml
index 703308a..bf7c62f 100644
--- a/InCallUI/res/values-da/strings.xml
+++ b/InCallUI/res/values-da/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Skriv dit eget svar..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Annuller"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Send"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Højttalertelefon blev valgt"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Højttaler blev valgt"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Headset med kabel blev valgt"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth-headset er valgt"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Lyd slået fra opkald."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Lyden for opkaldet blev slået til."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Opkaldet er sat i venteposition."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Opkaldet er ikke længere afventende."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Svar"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Send sms"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Afvis"</string>

diff --git a/InCallUI/res/values-de/strings.xml b/InCallUI/res/values-de/strings.xml
index 05a8ed0..8d4f044 100644
--- a/InCallUI/res/values-de/strings.xml
+++ b/InCallUI/res/values-de/strings.xml

@@ -67,7 +67,7 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Mailboxnummer unbekannt"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"kein Dienst"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Ausgewähltes Netzwerk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nicht verfügbar"</string>
-    <string name="notification_action_answer" msgid="6700362365135365143">"Antworten"</string>
+    <string name="notification_action_answer" msgid="6700362365135365143">"Annehmen"</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Beenden"</string>
     <string name="notification_action_answer_video" msgid="7809271910870211729">"Videoanruf"</string>
     <string name="notification_action_answer_voice" msgid="1770796916369437773">"Nur Audio"</string>
@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Eigene Antwort schreiben..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Abbrechen"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Senden"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Freisprechfunktion ausgewählt"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Kopfhörer ausgewählt"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Kabelheadset ausgewählt"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth-Headset ausgewählt"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Anruf stummgeschaltet"</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Stummschaltung des Anrufs aufgehoben"</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Anruf wird gehalten."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Anruf wird nicht mehr gehalten."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Antworten"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS senden"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Ablehnen"</string>

diff --git a/InCallUI/res/values-el/strings.xml b/InCallUI/res/values-el/strings.xml
index 6309d2b..e668ddf 100644
--- a/InCallUI/res/values-el/strings.xml
+++ b/InCallUI/res/values-el/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Επιλέχθηκε ανοικτή ακρόαση"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Επιλέχθηκε ακουστικό τηλεφώνου"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Επιλέχθηκαν ενσύρματα ακουστικά"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Επιλέχθηκε ακουστικό Bluetooth"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Η κλήση τέθηκε σε σίγαση."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Καταργήθηκε η σίγαση κλήσης."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Η κλήση είναι σε αναμονή."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Η κλήση δεν είναι πλέον σε αναμονή."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Απάντηση"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Αποστολή SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Απόρριψη"</string>

diff --git a/InCallUI/res/values-en-rGB/strings.xml b/InCallUI/res/values-en-rGB/strings.xml
index 94721fa..3cc0c31 100644
--- a/InCallUI/res/values-en-rGB/strings.xml
+++ b/InCallUI/res/values-en-rGB/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Write your own..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Cancel"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Send"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Speakerphone selected"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Earpiece selected"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Wired headset selected"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth headset selected"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Call muted."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Call unmuted."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Call put on hold."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Call no longer on hold."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Answer"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Send SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Decline"</string>

diff --git a/InCallUI/res/values-en-rIN/strings.xml b/InCallUI/res/values-en-rIN/strings.xml
index 94721fa..3cc0c31 100644
--- a/InCallUI/res/values-en-rIN/strings.xml
+++ b/InCallUI/res/values-en-rIN/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Write your own..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Cancel"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Send"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Speakerphone selected"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Earpiece selected"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Wired headset selected"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth headset selected"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Call muted."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Call unmuted."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Call put on hold."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Call no longer on hold."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Answer"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Send SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Decline"</string>

diff --git a/InCallUI/res/values-es-rUS/strings.xml b/InCallUI/res/values-es-rUS/strings.xml
index 70246e6..7fcd85d 100644
--- a/InCallUI/res/values-es-rUS/strings.xml
+++ b/InCallUI/res/values-es-rUS/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Escribe tu propia respuesta..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Cancelar"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Enviar"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Altavoz seleccionado"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Auricular seleccionado"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Auriculares con cable seleccionados"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Auriculares Bluetooth seleccionados"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Llamada silenciada"</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Llamada con sonido activado"</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Llamada en espera"</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"La llamada ya no está en espera."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Responder"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Enviar un mensaje SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Rechazar"</string>

diff --git a/InCallUI/res/values-es/strings.xml b/InCallUI/res/values-es/strings.xml
index c093a26..70f0bea 100644
--- a/InCallUI/res/values-es/strings.xml
+++ b/InCallUI/res/values-es/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Escribe tu propia respuesta..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Cancelar"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Enviar"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Altavoz seleccionado"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Auricular seleccionado"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Auriculares con cable seleccionados"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Auriculares Bluetooth seleccionados"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Llamada silenciada"</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Llamada silenciada."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Llamada en espera."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"La llamada ya no está en espera."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Responder"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Enviar SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Rechazar"</string>

diff --git a/InCallUI/res/values-et-rEE/strings.xml b/InCallUI/res/values-et-rEE/strings.xml
index b4fd507..64dcc17 100644
--- a/InCallUI/res/values-et-rEE/strings.xml
+++ b/InCallUI/res/values-et-rEE/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Kirjutage ise …"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Tühista"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Saada"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Valitud on valjuhääldi"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Valitud on kuular"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Valitud on juhtmega peakomplekt"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Valitud on Bluetooth-peakomplekt"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Kõne on summutatud."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Kõne vaigistus tühistati."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Kõne pandi ootele."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Kõne pole enam ootel."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Vastamine"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS-i saatmine"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Keeldumine"</string>

diff --git a/InCallUI/res/values-eu-rES/strings.xml b/InCallUI/res/values-eu-rES/strings.xml
index cccbddd..525d607 100644
--- a/InCallUI/res/values-eu-rES/strings.xml
+++ b/InCallUI/res/values-eu-rES/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Idatzi zeure erantzuna…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Utzi"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Bidali"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Bozgorailua hautatu da"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Aurikularrak hautatu dira"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Kabledun entzungailua hautatu da"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth entzungailua hautatu da"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Deiaren audioa desaktibatu da."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Deiaren audioa aktibatu da."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Deia zain utzi da."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Deiak zain egoteari utzi dio."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Erantzun"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Bidali SMS mezua"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Baztertu"</string>

diff --git a/InCallUI/res/values-fa/strings.xml b/InCallUI/res/values-fa/strings.xml
index 59584bf..c3529dc 100644
--- a/InCallUI/res/values-fa/strings.xml
+++ b/InCallUI/res/values-fa/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"بلندگو انتخاب شد"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"گوشی انتخاب شد"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"هدست سیم‌دار انتخاب شد"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"هدست بلوتوث انتخاب شد"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"تماس نادیده گرفته شد."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"صدای تماس وصل شد."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"تماس در حالت انتظار نگه داشته شد."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"تماس دیگر در حالت انتظار نیست."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"پاسخ"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"ارسال پیامک"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"عدم پذیرش"</string>

diff --git a/InCallUI/res/values-fi/strings.xml b/InCallUI/res/values-fi/strings.xml
index 72b944c..2bef852 100644
--- a/InCallUI/res/values-fi/strings.xml
+++ b/InCallUI/res/values-fi/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Kirjoita oma…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Peruuta"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Lähetä"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Kaiutinpuhelin valittiin"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Kaiutin valittiin"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Johdolla varustettu kuulokemikrofoni valittiin"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth-kuulokemikrofoni valittiin"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Puhelu mykistetty."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Puhelun mykistys poistettiin."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Puhelu asetettiin pitoon."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Puhelu ei ole enää pidossa."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Vastaa"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Lähetä tekstiviesti"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Hylkää"</string>

diff --git a/InCallUI/res/values-fr-rCA/strings.xml b/InCallUI/res/values-fr-rCA/strings.xml
index b498a7e..083d5bb 100644
--- a/InCallUI/res/values-fr-rCA/strings.xml
+++ b/InCallUI/res/values-fr-rCA/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Réponse personnalisée..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Annuler"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Envoyer"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Haut-parleur sélectionné"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Écouteur sélectionné"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Écouteurs à câble sélectionnés"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Écouteurs Bluetooth sélectionnés"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Son coupé"</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Le son de l\'appareil a été réactivé."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"L\'appel a été mis en attente."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"L\'appel n\'est plus en attente."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Répondre"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Envoyer un message texte"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Refuser"</string>

diff --git a/InCallUI/res/values-fr/strings.xml b/InCallUI/res/values-fr/strings.xml
index 3014720..1b17782 100644
--- a/InCallUI/res/values-fr/strings.xml
+++ b/InCallUI/res/values-fr/strings.xml

@@ -127,15 +127,7 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Réponse personnalisée..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Annuler"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Envoyer"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Haut-parleur sélectionné"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Écouteur sélectionné"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Casque filaire sélectionné"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Casque Bluetooth sélectionné"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Son coupé"</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Son de l\'appel réactivé"</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Appel mis en attente"</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"L\'appel n\'est plus en attente."</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Réponse"</string>
+    <string name="description_target_answer" msgid="7205604197797472471">"Répondre"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Envoyer un SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Refuser"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Répondre via un appel vidéo"</string>

diff --git a/InCallUI/res/values-gl-rES/strings.xml b/InCallUI/res/values-gl-rES/strings.xml
index 12eae15..80dae5b 100644
--- a/InCallUI/res/values-gl-rES/strings.xml
+++ b/InCallUI/res/values-gl-rES/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Escribe a túa propia..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Cancelar"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Enviar"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Seleccionouse o altofalante"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Seleccionouse o auricular"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Seleccionáronse os auriculares con fíos"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Seleccionáronse os auriculares de Bluetooth"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Chamada silenciada"</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Chamada con son activado."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Chamada en espera."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"A chamada xa non está en espera."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Responder"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Enviar SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Rexeitar"</string>

diff --git a/InCallUI/res/values-hi/strings.xml b/InCallUI/res/values-hi/strings.xml
index 7be1a1d..47ac317 100644
--- a/InCallUI/res/values-hi/strings.xml
+++ b/InCallUI/res/values-hi/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"स्पीकरफ़ोन चुना गया"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"इयरपीस चुना गया"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"वायर्ड हैडसेट चुना गया"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth हैडसेट चुना गया"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"कॉल म्‍यूट की गई."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"कॉल को अनम्यूट किया गया."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"कॉल को होल्ड पर रखा गया."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"कॉल अब होल्‍ड पर नहीं है."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"उत्तर"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS भेजें"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"अस्वीकार करें"</string>

diff --git a/InCallUI/res/values-hr/strings.xml b/InCallUI/res/values-hr/strings.xml
index 2216d9c..35d96a2 100644
--- a/InCallUI/res/values-hr/strings.xml
+++ b/InCallUI/res/values-hr/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Napišite odgovor..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Odustani"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Pošalji"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Zvučnik je odabran"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Zvučnik je odabran"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Žičane su slušalice odabrane"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth slušalice odabrane"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Zvuk poziva isključen."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Uključen je zvuk poziva."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Poziv je stavljen na čekanje."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Poziv više nije na čekanju."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Odgovori"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Pošalji SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Odbij"</string>

diff --git a/InCallUI/res/values-hu/strings.xml b/InCallUI/res/values-hu/strings.xml
index 36fafc9..67be5aa 100644
--- a/InCallUI/res/values-hu/strings.xml
+++ b/InCallUI/res/values-hu/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Saját válasz írása..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Mégse"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Küldés"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Kihangosító kiválasztva"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Fülhallgató kiválasztva"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Vezetékes headset kiválasztva"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth headset kiválasztva"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Hívás némítva."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"A hívás némítása feloldva."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Várakoztatott hívás."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"A hívás már nem várakozik."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Fogadás"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS küldése"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Elutasítás"</string>

diff --git a/InCallUI/res/values-hy-rAM/strings.xml b/InCallUI/res/values-hy-rAM/strings.xml
index f420ddb..301bd1e 100644
--- a/InCallUI/res/values-hy-rAM/strings.xml
+++ b/InCallUI/res/values-hy-rAM/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Ընտրվել է բարձրախոսը"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Ընտրվել է ականջակալը"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Ընտրվել է լարային ականջակալը"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Ընտրվել է Bluetooth ականջակալը"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Զանգը խլացված է:"</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Զանգը հանվեց համր ռեժիմից:"</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Զանգը դրվեց սպասման ռեժիմի վրա:"</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Զանգն այլևս սպասման մեջ չէ:"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Պատասխանել"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Ուղարկել SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Մերժել"</string>

diff --git a/InCallUI/res/values-in/strings.xml b/InCallUI/res/values-in/strings.xml
index c34c62e..a5819c6 100644
--- a/InCallUI/res/values-in/strings.xml
+++ b/InCallUI/res/values-in/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Tulis respons Anda sendiri…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Batal"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Kirim"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Speakerphone telah dipilih"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Earpiece telah dipilih"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Headset berkabel telah dipilih"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Headset Bluetooth dipilih"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Panggilan disenyapkan."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Panggilan disuarakan lagi."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Panggilan ditahan."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Panggilan tidak lagi ditunda."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Jawab"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Mengirim SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Menolak"</string>

diff --git a/InCallUI/res/values-is-rIS/strings.xml b/InCallUI/res/values-is-rIS/strings.xml
index 8553082..ed262ab 100644
--- a/InCallUI/res/values-is-rIS/strings.xml
+++ b/InCallUI/res/values-is-rIS/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Skrifaðu eigið svar…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Hætta við"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Senda"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Hátalari valinn"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Heyrnartól valin"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Höfuðtól með snúru valin"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth-höfuðtól valin"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Símtal þaggað."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Kveikt á hljóði í símtali."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Símtal sett í bið."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Símtal ekki lengur í bið."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Svara"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Senda SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Hafna"</string>

diff --git a/InCallUI/res/values-it/strings.xml b/InCallUI/res/values-it/strings.xml
index 583eed5..0cca18e 100644
--- a/InCallUI/res/values-it/strings.xml
+++ b/InCallUI/res/values-it/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Scrivi risposta personale..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Annulla"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Invia"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Vivavoce selezionato"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Auricolari selezionati"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Auricolari con cavo selezionati"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Auricolari Bluetooth selezionati"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Chiamata disattivata."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Audio chiamata riattivato."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Chiamata messa in attesa."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"La chiamata non è più in attesa."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Rispondi"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Invia SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Rifiuta"</string>

diff --git a/InCallUI/res/values-iw/strings.xml b/InCallUI/res/values-iw/strings.xml
index ec7a20b..5a6350a 100644
--- a/InCallUI/res/values-iw/strings.xml
+++ b/InCallUI/res/values-iw/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"נבחר רמקול"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"נבחרה אוזניה"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"נבחרו אוזניות קוויות"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"‏נבחרו אוזניות Bluetooth"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"שיחה מושתקת."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"השתקת השיחה בוטלה."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"השיחה הועברה להמתנה."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"השיחה כבר לא בהמתנה."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"ענה"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"‏שלח SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"דחה"</string>

diff --git a/InCallUI/res/values-ja/strings.xml b/InCallUI/res/values-ja/strings.xml
index c62a155..2c32df5 100644
--- a/InCallUI/res/values-ja/strings.xml
+++ b/InCallUI/res/values-ja/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"スピーカーフォンを選択しました"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"受話口を選択しました"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"有線ヘッドセットを選択しました"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetoothヘッドセットを選択しました"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"通話がミュートされています。"</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"通話のミュートを解除しました。"</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"通話を保留中です。"</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"通話が保留から解除されました。"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"電話に出る"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMSを送信"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"着信拒否"</string>

diff --git a/InCallUI/res/values-ka-rGE/strings.xml b/InCallUI/res/values-ka-rGE/strings.xml
index 45bbecb..5355539 100644
--- a/InCallUI/res/values-ka-rGE/strings.xml
+++ b/InCallUI/res/values-ka-rGE/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"არჩეულია სპიკერი"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"არჩეულია ყურმილი"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"არჩეულია კაბელიანი ყურსაცვამი"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth ყურსაცვამი არჩეულია"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"ზარი დადუმებულია."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"ზარის აღარ არის დადუმებული."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"ზარი გადავიდა მოცდის რეჟიმზე."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"ზარი აღარ არის დაყოვნებული."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"პასუხი"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS-ის გაგზავნა"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"უარყოფა"</string>

diff --git a/InCallUI/res/values-kk-rKZ/strings.xml b/InCallUI/res/values-kk-rKZ/strings.xml
index 9d256bd..72ac632 100644
--- a/InCallUI/res/values-kk-rKZ/strings.xml
+++ b/InCallUI/res/values-kk-rKZ/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Спикерфон таңдалды"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Құлаққап таңдалды"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Сымды құлақаспап жинағы таңдалды"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth құлақаспап жинағы таңдалды"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Қоңырау үнсіздендірілген."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Қоңырау дыбысы қосылды."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Қоңырау ұстауға қойылды."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Қоңырау енді ұстауда емес."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Жауап"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS жіберу"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Қабылдамау"</string>

diff --git a/InCallUI/res/values-km-rKH/strings.xml b/InCallUI/res/values-km-rKH/strings.xml
index e2ed944..cf371ad 100644
--- a/InCallUI/res/values-km-rKH/strings.xml
+++ b/InCallUI/res/values-km-rKH/strings.xml

@@ -59,7 +59,7 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"កំពុងបន្តការហៅ"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"រង់ចាំ"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"ការហៅចូល"</string>
-    <string name="notification_incoming_video_call" msgid="7356836933934464805">"ការហៅចូលជាវីដេអូ"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"ការហៅចូលជាវីដេអូ"</string>
     <string name="notification_requesting_video_call" msgid="1405576812892369451">"សំណើការហៅជាវីដេអូចូល"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"សារជាសំឡេងថ្មី"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"សារជាសំឡេងថ្មី (<xliff:g id="COUNT">%d</xliff:g>)"</string>
@@ -108,7 +108,7 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"បញ្ចូលការហៅរួមគ្នា"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"ប្ដូរ"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"គ្រប់គ្រងការហៅ"</string>
-    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"គ្រប់គ្រងការហៅជាសន្និសីទ"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"គ្រប់គ្រងការហៅជាសន្និសីទ"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"សំឡេង"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"ហៅជាវីដេអូ"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"ប្ដូរទៅការហៅជាសំឡេង"</string>
@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"បានជ្រើសអូប៉ាល័រទូរស័ព្ទ"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"បានជ្រើសកាស"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"បានជ្រើសកាសមានខ្សែ"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"បានជ្រើសកាសប៊្លូធូស"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"ការហៅបិទសំឡេង។"</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"បានបើកសំឡេងការហៅ។"</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"ការហៅស្ថិតក្នុងការរង់ចាំ។"</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"ការហៅទូរស័ព្ទមិនស្ថិតនៅក្នុងការរង់ចាំទៀតទេ។"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"ឆ្លើយតប"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"ផ្ញើសារ SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"បដិសេធ"</string>

diff --git a/InCallUI/res/values-kn-rIN/strings.xml b/InCallUI/res/values-kn-rIN/strings.xml
index 909b59e..27d3aea 100644
--- a/InCallUI/res/values-kn-rIN/strings.xml
+++ b/InCallUI/res/values-kn-rIN/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"ಸ್ಪೀಕರ್‌ಫೋನ್ ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"ಇಯರ್‌ಪೀಸ್ ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"ವೈರ್‌ನ ಹೆಡ್‌ಸೆಟ್ ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"ಬ್ಲೂಟೂತ್ ಹೆಡ್‌ಸೆಟ್ ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"ಕರೆಯನ್ನು ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"ಕರೆಯನ್ನು ಅನ್‌ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"ಕರೆಯನ್ನು ತಡೆಹಿಡಿಯಲಾಗಿದೆ."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"ಕರೆಯನ್ನು ಇನ್ನು ಮುಂದೆ ಹೋಲ್ಡ್‌ನಲ್ಲಿರುವುದಿಲ್ಲ."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"ಉತ್ತರ"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS ಕಳುಹಿಸು"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"ನಿರಾಕರಿಸು"</string>

diff --git a/InCallUI/res/values-ko/strings.xml b/InCallUI/res/values-ko/strings.xml
index 20014a4..9e0b18f 100644
--- a/InCallUI/res/values-ko/strings.xml
+++ b/InCallUI/res/values-ko/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"스피커폰 선택됨"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"스피커 선택됨"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"유선 헤드셋 선택됨"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"블루투스 헤드셋 선택됨"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"통화가 음소거되었습니다."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"통화가 음소거 해제되었습니다."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"통화 대기 중입니다."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"대기 중인 통화 없음"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"통화"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS 보내기"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"거부"</string>

diff --git a/InCallUI/res/values-ky-rKG/strings.xml b/InCallUI/res/values-ky-rKG/strings.xml
index 6bde077..1a6fdd1 100644
--- a/InCallUI/res/values-ky-rKG/strings.xml
+++ b/InCallUI/res/values-ky-rKG/strings.xml

@@ -180,14 +180,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Катуу сүйлөгүч тандалды"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Кулакчын тандалды"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Зымдуу гарнитура тандалды"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth гарнитурасы тандалды"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Чалуу үнсүз тартипте."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Чалуу үнсүз режимден чыгарылды."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Чалуу күтүүгө коюлду."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Чалуу кармалбай калды."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Жооп берүү"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS жөнөтүү"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Четке кагуу"</string>

diff --git a/InCallUI/res/values-lo-rLA/strings.xml b/InCallUI/res/values-lo-rLA/strings.xml
index ab90d41..b316bef 100644
--- a/InCallUI/res/values-lo-rLA/strings.xml
+++ b/InCallUI/res/values-lo-rLA/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"ເລືອກລຳໂພງແລ້ວ"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"ເລືອກຫູຟັງແລ້ວ"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"ເລືອກຫູຟັງແບບມີສາຍແລ້ວ"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"ເລືອກຫູຟັງ Bluetooth"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"ປິດສຽງການໂທແລ້ວ."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"ເຊົາປິດສຽງສາຍໂທເຂົ້າແລ້ວ."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"ສາຍໂທເຂົ້າຖືກຕັ້ງໃຫ້ຖືສາຍລໍຖ້າແລ້ວ."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"ສາຍໂທຈະບໍ່ພັກສາຍອີກ."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"ຄໍາຕອບ"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"ສົ່ງ SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"ປະຕິເສດ"</string>

diff --git a/InCallUI/res/values-lt/strings.xml b/InCallUI/res/values-lt/strings.xml
index 4f0a05c..1e25960 100644
--- a/InCallUI/res/values-lt/strings.xml
+++ b/InCallUI/res/values-lt/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Sukurkite patys..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Atšaukti"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Siųsti"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Pasirinktas telefonas su garsiakalbiu"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Pasirinktas garsiakalbis prie ausies"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Pasirinktos laidinės ausinės"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"„Bluetooth“ ausinės pasirinktos"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Skambutis nutildytas."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Skambučio garsas įjungtas."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Skambutis sulaikytas."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Skambutis nebesulaikytas."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Atsakyti"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Siųsti SMS pranešimą"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Atmesti"</string>

diff --git a/InCallUI/res/values-lv/strings.xml b/InCallUI/res/values-lv/strings.xml
index 9e832ed..0171924 100644
--- a/InCallUI/res/values-lv/strings.xml
+++ b/InCallUI/res/values-lv/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Rakstīt savu…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Atcelt"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Sūtīt"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Tika atlasīts skaļrunis."</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Tika atlasīts auss skaļrunis."</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Tika atlasītas austiņas."</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Tika atlasītas Bluetooth austiņas."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Zvana skaņa ir izslēgta."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Zvanam tika ieslēgta skaņa."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Zvans ir aizturēts."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Zvans vairs netiek aizturēts."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Atbildēt"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Sūtīt īsziņu"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Noraidīt"</string>

diff --git a/InCallUI/res/values-mk-rMK/strings.xml b/InCallUI/res/values-mk-rMK/strings.xml
index eefc3a8..6081ac9 100644
--- a/InCallUI/res/values-mk-rMK/strings.xml
+++ b/InCallUI/res/values-mk-rMK/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Избран е звучник"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Избрана е слушалка"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Избрани се слушалки со кабел"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Избрани се слушалки со Bluetooth"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Повикот е со исклучен звук"</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Повикот е со вклучен звук."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Повикот е ставен на чекање."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Повикот повеќе не е на чекање."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Одговори"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Испрати СМС"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Одбиј"</string>

diff --git a/InCallUI/res/values-ml-rIN/strings.xml b/InCallUI/res/values-ml-rIN/strings.xml
index 2ea07c5..18ab1f4 100644
--- a/InCallUI/res/values-ml-rIN/strings.xml
+++ b/InCallUI/res/values-ml-rIN/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"സ്‌പീക്കർഫോൺ തിരഞ്ഞെടുത്തു"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"ഇയർഫോൺ തിരഞ്ഞെടുത്തു"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"വയർ മുഖേന ബന്ധിപ്പിച്ച ഹെഡ്‌സെറ്റ് തിരഞ്ഞെടുത്തു"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"ബ്ലൂടൂത്ത് ഹെഡ്‌സെറ്റ് തിരഞ്ഞെടുത്തു"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"കോൾ നിശബ്‌ദമാക്കി."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"കോൾ അൺ‌മ്യൂട്ടുചെയ്‌തു."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"കോൾ ഹോൾഡുചെയ്‌തു."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"കോൾ ഇനി ഹോൾഡുചെയ്യാനാവില്ല."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"മറുപടി നൽകുക"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS അയയ്ക്കുക"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"നിരസിക്കുക"</string>

diff --git a/InCallUI/res/values-mn-rMN/strings.xml b/InCallUI/res/values-mn-rMN/strings.xml
index 65351dc..c4646d0 100644
--- a/InCallUI/res/values-mn-rMN/strings.xml
+++ b/InCallUI/res/values-mn-rMN/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Чанга яригч сонгогдсон"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Чихэвч сонгогдсон"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Утастай чихэвч сонгогдсон"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Блютүүт чихэвч сонгогдсон"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Дууг хаасан."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Дуудлагыг хаасан."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Дуудлагыг хүлээлгэсэн"</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Дуудлага хадгалагдаагүй"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Хариулах"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS илгээх"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Татгалзах"</string>

diff --git a/InCallUI/res/values-mr-rIN/strings.xml b/InCallUI/res/values-mr-rIN/strings.xml
index c9e5e8b..b4dbeef 100644
--- a/InCallUI/res/values-mr-rIN/strings.xml
+++ b/InCallUI/res/values-mr-rIN/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"स्पीकरफोन निवडला"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"इअरपिस निवडला"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"तार असलेला हेडसेट निवडला"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"ब हेडसेट निवडला"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"कॉल नि.शब्‍द केला."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"कॉल सशब्द केला."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"कॉल होल्डवर ठेवला."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"कॉल यापुढे होल्डवर राहणार नाही."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"उत्तर"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS पाठवा"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"नकार द्या"</string>

diff --git a/InCallUI/res/values-ms-rMY/strings.xml b/InCallUI/res/values-ms-rMY/strings.xml
index 0310409..3bbc836 100644
--- a/InCallUI/res/values-ms-rMY/strings.xml
+++ b/InCallUI/res/values-ms-rMY/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Tulis sendiri…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Batal"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Hantar"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Pembesar suara dipilih"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Alat dengar dipilih"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Set kepala berwayar dipilih"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Set kepala Bluetooth dipilih"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Panggilan diredam."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Panggilan dinyahredam."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Panggilan sedang menunggu."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Panggilan tidak menunggu lagi."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Jawapan"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Hantar SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Tolak"</string>

diff --git a/InCallUI/res/values-my-rMM/strings.xml b/InCallUI/res/values-my-rMM/strings.xml
index ad84f72..a9cde2e 100644
--- a/InCallUI/res/values-my-rMM/strings.xml
+++ b/InCallUI/res/values-my-rMM/strings.xml

@@ -21,7 +21,7 @@
     <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>
+    <string name="payphone" msgid="4793877574636445118">"ငွေပေးရသည့်ဖုန်း"</string>
     <string name="confCall" msgid="1904840547188336828">"ကွန်းဖရင့်ခေါ်ဆိုမှု"</string>
     <string name="call_lost" msgid="6183862117003999578">"ဖုန်းလိုင်းကျသွား၏"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"စပီကာ"</string>
@@ -50,7 +50,7 @@
     <string name="card_title_video_call_requesting" msgid="4587504939739340937">"ဗွီဒီယိုကို တောင်းဆိုနေ"</string>
     <string name="card_title_video_call_error" msgid="9000555878389539225">"ဗွီဒီယို ခေါ်ဆိုမှု မပြုနိုင်။"</string>
     <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="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>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"လွဲသွားသော ဖုန်းခေါ်မှု"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"လွဲသွားသော ဖုန်းခေါ်မှုများ"</string>
@@ -59,7 +59,7 @@
     <string name="notification_ongoing_call" msgid="7068688957273482989">"ဆက်သွားနေသော ဖုန်းခေါ်မှု"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"ခဏ ကိုင်ထားစဉ်"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"အဝင်ခေါ်ဆိုမှု"</string>
-    <string name="notification_incoming_video_call" msgid="7356836933934464805">"ဝင်လာသည့် ဗီဒီယို ခေါ်ဆိုမှု"</string>
+    <string name="notification_incoming_video_call" msgid="7356836933934464805">"ဝင်လာသည့် ဗီဒီယို ခေါ်ဆိုမှု"</string>
     <string name="notification_requesting_video_call" msgid="1405576812892369451">"အသံ ခေါ်ဆိုမှုအဖြစ် တောင်းဆိုမှု"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"အသံမေးလ်အသစ်"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"အသံစာ အသစ် (<xliff:g id="COUNT">%d</xliff:g>) စောင်"</string>
@@ -78,14 +78,14 @@
     <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_no_phone_number_supplied" msgid="1150414018684246528">"ဖုန်းခေါ်ရန်အတွက်၊ သင့်လျော်သည့်နံပါတ် ရိုက်ထည့်ပါ။"</string>
     <string name="incall_error_call_failed" msgid="6302746943230078197">"မခေါ်ဆိုနိုင်ပါ။"</string>
     <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>
     <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"မလွှဲပြောင်းနိုင်ပါ။"</string>
-    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"ကွန်းဖရန့်စ် မလုပ်နိုင်ပါ။"</string>
+    <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"ကွန်းဖရန့်စ် မလုပ်နိုင်ပါ။"</string>
     <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>
@@ -97,22 +97,22 @@
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ကီးဘုတ်သုံး၍ခလုတ်နှိပ်ပါ"</string>
     <string name="overflowHoldMenuItemText" msgid="7382457697092158039">"ခေါ်ဆိုမှု ခဏရပ်ပါ"</string>
     <string name="overflowResumeMenuItemText" msgid="8826360006222366843">"ခေါ်ဆိုမှု ဆက်လုပ်ရန်"</string>
-    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"ခေါ်ဆိုမှု ထည့်ရန်"</string>
+    <string name="overflowAddMenuItemText" msgid="5605615101930811453">"ခေါ်ဆိုမှု ထည့်ရန်"</string>
     <string name="overflowMergeMenuItemText" msgid="6305762210377655389">"ခေါ်ဆိုမှုများကို ပေါင်းစည်းရန်"</string>
     <string name="overflowSwapMenuItemText" msgid="6603717809137071603">"ခေါ်ဆိုမှုများကို ဖလှယ်ရန်"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"ကိုင်ထားသည်"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"ပြီးပါပြီ"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"နံပါတ်ကွက်"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"အသံတိတ်"</string>
-    <string name="onscreenAddCallText" msgid="5140385634712287403">"ဖုန်းခေါ်မှု ထပ်ထည့်ပါ"</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>
     <string name="onscreenAudioText" msgid="1710087112800041743">"အသံ"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"ဗီဒီယိုခေါ်ဆိုမှု"</string>
-    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"အသံဖြင့် ခေါ်ဆိုမှုသို့ ပြောင်းရန်"</string>
-    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"ကင်မရာကို ဖွင့်ရန်"</string>
+    <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"အသံဖြင့် ခေါ်ဆိုမှုသို့ ပြောင်းရန်"</string>
+    <string name="onscreenSwitchCameraText" msgid="5324543493442787798">"ကင်မရာကို ဖွင့်ရန်"</string>
     <string name="onscreenPauseVideoText" msgid="5663965924921429203">"ဗီဒီယို ဆိုင်းငံ့ရန်"</string>
     <string name="onscreenOverflowText" msgid="2702376562345723132">"နောက်ထပ် ရွေးစရာများ"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"ဝန်ဆောင်မှု"</string>
@@ -120,21 +120,13 @@
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"မသတ်မှတ်ထားပါ"</string>
     <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>
+    <string name="incoming_via_template" msgid="1696993226115570960">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>မှ တစ်ဆင့် ခေါ်ဆိုမှု"</string>
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"စမီကာဖုန်းကို ရွေးထား"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"နားကြပ်ကို ရွေးထား"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"ကြိုးတပ် ဟက်ဆက်ကို ရွေးထား"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"ဘလူးတုသ် ဟက်ဆက်ကို ရွေးထား"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"နားထောင်ရုံသာ (စကားပြောပိတ်ထားသည်)"</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"ခေါ်ဆိုမှု အသံတိတ်မထားပါ"</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"ခေါ်ဆိုမှုကို ရပ်ဆိုင်းထားသည်။"</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"ဖုန်း စောင့်ဆိုင်းနေခြင်း မရှိတော့ပါ။"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"အဖြေ"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"စာတို ပေးပို့သည်"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"လက်မခံပါ"</string>
@@ -152,7 +144,7 @@
     <string name="default_notification_description" msgid="78174796906240970">"ပုံသေ အသံ (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <string name="ringtone_title" msgid="6374978286202084684">"ဖုန်းမြည်သံ"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"ဖုန်းမြည်စဉ်တုန်ခါရန်"</string>
-    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"နံပါတ်ကွက် အလိုအလျောက်ဖြည့်ရန်"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"နံပါတ်ကွက် အလိုအလျောက်ဖြည့်ရန်"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"ဖုန်းမြည်သံ &amp; တုန်ခါသံ"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"ကွန်းဖရင့် ခေါ်ဆိုမှုကို ထိန်းချုပ်သည်"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="8373041754188879871">"အရေးပေါ်နံပါတ်"</string>

diff --git a/InCallUI/res/values-nb/strings.xml b/InCallUI/res/values-nb/strings.xml
index 12ef8f9..6604a53 100644
--- a/InCallUI/res/values-nb/strings.xml
+++ b/InCallUI/res/values-nb/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Skriv ditt eget"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Avbryt"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Send"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Høyttaleren er valgt"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Ørepluggen er valgt"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Hodetelefonene med ledning er valgt"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth-hodetelefonene er valgt"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Samtalelyd er kuttet."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Anropslyden er slått på."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Anropet er satt på vent."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Samtalen er ikke lenger på vent."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Svar"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Send tekstmelding"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Avslå"</string>

diff --git a/InCallUI/res/values-ne-rNP/strings.xml b/InCallUI/res/values-ne-rNP/strings.xml
index 40d15e6..5acaad9 100644
--- a/InCallUI/res/values-ne-rNP/strings.xml
+++ b/InCallUI/res/values-ne-rNP/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"स्पिकरफोन चयन गरियो"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"इयरपिस चयन गरियो"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"तार युक्त हेडसेट चयन गरियो"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"ब्लुटुथ हेडसेट चयन गरियो"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"कल म्युट भयो।"</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"कलको मौनता हटाइयो।"</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"कल होल्डमा राखियो।"</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"कल अब पकडमा छैन"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"उत्तर"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS पठाउनुहोस्"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"अस्वीकार गर्नुहोस्"</string>

diff --git a/InCallUI/res/values-nl/strings.xml b/InCallUI/res/values-nl/strings.xml
index 2a59f83..9b32a03 100644
--- a/InCallUI/res/values-nl/strings.xml
+++ b/InCallUI/res/values-nl/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Eigen reactie opstellen..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Annuleren"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Verzenden"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Luidsprekertelefoon geselecteerd"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Oortelefoon geselecteerd"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Bedrade headset geselecteerd"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth-headset geselecteerd"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Oproep gedempt."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Dempen van gesprek opgeheven."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Gesprek in de wacht gezet."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Oproep niet langer in de wacht."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Antwoord"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Sms verzenden"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Weigeren"</string>

diff --git a/InCallUI/res/values-pl/strings.xml b/InCallUI/res/values-pl/strings.xml
index e9ccde2..8f0835b 100644
--- a/InCallUI/res/values-pl/strings.xml
+++ b/InCallUI/res/values-pl/strings.xml

@@ -127,15 +127,7 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Napisz własną..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Anuluj"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Wyślij"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Wybrano głośnik telefonu"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Wybrano słuchawkę"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Wybrano przewodowy zestaw słuchawkowy"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Wybrano zestaw słuchawkowy Bluetooth"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Połączenie wyciszone."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Połączenie już nie jest ignorowane."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Połączenie zawieszone."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Połączenie nie jest już wstrzymane."</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Odpowiedz"</string>
+    <string name="description_target_answer" msgid="7205604197797472471">"Odbierz"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Wyślij SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Odrzuć"</string>
     <string name="description_target_answer_video_call" msgid="3495965588512395026">"Odbierz jako rozmowę wideo"</string>

diff --git a/InCallUI/res/values-pt-rPT/strings.xml b/InCallUI/res/values-pt-rPT/strings.xml
index 0375306..7821436 100644
--- a/InCallUI/res/values-pt-rPT/strings.xml
+++ b/InCallUI/res/values-pt-rPT/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Escrever a sua própria..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Cancelar"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Enviar"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Alta-voz selecionado"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Auricular selecionado"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Auscultadores com microfone integrado com fios selecionados"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Auscultadores Bluetooth com microfone integrado selecionados"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Chamada sem som."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Chamada com som."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Chamada colocada em espera."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"A chamada já não está em espera."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Atender"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Enviar SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Recusar"</string>

diff --git a/InCallUI/res/values-pt/strings.xml b/InCallUI/res/values-pt/strings.xml
index c18ca54..df32188 100644
--- a/InCallUI/res/values-pt/strings.xml
+++ b/InCallUI/res/values-pt/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Escreva sua resposta..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Cancelar"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Enviar"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Vivavoz selecionado"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Minifone de ouvido selecionado"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Fone de ouvido com fio selecionado"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Fone de ouvido Bluetooth selecionado"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Chamada sem áudio."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Ativar som da chamada."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Chamada colocada em espera."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"A chamada não está mais em espera."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Responder"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Enviar SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Recusar"</string>

diff --git a/InCallUI/res/values-ro/strings.xml b/InCallUI/res/values-ro/strings.xml
index 80df934..2051626 100644
--- a/InCallUI/res/values-ro/strings.xml
+++ b/InCallUI/res/values-ro/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Scrieți propriul răspuns…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Anulați"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Trimiteți"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Ați selectat difuzorul"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Ați selectat casca"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Ați selectat setul căști-microfon cu fir"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Ați selectat setul căști-microfon Bluetooth"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Apel cu sunet dezactivat."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"S-a activat sunetul pentru apel."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Apelul a fost pus în așteptare."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Apelul nu mai este în așteptare."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Răspundeţi"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Trimiteţi SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Refuzaţi"</string>

diff --git a/InCallUI/res/values-ru/strings.xml b/InCallUI/res/values-ru/strings.xml
index 5bdbbd8..e0e0724 100644
--- a/InCallUI/res/values-ru/strings.xml
+++ b/InCallUI/res/values-ru/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Выбрана громкая связь."</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Выбран динамик."</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Выбрана проводная гарнитура."</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Выбрана Bluetooth-гарнитура."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Звук выключен."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Для вызова включен звук."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Включено удержание вызова."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Вызов больше не находится на удержании."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Ответить"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Отправить SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Отклонить"</string>

diff --git a/InCallUI/res/values-si-rLK/strings.xml b/InCallUI/res/values-si-rLK/strings.xml
index af8d24b..e440b7c 100644
--- a/InCallUI/res/values-si-rLK/strings.xml
+++ b/InCallUI/res/values-si-rLK/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"ස්පීකර්ෆෝන් තෝරන ලදි"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"සවන් කඬ තෝරන ලදි"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"වයර කළ හෙඩ්සෙට් තෝරන ලදි"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"බ්ලූටූත් හෙඩ්සෙටය තෝරන ලදි"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"ඇමතුම නිශ්ශබ්දයි."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"ඇමතුම නිශ්ශබ්ද නොකර තිබේ."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"ඇමතුම නවතා තබා ඇත."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"ඇමතුම තව දුරටත් රඳවාගෙන නොමැත."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"පිළිතුරු දෙන්න"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS යවන්න"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"ප්‍රතික්ෂේප කරන්න"</string>

diff --git a/InCallUI/res/values-sk/strings.xml b/InCallUI/res/values-sk/strings.xml
index 18fcb5c..b6b3c3e 100644
--- a/InCallUI/res/values-sk/strings.xml
+++ b/InCallUI/res/values-sk/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Napísať vlastnú..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Zrušiť"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Odoslať"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Bol vybraný reproduktor"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Bolo vybrané slúchadlo"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Bola vybraná pripojená náhlavná súprava"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bola vybraná náhlavná súprava Bluetooth"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Zvuk hovoru bol vypnutý."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Zvuk hovoru bol obnovený"</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Hovor bol pozdržaný"</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Hovor už nie je pozdržaný."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Odpovedať"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Odoslať SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Odmietnuť"</string>

diff --git a/InCallUI/res/values-sl/strings.xml b/InCallUI/res/values-sl/strings.xml
index 9df2b03..c59ec6f 100644
--- a/InCallUI/res/values-sl/strings.xml
+++ b/InCallUI/res/values-sl/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Napišite svoje besedilo …"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Prekliči"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Pošlji"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Izbran je zvočnik"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Izbrane so slušalke"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Izbrane so žične slušalke z mikrofonom"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Izbrane so slušalke z mikrofonom Bluetooth"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Klic izključen."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Zvok klica je znova vklopljen."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Klic je zadržan"</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Klic ni več na čakanju."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Odgovori"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Pošlji SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Zavrni"</string>

diff --git a/InCallUI/res/values-sr/strings.xml b/InCallUI/res/values-sr/strings.xml
index fab2df2..d25ce60 100644
--- a/InCallUI/res/values-sr/strings.xml
+++ b/InCallUI/res/values-sr/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Изабран је спикерфон"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Изабрана је слушалица"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Изабране су жичане слушалице"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Изабране су Bluetooth слушалице"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Звук позива је искључен."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Звук позива је укључен."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Позив је стављен на чекање."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Позив више није на чекању."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Одговори"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Пошаљи SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Одбиј"</string>

diff --git a/InCallUI/res/values-sv/strings.xml b/InCallUI/res/values-sv/strings.xml
index a71d1aa..f024476 100644
--- a/InCallUI/res/values-sv/strings.xml
+++ b/InCallUI/res/values-sv/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Skriv ett eget svar ..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Avbryt"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Skicka"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Högtalartelefon har valts"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Lur har valts"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Mikrofonlurar med sladd har valts"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth-mikrofonlurar har valts"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Samtalets ljud avstängt."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Ljudet har slagits på för samtalet."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Samtalet har parkerats."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Samtalet är inte längre parkerat."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Svara"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Skicka SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Avvisa"</string>

diff --git a/InCallUI/res/values-sw/strings.xml b/InCallUI/res/values-sw/strings.xml
index e55876a..e3f3cc8 100644
--- a/InCallUI/res/values-sw/strings.xml
+++ b/InCallUI/res/values-sw/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Andika yako binafsi..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Ghairi"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Tuma"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Spika ya simu imechaguliwa"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Spika ya sikioni imechaguliwa"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Vifaa vya sauti vinavyotumia waya vimechaguliwa"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Vifaa vya sauti vya Bluetooth vimechaguliwa"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Simu imezimwa."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Sauti ya simu imerejeshwa."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Simu imewekwa isubiri."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Simu haisubiri tena."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Jibu"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Tuma SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Kataa"</string>

diff --git a/InCallUI/res/values-ta-rIN/strings.xml b/InCallUI/res/values-ta-rIN/strings.xml
index f5ef486..c1e17bf 100644
--- a/InCallUI/res/values-ta-rIN/strings.xml
+++ b/InCallUI/res/values-ta-rIN/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"ஸ்பீக்கர்போன் தேர்ந்தெடுக்கப்பட்டது"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"இயர்பீஸ் தேர்ந்தெடுக்கப்பட்டது"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"வயர் ஹெட்செட் தேர்ந்தெடுக்கப்பட்டது"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"புளூடூத் ஹெட்செட் தேர்ந்தெடுக்கப்பட்டது"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"அழைப்பு முடக்கப்பட்டது."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"அழைப்பு இயக்கப்பட்டது."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"அழைப்பு இடைநிறுத்தப்பட்டது."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"அழைப்பை நிறுத்தி வைக்க முடியாது."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"பதிலளி"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS அனுப்பு"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"நிராகரி"</string>

diff --git a/InCallUI/res/values-te-rIN/strings.xml b/InCallUI/res/values-te-rIN/strings.xml
index a4e3804..dc26f43 100644
--- a/InCallUI/res/values-te-rIN/strings.xml
+++ b/InCallUI/res/values-te-rIN/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"స్పీకర్‌ఫోన్ ఎంచుకోబడింది"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"ఇయర్‌పీస్ ఎంచుకోబడింది"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"వైర్ గల హెడ్‌సెట్ ఎంచుకోబడింది"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"బ్లూటూత్ హెడ్‌సెట్ ఎంచుకోబడింది"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"కాల్ మ్యూట్ చేయబడింది."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"కాల్ అన్‌మ్యూట్ చేయబడింది."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"కాల్‌ హోల్డ్‌లో ఉంది."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"కాల్ ఇకపై హోల్డ్‌లో ఉండదు."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"సమాధానం ఇవ్వండి"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS పంపండి"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"తిరస్కరిస్తున్నాను"</string>

diff --git a/InCallUI/res/values-th/strings.xml b/InCallUI/res/values-th/strings.xml
index 372c7e3..1709dc4 100644
--- a/InCallUI/res/values-th/strings.xml
+++ b/InCallUI/res/values-th/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"เลือกลำโพงแล้ว"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"เลือกหูฟังโทรศัพท์แล้ว"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"เลือกชุดหูฟังแบบใช้สายแล้ว"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"เลือกชุดหูฟังบลูทูธแล้ว"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"ปิดเสียงการโทร"</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"เปิดเสียงการโทรแล้ว"</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"พักสายการโทรอยู่"</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"ไม่ได้พักสายแล้ว"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"คำตอบ"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"ส่ง SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"ปฏิเสธ"</string>

diff --git a/InCallUI/res/values-tl/strings.xml b/InCallUI/res/values-tl/strings.xml
index f4000bc..cf2efed 100644
--- a/InCallUI/res/values-tl/strings.xml
+++ b/InCallUI/res/values-tl/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Sumulat ng sarili mong tugon…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Kanselahin"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Ipadala"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Pinili ang speakerphone"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Pinili ang earpiece"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Pinili ang wired na headset"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Pinili ang Bluetooth headset"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Naka-mute ang tawag."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Inalis sa pagkaka-mute ang tawag."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Ini-hold ang tawag."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Hindi na naka-hold ang tawag."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Sagutin"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Magpadala ng SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Tanggihan"</string>

diff --git a/InCallUI/res/values-tr/strings.xml b/InCallUI/res/values-tr/strings.xml
index 9ec8b09..2782092 100644
--- a/InCallUI/res/values-tr/strings.xml
+++ b/InCallUI/res/values-tr/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Kendi yanıtınızı oluşturun…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"İptal"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Gönder"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Hoparlör seçildi"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Kulaklık seçildi"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Kablolu mikrofonlu kulaklık seçildi"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth mikrofonlu kulaklığı seçildi"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Çağrı sesi kapatıldı."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Çağrının sesi açıldı."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Çağrı beklemeye alındı."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Çağrı artık beklemede değil."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Yanıtla"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS gönder"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Reddet"</string>

diff --git a/InCallUI/res/values-uk/strings.xml b/InCallUI/res/values-uk/strings.xml
index 29d58fa..d05fc42 100644
--- a/InCallUI/res/values-uk/strings.xml
+++ b/InCallUI/res/values-uk/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Мікрофон із гучномовцем вибрано"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Динамік вибрано"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Дротову гарнітуру вибрано"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Гарнітуру Bluetooth вибрано"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Звук виклику вимкнено."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Дзвінок не ігнорується."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Дзвінок відкладено."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Виклик переведено з режиму очікування"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Відповісти"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Надіслати SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Відхилити"</string>

diff --git a/InCallUI/res/values-ur-rPK/strings.xml b/InCallUI/res/values-ur-rPK/strings.xml
index 412543d..2f84bd3 100644
--- a/InCallUI/res/values-ur-rPK/strings.xml
+++ b/InCallUI/res/values-ur-rPK/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"اسپیکر فون منتخب کیا گیا"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"ایئر پیس منتخب کیا گیا"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"تار والا ہیڈ سیٹ منتخب کیا گیا"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"بلوٹوتھ ہیڈ سیٹ منتخب کیا گیا"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"کال خاموش کر دی گئی۔"</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"کال کی آواز چلا دی گئی۔"</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"کال ہولڈ پر ہے۔"</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"کال اب ہولڈ پر نہیں ہے۔"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"جواب دیں"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"‏SMS بھیجیں"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"مسترد کریں"</string>

diff --git a/InCallUI/res/values-uz-rUZ/strings.xml b/InCallUI/res/values-uz-rUZ/strings.xml
index 801c335..bece8a9 100644
--- a/InCallUI/res/values-uz-rUZ/strings.xml
+++ b/InCallUI/res/values-uz-rUZ/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"O‘z javobingizni yozing..."</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Bekor qilish"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Jo‘natish"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Karnay tanlandi"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Quloqlik tanlandi"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Simsiz moslama tanlandi"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth moslamasi tanlandi"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Qo‘ng‘iroq ovozi o‘chirildi."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Qo‘ng‘iroq ovozli qilindi."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Qo‘ng‘iroq kutish rejimiga qo‘yildi."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Qo‘ng‘iroq kutish rejimidan chiqdi."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Javob berish"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS yuborish"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Rad qilish"</string>

diff --git a/InCallUI/res/values-vi/strings.xml b/InCallUI/res/values-vi/strings.xml
index 029426e..7e7a694 100644
--- a/InCallUI/res/values-vi/strings.xml
+++ b/InCallUI/res/values-vi/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Viết trả lời của riêng bạn…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Hủy"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Gửi"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Đã chọn loa ngoài"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Đã chọn loa tai nghe"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Đã chọn tai nghe có dây"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Đã chọn tai nghe Bluetooth"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Đã tắt tiếng cuộc gọi."</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Đã bật tiếng cuộc gọi."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Cuộc gọi đã được chuyển sang trạng thái chờ."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Cuộc gọi không còn nằm trong danh sách chờ."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Trả lời"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Gửi SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Từ chối"</string>

diff --git a/InCallUI/res/values-zh-rCN/strings.xml b/InCallUI/res/values-zh-rCN/strings.xml
index e94b738..be2ac76 100644
--- a/InCallUI/res/values-zh-rCN/strings.xml
+++ b/InCallUI/res/values-zh-rCN/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"已选择扬声器"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"已选择手机听筒"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"已选择有线耳机"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"已选择蓝牙耳机"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"通话已静音。"</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"通话已取消静音。"</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"通话已置于保持状态。"</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"不再保持通话。"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"接听"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"发送短信"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"拒绝"</string>

diff --git a/InCallUI/res/values-zh-rHK/strings.xml b/InCallUI/res/values-zh-rHK/strings.xml
index e067ce2..b067eee 100644
--- a/InCallUI/res/values-zh-rHK/strings.xml
+++ b/InCallUI/res/values-zh-rHK/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"已選取免持聽筒"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"已選取聽筒"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"已選取有線耳機"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"已選取藍牙耳機"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"通話已靜音。"</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"通話已取消靜音。"</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"通話保留中。"</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"不再保留通話。"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"接聽"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"發送短訊"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"拒絕"</string>

diff --git a/InCallUI/res/values-zh-rTW/strings.xml b/InCallUI/res/values-zh-rTW/strings.xml
index f986157..724fd91 100644
--- a/InCallUI/res/values-zh-rTW/strings.xml
+++ b/InCallUI/res/values-zh-rTW/strings.xml

@@ -127,14 +127,6 @@
     <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>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"已選取擴音器"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"已選取耳機"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"已選取有線耳機"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"已選取藍牙耳機"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"通話已靜音。"</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"通話靜音已取消。"</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"通話保留中。"</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"已不再保留通話。"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"接聽"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"傳送簡訊"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"拒絕"</string>

diff --git a/InCallUI/res/values-zu/strings.xml b/InCallUI/res/values-zu/strings.xml
index e04b7bf..370d84c 100644
--- a/InCallUI/res/values-zu/strings.xml
+++ b/InCallUI/res/values-zu/strings.xml

@@ -127,14 +127,6 @@
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Bhala okwakho…"</string>
     <string name="custom_message_cancel" msgid="7516406059429609296">"Khansela"</string>
     <string name="custom_message_send" msgid="5795754217085747742">"Thumela"</string>
-    <string name="accessibility_speakerphone_selected" msgid="4389354567657833468">"Ifoni yesipikha ikhethiwe"</string>
-    <string name="accessibility_earpiece_selected" msgid="5749525199671068663">"Isipikha sendlebe sikhethiwe"</string>
-    <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"Ama-earphone anentambo akhethiwe"</string>
-    <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Ama-earphone we-Bluetooth akhethiwe"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Ikholu ithulisiwe"</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Ikholi isuswe ukuthula."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Ikholi ibanjiwe okwesikhashana."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Ikholi ayisabanjiwe."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Phendula"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Thumela i-SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Nqaba"</string>

diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml
index f390f38..43307e8 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml

@@ -69,13 +69,6 @@
 
     <dimen name="floating_action_bar_vertical_offset">-24dp</dimen>
 
-    <!-- Padding at the left and right edges of the incall_touch_ui button
-         cluster.  This padding is necessary because we can't allow the
-         buttons to be very close to the edges of the screen, due to the
-         risk of false touches (from your finger wrapping around while
-         holding the phone, *before* moving it up to your face and having
-         the prox sensor kick in.) -->
-    <dimen name="button_cluster_horizontal_padding">20dp</dimen>
     <dimen name="call_button_margin_vertical">8dp</dimen>
     <dimen name="call_button_margin_horizontal">6dp</dimen>
 

diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml
index 585030d..e8cc64c 100644
--- a/InCallUI/res/values/strings.xml
+++ b/InCallUI/res/values/strings.xml

@@ -336,30 +336,6 @@
     <!-- "Custom Message" Send alert dialog button -->
     <string name="custom_message_send">Send</string>
 
-    <!-- String used by AccessibilityService to announce that the speakerphone has been selected for audio output [CHAR LIMIT=NONE]-->
-    <string name="accessibility_speakerphone_selected">Speakerphone selected</string>
-
-    <!-- String used by AccessibilityService to announce that the phone's earpiece has been selected for audio output [CHAR LIMIT=NONE]-->
-    <string name="accessibility_earpiece_selected">Earpiece selected</string>
-
-    <!-- String used by AccessibilityService to announce that the wired headset has been selected for audio output [CHAR LIMIT=NONE]-->
-    <string name="accessibility_wired_headset_selected">Wired headset selected</string>
-
-    <!-- String used by AccessibilityService to announce that the bluetooth headset has been selected for audio output [CHAR LIMIT=NONE]-->
-    <string name="accessibility_bluetooth_headset_selected">Bluetooth headset selected</string>
-
-    <!-- String used by AccessibilityService to announce that the call has been muted [CHAR LIMIT=NONE]-->
-    <string name="accessibility_call_muted">Call muted.</string>
-
-    <!-- String used by AccessibilityService to announce that the call has been unmuted [CHAR LIMIT=NONE]-->
-    <string name="accessibility_call_unmuted">Call unmuted.</string>
-
-    <!-- String used by AccessibilityService to announce that the call has been put on hold [CHAR LIMIT=NONE]-->
-    <string name="accessibility_call_put_on_hold">Call put on hold.</string>
-
-    <!-- String used by AccessibilityService to announce that the call has been removed from hold [CHAR LIMIT=NONE]-->
-    <string name="accessibility_call_removed_from_hold">Call no longer on hold.</string>
-
     <!-- Description of the answer target in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->
     <string name="description_target_answer">Answer</string>
     <!-- Description of the send_sms target in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->

diff --git a/InCallUI/res/values/styles.xml b/InCallUI/res/values/styles.xml
index 9471c18..e16d72c 100644
--- a/InCallUI/res/values/styles.xml
+++ b/InCallUI/res/values/styles.xml

@@ -61,11 +61,11 @@
     </style>
 
     <!-- "Compound button" variation of InCallButton.
-         These buttons have the concept of two states: checked and unchecked.
-         (This style is just like "InCallButton" except that we also
-         clear out android:textOn and android:textOff, to avoid the default
-         text label behavior of the ToggleButton class.) -->
+         These buttons have the concept of two states: checked and unchecked. This style is just
+         like "InCallButton" except that we also clear out android:background, android:textOn,
+         android:textOff, to avoid the default behavior of the ToggleButton class. -->
     <style name="InCallCompoundButton" parent="InCallButton">
+        <item name="android:background">@null</item>
         <item name="android:textOn">@null</item>
         <item name="android:textOff">@null</item>
     </style>
@@ -115,6 +115,7 @@
         <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
         <item name="android:popupMenuStyle">@style/InCallPopupMenuStyle</item>
         <item name="android:actionBarStyle">@style/InCallActionBarStyle</item>
+        <item name="android:buttonStyleToggle">@style/InCallCompoundButton</item>
     </style>
 
     <style name="Theme.CircularRevealAnimation" parent="@android:style/Theme.Material.Light">

diff --git a/InCallUI/src/com/android/incallui/CallButtonFragment.java b/InCallUI/src/com/android/incallui/CallButtonFragment.java
index 5c67862..b2d109a 100644
--- a/InCallUI/src/com/android/incallui/CallButtonFragment.java
+++ b/InCallUI/src/com/android/incallui/CallButtonFragment.java

@@ -33,8 +33,6 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.accessibility.AccessibilityEvent;
-import android.view.accessibility.AccessibilityManager;
 import android.widget.CompoundButton;
 import android.widget.ImageButton;
 import android.widget.PopupMenu;
@@ -50,18 +48,18 @@
 public class CallButtonFragment
         extends BaseFragment<CallButtonPresenter, CallButtonPresenter.CallButtonUi>
         implements CallButtonPresenter.CallButtonUi, OnMenuItemClickListener, OnDismissListener,
-        View.OnClickListener, CompoundButton.OnCheckedChangeListener {
-    private ImageButton mAudioButton;
+        View.OnClickListener {
+    private CompoundButton mAudioButton;
     private ImageButton mChangeToVoiceButton;
-    private ImageButton mMuteButton;
-    private ImageButton mShowDialpadButton;
-    private ImageButton mHoldButton;
+    private CompoundButton mMuteButton;
+    private CompoundButton mShowDialpadButton;
+    private CompoundButton mHoldButton;
     private ImageButton mSwapButton;
     private ImageButton mChangeToVideoButton;
-    private ImageButton mSwitchCameraButton;
+    private CompoundButton mSwitchCameraButton;
     private ImageButton mAddCallButton;
     private ImageButton mMergeButton;
-    private ImageButton mPauseVideoButton;
+    private CompoundButton mPauseVideoButton;
     private ImageButton mOverflowButton;
 
     private PopupMenu mAudioModePopup;
@@ -98,27 +96,27 @@
             Bundle savedInstanceState) {
         final View parent = inflater.inflate(R.layout.call_button_fragment, container, false);
 
-        mAudioButton = (ImageButton) parent.findViewById(R.id.audioButton);
+        mAudioButton = (CompoundButton) parent.findViewById(R.id.audioButton);
         mAudioButton.setOnClickListener(this);
         mChangeToVoiceButton = (ImageButton) parent.findViewById(R.id.changeToVoiceButton);
         mChangeToVoiceButton. setOnClickListener(this);
-        mMuteButton = (ImageButton) parent.findViewById(R.id.muteButton);
+        mMuteButton = (CompoundButton) parent.findViewById(R.id.muteButton);
         mMuteButton.setOnClickListener(this);
-        mShowDialpadButton = (ImageButton) parent.findViewById(R.id.dialpadButton);
+        mShowDialpadButton = (CompoundButton) parent.findViewById(R.id.dialpadButton);
         mShowDialpadButton.setOnClickListener(this);
-        mHoldButton = (ImageButton) parent.findViewById(R.id.holdButton);
+        mHoldButton = (CompoundButton) parent.findViewById(R.id.holdButton);
         mHoldButton.setOnClickListener(this);
         mSwapButton = (ImageButton) parent.findViewById(R.id.swapButton);
         mSwapButton.setOnClickListener(this);
         mChangeToVideoButton = (ImageButton) parent.findViewById(R.id.changeToVideoButton);
         mChangeToVideoButton.setOnClickListener(this);
-        mSwitchCameraButton = (ImageButton) parent.findViewById(R.id.switchCameraButton);
+        mSwitchCameraButton = (CompoundButton) parent.findViewById(R.id.switchCameraButton);
         mSwitchCameraButton.setOnClickListener(this);
         mAddCallButton = (ImageButton) parent.findViewById(R.id.addButton);
         mAddCallButton.setOnClickListener(this);
         mMergeButton = (ImageButton) parent.findViewById(R.id.mergeButton);
         mMergeButton.setOnClickListener(this);
-        mPauseVideoButton = (ImageButton) parent.findViewById(R.id.pauseVideoButton);
+        mPauseVideoButton = (CompoundButton) parent.findViewById(R.id.pauseVideoButton);
         mPauseVideoButton.setOnClickListener(this);
         mOverflowButton = (ImageButton) parent.findViewById(R.id.overflowButton);
         mOverflowButton.setOnClickListener(this);
@@ -145,10 +143,6 @@
     }
 
     @Override
-    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-    }
-
-    @Override
     public void onClick(View view) {
         int id = view.getId();
         Log.d(this, "onClick(View " + view + ", id " + id + ")...");
@@ -165,8 +159,7 @@
                 getPresenter().changeToVoiceClicked();
                 break;
             case R.id.muteButton: {
-                final ImageButton button = (ImageButton) view;
-                getPresenter().muteClicked(!button.isSelected());
+                getPresenter().muteClicked(!mMuteButton.isSelected());
                 break;
             }
             case R.id.mergeButton:
@@ -174,8 +167,7 @@
                 mMergeButton.setEnabled(false);
                 break;
             case R.id.holdButton: {
-                final ImageButton button = (ImageButton) view;
-                getPresenter().holdClicked(!button.isSelected());
+                getPresenter().holdClicked(!mHoldButton.isSelected());
                 break;
             }
             case R.id.swapButton:
@@ -219,7 +211,7 @@
         }
 
         Resources res = getActivity().getResources();
-        ImageButton[] compoundButtons = {
+        View[] compoundButtons = {
                 mAudioButton,
                 mMuteButton,
                 mShowDialpadButton,
@@ -228,7 +220,7 @@
                 mPauseVideoButton
         };
 
-        for (ImageButton button : compoundButtons) {
+        for (View button : compoundButtons) {
             final LayerDrawable layers = (LayerDrawable) button.getBackground();
             final RippleDrawable btnCompoundDrawable = compoundBackgroundDrawable(themeColors);
             layers.setDrawableByLayerId(R.id.compoundBackgroundItem, btnCompoundDrawable);
@@ -343,8 +335,6 @@
     public void setMute(boolean value) {
         if (mMuteButton.isSelected() != value) {
             mMuteButton.setSelected(value);
-            maybeSendAccessibilityEvent(mMuteButton, value ? R.string.accessibility_call_muted
-                    : R.string.accessibility_call_unmuted);
         }
     }
 
@@ -372,9 +362,6 @@
     public void setHold(boolean value) {
         if (mHoldButton.isSelected() != value) {
             mHoldButton.setSelected(value);
-            maybeSendAccessibilityEvent(mHoldButton,
-                    value ? R.string.accessibility_call_put_on_hold :
-                            R.string.accessibility_call_removed_from_hold);
         }
     }
 
@@ -505,26 +492,7 @@
         refreshAudioModePopup();
 
         if (mPrevAudioMode != mode) {
-            if (mPrevAudioMode != 0) {
-                int stringId = 0;
-                switch (mode) {
-                    case AudioState.ROUTE_EARPIECE:
-                        stringId = R.string.accessibility_earpiece_selected;
-                        break;
-                    case AudioState.ROUTE_BLUETOOTH:
-                        stringId = R.string.accessibility_bluetooth_headset_selected;
-                        break;
-                    case AudioState.ROUTE_WIRED_HEADSET:
-                        stringId = R.string.accessibility_wired_headset_selected;
-                        break;
-                    case AudioState.ROUTE_SPEAKER:
-                        stringId = R.string.accessibility_speakerphone_selected;
-                        break;
-                }
-                if (stringId != 0) {
-                    maybeSendAccessibilityEvent(mAudioButton, stringId);
-                }
-            }
+            updateAudioButtonContentDescription(mode);
             mPrevAudioMode = mode;
         }
     }
@@ -575,6 +543,7 @@
     public void onDismiss(PopupMenu menu) {
         Log.d(this, "- onDismiss: " + menu);
         mAudioModePopupVisible = false;
+        updateAudioButtons(getPresenter().getSupportedAudio());
     }
 
     /**
@@ -632,10 +601,8 @@
             Log.d(this, "updateAudioButtons - popup menu mode");
 
             audioButtonEnabled = true;
+            audioButtonChecked = true;
             showMoreIndicator = true;
-            // The audio button is NOT a toggle in this state.  (And its
-            // setChecked() state is irrelevant since we completely hide the
-            // btn_compound_background layer anyway.)
 
             // Update desired layers:
             if (isAudio(AudioState.ROUTE_BLUETOOTH)) {
@@ -649,6 +616,9 @@
                 // sort of "wired headset" icon here instead of the "handset
                 // earpiece" icon.  (Still need an asset for that, though.)
             }
+
+            // The audio button is NOT a toggle in this state, so set selected to false.
+            mAudioButton.setSelected(false);
         } else if (speakerSupported) {
             Log.d(this, "updateAudioButtons - speaker toggle mode");
 
@@ -657,6 +627,7 @@
             // The audio button *is* a toggle in this state, and indicated the
             // current state of the speakerphone.
             audioButtonChecked = isAudio(AudioState.ROUTE_SPEAKER);
+            mAudioButton.setSelected(audioButtonChecked);
 
             // update desired layers:
             showToggleIndicator = true;
@@ -668,6 +639,7 @@
             // irrelevant since it's always disabled and unchecked.
             audioButtonEnabled = false;
             audioButtonChecked = false;
+            mAudioButton.setSelected(false);
 
             // update desired layers:
             showToggleIndicator = true;
@@ -685,7 +657,7 @@
 
         // Only enable the audio button if the fragment is enabled.
         mAudioButton.setEnabled(audioButtonEnabled && mIsEnabled);
-        mAudioButton.setSelected(audioButtonChecked);
+        mAudioButton.setChecked(audioButtonChecked);
 
         final LayerDrawable layers = (LayerDrawable) mAudioButton.getBackground();
         Log.d(this, "'layers' drawable: " + layers);
@@ -707,6 +679,38 @@
 
     }
 
+    /**
+     * Update the content description of the audio button.
+     */
+    private void updateAudioButtonContentDescription(int mode) {
+        int stringId = 0;
+
+        // If bluetooth is not supported, the audio buttion will toggle, so use the label "speaker".
+        // Otherwise, use the label of the currently selected audio mode.
+        if (!isSupported(AudioState.ROUTE_BLUETOOTH)) {
+            stringId = R.string.audio_mode_speaker;
+        } else {
+            switch (mode) {
+                case AudioState.ROUTE_EARPIECE:
+                    stringId = R.string.audio_mode_earpiece;
+                    break;
+                case AudioState.ROUTE_BLUETOOTH:
+                    stringId = R.string.audio_mode_bluetooth;
+                    break;
+                case AudioState.ROUTE_WIRED_HEADSET:
+                    stringId = R.string.audio_mode_wired_headset;
+                    break;
+                case AudioState.ROUTE_SPEAKER:
+                    stringId = R.string.audio_mode_speaker;
+                    break;
+            }
+        }
+
+        if (stringId != 0) {
+            mAudioButton.setContentDescription(getResources().getString(stringId));
+        }
+    }
+
     private void showAudioModePopup() {
         Log.d(this, "showAudioPopup()...");
 
@@ -785,19 +789,4 @@
     public Context getContext() {
         return getActivity();
     }
-
-    private void maybeSendAccessibilityEvent(View view, int stringId) {
-        final Context context = getActivity();
-        AccessibilityManager manager =
-                (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE);
-        if (manager != null && manager.isEnabled()) {
-            AccessibilityEvent e = AccessibilityEvent.obtain();
-            e.setSource(view);
-            e.setEventType(AccessibilityEvent.TYPE_ANNOUNCEMENT);
-            e.setClassName(getClass().getName());
-            e.setPackageName(context.getPackageName());
-            e.getText().add(context.getResources().getString(stringId));
-            manager.sendAccessibilityEvent(e);
-        }
-    }
 }

diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 4bc9855..81b9ff7 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java

@@ -557,6 +557,15 @@
         } else {
             mCallStateVideoCallIcon.setVisibility(View.GONE);
         }
+
+        if (state == Call.State.INCOMING) {
+            if (callStateLabel != null) {
+                getView().announceForAccessibility(callStateLabel);
+            }
+            if (mPrimaryName.getText() != null) {
+                getView().announceForAccessibility(mPrimaryName.getText());
+            }
+        }
     }
 
     @Override
@@ -727,11 +736,12 @@
             mSecondaryCallName = (TextView) getView().findViewById(R.id.secondaryCallName);
             mSecondaryCallConferenceCallIcon =
                     getView().findViewById(R.id.secondaryCallConferenceCallIcon);
-            if (hasProvider) {
-                mSecondaryCallProviderInfo.setVisibility(View.VISIBLE);
-                mSecondaryCallProviderLabel = (TextView) getView()
-                        .findViewById(R.id.secondaryCallProviderLabel);
-            }
+        }
+
+        if (mSecondaryCallProviderLabel == null && hasProvider) {
+            mSecondaryCallProviderInfo.setVisibility(View.VISIBLE);
+            mSecondaryCallProviderLabel = (TextView) getView()
+                    .findViewById(R.id.secondaryCallProviderLabel);
         }
     }
 

diff --git a/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java b/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java
index bef4ef3..86fc18f 100644
--- a/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java
+++ b/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java

@@ -21,6 +21,7 @@
 import com.android.incallui.InCallPresenter.InCallDetailsListener;
 import com.android.incallui.InCallPresenter.InCallState;
 import com.android.incallui.InCallPresenter.InCallStateListener;
+import com.android.incallui.InCallPresenter.IncomingCallListener;
 
 import com.google.common.base.Preconditions;
 
@@ -32,7 +33,7 @@
  */
 public class ConferenceManagerPresenter
         extends Presenter<ConferenceManagerPresenter.ConferenceManagerUi>
-        implements InCallStateListener, InCallDetailsListener {
+        implements InCallStateListener, InCallDetailsListener, IncomingCallListener {
 
     private Context mContext;
 
@@ -42,6 +43,7 @@
 
         // register for call state changes last
         InCallPresenter.getInstance().addListener(this);
+        InCallPresenter.getInstance().addIncomingCallListener(this);
     }
 
     @Override
@@ -49,6 +51,7 @@
         super.onUiUnready(ui);
 
         InCallPresenter.getInstance().removeListener(this);
+        InCallPresenter.getInstance().removeIncomingCallListener(this);
     }
 
     @Override
@@ -90,6 +93,15 @@
         }
     }
 
+    @Override
+    public void onIncomingCall(InCallState oldState, InCallState newState, Call call) {
+        // When incoming call exists, set conference ui invisible.
+        if (getUi().isFragmentVisible()) {
+            Log.d(this, "onIncomingCall()... Conference ui is showing, hide it.");
+            InCallPresenter.getInstance().showConferenceCallManager(false);
+        }
+    }
+
     public void init(Context context, CallList callList) {
         mContext = Preconditions.checkNotNull(context);
         mContext = context;
commit	6ad502310c2ada18805b678f2e8b3f3ec5b58d35	[log] [tgz]
author	Tyler Gunn <tgunn@google.com>	Thu Jan 22 16:42:51 2015 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Thu Jan 22 16:42:52 2015 +0000
tree	fa84f728924eaa244f19bc885fe69287e2fb9b38
parent	15110c789df7c1095b9586dff2d04806b10cfae3 [diff]
parent	7ba84ee61ef5d4284808f77711c7843b4b94a6b8 [diff]