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

MSIM Ringtone: Improve on devices with ESIM

Browse Source 
Change-Id: Ib0e0348b29d9bcb567f2d3c0725dd6950a3bbc1e
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
This commit is contained in:
jhenrique09
2021-12-11 14:23:43 -03:00
committed by Joey
parent 2ad3bcbcd7
commit 7c29c1956b
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,6 +55,9 @@ public class PhoneRingtone2PreferenceController extends RingtonePreferenceContro
@Override
public boolean isAvailable() {
if (isBuiltInEuiccSlot(SLOT_ID)) {
return false;
}
TelephonyManager telephonyManager =
(TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
return Utils.isVoiceCapable(mContext) && telephonyManager.isMultiSimEnabled();

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

@@ -44,12 +44,10 @@ public class PhoneRingtonePreferenceController extends RingtonePreferenceControl
TelephonyManager telephonyManager =
(TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
if (telephonyManager.isMultiSimEnabled()) {
// For Multi SIM device, shoud show "Phone ringtone - SIM 1" for slot1 ringtone setting.
if (telephonyManager.isMultiSimEnabled() && !isDeviceSupportsESIM()) {
DefaultRingtonePreference ringtonePreference =
(DefaultRingtonePreference) screen.findPreference(KEY_PHONE_RINGTONE);
ringtonePreference.setTitle(mContext.getString(R.string.ringtone_title) + " - " +
String.format(mContext.getString(R.string.sim_card_number_title), 1));
ringtonePreference.setTitle(mContext.getString(R.string.ringtone_title));
ringtonePreference.setEnabled(hasCard());
}
}

15
src/com/android/settings/notification/RingtonePreferenceControllerBase.java
View File

@@ -70,4 +70,19 @@ public abstract class RingtonePreferenceControllerBase extends AbstractPreferenc
public abstract int getRingtoneType();
public boolean isBuiltInEuiccSlot(int slotIndex) {
int[] euiccSlots = mContext.getResources()
.getIntArray(com.android.internal.R.array.non_removable_euicc_slots);
for (int slot : euiccSlots) {
if (slot == slotIndex) {
return true;
}
}
return false;
}
public boolean isDeviceSupportsESIM() {
return mContext.getResources()
.getIntArray(com.android.internal.R.array.non_removable_euicc_slots).length > 0;
}
}