PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix UI issue in Sim Settings screen." into nyc-dev

Browse Source
This commit is contained in:
Sanket Padawe
2016-04-12 15:58:06 +00:00
committed by Android (Google) Code Review
parent 2f99770cc1 e0e651f2e0
commit 348a5c4c35
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/sim/SimSettings.java
View File

@@ -164,10 +164,11 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
if (sir != null) { if (sir != null) {
simPref.setSummary(sir.getDisplayName()); simPref.setSummary(sir.getDisplayName());
simPref.setEnabled(mSelectableSubInfos.size() > 1);
} else if (sir == null) { } else if (sir == null) {
simPref.setSummary(R.string.sim_selection_required_pref); simPref.setSummary(R.string.sim_selection_required_pref);
simPref.setEnabled(mSelectableSubInfos.size() >= 1);
} }
simPref.setEnabled(mSelectableSubInfos.size() >= 1);
} }
private void updateCellularDataValues() { private void updateCellularDataValues() {
@@ -176,17 +177,18 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
simPref.setTitle(R.string.cellular_data_title); simPref.setTitle(R.string.cellular_data_title);
if (DBG) log("[updateCellularDataValues] mSubInfoList=" + mSubInfoList); if (DBG) log("[updateCellularDataValues] mSubInfoList=" + mSubInfoList);
if (sir != null) {
simPref.setSummary(sir.getDisplayName());
} else if (sir == null) {
simPref.setSummary(R.string.sim_selection_required_pref);
}
boolean callStateIdle = isCallStateIdle(); boolean callStateIdle = isCallStateIdle();
final boolean ecbMode = SystemProperties.getBoolean( final boolean ecbMode = SystemProperties.getBoolean(
TelephonyProperties.PROPERTY_INECM_MODE, false); TelephonyProperties.PROPERTY_INECM_MODE, false);
// Enable data preference in msim mode and call state idle if (sir != null) {
simPref.setEnabled((mSelectableSubInfos.size() >= 1) && callStateIdle && !ecbMode); 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);
// Enable data preference in msim mode and call state idle
simPref.setEnabled((mSelectableSubInfos.size() >= 1) && callStateIdle && !ecbMode);
}
} }
private void updateCallValues() { private void updateCallValues() {