Merge "Add Help lin to Settings > Security" into jb-mr1-dev

This commit is contained in:
rich cannings
2012-09-30 15:48:54 -07:00
committed by Android (Google) Code Review
3 changed files with 9 additions and 1 deletions

View File

@@ -727,6 +727,11 @@ public class SecuritySettings extends SettingsPreferenceFragment
return true;
}
@Override
protected int getHelpResource() {
return R.string.help_url_security;
}
public void startBiometricWeakImprove(){
Intent intent = new Intent();
intent.setClassName("com.android.facelock", "com.android.facelock.AddToSetup");

View File

@@ -364,7 +364,8 @@ public class Settings extends PreferenceActivity
SoundSettings.class.getName().equals(fragmentName) ||
PrivacySettings.class.getName().equals(fragmentName) ||
ManageAccountsSettings.class.getName().equals(fragmentName) ||
VpnSettings.class.getName().equals(fragmentName)) {
VpnSettings.class.getName().equals(fragmentName) ||
SecuritySettings.class.getName().equals(fragmentName)) {
intent.putExtra(EXTRA_CLEAR_UI_OPTIONS, true);
}