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

Commit 9956d911 authored by Joel Galenson's avatar Joel Galenson
Browse files

Use the full permission label to avoid truncation in some locales. 

Fixes: 131630237
Fixes: 131837398
Test: View PermissionAppsFragment and AppPermissionFragment in English
and Spanish.
Change-Id: I9ac6dafb564566edfd9fe1b5ffd69a9137acdca3
parent 7f409acf

src/com/android/packageinstaller/permission/model/PermissionApps.java

+7 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ public class PermissionApps { 
    private final @Nullable AppDataCache mAppDataCache;



    private CharSequence mLabel;

    private CharSequence mFullLabel;

    private Drawable mIcon;

    private @Nullable CharSequence mDescription;

    private List<PermissionApp> mPermApps;
@@ -160,6 +161,10 @@ public class PermissionApps { 
        return mLabel;

    }



    public CharSequence getFullLabel() {

        return mFullLabel;

    }



    public Drawable getIcon() {

        return mIcon;

    }
@@ -327,6 +332,8 @@ public class PermissionApps { 
            }

        }

        mLabel = info.loadLabel(mPm);

        mFullLabel = info.loadSafeLabel(mPm, 0,

                TextUtils.SAFE_STRING_FLAG_TRIM | TextUtils.SAFE_STRING_FLAG_FIRST_LINE);

        if (info.icon != 0) {

            mIcon = info.loadUnbadgedIcon(mPm);

        } else {

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

+2 −2
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ public class AppPermissionFragment extends SettingsWithLargeHeader { 
        if (mGroup != null) {

            getActivity().setTitle(

                    getPreferenceManager().getContext().getString(R.string.app_permission_title,

                            mGroup.getLabel()));

                            mGroup.getFullLabel()));

        }

    }
@@ -193,7 +193,7 @@ public class AppPermissionFragment extends SettingsWithLargeHeader { 
        updateHeader(root.requireViewById(R.id.large_header));



        ((TextView) root.requireViewById(R.id.permission_message)).setText(

                context.getString(R.string.app_permission_header, mGroup.getLabel()));

                context.getString(R.string.app_permission_header, mGroup.getFullLabel()));



        if (!Utils.isPermissionsHubEnabled()) {

            root.requireViewById(R.id.usage_summary).setVisibility(View.GONE);

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

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ public final class PermissionAppsFragment extends SettingsWithLargeHeader implem 
    private static void bindUi(SettingsWithLargeHeader fragment, PermissionApps permissionApps,

            @NonNull String groupName) {

        final Drawable icon = permissionApps.getIcon();

        final CharSequence label = permissionApps.getLabel();

        final CharSequence label = permissionApps.getFullLabel();



        fragment.setHeader(icon, label, null, null, true);

        fragment.setSummary(Utils.getPermissionGroupDescriptionString(fragment.getActivity(),