Merge change 6630 into donut
* changes:
Remove "no" locale strings.xml file that duplicates "nb" locale file.
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 73578c7..79a3948 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -525,7 +525,12 @@
public void onClick(DialogInterface dialog, int which) {
if (which == DialogInterface.BUTTON_NEGATIVE) {
- if (mCstorAddCredentialHelper != null) finish();
+ if (mCstorAddCredentialHelper != null) {
+ // release the object here so that it doesn't get triggerred in
+ // onDismiss()
+ mCstorAddCredentialHelper = null;
+ finish();
+ }
return;
}
diff --git a/src/com/android/settings/vpn/AuthenticationActor.java b/src/com/android/settings/vpn/AuthenticationActor.java
index 286064f..537438f 100644
--- a/src/com/android/settings/vpn/AuthenticationActor.java
+++ b/src/com/android/settings/vpn/AuthenticationActor.java
@@ -204,6 +204,7 @@
usernameView.setText(username);
passwordView.setText(password);
saveUsername.setChecked(toSaveUsername);
+ if (toSaveUsername) passwordView.requestFocus();
}
private void broadcastConnectivity(VpnState s) {