commit 3e3b75f26f2ad91c40ba28d13af2838331113bca
author Amith Yamasani <yamasani@google.com> Tue Sep 18 09:55:20 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 18 09:55:21 2012 -0700
tree e36f2439c02f360aa9a8c595029c00a897ca9d1c
parent 05bf34c2559a8d800da18eabeb0214f559d4aeef
parent 38223dc4585bb8f11125c90082789db78881e97d

Merge "Add help menu for Users and Location access" into jb-mr1-dev

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 18e2f61..233963c 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>

src/com/android/settings/LocationSettings.java

diff --git a/src/com/android/settings/LocationSettings.java b/src/com/android/settings/LocationSettings.java
index 4153485..cfbbe26 100644
--- a/src/com/android/settings/LocationSettings.java
+++ b/src/com/android/settings/LocationSettings.java
@@ -185,6 +185,10 @@
         return true;
     }
 
+    @Override
+    public int getHelpResource() {
+        return R.string.help_url_location_access;
+    }
 }
 
 class WrappingSwitchPreference extends SwitchPreference {

src/com/android/settings/users/UserSettings.java

diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 515005d..079996e 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -194,6 +194,7 @@
             removeThisUser.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
                     | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
         }
+        super.onCreateOptionsMenu(menu, inflater);
     }
 
     @Override
@@ -524,4 +525,8 @@
         return false;
     }
 
+    @Override
+    public int getHelpResource() {
+        return R.string.help_url_users;
+    }
 }