Pass the locale code in the help url for help pages.
Otherwise the help will always be shown in English.
Bug: 7564049
Change-Id: I94da36aa1ae5aabd118178866b7e570bb77add34
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index c0440c8..b418826 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -84,13 +84,9 @@
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- if (mHelpUrl != null) {
- Intent helpIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(mHelpUrl));
- helpIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
- | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+ if (mHelpUrl != null && getActivity() != null) {
MenuItem helpItem = menu.add(0, MENU_HELP, 0, R.string.help_label);
- helpItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
- helpItem.setIntent(helpIntent);
+ HelpUtils.prepareHelpMenuItem(getActivity(), helpItem, mHelpUrl);
}
}