2 files changed, 67 insertions, 10 deletions
diff --git a/java/com/android/voicemail/impl/res/xml/voicemail_settings.xml b/java/com/android/voicemail/impl/res/xml/voicemail_settings.xml
index 53fd57f7e..50510905c 100644
--- a/java/com/android/voicemail/impl/res/xml/voicemail_settings.xml
+++ b/java/com/android/voicemail/impl/res/xml/voicemail_settings.xml
@@ -17,16 +17,9 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
   android:title="@string/voicemail_settings_title">
 
-  <com.android.voicemail.impl.settings.VoicemailRingtonePreference
-    android:key="@string/voicemail_notification_ringtone_key"
-    android:title="@string/voicemail_notification_ringtone_title"
-    android:persistent="false"
-    android:ringtoneType="notification" />
-
-  <CheckBoxPreference
-    android:key="@string/voicemail_notification_vibrate_key"
-    android:title="@string/voicemail_notification_vibrate_when_title"
-    android:persistent="true" />
+  <Preference
+      android:key="@string/voicemail_notifications_key"
+      android:title="@string/voicemail_notifications_preference_title"/>
 
   <SwitchPreference
     android:key="@string/voicemail_visual_voicemail_key"
diff --git a/java/com/android/voicemail/impl/res/xml/vvm_config.xml b/java/com/android/voicemail/impl/res/xml/vvm_config.xml
index 230d40f90..daba3d511 100644
--- a/java/com/android/voicemail/impl/res/xml/vvm_config.xml
+++ b/java/com/android/voicemail/impl/res/xml/vvm_config.xml
@@ -23,6 +23,30 @@
   </pbundle_as_map>
 
   <pbundle_as_map>
+    <!-- Orange Belgium -->
+    <string name="feature_flag_name">vvm_carrier_flag_20610</string>
+    <string-array name="mccmnc">
+      <item value="20610"/>
+    </string-array>
+
+    <int
+        name="vvm_port_number_int"
+        value="0"/>
+    <string name="vvm_destination_number_string">8082</string>
+    <string-array name="carrier_vvm_package_name_string_array">
+      <item value="com.orange.vvm"/>
+    </string-array>
+    <string name="vvm_type_string">vvm_type_omtp</string>
+    <boolean
+        name="vvm_cellular_data_required_bool"
+        value="true"/>
+    <string-array name="vvm_disabled_capabilities_string_array">
+      <!-- b/32365569 -->
+      <item value="STARTTLS"/>
+    </string-array>
+  </pbundle_as_map>
+
+  <pbundle_as_map>
     <!-- Orange France -->
     <string-array name="mccmnc">
       <item value="20801"/>
@@ -47,6 +71,30 @@
   </pbundle_as_map>
 
   <pbundle_as_map>
+    <!-- Orange Luxembourg -->
+    <string name="feature_flag_name">vvm_carrier_flag_20610</string>
+    <string-array name="mccmnc">
+      <item value="27099"/>
+    </string-array>
+
+    <int
+        name="vvm_port_number_int"
+        value="0"/>
+    <string name="vvm_destination_number_string">64085</string>
+    <string-array name="carrier_vvm_package_name_string_array">
+      <item value="com.orange.vvm"/>
+    </string-array>
+    <string name="vvm_type_string">vvm_type_omtp</string>
+    <boolean
+        name="vvm_cellular_data_required_bool"
+        value="true"/>
+    <string-array name="vvm_disabled_capabilities_string_array">
+      <!-- b/32365569 -->
+      <item value="STARTTLS"/>
+    </string-array>
+  </pbundle_as_map>
+
+  <pbundle_as_map>
     <!-- T-Mobile USA-->
     <string-array name="mccmnc">
       <item value="310160"/>
@@ -86,6 +134,22 @@
   </pbundle_as_map>
 
   <pbundle_as_map>
+    <!-- Telus Canada -->
+    <string name="feature_flag_name">vvm_carrier_flag_302220</string>
+    <string-array name="mccmnc">
+      <item value="302220"/>
+    </string-array>
+    <int
+        name="vvm_port_number_int"
+        value="5499"/>
+    <string name="vvm_destination_number_string">7723</string>
+    <string name="vvm_type_string">vvm_type_omtp</string>
+    <boolean
+        name="vvm_cellular_data_required_bool"
+        value="true"/>
+  </pbundle_as_map>
+
+  <pbundle_as_map>
     <!-- Verizon USA -->
     <string-array name="mccmnc">
       <item value="310004"/>