Merge "Use the full permission label to avoid truncation in some locales." into qt-dev (33a1f50d) · Commits · e / os / android_packages_apps_PackageInstaller

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 {

+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);

+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(),