From 38223dc4585bb8f11125c90082789db78881e97d Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Tue, 18 Sep 2012 09:51:07 -0700
Subject: [PATCH] Add help menu for Users and Location access

Bug: 7093415
Bug: 7130812
Change-Id: I44c68e846dcc5d98fc8b152f79d75140e151323a
---
 res/values/strings.xml                           | 4 ++++
 src/com/android/settings/LocationSettings.java   | 4 ++++
 src/com/android/settings/users/UserSettings.java | 5 +++++
 3 files changed, 13 insertions(+)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 18e2f61a7e1..233963c1d55 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4257,6 +4257,10 @@
     <string name="help_url_tether" translatable="false"></string>
     <!-- Help URL, Dreams [DO NOT TRANSLATE] -->
     <string name="help_url_dreams" translatable="false"></string>
+    <!-- Help URL, User settings [DO NOT TRANSLATE] -->
+    <string name="help_url_users" translatable="false"></string>
+    <!-- Help URL, Location access [DO NOT TRANSLATE] -->
+    <string name="help_url_location_access" 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/LocationSettings.java b/src/com/android/settings/LocationSettings.java
index 4153485b994..cfbbe26b65c 100644
--- a/src/com/android/settings/LocationSettings.java
+++ b/src/com/android/settings/LocationSettings.java
@@ -185,6 +185,10 @@ public class LocationSettings extends SettingsPreferenceFragment
         return true;
     }
 
+    @Override
+    public int getHelpResource() {
+        return R.string.help_url_location_access;
+    }
 }
 
 class WrappingSwitchPreference extends SwitchPreference {
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 515005d5678..079996ecd86 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -194,6 +194,7 @@ public class UserSettings extends SettingsPreferenceFragment
             removeThisUser.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
                     | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
         }
+        super.onCreateOptionsMenu(menu, inflater);
     }
 
     @Override
@@ -524,4 +525,8 @@ public class UserSettings extends SettingsPreferenceFragment
         return false;
     }
 
+    @Override
+    public int getHelpResource() {
+        return R.string.help_url_users;
+    }
 }