release-request-94bbded7-c270-40fa-9a74-fedecfd046c6-for-git_oc-release-4034177 snap-temp-L73200000066785187android-cts-8.0_r1

Change-Id: I89cce12c67dd40c8a54f4cabf0e36a34792ea82c

1 files changed, 7 insertions, 5 deletions

diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java
index 415d56368..3d354775d 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java
@@ -356,13 +356,15 @@ public class CellBroadcastAlertDialog extends Activity {
         setTitle(titleId);
         ((TextView) findViewById(R.id.alertTitle)).setText(titleId);
         ((TextView) findViewById(R.id.message)).setText(message.getMessageBody());
+
+        String dismissButtonText = getApplicationContext().getResources()
+                .getString(R.string.button_dismiss);
+
         if (mMessageList.size() > 1) {
-            ((TextView) findViewById(R.id.dismissButton)).setText("OK  (1/" +
-                    mMessageList.size() + ")");
-        }
-        else if (mMessageList.size() == 1) {
-            ((TextView) findViewById(R.id.dismissButton)).setText("OK");
+            dismissButtonText += "  (1/" + mMessageList.size() + ")";
         }
+
+        ((TextView) findViewById(R.id.dismissButton)).setText(dismissButtonText);
         // Set alert reminder depending on user preference
         CellBroadcastAlertReminder.queueAlertReminder(this, true);
     }