am bac5a389: am 3d319d0b: Merge "Greyed out SIM activities if only one SIM is present." into lmp-dev

* commit 'bac5a3892dd7e1999f8e33fe7b4e28e3f0530cd9':
  Greyed out SIM activities if only one SIM is present.
This commit is contained in:
PauloftheWest
2014-08-27 21:58:18 +00:00
committed by Android Git Automerger

View File

@@ -88,6 +88,8 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
private SubInfoRecord mCalls = null; private SubInfoRecord mCalls = null;
private SubInfoRecord mSMS = null; private SubInfoRecord mSMS = null;
private int mNumSims;
public SimSettings() { public SimSettings() {
super(DISALLOW_CONFIG_SIM); super(DISALLOW_CONFIG_SIM);
} }
@@ -114,10 +116,14 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
final int numSlots = tm.getSimCount(); final int numSlots = tm.getSimCount();
mAvailableSubInfos = new ArrayList<SubInfoRecord>(numSlots); mAvailableSubInfos = new ArrayList<SubInfoRecord>(numSlots);
mNumSims = 0;
for (int i = 0; i < numSlots; ++i) { for (int i = 0; i < numSlots; ++i) {
final SubInfoRecord sir = findRecordBySlotId(i); final SubInfoRecord sir = findRecordBySlotId(i);
simCards.addPreference(new SimPreference(getActivity(), sir, i)); simCards.addPreference(new SimPreference(getActivity(), sir, i));
mAvailableSubInfos.add(sir); mAvailableSubInfos.add(sir);
if (sir != null) {
mNumSims++;
}
} }
updateActivitesCategory(); updateActivitesCategory();
@@ -195,6 +201,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
if (sir != null) { if (sir != null) {
simPref.setSelectedItem(sir.mSlotId + 1); simPref.setSelectedItem(sir.mSlotId + 1);
} }
simPref.setEnabled(mNumSims > 1);
} }
private void updateCellularDataValues() { private void updateCellularDataValues() {
@@ -203,6 +210,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
if (sir != null) { if (sir != null) {
simPref.setSelectedItem(sir.mSlotId); simPref.setSelectedItem(sir.mSlotId);
} }
simPref.setEnabled(mNumSims > 1);
} }
private void updateCallValues() { private void updateCallValues() {
@@ -211,6 +219,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
if (sir != null) { if (sir != null) {
simPref.setSelectedItem(sir.mSlotId + 1); simPref.setSelectedItem(sir.mSlotId + 1);
} }
simPref.setEnabled(mNumSims > 1);
} }
@Override @Override