am e88c4bab: am 82988b48: Merge "Add Help lin to Settings > Security" into jb-mr1-dev

* commit 'e88c4bab2ee4fcefe431414f7eb64ae2c56ef022':
  Add Help lin to Settings > Security

src/com/android/settings/SecuritySettings.java

@@ -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");

src/com/android/settings/Settings.java

@@ -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);
         }