PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3e3b75f2: Merge "Add help menu for Users and Location access" into jb-mr1-dev

Browse Source 
* commit '3e3b75f26f2ad91c40ba28d13af2838331113bca':
  Add help menu for Users and Location access
This commit is contained in:
Amith Yamasani
2012-09-18 10:44:10 -07:00
committed by Android Git Automerger
parent b4fabb93a9 3e3b75f26f
commit 45c18afa5c
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -4257,6 +4257,10 @@
<string name="help_url_tether" translatable="false"></string> <string name="help_url_tether" translatable="false"></string>
<!-- Help URL, Dreams [DO NOT TRANSLATE] --> <!-- Help URL, Dreams [DO NOT TRANSLATE] -->
<string name="help_url_dreams" translatable="false"></string> <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] --> <!-- User account title [CHAR LIMIT=30] -->
<string name="user_account_title">Account for content</string> <string name="user_account_title">Account for content</string>

4
src/com/android/settings/LocationSettings.java
View File

@@ -185,6 +185,10 @@ public class LocationSettings extends SettingsPreferenceFragment
return true; return true;
} }
@Override
public int getHelpResource() {
return R.string.help_url_location_access;
}
} }
class WrappingSwitchPreference extends SwitchPreference { class WrappingSwitchPreference extends SwitchPreference {

5
src/com/android/settings/users/UserSettings.java
View File

@@ -194,6 +194,7 @@ public class UserSettings extends SettingsPreferenceFragment
removeThisUser.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM removeThisUser.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
| MenuItem.SHOW_AS_ACTION_WITH_TEXT); | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
} }
super.onCreateOptionsMenu(menu, inflater);
} }
@Override @Override
@@ -524,4 +525,8 @@ public class UserSettings extends SettingsPreferenceFragment
return false; return false;
} }
@Override
public int getHelpResource() {
return R.string.help_url_users;
}
} }