diff options
| author | Michael Bestas <mikeioannina@cyanogenmod.org> | 2016-01-05 00:38:53 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-01-05 11:29:12 -0800 |
| commit | 32f2f125160a57f4511c56069398c024b7f91579 (patch) | |
| tree | 578d17f6f170b88a94e589fc91e0e26fdff51ce9 /src/com/android/settings/sim | |
| parent | f8431ca72a05049d386fc2eba34f8f34ea5dd31d (diff) | |
| download | packages_apps_Settings-32f2f125160a57f4511c56069398c024b7f91579.zip packages_apps_Settings-32f2f125160a57f4511c56069398c024b7f91579.tar.gz packages_apps_Settings-32f2f125160a57f4511c56069398c024b7f91579.tar.bz2 | |
Move more CAF strings and cleanup
* Move all CAF strings to cm_strings
* Remove duplicate strings
* Reuse sim_calls_ask_first_prefs_title for sms
* Improve CAF SIM enabler strings
Change-Id: I6cf0fb0fe23800301b1fc8c37022ee9b79b5818b
Diffstat (limited to 'src/com/android/settings/sim')
| -rw-r--r-- | src/com/android/settings/sim/SimDialogActivity.java | 2 | ||||
| -rw-r--r-- | src/com/android/settings/sim/SimSettings.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java index df4a8d5..79dc40a 100644 --- a/src/com/android/settings/sim/SimDialogActivity.java +++ b/src/com/android/settings/sim/SimDialogActivity.java @@ -255,7 +255,7 @@ public class SimDialogActivity extends Activity { } } } else if ((id == SMS_PICK)){ - list.add(getResources().getString(R.string.sim_sms_ask_first_prefs_title)); + list.add(getResources().getString(R.string.sim_calls_ask_first_prefs_title)); smsSubInfoList.add(null); for (int i = 0; i < selectableSubInfoLength; ++i) { final SubscriptionInfo sir = subInfoList.get(i); diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java index 6748489..b70cd13 100644 --- a/src/com/android/settings/sim/SimSettings.java +++ b/src/com/android/settings/sim/SimSettings.java @@ -234,7 +234,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable log("[updateSmsValues] isSMSPrompt: " + isSMSPrompt); if (isSMSPrompt || sir == null) { simPref.setSummary(mContext.getResources().getString( - R.string.sim_sms_ask_first_prefs_title)); + R.string.sim_calls_ask_first_prefs_title)); } else { simPref.setSummary(sir.getDisplayName()); } @@ -587,7 +587,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable summary = displayName + " - " + mSir.getNumber(); } } else { - summary = displayName + mContext.getString(R.string.sim_enabler_summary, + summary = mContext.getString(R.string.sim_enabler_summary, displayName, res.getString(hasCard() ? R.string.sim_disabled : R.string.sim_missing)); } |