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

Commit 418346d5 authored by Wink Saville's avatar Wink Saville Committed by Android (Google) Code Review
Browse files

Merge "Prepare to make SubscriptionManager public." into lmp-dev

parents b5caa647 d8571043

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

+5 −5
Original line number Original line Diff line number Diff line
@@ -99,7 +99,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 
        super.onCreate(bundle);

        super.onCreate(bundle);





        if (mSubInfoList == null) {

        if (mSubInfoList == null) {

            mSubInfoList = SubscriptionManager.getActivatedSubInfoList(getActivity());

            mSubInfoList = SubscriptionManager.getActiveSubInfoList();

        }

        }





        createPreferences();

        createPreferences();
@@ -135,7 +135,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 
    }

    }





    private void updateSimSlotValues() {

    private void updateSimSlotValues() {

        SubscriptionManager.getAllSubInfoList(getActivity());

        SubscriptionManager.getAllSubInfoList();

        final PreferenceCategory simCards = (PreferenceCategory)findPreference(SIM_CARD_CATEGORY);

        final PreferenceCategory simCards = (PreferenceCategory)findPreference(SIM_CARD_CATEGORY);

        final PreferenceScreen prefScreen = getPreferenceScreen();

        final PreferenceScreen prefScreen = getPreferenceScreen();
@@ -197,7 +197,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 




    private void updateSmsValues() {

    private void updateSmsValues() {

        final DropDownPreference simPref = (DropDownPreference) findPreference(KEY_SMS);

        final DropDownPreference simPref = (DropDownPreference) findPreference(KEY_SMS);

        final SubInfoRecord sir = findRecordBySubId(SubscriptionManager.getPreferredSmsSubId());

        final SubInfoRecord sir = findRecordBySubId(SubscriptionManager.getDefaultSmsSubId());

        if (sir != null) {

        if (sir != null) {

            simPref.setSelectedItem(sir.mSlotId + 1);

            simPref.setSelectedItem(sir.mSlotId + 1);

        }

        }
@@ -344,13 +344,13 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 
                    final Spinner displayNumbers =

                    final Spinner displayNumbers =

                        (Spinner)dialogLayout.findViewById(R.id.display_numbers);

                        (Spinner)dialogLayout.findViewById(R.id.display_numbers);





                    SubscriptionManager.setDisplayNumberFormat(getActivity(),

                    SubscriptionManager.setDisplayNumberFormat(

                        displayNumbers.getSelectedItemPosition() == 0

                        displayNumbers.getSelectedItemPosition() == 0

                            ? SubscriptionManager.DISPLAY_NUMBER_LAST

                            ? SubscriptionManager.DISPLAY_NUMBER_LAST

                            : SubscriptionManager.DISPLAY_NUMBER_FIRST, mSubInfoRecord.mSubId);

                            : SubscriptionManager.DISPLAY_NUMBER_FIRST, mSubInfoRecord.mSubId);





                    mSubInfoRecord.mDisplayName = nameText.getText().toString();

                    mSubInfoRecord.mDisplayName = nameText.getText().toString();

                    SubscriptionManager.setDisplayName(getActivity(), mSubInfoRecord.mDisplayName,

                    SubscriptionManager.setDisplayName(mSubInfoRecord.mDisplayName,

                        mSubInfoRecord.mSubId);

                        mSubInfoRecord.mSubId);





                    updateAllOptions();

                    updateAllOptions();