Merge "RESTRICT AUTOMERGE add requiresAPI annotation for DPM#getString" into tm-dev (941e5274) · Commits · e / os / android_packages_apps_DocumentsUI

src/com/android/documentsui/ProfileTabs.java

+12 −5

Original line number	Diff line number	Diff line
		@@ -22,10 +22,12 @@ import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.WORK_T
		import static androidx.core.util.Preconditions.checkNotNull;

		import android.app.admin.DevicePolicyManager;
		import android.os.Build;
		import android.view.View;
		import android.view.ViewGroup;

		import androidx.annotation.Nullable;
		import androidx.annotation.RequiresApi;

		import com.android.documentsui.base.RootInfo;
		import com.android.documentsui.base.State;
		@@ -164,14 +166,19 @@ public class ProfileTabs implements ProfileTabsAddons {

		private String getEnterpriseString(String updatableStringId, int defaultStringId) {
		if (VersionUtils.isAtLeastT()) {
		return getUpdatableEnterpriseString(updatableStringId, defaultStringId);
		} else {
		return mTabsContainer.getContext().getString(defaultStringId);
		}
		}

		@RequiresApi(Build.VERSION_CODES.TIRAMISU)
		private String getUpdatableEnterpriseString(String updatableStringId, int defaultStringId) {
		DevicePolicyManager dpm = mTabsContainer.getContext().getSystemService(
		DevicePolicyManager.class);
		return dpm.getString(
		updatableStringId,
		() -> mTabsContainer.getContext().getString(defaultStringId));
		} else {
		return mTabsContainer.getContext().getString(defaultStringId);
		}
		}

		/**

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

+17 −9

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import static android.app.admin.DevicePolicyResources.Strings.UNDEFINED;
		import android.app.admin.DevicePolicyManager;
		import android.content.Context;
		import android.database.Cursor;
		import android.os.Build;
		import android.os.Bundle;
		import android.view.KeyEvent;
		import android.view.LayoutInflater;
		@@ -31,6 +32,7 @@ import android.view.ViewGroup;
		import android.view.ViewPropertyAnimator;
		import android.widget.ImageView;

		import androidx.annotation.RequiresApi;
		import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
		import androidx.recyclerview.widget.RecyclerView;

		@@ -179,6 +181,16 @@ public abstract class DocumentHolder

		protected String getPreviewIconContentDescription(boolean isWorkProfile, String fileName) {
		if (VersionUtils.isAtLeastT()) {
		return getUpdatablePreviewIconContentDescription(isWorkProfile, fileName);
		} else {
		return itemView.getResources().getString(
		isWorkProfile ? R.string.preview_work_file : R.string.preview_file, fileName);
		}
		}

		@RequiresApi(Build.VERSION_CODES.TIRAMISU)
		private String getUpdatablePreviewIconContentDescription(
		boolean isWorkProfile, String fileName) {
		DevicePolicyManager dpm = itemView.getContext().getSystemService(
		DevicePolicyManager.class);
		String updatableStringId = isWorkProfile ? PREVIEW_WORK_FILE_ACCESSIBILITY : UNDEFINED;
		@@ -188,10 +200,6 @@ public abstract class DocumentHolder
		updatableStringId,
		() -> itemView.getResources().getString(defaultStringId, fileName),
		/* formatArgs= */ fileName);
		} else {
		return itemView.getResources().getString(
		isWorkProfile ? R.string.preview_work_file : R.string.preview_file, fileName);
		}
		}

		protected static class PreviewAccessibilityDelegate extends View.AccessibilityDelegate {

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

+9 −4

Original line number	Diff line number	Diff line
		@@ -334,13 +334,18 @@ abstract class Message {

		private String getEnterpriseString(String updatableStringId, int defaultStringId) {
		if (VersionUtils.isAtLeastT()) {
		return getUpdatableEnterpriseString(updatableStringId, defaultStringId);
		} else {
		return mEnv.getContext().getString(defaultStringId);
		}
		}

		@RequiresApi(Build.VERSION_CODES.TIRAMISU)
		private String getUpdatableEnterpriseString(String updatableStringId, int defaultStringId) {
		DevicePolicyManager dpm = mEnv.getContext().getSystemService(
		DevicePolicyManager.class);
		return dpm.getString(
		updatableStringId, () -> mEnv.getContext().getString(defaultStringId));
		} else {
		return mEnv.getContext().getString(defaultStringId);
		}
		}

		private Drawable getWorkProfileOffIcon() {

src/com/android/documentsui/sidebar/UserItemsCombiner.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,9 @@ import static androidx.core.util.Preconditions.checkNotNull;

		import android.app.admin.DevicePolicyManager;
		import android.content.res.Resources;
		import android.os.Build;

		import androidx.annotation.RequiresApi;
		import androidx.annotation.VisibleForTesting;

		import com.android.documentsui.R;
		@@ -109,9 +111,14 @@ class UserItemsCombiner {

		private String getEnterpriseString(String updatableStringId, int defaultStringId) {
		if (VersionUtils.isAtLeastT()) {
		return mDpm.getString(updatableStringId, () -> mResources.getString(defaultStringId));
		return getUpdatableEnterpriseString(updatableStringId, defaultStringId);
		} else {
		return mResources.getString(defaultStringId);
		}
		}

		@RequiresApi(Build.VERSION_CODES.TIRAMISU)
		private String getUpdatableEnterpriseString(String updatableStringId, int defaultStringId) {
		return mDpm.getString(updatableStringId, () -> mResources.getString(defaultStringId));
		}
		}