Merge "Set profile badge content description" into main (92ac23fc) · Commits · e / os / android_packages_apps_DocumentsUI

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

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -54,7 +54,10 @@ final class GridDirectoryHolder extends DocumentHolder {
	private final ImageView mIconBadge;		private final ImageView mIconBadge;
	private final View mIconLayout;		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);		super(context, parent, R.layout.item_dir_grid, configStore);

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

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

	@Override		@Override

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

+1 −0

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

	@Override		@Override

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

+9 −2

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

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

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

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -280,4 +280,13 @@ public class IconHelper {
	return mMaybeShowBadge && mManagedUser != null		return mMaybeShowBadge && mManagedUser != null
	&& mManagedUser.getIdentifier() == userIdIdentifier;		&& 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 "";
			}
			}
	}		}

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

+1 −0

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

	@Override		@Override