Snap for 11920703 from 92ac23fcf303fd1914d0522641b9c36e7a0945b4 to 24Q3-release (a555c109) · Commits · e / os / android_packages_apps_DocumentsUI

src/com/android/documentsui/dirlist/GridDirectoryHolder.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,10 @@ final class GridDirectoryHolder extends DocumentHolder {
		private final ImageView mIconBadge;
		private final View mIconLayout;

		GridDirectoryHolder(Context context, ViewGroup parent, ConfigStore configStore) {
		private final IconHelper mIconHelper;

		GridDirectoryHolder(
		Context context, ViewGroup parent, IconHelper iconHelper, ConfigStore configStore) {
		super(context, parent, R.layout.item_dir_grid, configStore);

		mIconLayout = itemView.findViewById(R.id.icon);
		@@ -64,6 +67,7 @@ final class GridDirectoryHolder extends DocumentHolder {
		mIconBadge = (ImageView) itemView.findViewById(R.id.icon_profile_badge);
		mIconMime.setImageDrawable(
		IconUtils.loadMimeIcon(context, DocumentsContract.Document.MIME_TYPE_DIR));
		mIconHelper = iconHelper;

		if (SdkLevel.isAtLeastT() && !mConfigStore.isPrivateSpaceInDocsUIEnabled()) {
		setUpdatableWorkProfileIcon(context);
		@@ -105,6 +109,7 @@ final class GridDirectoryHolder extends DocumentHolder {
		Drawable drawable = userIdToBadgeMap.get(UserId.of(userIdIdentifier));
		mIconBadge.setImageDrawable(drawable);
		mIconBadge.setVisibility(show ? View.VISIBLE : View.GONE);
		mIconBadge.setContentDescription(mIconHelper.getProfileLabel(userIdIdentifier));
		}

		@Override

+1 −0

Original line number	Diff line number	Diff line
		@@ -160,6 +160,7 @@ final class GridDocumentHolder extends DocumentHolder {
		Drawable drawable = userIdToBadgeMap.get(UserId.of(userIdIdentifier));
		mIconBadge.setImageDrawable(drawable);
		mIconBadge.setVisibility(show ? View.VISIBLE : View.GONE);
		mIconBadge.setContentDescription(mIconHelper.getProfileLabel(userIdIdentifier));
		}

		@Override

+9 −2

Original line number	Diff line number	Diff line
		@@ -146,6 +146,7 @@ final class GridPhotoHolder extends DocumentHolder {
		ImageView icon = mIconBadge.findViewById(R.id.icon_id);
		icon.setImageDrawable(drawable);
		mIconBadge.setVisibility(show ? View.VISIBLE : View.GONE);
		mIconBadge.setContentDescription(mIconHelper.getProfileLabel(userIdIdentifier));
		}

		@Override
		@@ -194,8 +195,14 @@ final class GridPhotoHolder extends DocumentHolder {
		Formatter.formatFileSize(mContext, getCursorLong(cursor, Document.COLUMN_SIZE));
		final String docDate = Shared.formatTime(mContext, mDoc.lastModified);
		if (mIconHelper.shouldShowBadge(mDoc.userId.getIdentifier())) {
		itemView.setContentDescription((mContext.getText(R.string.a11y_work) + ", ")
		+ mDoc.displayName + ", " + docSize + ", " + docDate);
		itemView.setContentDescription(
		mIconHelper.getProfileLabel(mDoc.userId.getIdentifier())
		+ ", "
		+ mDoc.displayName
		+ ", "
		+ docSize
		+ ", "
		+ docDate);
		} else {
		itemView.setContentDescription(mDoc.displayName + ", " + docSize + ", " + docDate);
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -280,4 +280,13 @@ public class IconHelper {
		return mMaybeShowBadge && mManagedUser != null
		&& mManagedUser.getIdentifier() == userIdIdentifier;
		}

		/** Returns label of the profile the icon belongs to. */
		public String getProfileLabel(int userIdIdentifier) {
		if (SdkLevel.isAtLeastS()) {
		return mUserManagerState.getUserIdToLabelMap().get(UserId.of(userIdIdentifier));
		} else {
		return "";
		}
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -181,6 +181,7 @@ final class ListDocumentHolder extends DocumentHolder {
		Drawable drawable = userIdToBadgeMap.get(UserId.of(userIdIdentifier));
		mIconBadge.setImageDrawable(drawable);
		mIconBadge.setVisibility(show ? View.VISIBLE : View.GONE);
		mIconBadge.setContentDescription(mIconHelper.getProfileLabel(userIdIdentifier));
		}

		@Override