diff options
| author | Suprabh Shukla <suprabh@google.com> | 2016-04-08 19:31:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-08 19:31:38 +0000 |
| commit | adcae49ec2b8dd6a9cf8a5c5fdc6e71b3767f08d (patch) | |
| tree | 06714cae0577285192ef5ce73806078ed340b995 | |
| parent | 5b81d8be034b5dd0d1a253315f7b42003c29c1b5 (diff) | |
| parent | 59fcb01326e96bf6295fbe10738a8cb1538a78c3 (diff) | |
| download | android_packages_apps_PackageInstaller-adcae49ec2b8dd6a9cf8a5c5fdc6e71b3767f08d.tar.gz android_packages_apps_PackageInstaller-adcae49ec2b8dd6a9cf8a5c5fdc6e71b3767f08d.tar.bz2 android_packages_apps_PackageInstaller-adcae49ec2b8dd6a9cf8a5c5fdc6e71b3767f08d.zip | |
Merge "Adding help link to apps permissions page" into nyc-dev
3 files changed, 9 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 448436bb..ace1295b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -300,4 +300,7 @@ <!-- Placeholder for an app name when it is unknown --> <string name="app_name_unknown">Unknown</string> + <!-- Help URL, application permissions [DO NOT TRANSLATE] --> + <string name="help_app_permissions" translatable="false"></string> + </resources> diff --git a/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java index 8731b53b..7ff01fb8 100644 --- a/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java @@ -52,6 +52,7 @@ import com.android.packageinstaller.permission.model.AppPermissions; import com.android.packageinstaller.permission.utils.LocationUtils; import com.android.packageinstaller.permission.utils.SafetyNetLogger; import com.android.packageinstaller.util.Utils; +import com.android.settingslib.HelpUtils; import com.android.settingslib.RestrictedLockUtils; import java.util.ArrayList; @@ -154,6 +155,8 @@ public final class AppPermissionsFragment extends SettingsWithHeader public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); menu.add(Menu.NONE, MENU_ALL_PERMS, Menu.NONE, R.string.all_permissions); + HelpUtils.prepareHelpMenuItem(getActivity(), menu, R.string.help_app_permissions, + getClass().getName()); } private static void bindUi(SettingsWithHeader fragment, PackageInfo packageInfo) { diff --git a/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java index 0fb1ad52..25689006 100644 --- a/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java @@ -46,6 +46,7 @@ import com.android.packageinstaller.permission.model.PermissionApps.PermissionAp import com.android.packageinstaller.permission.utils.LocationUtils; import com.android.packageinstaller.permission.utils.SafetyNetLogger; import com.android.packageinstaller.util.Utils; +import com.android.settingslib.HelpUtils; import com.android.settingslib.RestrictedLockUtils; import java.util.ArrayList; @@ -113,6 +114,8 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple R.string.menu_show_system); mHideSystemMenu = menu.add(Menu.NONE, MENU_HIDE_SYSTEM, Menu.NONE, R.string.menu_hide_system); + HelpUtils.prepareHelpMenuItem(getActivity(), menu, R.string.help_app_permissions, + getClass().getName()); updateMenu(); } |