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

Commit 7899be0f authored by Stuart Scott's avatar Stuart Scott Committed by jianzhou
Browse files

Update SubInfoRecord usage. 

bug: 17575308
Conflicts:
	src/com/android/settings/sim/SimSettings.java

Change-Id: Id854afd609d58bb63ed8d42bf5e641a15589f79d
parent a4cbe7c8

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

+13 −13
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 
    }



    private void updateSmsValues() {

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

        final Preference simPref = findPreference(KEY_SMS);

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

        simPref.setTitle(R.string.sms_messages_title);

        if (mSubInfoList.size() == 1) {
@@ -703,24 +703,24 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 
            nameText.setText(mSubscriptionInfo.getDisplayName());

            nameText.addTextChangedListener(SimSettings.this);



            final Spinner colorSpinner = (Spinner) dialogLayout.findViewById(R.id.spinner);

            final Spinner tintSpinner = (Spinner) dialogLayout.findViewById(R.id.spinner);

            ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(getContext(),

                    R.array.color_picker, android.R.layout.simple_spinner_item);

            adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);

            colorSpinner.setAdapter(adapter);

            tintSpinner.setAdapter(adapter);



            for (int i = 0; i < colorArr.length; i++) {

                if (colorArr[i] == mSubInfoRecord.getColor()) {

                    colorSpinner.setSelection(i);

            for (int i = 0; i < tintArr.length; i++) {

                if (tintArr[i] == mSubInfoRecord.getIconTint()) {

                    tintSpinner.setSelection(i);

                    break;

                }

            }



            colorSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {

            tintSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {

                @Override

                public void onItemSelected(AdapterView<?> parent, View view,

                    int pos, long id){

                    colorSpinner.setSelection(pos);

                    tintSpinner.setSelection(pos);

                }



                @Override
@@ -755,12 +755,12 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 
                            SubscriptionManager.NAME_SOURCE_USER_INPUT);

                    Utils.findRecordBySubId(subId).setDisplayName(displayName);



                    final int colorSelected = colorSpinner.getSelectedItemPosition();

                    final int tintSelected = tintSpinner.getSelectedItemPosition();

                    int subscriptionId = mSubInfoRecord.getSubscriptionId();

                    int color = colorArr[colorSelected];

                    mSubInfoRecord.setColor(color);

                    SubscriptionManager.setColor(color, subscriptionId);

                    Utils.findRecordBySubId(subscriptionId).setColor(color);

                    int tint = tintArr[tintSelected];

                    mSubInfoRecord.setIconTint(tint);

                    SubscriptionManager.setIconTint(tint, subscriptionId);

                    Utils.findRecordBySubId(subscriptionId).setIconTint(tint);



                    updateAllOptions();

                    update();