Merge "Don't change the settings title when editing VPN entries."
diff --git a/src/com/android/settings/vpn/VpnEditor.java b/src/com/android/settings/vpn/VpnEditor.java
index f4f5828..d362793 100644
--- a/src/com/android/settings/vpn/VpnEditor.java
+++ b/src/com/android/settings/vpn/VpnEditor.java
@@ -22,6 +22,7 @@
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
+import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.net.vpn.L2tpIpsecProfile;
@@ -152,17 +153,15 @@
}*/
private void initViewFor(VpnProfile profile) {
- setTitle(profile);
mProfileEditor.loadPreferencesTo(getPreferenceScreen());
}
- private void setTitle(VpnProfile profile) {
- final Activity activity = getActivity();
- String formatString = mAddingProfile
- ? activity.getString(R.string.vpn_edit_title_add)
- : activity.getString(R.string.vpn_edit_title_edit);
- activity.setTitle(String.format(formatString,
- profile.getType().getDisplayName()));
+ /* package */static String getTitle(Context context, VpnProfile profile, boolean adding) {
+ String formatString = adding
+ ? context.getString(R.string.vpn_edit_title_add)
+ : context.getString(R.string.vpn_edit_title_edit);
+ return String.format(formatString,
+ profile.getType().getDisplayName());
}
/**
diff --git a/src/com/android/settings/vpn/VpnSettings.java b/src/com/android/settings/vpn/VpnSettings.java
index ba6258c..e62a5ee 100644
--- a/src/com/android/settings/vpn/VpnSettings.java
+++ b/src/com/android/settings/vpn/VpnSettings.java
@@ -745,7 +745,7 @@
// TODO: Show different titles for add and edit.
((PreferenceActivity)getActivity()).startPreferencePanel(
VpnEditor.class.getCanonicalName(), args,
- add ? R.string.vpn_details_title : R.string.vpn_details_title, null,
+ 0, VpnEditor.getTitle(getActivity(), profile, add),
this, REQUEST_ADD_OR_EDIT_PROFILE);
}