Merge "Fix UI issue in Sim Settings screen." into nyc-dev am: 348a5c4 (754f8c92) · Commits · e / os / android_packages_apps_Settings

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);