Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adcae49e authored by Suprabh Shukla's avatar Suprabh Shukla Committed by Android (Google) Code Review
Browse files

Merge "Adding help link to apps permissions page" into nyc-dev

parents 5b81d8be 59fcb013

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -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>

src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java

+3 −0
Original line number Diff line number Diff line
@@ -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) {

src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java

+3 −0
Original line number Diff line number Diff line
@@ -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();

    }