From 2fd700aebbc8e670bc7c419a22441149f3b7862f Mon Sep 17 00:00:00 2001
From: rich cannings <richc@google.com>
Date: Mon, 1 Oct 2012 10:16:18 -0700
Subject: [PATCH] am e88c4bab: am 82988b48: Merge "Add Help lin to Settings >
 Security" into jb-mr1-dev

* commit 'e88c4bab2ee4fcefe431414f7eb64ae2c56ef022':
  Add Help lin to Settings > Security
---
 res/values/strings.xml                         | 2 ++
 src/com/android/settings/SecuritySettings.java | 5 +++++
 src/com/android/settings/Settings.java         | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1802ac6d675..fe348918434 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4384,6 +4384,8 @@
     <string name="help_url_users" translatable="false"></string>
     <!-- Help URL, Location access [DO NOT TRANSLATE] -->
     <string name="help_url_location_access" translatable="false"></string>
+    <!-- Help URL, Security settings [DO NOT TRANSLATE] -->
+    <string name="help_url_security" translatable="false"></string>
 
     <!-- User account title [CHAR LIMIT=30] -->
     <string name="user_account_title">Account for content</string>
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 82ba595a6f7..f56fc25fa32 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/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");
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index d7580feb260..c8649eadbcc 100644
--- a/src/com/android/settings/Settings.java
+++ b/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);
         }