Superuser: Don't duplicate 'Allow' string
Change-Id: I98085f8da3ea9f6f6b8899d0bb0cda0cc1d503aa
diff --git a/Superuser/res/values/strings.xml b/Superuser/res/values/strings.xml
index 18ef309..5f39ff9 100644
--- a/Superuser/res/values/strings.xml
+++ b/Superuser/res/values/strings.xml
@@ -17,7 +17,7 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="superuser">Superuser</string>
<string name="allow">Allow</string>
- <string name="allow_countdown">Allow (%1$s)</string>
+ <string name="allow_countdown">%1$s (%2$s)</string>
<string name="deny">Deny</string>
<string name="status_incoming">Incoming Superuser Request\u2026</string>
<string name="unknown_uid">Unknown UID: %s</string>
diff --git a/Superuser/src/com/koushikdutta/superuser/MultitaskSuRequestActivity.java b/Superuser/src/com/koushikdutta/superuser/MultitaskSuRequestActivity.java
index d7d6088..704e2bd 100644
--- a/Superuser/src/com/koushikdutta/superuser/MultitaskSuRequestActivity.java
+++ b/Superuser/src/com/koushikdutta/superuser/MultitaskSuRequestActivity.java
@@ -269,9 +269,10 @@
new Runnable() {
public void run() {
- mAllow.setText(getString(R.string.allow_countdown, mTimeLeft));
+ String allow = getString(R.string.allow);
+ mAllow.setText(getString(R.string.allow_countdown, allow, mTimeLeft));
if (mTimeLeft-- <= 0) {
- mAllow.setText(getString(R.string.allow));
+ mAllow.setText(allow);
if (!mHandled)
mAllow.setEnabled(true);
return;