From 2ad3bcbcd70eb221863515532b95467354ae98e0 Mon Sep 17 00:00:00 2001
From: jhenrique09 <jhenrique09.mcz@hotmail.com>
Date: Fri, 5 Mar 2021 14:01:45 -0300
Subject: [PATCH] Settings: Use AOSP translations for MSIM ringtone
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I048a161e33eaabe8d2eb46fee49cae844836258f
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
---
 res/values/strings.xml                                       | 5 -----
 res/xml/sound_settings.xml                                   | 2 +-
 .../notification/PhoneRingtone2PreferenceController.java     | 4 ++++
 .../notification/PhoneRingtonePreferenceController.java      | 3 ++-
 .../notification/PhoneRingtonePreferenceControllerTest.java  | 3 ++-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ef38c78b809..e60455a52c4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -14407,9 +14407,4 @@ Data usage charges may apply.</string>
     <!-- Title for supervision PIN verification screen [CHAR LIMIT=60] -->
     <string name="supervision_full_screen_pin_verification_title">Enter supervision PIN</string>
     <string name="accessibility_illustration_content_description"><xliff:g id="feature" example="Select to Speak">%1$s</xliff:g> animation</string>
-
-    <!-- Sound: Title for the option defining the phone ringtone for slot1 on Muilti SIM device. [CHAR LIMIT=50] -->
-    <string name="ringtone1_title">Phone ringtone - SIM 1</string>
-    <!-- Sound: Title for the option defining the phone ringtone for slot2 on Muilti SIM device. [CHAR LIMIT=50] -->
-    <string name="ringtone2_title">Phone ringtone - SIM 2</string>
 </resources>
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index 85a703f1e4f..efc12622656 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -119,7 +119,7 @@
     <!-- Phone ringtone for Slot2 -->
     <com.android.settings.DefaultRingtonePreference
         android:key="ringtone2"
-        android:title="@string/ringtone2_title"
+        android:title="@string/ringtone_title"
         android:dialogTitle="@string/ringtone_title"
         android:summary="@string/summary_placeholder"
         android:ringtoneType="ringtone"
diff --git a/src/com/android/settings/notification/PhoneRingtone2PreferenceController.java b/src/com/android/settings/notification/PhoneRingtone2PreferenceController.java
index 2acda015e5d..2c2e07bb26e 100644
--- a/src/com/android/settings/notification/PhoneRingtone2PreferenceController.java
+++ b/src/com/android/settings/notification/PhoneRingtone2PreferenceController.java
@@ -25,6 +25,8 @@ import androidx.preference.PreferenceScreen;
 import com.android.settings.DefaultRingtonePreference;
 import com.android.settings.Utils;
 
+import com.android.settings.R;
+
 public class PhoneRingtone2PreferenceController extends RingtonePreferenceControllerBase {
 
     private static final int SLOT_ID = 1;
@@ -41,6 +43,8 @@ public class PhoneRingtone2PreferenceController extends RingtonePreferenceContro
         DefaultRingtonePreference ringtonePreference =
                 (DefaultRingtonePreference) screen.findPreference(KEY_PHONE_RINGTONE2);
         ringtonePreference.setSlotId(SLOT_ID);
+        ringtonePreference.setTitle(mContext.getString(R.string.ringtone_title) + " - " +
+            String.format(mContext.getString(R.string.sim_card_number_title), 2));
         ringtonePreference.setEnabled(hasCard());
     }
 
diff --git a/src/com/android/settings/notification/PhoneRingtonePreferenceController.java b/src/com/android/settings/notification/PhoneRingtonePreferenceController.java
index bb9d0da84c2..9c681d437a5 100644
--- a/src/com/android/settings/notification/PhoneRingtonePreferenceController.java
+++ b/src/com/android/settings/notification/PhoneRingtonePreferenceController.java
@@ -48,7 +48,8 @@ public class PhoneRingtonePreferenceController extends RingtonePreferenceControl
             // For Multi SIM device, shoud show "Phone ringtone - SIM 1" for slot1 ringtone setting.
             DefaultRingtonePreference ringtonePreference =
                     (DefaultRingtonePreference) screen.findPreference(KEY_PHONE_RINGTONE);
-            ringtonePreference.setTitle(mContext.getString(R.string.ringtone1_title));
+            ringtonePreference.setTitle(mContext.getString(R.string.ringtone_title) + " - " +
+                String.format(mContext.getString(R.string.sim_card_number_title), 1));
             ringtonePreference.setEnabled(hasCard());
         }
     }
diff --git a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
index fca98e42aa0..fc9041227ad 100644
--- a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
@@ -80,7 +80,8 @@ public class PhoneRingtonePreferenceControllerTest {
                 .thenReturn(mPreference);
         mController.displayPreference(mPreferenceScreen);
 
-        verify(mPreference).setTitle(mContext.getString(R.string.ringtone1_title));
+        verify(mPreference).setTitle(mContext.getString(R.string.ringtone_title) + " - " +
+            String.format(mContext.getString(R.string.sim_card_number_title), 1)));
     }
 
     @Test