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

Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev

Browse Source
This commit is contained in:
Sanket Padawe
2014-10-20 20:42:57 +00:00
committed by Android (Google) Code Review
parent 96a0370a2b 9d276ca597
commit bdedbb8516
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,10 +390,13 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
public void update() {
final Resources res = getResources();
setTitle(res.getString(R.string.sim_card_number_title, mSlotId + 1));
if (mSubInfoRecord != null) {
setSummary(res.getString(R.string.sim_settings_summary,
mSubInfoRecord.displayName, mSubInfoRecord.number));
if(TextUtils.isEmpty(mSubInfoRecord.displayName)) {
setTitle(getCarrierName());
} else {
setTitle(mSubInfoRecord.displayName);
}
setSummary(mSubInfoRecord.number.toString());
setEnabled(true);
} else {
setSummary(R.string.sim_slot_empty);
@@ -428,6 +431,8 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
}
public void createEditDialog(SimPreference simPref) {
final Resources res = getResources();
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
final View dialogLayout = getActivity().getLayoutInflater().inflate(
@@ -443,7 +448,8 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
TextView carrierView = (TextView)dialogLayout.findViewById(R.id.carrier);
carrierView.setText(getCarrierName());
builder.setTitle(R.string.sim_editor_title);
builder.setTitle(String.format(res.getString(R.string.sim_editor_title),
(mSubInfoRecord.slotId + 1)));
builder.setPositiveButton(R.string.okay, new DialogInterface.OnClickListener() {
@Override