Improve strings.

Change-Id: I852e220586d41f7c1f6b945a1efd2132fc615c5b

4 files changed, 14 insertions, 11 deletions

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 9149d6f47..67ccaf15c 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -1153,7 +1153,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
         String name = Settings.System.getString(context.getContentResolver(),
                 MULTI_SIM_NAME[subscription]);
         if (TextUtils.isEmpty(name)) {
-            return context.getString(R.string.slot_name) + " " + (subscription + 1);
+            return context.getString(R.string.multi_sim_slot_name, subscription + 1);
         }
         return name;
     }
diff --git a/src/com/android/dialer/SpecialCharSequenceMgr.java b/src/com/android/dialer/SpecialCharSequenceMgr.java
index 278e7a727..01948fa6e 100755
--- a/src/com/android/dialer/SpecialCharSequenceMgr.java
+++ b/src/com/android/dialer/SpecialCharSequenceMgr.java
@@ -316,7 +316,6 @@ public class SpecialCharSequenceMgr {
 
     static boolean handleMSimIMEIDisplay(Context context) {
         StringBuffer deviceIds = new StringBuffer();
-        int titleId = R.string.device_id;
         for (int i = 0; i < MSimTelephonyManager.getDefault().getPhoneCount(); i++) {
             if (i != 0) {
                 deviceIds.append("\n");
@@ -333,7 +332,7 @@ public class SpecialCharSequenceMgr {
             deviceIds.append(MSimTelephonyManager.getDefault().getDeviceId(i));
         }
         AlertDialog alert = new AlertDialog.Builder(context)
-                .setTitle(titleId)
+                .setTitle(R.string.msim_ime_dialog_title)
                 .setMessage(deviceIds.toString())
                 .setPositiveButton(android.R.string.ok, null)
                 .setCancelable(false)
diff --git a/src/com/android/dialer/SpeedDialListActivity.java b/src/com/android/dialer/SpeedDialListActivity.java
index a92d11092..656ad676f 100755
--- a/src/com/android/dialer/SpeedDialListActivity.java
+++ b/src/com/android/dialer/SpeedDialListActivity.java
@@ -139,7 +139,7 @@ public class SpeedDialListActivity extends ListActivity implements OnItemClickLi
                 mContactSimKey[i - 1] = false;
 
                 mSpeedListItems[i] = getString(R.string.speed_item, String.valueOf(i + 1),
-                        getString(R.string.not_set));
+                        getString(R.string.speed_dial_not_set));
             } else {
                 mContactDataName[i - 1] = mSpeedDialUtils.getValidName(mContactDataNumber[i - 1]);
                 if (TextUtils.isEmpty(mContactDataName[i - 1])) {
@@ -254,8 +254,9 @@ public class SpeedDialListActivity extends ListActivity implements OnItemClickLi
                             name = c.getString(c.getColumnIndexOrThrow("display_name"));
                             accountType = c.getString(c.getColumnIndexOrThrow("account_type"));
                             if (!okToSet(number)) {
-                                Toast.makeText(this, R.string.assignSpeedDialFailToast,
-                                        Toast.LENGTH_LONG).show();
+                                String text = getString(R.string.speed_dial_assign_failure_toast,
+                                        number);
+                                Toast.makeText(this, text, Toast.LENGTH_LONG).show();
                                 return ;
                             } else {
                                 mContactDataName[numId] = name;
@@ -303,8 +304,8 @@ public class SpeedDialListActivity extends ListActivity implements OnItemClickLi
                 String contactName = mContactDataName[pos - 1];
                 String hdrTitle = !("".equals(contactName)) ? contactName : contactNum;
                 menu.setHeaderTitle(hdrTitle);
-                menu.add(0, MENU_REPLACE, 0, R.string.replace);
-                menu.add(0, MENU_DELETE, 0, R.string.delete);
+                menu.add(0, MENU_REPLACE, 0, R.string.speed_dial_replace);
+                menu.add(0, MENU_DELETE, 0, R.string.speed_dial_delete);
             }
         }
         super.onCreateContextMenu(menu, v, menuInfo);
@@ -327,7 +328,7 @@ public class SpeedDialListActivity extends ListActivity implements OnItemClickLi
             mContactDataNumber[pos-1] = "";
             mContactDataName[pos-1] = "";
             mSpeedListItems[pos] = getString(R.string.speed_item, String.valueOf(pos+1),
-                getString(R.string.not_set));
+                getString(R.string.speed_dial_not_set));
             mSpeedDialUtils.storeContactDataNumber(pos-1, "");
             mSpeedDialUtils.storeContactDataName(pos-1, "");
             mSpeedDialUtils.storeContactSimKey(pos - 1, false);
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index a6790c7eb..0ab28780c 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -2004,9 +2004,12 @@ public class DialpadFragment extends Fragment
     private void showNoSpeedNumberDialog(int numId) {
         //because numId start from 0, but numKey from 2 that represent num 2-9, so here add two
         int numKey = numId + 2;
-        String dialogTxt = getString(R.string.is_set_speed, String.valueOf(numKey));
+        String dialogTxt = getString(R.string.speed_dial_unassigned_dialog_message,
+                String.valueOf(numKey));
         final Activity thisActivity = getActivity();
-        new AlertDialog.Builder(thisActivity).setTitle(R.string.dialog_title).setMessage(dialogTxt)
+        new AlertDialog.Builder(thisActivity)
+            .setTitle(R.string.speed_dial_unassigned_dialog_title)
+            .setMessage(dialogTxt)
           .setPositiveButton(android.R.string.ok,
                  new DialogInterface.OnClickListener() {
                      @Override