Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0e651f2 authored by Sanket Padawe's avatar Sanket Padawe
Browse files

Fix UI issue in Sim Settings screen. 

+ Preference screen for Sim card selection should be enabled when 1)sim
 count > 1. 2) no default is set for Sms & Data & sim count >= 1

Bug: 27637607
Change-Id: Idb7207316a7bf9aab119ec6568038990623ba514
parent e6924ce8

src/com/android/settings/sim/SimSettings.java

+9 −7
Original line number Diff line number Diff line
@@ -164,11 +164,12 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 


        if (sir != null) {

            simPref.setSummary(sir.getDisplayName());

            simPref.setEnabled(mSelectableSubInfos.size() > 1);

        } else if (sir == null) {

            simPref.setSummary(R.string.sim_selection_required_pref);

        }

            simPref.setEnabled(mSelectableSubInfos.size() >= 1);

        }

    }



    private void updateCellularDataValues() {

        final Preference simPref = findPreference(KEY_CELLULAR_DATA);
@@ -176,18 +177,19 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 
        simPref.setTitle(R.string.cellular_data_title);

        if (DBG) log("[updateCellularDataValues] mSubInfoList=" + mSubInfoList);



        boolean callStateIdle = isCallStateIdle();

        final boolean ecbMode = SystemProperties.getBoolean(

                TelephonyProperties.PROPERTY_INECM_MODE, false);

        if (sir != null) {

            simPref.setSummary(sir.getDisplayName());

            // Enable data preference in msim mode and call state idle

            simPref.setEnabled((mSelectableSubInfos.size() > 1) && callStateIdle && !ecbMode);

        } else if (sir == null) {

            simPref.setSummary(R.string.sim_selection_required_pref);

        }



        boolean callStateIdle = isCallStateIdle();

        final boolean ecbMode = SystemProperties.getBoolean(

                TelephonyProperties.PROPERTY_INECM_MODE, false);

            // Enable data preference in msim mode and call state idle

            simPref.setEnabled((mSelectableSubInfos.size() >= 1) && callStateIdle && !ecbMode);

        }

    }



    private void updateCallValues() {

        final Preference simPref = findPreference(KEY_CALLS);