SU: Use different strings for notification summary & popup list

Change-Id: I46017bd0dec40b57c27e951a863662d1a6afb72e

diff --git a/Superuser/res/values/strings.xml b/Superuser/res/values/strings.xml
index 49a8986..45d6f58 100644 (file)
--- a/Superuser/res/values/strings.xml
+++ b/Superuser/res/values/strings.xml
@@ -45,7 +45,12 @@
     <string name="request_timeout_summary">Superuser requests will time out and be denied after %s seconds</string>
     <string name="notifications">Notifications</string>
     <string name="none">None</string>
+    <string name="toast">Toast</string>
+    <string name="notification">Notification</string>
+    <string name="toast_summary">toast</string>
+    <string name="notification_summary">notification</string>
     <string name="notifications_summary">A %s will be shown when an app is granted or denied Superuser permissions</string>
+    <string name="no_notification">No notification will be shown</string>
     <string name="enter_pin">Enter PIN</string>
     <string name="enter_new_pin">Enter New PIN</string>
     <string name="incorrect_pin">Incorrect PIN</string>
@@ -55,9 +60,6 @@
     <string name="number_seconds">%s seconds</string>
     <string name="superuser_granted">Superuser granted to %s</string>
     <string name="superuser_denied">Superuser denied to %s</string>
-    <string name="toast">Toast</string>
-    <string name="notification">Notification</string>
-    <string name="no_notification">No notification will be shown</string>
     <string name="developer_warning">Developer Warning:\nandroid.permission.ACCESS_SUPERUSER\nnot declared in manifest.</string>
     <string name="superuser_description">full permissions to all device features and storage</string>
     <string name="superuser_description_more">Superuser grants full access to all device features and storage, including the secure and sensitive hardware elements of your device. This permission is potentially dangerous.</string>

diff --git a/Superuser/src/com/koushikdutta/superuser/SettingsFragmentInternal.java b/Superuser/src/com/koushikdutta/superuser/SettingsFragmentInternal.java
index 158c860..86a5403 100644 (file)
--- a/Superuser/src/com/koushikdutta/superuser/SettingsFragmentInternal.java
+++ b/Superuser/src/com/koushikdutta/superuser/SettingsFragmentInternal.java
@@ -351,10 +351,12 @@ public class SettingsFragmentInternal extends BetterListFragmentInternal {
                     setSummary(getString(R.string.no_notification));
                     break;
                 case Settings.NOTIFICATION_TYPE_NOTIFICATION:
-                    setSummary(getString(R.string.notifications_summary, getString(R.string.notification)));
+                    setSummary(getString(R.string.notifications_summary,
+                            getString(R.string.notification_summary)));
                     break;
                 case Settings.NOTIFICATION_TYPE_TOAST:
-                    setSummary(getString(R.string.notifications_summary, getString(R.string.toast)));
+                    setSummary(getString(R.string.notifications_summary,
+                            getString(R.string.toast_summary)));
                     break;
                 }
             }