commit 38a9daffa5d3c5cd478bf5a81334cdbc02d4727c
author Hung-ying Tyan <tyanh@google.com> Thu Jul 23 07:36:23 2009 +0800
committer Hung-ying Tyan <tyanh@google.com> Sat Jul 25 05:37:42 2009 +0800
tree 84ee85c9cad09e8e841f8310b7ad3f627fcd79f3
parent c25f8955bee14a26520457fca2ab79c013f6196e

Fix secret EditText display and other fixes.

+ Now it shows shadowed "(unchanged)" (as in wifi settings) and "(not set)"
  instead of two dots.

Patch Set 2:
+ Show cancellation confirmation dialog only when there's change in
  profile.

Patch Set 3:
+ Re-enable profile preferences when the reconnect dialog is cancelled.

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index f63a0a6..b96f3ee 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1829,7 +1829,7 @@
     <string name="vpn_yes_button">Yes</string>
     <string name="vpn_no_button">No</string>
     <string name="vpn_back_button">Back</string>
-    <string name="vpn_mistake_button">No, it's a mistake</string>
+    <string name="vpn_mistake_button">No</string>
 
     <string name="vpn_menu_done">Save</string>
     <string name="vpn_menu_cancel">Cancel</string>
@@ -1935,6 +1935,10 @@
     <string name="vpn_settings_title">VPN settings</string>
     <!-- Summary of preference to enter the VPN settings activity -->
     <string name="vpn_settings_summary">Set up &amp; manage Virtual Private Networks (VPNs)</string>
+    <!-- A secret edit field's grayed out value when it has not been modified -->
+    <string name="vpn_secret_unchanged">(unchanged)</string>
+    <!-- A secret edit field's grayed out value when it has not been set -->
+    <string name="vpn_secret_not_set">(not set)</string>
 
     <!-- Title of preference group for credential storage settings -->
     <string name="cstor_settings_category">Credential storage</string>