Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: Use AOSP translations for MSIM ringtone

Browse Source 
Change-Id: I048a161e33eaabe8d2eb46fee49cae844836258f
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
This commit is contained in:
jhenrique09
2021-03-05 14:01:45 -03:00
committed by Joey
parent e60e722eb5
commit 2ad3bcbcd7
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/strings.xml
View File

@@ -14407,9 +14407,4 @@ Data usage charges may apply.</string>
<!-- Title for supervision PIN verification screen [CHAR LIMIT=60] --> <!-- Title for supervision PIN verification screen [CHAR LIMIT=60] -->
<string name="supervision_full_screen_pin_verification_title">Enter supervision PIN</string> <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> <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> </resources>

2
res/xml/sound_settings.xml
View File

@@ -119,7 +119,7 @@
<!-- Phone ringtone for Slot2 --> <!-- Phone ringtone for Slot2 -->
<com.android.settings.DefaultRingtonePreference <com.android.settings.DefaultRingtonePreference
android:key="ringtone2" android:key="ringtone2"
android:title="@string/ringtone2_title" android:title="@string/ringtone_title"
android:dialogTitle="@string/ringtone_title" android:dialogTitle="@string/ringtone_title"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
android:ringtoneType="ringtone" android:ringtoneType="ringtone"

4
src/com/android/settings/notification/PhoneRingtone2PreferenceController.java
View File

@@ -25,6 +25,8 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.DefaultRingtonePreference; import com.android.settings.DefaultRingtonePreference;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.R;
public class PhoneRingtone2PreferenceController extends RingtonePreferenceControllerBase { public class PhoneRingtone2PreferenceController extends RingtonePreferenceControllerBase {
private static final int SLOT_ID = 1; private static final int SLOT_ID = 1;
@@ -41,6 +43,8 @@ public class PhoneRingtone2PreferenceController extends RingtonePreferenceContro
DefaultRingtonePreference ringtonePreference = DefaultRingtonePreference ringtonePreference =
(DefaultRingtonePreference) screen.findPreference(KEY_PHONE_RINGTONE2); (DefaultRingtonePreference) screen.findPreference(KEY_PHONE_RINGTONE2);
ringtonePreference.setSlotId(SLOT_ID); 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()); ringtonePreference.setEnabled(hasCard());
} }

3
src/com/android/settings/notification/PhoneRingtonePreferenceController.java
View File

@@ -48,7 +48,8 @@ public class PhoneRingtonePreferenceController extends RingtonePreferenceControl
// For Multi SIM device, shoud show "Phone ringtone - SIM 1" for slot1 ringtone setting. // For Multi SIM device, shoud show "Phone ringtone - SIM 1" for slot1 ringtone setting.
DefaultRingtonePreference ringtonePreference = DefaultRingtonePreference ringtonePreference =
(DefaultRingtonePreference) screen.findPreference(KEY_PHONE_RINGTONE); (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()); ringtonePreference.setEnabled(hasCard());
} }
} }

3
tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
View File

@@ -80,7 +80,8 @@ public class PhoneRingtonePreferenceControllerTest {
.thenReturn(mPreference); .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen); 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 @Test