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

Commit 74af95f3 authored by Joel Galenson's avatar Joel Galenson
Browse files

Update strings for denied permissions. 

This clarifies that denied permissions that have been accessed are
only currently denied.

Fixes: 129347610
Test: View screens.
Change-Id: Ieebe4eba6a6f11bb6bdb5feaa3734e1f72364cd5
parent ccf387d6

res/values/strings.xml

+7 −1
Original line number Diff line number Diff line
@@ -466,9 +466,15 @@ 
    <!-- Summary for showing the time and/or date of the most recent access of a permission by an app [CHAR LIMIT=60] -->

    <string name="app_permission_most_recent_summary">Last access: <xliff:g id="time_date" example="12:42 PM">%1$s</xliff:g></string>



    <!-- Summary for showing that an app has not accessed a permission. [CHAR LIMIT=60] -->

    <!-- Summary for showing the time and/or date of the most recent access of a denied permission by an app [CHAR LIMIT=60] -->

    <string name="app_permission_most_recent_denied_summary">Currently denied / Last access: <xliff:g id="time_date" example="12:42 PM">%1$s</xliff:g></string>



    <!-- Summary for showing that a denied app has not accessed a permission. [CHAR LIMIT=60] -->

    <string name="app_permission_never_accessed_summary">Never accessed</string>



    <!-- Summary for showing that an app has not accessed a permission. [CHAR LIMIT=60] -->

    <string name="app_permission_never_accessed_denied_summary">Denied / Never accessed</string>



    <!-- Header for granted permissions/apps [CHAR LIMIT=40] -->

    <string name="allowed_header">Allowed</string>

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

+15 −5
Original line number Diff line number Diff line
@@ -234,14 +234,24 @@ public final class AppPermissionsFragment extends SettingsWithLargeHeader { 
                String lastAccessStr = Utils.getAbsoluteLastUsageString(context,

                        PermissionUsages.loadLastGroupUsage(context, group));

                if (lastAccessStr != null) {

                    if (group.areRuntimePermissionsGranted()) {

                        preference.setSummary(

                                context.getString(R.string.app_permission_most_recent_summary,

                                        lastAccessStr));

                    } else {

                        preference.setSummary(context.getString(

                                R.string.app_permission_most_recent_denied_summary, lastAccessStr));

                    }

                } else {

                    preference.setGroupSummary(group);

                    if (preference.getSummary().length() == 0 && Utils.isPermissionsHubEnabled()) {

                        preference.setSummary(

                                context.getString(R.string.app_permission_never_accessed_summary));

                        if (group.areRuntimePermissionsGranted()) {

                            preference.setSummary(context.getString(

                                    R.string.app_permission_never_accessed_summary));

                        } else {

                            preference.setSummary(context.getString(

                                    R.string.app_permission_never_accessed_denied_summary));

                        }

                    }

                }

            } else {

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

+17 −6
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ public final class PermissionAppsFragment extends SettingsWithLargeHeader implem 
            if (existingPref != null) {

                if (existingPref instanceof PermissionControlPreference) {

                    setPreferenceSummary(group, (PermissionControlPreference) existingPref,

                            context);

                            category != denied, context);

                }

                category.addPreference(existingPref);

                continue;
@@ -300,7 +300,7 @@ public final class PermissionAppsFragment extends SettingsWithLargeHeader implem 
            pref.setTitle(Utils.getFullAppLabel(app.getAppInfo(), context));

            pref.setEllipsizeEnd();

            pref.useSmallerIcon();

            setPreferenceSummary(group, pref, context);

            setPreferenceSummary(group, pref, category != denied, context);



            if (isSystemApp && isTelevision) {

                if (mExtraScreen == null) {
@@ -374,17 +374,28 @@ public final class PermissionAppsFragment extends SettingsWithLargeHeader implem 
    }



    private void setPreferenceSummary(AppPermissionGroup group, PermissionControlPreference pref,

            Context context) {

            boolean allowed, Context context) {

        if (!Utils.isModernPermissionGroup(group.getName())) {

            return;

        }

        String lastAccessStr = Utils.getAbsoluteLastUsageString(context,

                PermissionUsages.loadLastGroupUsage(context, group));

        if (lastAccessStr != null) {

            if (allowed) {

                pref.setSummary(context.getString(R.string.app_permission_most_recent_summary,

                        lastAccessStr));

            } else {

                pref.setSummary(

                        context.getString(R.string.app_permission_most_recent_denied_summary,

                                lastAccessStr));

            }

        } else if (Utils.isPermissionsHubEnabled()) {

            if (allowed) {

                pref.setSummary(context.getString(R.string.app_permission_never_accessed_summary));

            } else {

                pref.setSummary(

                        context.getString(R.string.app_permission_never_accessed_denied_summary));

            }

        }

    }