diff --git a/core/api/current.txt b/core/api/current.txt index 619a30a02d4a1..2afcfc688bf16 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -7418,12 +7418,6 @@ package android.app.admin { method @NonNull public java.util.List getDelegatedScopes(@Nullable android.content.ComponentName, @NonNull String); method public CharSequence getDeviceOwnerLockScreenInfo(); method @Nullable public String getDevicePolicyManagementRoleHolderPackage(); - method @Nullable public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull String, @NonNull java.util.function.Supplier); - method @Nullable public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull String, @NonNull String, @NonNull java.util.function.Supplier); - method @Nullable public android.graphics.drawable.Icon getDrawableAsIcon(@NonNull String, @NonNull String, @NonNull String, @Nullable android.graphics.drawable.Icon); - method @Nullable public android.graphics.drawable.Icon getDrawableAsIcon(@NonNull String, @NonNull String, @Nullable android.graphics.drawable.Icon); - method @Nullable public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, @NonNull String, int, @NonNull java.util.function.Supplier); - method @Nullable public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, @NonNull String, @NonNull String, int, @NonNull java.util.function.Supplier); method public CharSequence getEndUserSessionMessage(@NonNull android.content.ComponentName); method @NonNull public String getEnrollmentSpecificId(); method @Nullable public android.app.admin.FactoryResetProtectionPolicy getFactoryResetProtectionPolicy(@Nullable android.content.ComponentName); @@ -7470,14 +7464,13 @@ package android.app.admin { method @NonNull public java.util.List getPreferentialNetworkServiceConfigs(); method public int getRequiredPasswordComplexity(); method public long getRequiredStrongAuthTimeout(@Nullable android.content.ComponentName); + method @NonNull public android.app.admin.DevicePolicyResourcesManager getResources(); method public boolean getScreenCaptureDisabled(@Nullable android.content.ComponentName); method public java.util.List getSecondaryUsers(@NonNull android.content.ComponentName); method public CharSequence getShortSupportMessage(@NonNull android.content.ComponentName); method public CharSequence getStartUserSessionMessage(@NonNull android.content.ComponentName); method @Deprecated public boolean getStorageEncryption(@Nullable android.content.ComponentName); method public int getStorageEncryptionStatus(); - method @Nullable public String getString(@NonNull String, @NonNull java.util.function.Supplier); - method @Nullable public String getString(@NonNull String, @NonNull java.util.function.Supplier, @NonNull java.lang.Object...); method @Nullable public android.app.admin.SystemUpdatePolicy getSystemUpdatePolicy(); method @Nullable public android.os.PersistableBundle getTransferOwnershipBundle(); method @Nullable public java.util.List getTrustAgentConfiguration(@Nullable android.content.ComponentName, @NonNull android.content.ComponentName); @@ -7839,31 +7832,18 @@ package android.app.admin { } public final class DevicePolicyResources { - } - - public static final class DevicePolicyResources.Drawables { - field public static final String UNDEFINED = "UNDEFINED"; - field public static final String WORK_PROFILE_ICON = "WORK_PROFILE_ICON"; - field public static final String WORK_PROFILE_ICON_BADGE = "WORK_PROFILE_ICON_BADGE"; - field public static final String WORK_PROFILE_OFF_ICON = "WORK_PROFILE_OFF_ICON"; - field public static final String WORK_PROFILE_USER_ICON = "WORK_PROFILE_USER_ICON"; - } - - public static final class DevicePolicyResources.Drawables.Source { - field public static final String HOME_WIDGET = "HOME_WIDGET"; - field public static final String LAUNCHER_OFF_BUTTON = "LAUNCHER_OFF_BUTTON"; - field public static final String NOTIFICATION = "NOTIFICATION"; - field public static final String PROFILE_SWITCH_ANIMATION = "PROFILE_SWITCH_ANIMATION"; - field public static final String QUICK_SETTINGS = "QUICK_SETTINGS"; - field public static final String STATUS_BAR = "STATUS_BAR"; field public static final String UNDEFINED = "UNDEFINED"; } - public static final class DevicePolicyResources.Drawables.Style { - field public static final String DEFAULT = "DEFAULT"; - field public static final String OUTLINE = "OUTLINE"; - field public static final String SOLID_COLORED = "SOLID_COLORED"; - field public static final String SOLID_NOT_COLORED = "SOLID_NOT_COLORED"; + public class DevicePolicyResourcesManager { + method @Nullable public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull String, @NonNull java.util.function.Supplier); + method @Nullable public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull String, @NonNull String, @NonNull java.util.function.Supplier); + method @Nullable public android.graphics.drawable.Icon getDrawableAsIcon(@NonNull String, @NonNull String, @NonNull String, @Nullable android.graphics.drawable.Icon); + method @Nullable public android.graphics.drawable.Icon getDrawableAsIcon(@NonNull String, @NonNull String, @Nullable android.graphics.drawable.Icon); + method @Nullable public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, @NonNull String, int, @NonNull java.util.function.Supplier); + method @Nullable public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, @NonNull String, @NonNull String, int, @NonNull java.util.function.Supplier); + method @Nullable public String getString(@NonNull String, @NonNull java.util.function.Supplier); + method @Nullable public String getString(@NonNull String, @NonNull java.util.function.Supplier, @NonNull java.lang.Object...); } public final class DnsEvent extends android.app.admin.NetworkEvent implements android.os.Parcelable { diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 66bd6b3780855..18bff6349b947 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -1109,16 +1109,12 @@ package android.app.admin { method @RequiresPermission("android.permission.NOTIFY_PENDING_SYSTEM_UPDATE") public void notifyPendingSystemUpdate(long, boolean); method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public boolean packageHasActiveAdmins(String); method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS, android.Manifest.permission.PROVISION_DEMO_DEVICE}) public void provisionFullyManagedDevice(@NonNull android.app.admin.FullyManagedDeviceProvisioningParams) throws android.app.admin.ProvisioningException; - method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void resetDrawables(@NonNull java.util.Set); - method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void resetStrings(@NonNull java.util.Set); method @RequiresPermission(android.Manifest.permission.TRIGGER_LOST_MODE) public void sendLostModeLocationUpdate(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer); method @Deprecated @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS) public boolean setActiveProfileOwner(@NonNull android.content.ComponentName, String) throws java.lang.IllegalArgumentException; method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public void setDeviceProvisioningConfigApplied(); method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void setDpcDownloaded(boolean); - method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void setDrawables(@NonNull java.util.Set); method @Deprecated @RequiresPermission(value=android.Manifest.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS, conditional=true) public void setProfileOwnerCanAccessDeviceIds(@NonNull android.content.ComponentName); method public void setSecondaryLockscreenEnabled(@NonNull android.content.ComponentName, boolean); - method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void setStrings(@NonNull java.util.Set); method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void setUserProvisioningState(int, @NonNull android.os.UserHandle); method @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public boolean shouldAllowBypassingDevicePolicyManagementRoleQualification(); field public static final String ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_ALLOWED = "android.account.DEVICE_OR_PROFILE_OWNER_ALLOWED"; @@ -1198,43 +1194,6 @@ package android.app.admin { } public static final class DevicePolicyResources.Strings { - field public static final String UNDEFINED = "UNDEFINED"; - } - - public static final class DevicePolicyResources.Strings.Dialer { - field public static final String NOTIFICATION_INCOMING_WORK_CALL_TITLE = "Dialer.NOTIFICATION_INCOMING_WORK_CALL_TITLE"; - field public static final String NOTIFICATION_MISSED_WORK_CALL_TITLE = "Dialer.NOTIFICATION_MISSED_WORK_CALL_TITLE"; - field public static final String NOTIFICATION_ONGOING_WORK_CALL_TITLE = "Dialer.NOTIFICATION_ONGOING_WORK_CALL_TITLE"; - field public static final String NOTIFICATION_WIFI_WORK_CALL_LABEL = "Dialer.NOTIFICATION_WIFI_WORK_CALL_LABEL"; - } - - public static final class DevicePolicyResources.Strings.DocumentsUi { - field public static final String CANT_SAVE_TO_PERSONAL_MESSAGE = "DocumentsUi.CANT_SAVE_TO_PERSONAL_MESSAGE"; - field public static final String CANT_SAVE_TO_PERSONAL_TITLE = "DocumentsUi.CANT_SAVE_TO_PERSONAL_TITLE"; - field public static final String CANT_SAVE_TO_WORK_MESSAGE = "DocumentsUi.CANT_SAVE_TO_WORK_MESSAGE"; - field public static final String CANT_SAVE_TO_WORK_TITLE = "DocumentsUi.CANT_SAVE_TO_WORK_TITLE"; - field public static final String CANT_SELECT_PERSONAL_FILES_MESSAGE = "DocumentsUi.CANT_SELECT_PERSONAL_FILES_MESSAGE"; - field public static final String CANT_SELECT_PERSONAL_FILES_TITLE = "DocumentsUi.CANT_SELECT_PERSONAL_FILES_TITLE"; - field public static final String CANT_SELECT_WORK_FILES_MESSAGE = "DocumentsUi.CANT_SELECT_WORK_FILES_MESSAGE"; - field public static final String CANT_SELECT_WORK_FILES_TITLE = "DocumentsUi.CANT_SELECT_WORK_FILES_TITLE"; - field public static final String CROSS_PROFILE_NOT_ALLOWED_MESSAGE = "DocumentsUi.CROSS_PROFILE_NOT_ALLOWED_MESSAGE"; - field public static final String CROSS_PROFILE_NOT_ALLOWED_TITLE = "DocumentsUi.CROSS_PROFILE_NOT_ALLOWED_TITLE"; - field public static final String PERSONAL_TAB = "DocumentsUi.PERSONAL_TAB"; - field public static final String PREVIEW_WORK_FILE_ACCESSIBILITY = "DocumentsUi.PREVIEW_WORK_FILE_ACCESSIBILITY"; - field public static final String WORK_ACCESSIBILITY = "DocumentsUi.WORK_ACCESSIBILITY"; - field public static final String WORK_PROFILE_OFF_ENABLE_BUTTON = "DocumentsUi.WORK_PROFILE_OFF_ENABLE_BUTTON"; - field public static final String WORK_PROFILE_OFF_ERROR_TITLE = "DocumentsUi.WORK_PROFILE_OFF_ERROR_TITLE"; - field public static final String WORK_TAB = "DocumentsUi.WORK_TAB"; - } - - public static final class DevicePolicyResources.Strings.MediaProvider { - field public static final String BLOCKED_BY_ADMIN_TITLE = "MediaProvider.BLOCKED_BY_ADMIN_TITLE"; - field public static final String BLOCKED_FROM_PERSONAL_MESSAGE = "MediaProvider.BLOCKED_FROM_PERSONAL_MESSAGE"; - field public static final String BLOCKED_FROM_WORK_MESSAGE = "MediaProvider.BLOCKED_FROM_WORK_MESSAGE"; - field public static final String SWITCH_TO_PERSONAL_MESSAGE = "MediaProvider.SWITCH_TO_PERSONAL_MESSAGE"; - field public static final String SWITCH_TO_WORK_MESSAGE = "MediaProvider.SWITCH_TO_WORK_MESSAGE"; - field public static final String WORK_PROFILE_PAUSED_MESSAGE = "MediaProvider.WORK_PROFILE_PAUSED_MESSAGE"; - field public static final String WORK_PROFILE_PAUSED_TITLE = "MediaProvider.WORK_PROFILE_PAUSED_TITLE"; } public static final class DevicePolicyResources.Strings.PermissionController { @@ -1246,6 +1205,13 @@ package android.app.admin { field public static final String WORK_PROFILE_DEFAULT_APPS_TITLE = "PermissionController.WORK_PROFILE_DEFAULT_APPS_TITLE"; } + public class DevicePolicyResourcesManager { + method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void resetDrawables(@NonNull java.util.Set); + method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void resetStrings(@NonNull java.util.Set); + method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void setDrawables(@NonNull java.util.Set); + method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void setStrings(@NonNull java.util.Set); + } + public final class DevicePolicyStringResource implements android.os.Parcelable { ctor public DevicePolicyStringResource(@NonNull android.content.Context, @NonNull String, @StringRes int); method public int describeContents(); diff --git a/core/java/android/app/admin/DevicePolicyDrawableResource.java b/core/java/android/app/admin/DevicePolicyDrawableResource.java index 7fd8e896bac23..dab98884ff823 100644 --- a/core/java/android/app/admin/DevicePolicyDrawableResource.java +++ b/core/java/android/app/admin/DevicePolicyDrawableResource.java @@ -20,7 +20,6 @@ import android.annotation.DrawableRes; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.app.admin.DevicePolicyResources.Drawables; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; @@ -29,21 +28,21 @@ import java.util.Objects; /** * Used to pass in the required information for updating an enterprise drawable resource using - * {@link DevicePolicyManager#setDrawables}. + * {@link DevicePolicyResourcesManager#setDrawables}. * * @hide */ @SystemApi public final class DevicePolicyDrawableResource implements Parcelable { - @NonNull private final @DevicePolicyResources.UpdatableDrawableId String mDrawableId; - @NonNull private final @DevicePolicyResources.UpdatableDrawableStyle String mDrawableStyle; - @NonNull private final @DevicePolicyResources.UpdatableDrawableSource String mDrawableSource; + @NonNull private final String mDrawableId; + @NonNull private final String mDrawableStyle; + @NonNull private final String mDrawableSource; private final @DrawableRes int mResourceIdInCallingPackage; @NonNull private ParcelableResource mResource; /** * Creates an object containing the required information for updating an enterprise drawable - * resource using {@link DevicePolicyManager#setDrawables}. + * resource using {@link DevicePolicyResourcesManager#setDrawables}. * *

It will be used to update the drawable defined by {@code drawableId} with style * {@code drawableStyle} located in source {@code drawableSource} to the drawable with ID @@ -60,9 +59,9 @@ public final class DevicePolicyDrawableResource implements Parcelable { */ public DevicePolicyDrawableResource( @NonNull Context context, - @NonNull @DevicePolicyResources.UpdatableDrawableId String drawableId, - @NonNull @DevicePolicyResources.UpdatableDrawableStyle String drawableStyle, - @NonNull @DevicePolicyResources.UpdatableDrawableSource String drawableSource, + @NonNull String drawableId, + @NonNull String drawableStyle, + @NonNull String drawableSource, @DrawableRes int resourceIdInCallingPackage) { this(drawableId, drawableStyle, drawableSource, resourceIdInCallingPackage, new ParcelableResource(context, resourceIdInCallingPackage, @@ -70,9 +69,9 @@ public final class DevicePolicyDrawableResource implements Parcelable { } private DevicePolicyDrawableResource( - @NonNull @DevicePolicyResources.UpdatableDrawableId String drawableId, - @NonNull @DevicePolicyResources.UpdatableDrawableStyle String drawableStyle, - @NonNull @DevicePolicyResources.UpdatableDrawableSource String drawableSource, + @NonNull String drawableId, + @NonNull String drawableStyle, + @NonNull String drawableSource, @DrawableRes int resourceIdInCallingPackage, @NonNull ParcelableResource resource) { @@ -90,7 +89,7 @@ public final class DevicePolicyDrawableResource implements Parcelable { /** * Creates an object containing the required information for updating an enterprise drawable - * resource using {@link DevicePolicyManager#setDrawables}. + * resource using {@link DevicePolicyResourcesManager#setDrawables}. *

It will be used to update the drawable defined by {@code drawableId} with style * {@code drawableStyle} to the drawable with ID {@code resourceIdInCallingPackage} in the * calling package

@@ -105,10 +104,10 @@ public final class DevicePolicyDrawableResource implements Parcelable { */ public DevicePolicyDrawableResource( @NonNull Context context, - @NonNull @DevicePolicyResources.UpdatableDrawableId String drawableId, - @NonNull @DevicePolicyResources.UpdatableDrawableStyle String drawableStyle, + @NonNull String drawableId, + @NonNull String drawableStyle, @DrawableRes int resourceIdInCallingPackage) { - this(context, drawableId, drawableStyle, Drawables.Source.UNDEFINED, + this(context, drawableId, drawableStyle, DevicePolicyResources.UNDEFINED, resourceIdInCallingPackage); } @@ -116,7 +115,6 @@ public final class DevicePolicyDrawableResource implements Parcelable { * Returns the ID of the drawable to update. */ @NonNull - @DevicePolicyResources.UpdatableDrawableId public String getDrawableId() { return mDrawableId; } @@ -125,7 +123,6 @@ public final class DevicePolicyDrawableResource implements Parcelable { * Returns the style of the drawable to update */ @NonNull - @DevicePolicyResources.UpdatableDrawableStyle public String getDrawableStyle() { return mDrawableStyle; } @@ -134,7 +131,6 @@ public final class DevicePolicyDrawableResource implements Parcelable { * Returns the source of the drawable to update. */ @NonNull - @DevicePolicyResources.UpdatableDrawableSource public String getDrawableSource() { return mDrawableSource; } diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index acd1ef28feea3..f9f0c58b22007 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -167,6 +167,7 @@ public class DevicePolicyManager { private final Context mContext; private final IDevicePolicyManager mService; private final boolean mParentInstance; + private final DevicePolicyResourcesManager mResourcesManager; /** @hide */ public DevicePolicyManager(Context context, IDevicePolicyManager service) { @@ -180,6 +181,7 @@ public class DevicePolicyManager { mContext = context; mService = service; mParentInstance = parentInstance; + mResourcesManager = new DevicePolicyResourcesManager(context, service); } /** @hide test will override it. */ @@ -3739,7 +3741,8 @@ public class DevicePolicyManager { /** * Broadcast action: notify system apps (e.g. settings, SysUI, etc) that the device management * resources with IDs {@link #EXTRA_RESOURCE_IDS} has been updated, the updated resources can be - * retrieved using {@link #getDrawable} and {@code #getString}. + * retrieved using {@link DevicePolicyResourcesManager#getDrawable} and + * {@link DevicePolicyResourcesManager#getString}. * *

This broadcast is sent to registered receivers only. * @@ -15265,475 +15268,12 @@ public class DevicePolicyManager { } /** - * For each {@link DevicePolicyDrawableResource} item in {@code drawables}, if - * {@link DevicePolicyDrawableResource#getDrawableSource()} is not set or is set to - * {@link DevicePolicyResources.Drawables.Source#UNDEFINED}, it updates the drawable resource for - * the combination of {@link DevicePolicyDrawableResource#getDrawableId()} and - * {@link DevicePolicyDrawableResource#getDrawableStyle()}, (see - * {@link DevicePolicyResources.Drawables} and {@link DevicePolicyResources.Drawables.Style}) to - * the drawable with ID {@link DevicePolicyDrawableResource#getResourceIdInCallingPackage()}, - * meaning any system UI surface calling {@link #getDrawable} - * with {@code drawableId} and {@code drawableStyle} will get the new resource after this API - * is called. - * - *

Otherwise, if {@link DevicePolicyDrawableResource#getDrawableSource()} is set (see - * {@link DevicePolicyResources.Drawables.Source}, it overrides any drawables that was set for - * the same {@code drawableId} and {@code drawableStyle} for the provided source. - * - *

Sends a broadcast with action {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to - * registered receivers when a resource has been updated successfully. - * - *

Important notes to consider when using this API: - *

    - *
  • {@link #getDrawable} references the resource - * {@link DevicePolicyDrawableResource#getResourceIdInCallingPackage()} in the - * calling package each time it gets called. You have to ensure that the resource is always - * available in the calling package as long as it is used as an updated resource. - *
  • You still have to re-call {@code setDrawables} even if you only make changes to the - * content of the resource with ID - * {@link DevicePolicyDrawableResource#getResourceIdInCallingPackage()} as the content might be - * cached and would need updating. - *
- * - * @param drawables The list of {@link DevicePolicyDrawableResource} to update. - * - * @hide + * Returns a {@link DevicePolicyResourcesManager} containing the required APIs to set, reset, + * and get device policy related resources. */ - @SystemApi - @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) - public void setDrawables(@NonNull Set drawables) { - if (mService != null) { - try { - mService.setDrawables(new ArrayList<>(drawables)); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - } - } - - /** - * Removes all updated drawables for the list of {@code drawableIds} (see - * {@link DevicePolicyResources.Drawables} that was previously set by calling - * {@link #setDrawables}, meaning any subsequent calls to {@link #getDrawable} for the provided - * IDs with any {@link DevicePolicyResources.Drawables.Style} and any - * {@link DevicePolicyResources.Drawables.Source} will return the default drawable from - * {@code defaultDrawableLoader}. - * - *

Sends a broadcast with action {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to - * registered receivers when a resource has been reset successfully. - * - * @param drawableIds The list of IDs to remove. - * - * @hide - */ - @SystemApi - @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) - public void resetDrawables(@NonNull Set drawableIds) { - if (mService != null) { - try { - mService.resetDrawables(new ArrayList<>(drawableIds)); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - } - } - - /** - * Returns the appropriate updated drawable for the {@code drawableId} - * (see {@link DevicePolicyResources.Drawables}), with style {@code drawableStyle} - * (see {@link DevicePolicyResources.Drawables.Style}) if one was set using - * {@code setDrawables}, otherwise returns the drawable from {@code defaultDrawableLoader}. - * - *

Also returns the drawable from {@code defaultDrawableLoader} if - * {@link DevicePolicyResources.Drawables#UNDEFINED} was passed. - * - *

Calls to this API will not return {@code null} unless no updated drawable was found - * and the call to {@code defaultDrawableLoader} returned {@code null}. - * - *

This API uses the screen density returned from {@link Resources#getConfiguration()}, to - * set a different value use - * {@link #getDrawableForDensity(String, String, int, Supplier)}. - * - *

Callers should register for {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to get - * notified when a resource has been updated. - * - *

Note that each call to this API loads the resource from the package that called - * {@code setDrawables} to set the updated resource. - * - * @param drawableId The drawable ID to get the updated resource for. - * @param drawableStyle The drawable style to use. - * @param defaultDrawableLoader To get the default drawable if no updated drawable was set for - * the provided params. - */ - @Nullable - public Drawable getDrawable( - @NonNull @DevicePolicyResources.UpdatableDrawableId String drawableId, - @NonNull @DevicePolicyResources.UpdatableDrawableStyle String drawableStyle, - @NonNull Supplier defaultDrawableLoader) { - return getDrawable( - drawableId, drawableStyle, Drawables.Source.UNDEFINED, defaultDrawableLoader); - } - - /** - * Similar to {@link #getDrawable(String, String, Supplier)}, but also accepts - * a {@code drawableSource} (see {@link DevicePolicyResources.Drawables.Source}) which - * could result in returning a different drawable than - * {@link #getDrawable(String, String, Supplier)} - * if an override was set for that specific source. - * - *

Calls to this API will not return {@code null} unless no updated drawable was found - * and the call to {@code defaultDrawableLoader} returned {@code null}. - * - *

Callers should register for {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to get - * notified when a resource has been updated. - * - * @param drawableId The drawable ID to get the updated resource for. - * @param drawableStyle The drawable style to use. - * @param drawableSource The source for the caller. - * @param defaultDrawableLoader To get the default drawable if no updated drawable was set for - * the provided params. - */ - @Nullable - public Drawable getDrawable( - @NonNull @DevicePolicyResources.UpdatableDrawableId String drawableId, - @NonNull @DevicePolicyResources.UpdatableDrawableStyle String drawableStyle, - @NonNull @DevicePolicyResources.UpdatableDrawableSource String drawableSource, - @NonNull Supplier defaultDrawableLoader) { - - Objects.requireNonNull(drawableId, "drawableId can't be null"); - Objects.requireNonNull(drawableStyle, "drawableStyle can't be null"); - Objects.requireNonNull(drawableSource, "drawableSource can't be null"); - Objects.requireNonNull(defaultDrawableLoader, "defaultDrawableLoader can't be null"); - - if (Drawables.UNDEFINED.equals(drawableId)) { - return ParcelableResource.loadDefaultDrawable(defaultDrawableLoader); - } - if (mService != null) { - try { - ParcelableResource resource = mService.getDrawable( - drawableId, drawableStyle, drawableSource); - if (resource == null) { - return ParcelableResource.loadDefaultDrawable( - defaultDrawableLoader); - } - return resource.getDrawable( - mContext, - /* density= */ 0, - defaultDrawableLoader); - - } catch (RemoteException e) { - Log.e( - TAG, - "Error getting the updated drawable from DevicePolicyManagerService.", - e); - return ParcelableResource.loadDefaultDrawable(defaultDrawableLoader); - } - } - return ParcelableResource.loadDefaultDrawable(defaultDrawableLoader); - } - - /** - * Similar to {@link #getDrawable(String, String, Supplier)}, but also accepts - * {@code density}. See {@link Resources#getDrawableForDensity(int, int, Resources.Theme)}. - * - *

Calls to this API will not return {@code null} unless no updated drawable was found - * and the call to {@code defaultDrawableLoader} returned {@code null}. - * - *

Callers should register for {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to get - * notified when a resource has been updated. - * - * @param drawableId The drawable ID to get the updated resource for. - * @param drawableStyle The drawable style to use. - * @param density The desired screen density indicated by the resource as - * found in {@link DisplayMetrics}. A value of 0 means to use the - * density returned from {@link Resources#getConfiguration()}. - * @param defaultDrawableLoader To get the default drawable if no updated drawable was set for - * the provided params. - */ - @Nullable - public Drawable getDrawableForDensity( - @NonNull @DevicePolicyResources.UpdatableDrawableId String drawableId, - @NonNull @DevicePolicyResources.UpdatableDrawableStyle String drawableStyle, - int density, - @NonNull Supplier defaultDrawableLoader) { - return getDrawableForDensity( - drawableId, - drawableStyle, - Drawables.Source.UNDEFINED, - density, - defaultDrawableLoader); - } - - /** - * Similar to {@link #getDrawable(String, String, String, Supplier)}, but also accepts - * {@code density}. See {@link Resources#getDrawableForDensity(int, int, Resources.Theme)}. - * - *

Calls to this API will not return {@code null} unless no updated drawable was found - * and the call to {@code defaultDrawableLoader} returned {@code null}. - * - *

Callers should register for {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to get - * notified when a resource has been updated. - * - * @param drawableId The drawable ID to get the updated resource for. - * @param drawableStyle The drawable style to use. - * @param drawableSource The source for the caller. - * @param density The desired screen density indicated by the resource as - * found in {@link DisplayMetrics}. A value of 0 means to use the - * density returned from {@link Resources#getConfiguration()}. - * @param defaultDrawableLoader To get the default drawable if no updated drawable was set for - * the provided params. - */ - @Nullable - public Drawable getDrawableForDensity( - @NonNull @DevicePolicyResources.UpdatableDrawableId String drawableId, - @NonNull @DevicePolicyResources.UpdatableDrawableStyle String drawableStyle, - @NonNull @DevicePolicyResources.UpdatableDrawableSource String drawableSource, - int density, - @NonNull Supplier defaultDrawableLoader) { - - Objects.requireNonNull(drawableId, "drawableId can't be null"); - Objects.requireNonNull(drawableStyle, "drawableStyle can't be null"); - Objects.requireNonNull(drawableSource, "drawableSource can't be null"); - Objects.requireNonNull(defaultDrawableLoader, "defaultDrawableLoader can't be null"); - - if (Drawables.UNDEFINED.equals(drawableId)) { - return ParcelableResource.loadDefaultDrawable(defaultDrawableLoader); - } - if (mService != null) { - try { - ParcelableResource resource = mService.getDrawable( - drawableId, drawableStyle, drawableSource); - if (resource == null) { - return ParcelableResource.loadDefaultDrawable( - defaultDrawableLoader); - } - return resource.getDrawable(mContext, density, defaultDrawableLoader); - } catch (RemoteException e) { - Log.e( - TAG, - "Error getting the updated drawable from DevicePolicyManagerService.", - e); - return ParcelableResource.loadDefaultDrawable(defaultDrawableLoader); - } - } - return ParcelableResource.loadDefaultDrawable(defaultDrawableLoader); - } - - /** - * Similar to {@link #getDrawable(String, String, String, Supplier)} but returns an - * {@link Icon} instead of a {@link Drawable}. - * - * @param drawableId The drawable ID to get the updated resource for. - * @param drawableStyle The drawable style to use. - * @param drawableSource The source for the caller. - * @param defaultIcon Returned if no updated drawable was set for the provided params. - */ - @Nullable - public Icon getDrawableAsIcon( - @NonNull @DevicePolicyResources.UpdatableDrawableId String drawableId, - @NonNull @DevicePolicyResources.UpdatableDrawableStyle String drawableStyle, - @NonNull @DevicePolicyResources.UpdatableDrawableSource String drawableSource, - @Nullable Icon defaultIcon) { - Objects.requireNonNull(drawableId, "drawableId can't be null"); - Objects.requireNonNull(drawableStyle, "drawableStyle can't be null"); - Objects.requireNonNull(drawableSource, "drawableSource can't be null"); - Objects.requireNonNull(defaultIcon, "defaultIcon can't be null"); - - if (Drawables.UNDEFINED.equals(drawableId)) { - return defaultIcon; - } - if (mService != null) { - try { - ParcelableResource resource = mService.getDrawable( - drawableId, drawableStyle, drawableSource); - if (resource == null) { - return defaultIcon; - } - return Icon.createWithResource(resource.getPackageName(), resource.getResourceId()); - } catch (RemoteException e) { - Log.e( - TAG, - "Error getting the updated drawable from DevicePolicyManagerService.", - e); - return defaultIcon; - } - } - return defaultIcon; - } - - /** - * Similar to {@link #getDrawable(String, String, Supplier)} but returns an {@link Icon} - * instead of a {@link Drawable}. - * - * @param drawableId The drawable ID to get the updated resource for. - * @param drawableStyle The drawable style to use. - * @param defaultIcon Returned if no updated drawable was set for the provided params. - */ - @Nullable - public Icon getDrawableAsIcon( - @NonNull @DevicePolicyResources.UpdatableDrawableId String drawableId, - @NonNull @DevicePolicyResources.UpdatableDrawableStyle String drawableStyle, - @Nullable Icon defaultIcon) { - return getDrawableAsIcon( - drawableId, drawableStyle, Drawables.Source.UNDEFINED, defaultIcon); - } - - - /** - * For each {@link DevicePolicyStringResource} item in {@code strings}, it updates the string - * resource for {@link DevicePolicyStringResource#getStringId()} to the string with ID - * {@code callingPackageResourceId} (see {@link DevicePolicyResources.Strings}), meaning any - * system UI surface calling {@link #getString} with {@code stringId} will get - * the new resource after this API is called. - * - *

Sends a broadcast with action {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to - * registered receivers when a resource has been updated successfully. - * - *

Important notes to consider when using this API: - *

    - *
  • {@link #getString} references the resource - * {@code callingPackageResourceId} in the calling package each time it gets called. You have to - * ensure that the resource is always available in the calling package as long as it is used as - * an updated resource. - *
  • You still have to re-call {@code setStrings} even if you only make changes to the - * content of the resource with ID {@code callingPackageResourceId} as the content might be - * cached and would need updating. - *
- * - * @param strings The list of {@link DevicePolicyStringResource} to update. - * - * @hide - */ - @SystemApi - @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) - public void setStrings(@NonNull Set strings) { - if (mService != null) { - try { - mService.setStrings(new ArrayList<>(strings)); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - } - } - - /** - * Removes the updated strings for the list of {@code stringIds} (see - * {@link DevicePolicyResources.Strings}) that was previously set by calling {@link #setStrings}, - * meaning any subsequent calls to {@link #getString} for the provided IDs will - * return the default string from {@code defaultStringLoader}. - * - *

Sends a broadcast with action {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to - * registered receivers when a resource has been reset successfully. - * - * @param stringIds The list of IDs to remove the updated resources for. - * - * @hide - */ - @SystemApi - @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) - public void resetStrings(@NonNull Set stringIds) { - if (mService != null) { - try { - mService.resetStrings(new ArrayList<>(stringIds)); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - } - } - - /** - * Returns the appropriate updated string for the {@code stringId} (see - * {@link DevicePolicyResources.Strings}) if one was set using - * {@code setStrings}, otherwise returns the string from {@code defaultStringLoader}. - * - *

Also returns the string from {@code defaultStringLoader} if - * {@link DevicePolicyResources.Strings#UNDEFINED} was passed. - * - *

Calls to this API will not return {@code null} unless no updated drawable was found - * and the call to {@code defaultStringLoader} returned {@code null}. - * - *

Callers should register for {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to get - * notified when a resource has been updated. - * - *

Note that each call to this API loads the resource from the package that called - * {@code setStrings} to set the updated resource. - * - * @param stringId The IDs to get the updated resource for. - * @param defaultStringLoader To get the default string if no updated string was set for - * {@code stringId}. - */ - @Nullable - public String getString( - @NonNull @DevicePolicyResources.UpdatableStringId String stringId, - @NonNull Supplier defaultStringLoader) { - - Objects.requireNonNull(stringId, "stringId can't be null"); - Objects.requireNonNull(defaultStringLoader, "defaultStringLoader can't be null"); - - if (stringId.equals(DevicePolicyResources.Strings.UNDEFINED)) { - return ParcelableResource.loadDefaultString(defaultStringLoader); - } - if (mService != null) { - try { - ParcelableResource resource = mService.getString(stringId); - if (resource == null) { - return ParcelableResource.loadDefaultString(defaultStringLoader); - } - return resource.getString(mContext, defaultStringLoader); - } catch (RemoteException e) { - Log.e( - TAG, - "Error getting the updated string from DevicePolicyManagerService.", - e); - return ParcelableResource.loadDefaultString(defaultStringLoader); - } - } - return ParcelableResource.loadDefaultString(defaultStringLoader); - } - - /** - * Similar to {@link #getString(String, Supplier)} but accepts {@code formatArgs} and returns a - * localized formatted string, substituting the format arguments as defined in - * {@link java.util.Formatter} and {@link java.lang.String#format}, (see - * {@link Resources#getString(int, Object...)}). - * - *

Calls to this API will not return {@code null} unless no updated drawable was found - * and the call to {@code defaultStringLoader} returned {@code null}. - * - * @param stringId The IDs to get the updated resource for. - * @param defaultStringLoader To get the default string if no updated string was set for - * {@code stringId}. - * @param formatArgs The format arguments that will be used for substitution. - */ - @Nullable - @SuppressLint("SamShouldBeLast") - public String getString( - @NonNull @DevicePolicyResources.UpdatableStringId String stringId, - @NonNull Supplier defaultStringLoader, - @NonNull Object... formatArgs) { - - Objects.requireNonNull(stringId, "stringId can't be null"); - Objects.requireNonNull(defaultStringLoader, "defaultStringLoader can't be null"); - - if (stringId.equals(DevicePolicyResources.Strings.UNDEFINED)) { - return ParcelableResource.loadDefaultString(defaultStringLoader); - } - if (mService != null) { - try { - ParcelableResource resource = mService.getString(stringId); - if (resource == null) { - return ParcelableResource.loadDefaultString(defaultStringLoader); - } - return resource.getString(mContext, defaultStringLoader, formatArgs); - } catch (RemoteException e) { - Log.e( - TAG, - "Error getting the updated string from DevicePolicyManagerService.", - e); - return ParcelableResource.loadDefaultString(defaultStringLoader); - } - } - return ParcelableResource.loadDefaultString(defaultStringLoader); + @NonNull + public DevicePolicyResourcesManager getResources() { + return mResourcesManager; } /** diff --git a/core/java/android/app/admin/DevicePolicyResources.java b/core/java/android/app/admin/DevicePolicyResources.java index 042e407becb46..2b3780e5a32b8 100644 --- a/core/java/android/app/admin/DevicePolicyResources.java +++ b/core/java/android/app/admin/DevicePolicyResources.java @@ -16,530 +16,38 @@ package android.app.admin; -import static android.app.admin.DevicePolicyResources.Strings.Core.CANT_ADD_ACCOUNT_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.Core.FORWARD_INTENT_TO_PERSONAL; -import static android.app.admin.DevicePolicyResources.Strings.Core.FORWARD_INTENT_TO_WORK; -import static android.app.admin.DevicePolicyResources.Strings.Core.LOCATION_CHANGED_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.Core.LOCATION_CHANGED_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Core.NETWORK_LOGGING_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.Core.NETWORK_LOGGING_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Core.NOTIFICATION_CHANNEL_DEVICE_ADMIN; -import static android.app.admin.DevicePolicyResources.Strings.Core.NOTIFICATION_WORK_PROFILE_CONTENT_DESCRIPTION; -import static android.app.admin.DevicePolicyResources.Strings.Core.PACKAGE_DELETED_BY_DO; -import static android.app.admin.DevicePolicyResources.Strings.Core.PACKAGE_INSTALLED_BY_DO; -import static android.app.admin.DevicePolicyResources.Strings.Core.PACKAGE_UPDATED_BY_DO; -import static android.app.admin.DevicePolicyResources.Strings.Core.PERSONAL_APP_SUSPENSION_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.Core.PERSONAL_APP_SUSPENSION_SOON_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.Core.PERSONAL_APP_SUSPENSION_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Core.PERSONAL_APP_SUSPENSION_TURN_ON_PROFILE; -import static android.app.admin.DevicePolicyResources.Strings.Core.PRINTING_DISABLED_NAMED_ADMIN; -import static android.app.admin.DevicePolicyResources.Strings.Core.PROFILE_ENCRYPTED_DETAIL; -import static android.app.admin.DevicePolicyResources.Strings.Core.PROFILE_ENCRYPTED_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.Core.PROFILE_ENCRYPTED_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CANT_ACCESS_PERSONAL; -import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CANT_ACCESS_WORK; -import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CANT_SHARE_WITH_PERSONAL; -import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CANT_SHARE_WITH_WORK; -import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CROSS_PROFILE_BLOCKED_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_NO_PERSONAL_APPS; -import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_NO_WORK_APPS; -import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_PERSONAL_TAB; -import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_PERSONAL_TAB_ACCESSIBILITY; -import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_WORK_PAUSED_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_WORK_PROFILE_NOT_SUPPORTED; -import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_WORK_TAB; -import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_WORK_TAB_ACCESSIBILITY; -import static android.app.admin.DevicePolicyResources.Strings.Core.SWITCH_TO_PERSONAL_LABEL; -import static android.app.admin.DevicePolicyResources.Strings.Core.SWITCH_TO_WORK_LABEL; -import static android.app.admin.DevicePolicyResources.Strings.Core.UNLAUNCHABLE_APP_WORK_PAUSED_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.Core.UNLAUNCHABLE_APP_WORK_PAUSED_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Core.WORK_PROFILE_BADGED_LABEL; -import static android.app.admin.DevicePolicyResources.Strings.Core.WORK_PROFILE_DELETED_FAILED_PASSWORD_ATTEMPTS_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.Core.WORK_PROFILE_DELETED_GENERIC_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.Core.WORK_PROFILE_DELETED_ORG_OWNED_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.Core.WORK_PROFILE_DELETED_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Dialer.NOTIFICATION_INCOMING_WORK_CALL_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Dialer.NOTIFICATION_MISSED_WORK_CALL_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Dialer.NOTIFICATION_ONGOING_WORK_CALL_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Dialer.NOTIFICATION_WIFI_WORK_CALL_LABEL; -import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.CANT_SAVE_TO_PERSONAL_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.CANT_SAVE_TO_PERSONAL_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.CANT_SAVE_TO_WORK_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.CANT_SAVE_TO_WORK_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.CANT_SELECT_PERSONAL_FILES_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.CANT_SELECT_PERSONAL_FILES_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.CANT_SELECT_WORK_FILES_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.CANT_SELECT_WORK_FILES_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.CROSS_PROFILE_NOT_ALLOWED_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.CROSS_PROFILE_NOT_ALLOWED_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.PERSONAL_TAB; -import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.PREVIEW_WORK_FILE_ACCESSIBILITY; -import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.WORK_ACCESSIBILITY; -import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.WORK_PROFILE_OFF_ENABLE_BUTTON; -import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.WORK_PROFILE_OFF_ERROR_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.WORK_TAB; -import static android.app.admin.DevicePolicyResources.Strings.Launcher.ALL_APPS_PERSONAL_TAB; -import static android.app.admin.DevicePolicyResources.Strings.Launcher.ALL_APPS_PERSONAL_TAB_ACCESSIBILITY; -import static android.app.admin.DevicePolicyResources.Strings.Launcher.ALL_APPS_WORK_TAB; -import static android.app.admin.DevicePolicyResources.Strings.Launcher.ALL_APPS_WORK_TAB_ACCESSIBILITY; -import static android.app.admin.DevicePolicyResources.Strings.Launcher.DISABLED_BY_ADMIN_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.Launcher.WIDGETS_PERSONAL_TAB; -import static android.app.admin.DevicePolicyResources.Strings.Launcher.WIDGETS_WORK_TAB; -import static android.app.admin.DevicePolicyResources.Strings.Launcher.WORK_FOLDER_NAME; -import static android.app.admin.DevicePolicyResources.Strings.Launcher.WORK_PROFILE_EDU; -import static android.app.admin.DevicePolicyResources.Strings.Launcher.WORK_PROFILE_EDU_ACCEPT; -import static android.app.admin.DevicePolicyResources.Strings.Launcher.WORK_PROFILE_ENABLE_BUTTON; -import static android.app.admin.DevicePolicyResources.Strings.Launcher.WORK_PROFILE_PAUSED_DESCRIPTION; -import static android.app.admin.DevicePolicyResources.Strings.Launcher.WORK_PROFILE_PAUSE_BUTTON; -import static android.app.admin.DevicePolicyResources.Strings.MediaProvider.BLOCKED_BY_ADMIN_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.MediaProvider.BLOCKED_FROM_PERSONAL_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.MediaProvider.BLOCKED_FROM_WORK_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.MediaProvider.SWITCH_TO_PERSONAL_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.MediaProvider.SWITCH_TO_WORK_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.MediaProvider.WORK_PROFILE_PAUSED_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.PermissionController.BACKGROUND_ACCESS_DISABLED_BY_ADMIN_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.PermissionController.BACKGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.PermissionController.FOREGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.PermissionController.HOME_MISSING_WORK_PROFILE_SUPPORT_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.PermissionController.LOCATION_AUTO_GRANTED_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.PermissionController.WORK_PROFILE_DEFAULT_APPS_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ACCESSIBILITY_CATEGORY_PERSONAL; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ACCESSIBILITY_CATEGORY_WORK; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ACCESSIBILITY_PERSONAL_ACCOUNT_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ACCESSIBILITY_WORK_ACCOUNT_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ACCOUNTS_SEARCH_KEYWORDS; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ACTIVATE_DEVICE_ADMIN_APP; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ACTIVATE_DEVICE_ADMIN_APP_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ACTIVATE_THIS_DEVICE_ADMIN_APP; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ACTIVE_DEVICE_ADMIN_WARNING; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_ACTIONS_APPS_COUNT; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_ACTIONS_APPS_COUNT_MINIMUM; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_ACTION_ACCESS_CAMERA; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_ACTION_ACCESS_LOCATION; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_ACTION_ACCESS_MICROPHONE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_ACTION_APPS_COUNT_ESTIMATED; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_ACTION_APPS_INSTALLED; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_ACTION_NONE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_ACTION_SET_CURRENT_INPUT_METHOD; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_ACTION_SET_DEFAULT_APPS; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_ACTION_SET_HTTP_PROXY; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_ACTION_SET_INPUT_METHOD_NAME; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_LOCK_DEVICE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_SEE_APPS_WARNING; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_SEE_BUG_REPORT_WARNING; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_SEE_NETWORK_LOGS_WARNING; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_SEE_SECURITY_LOGS_WARNING; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_SEE_USAGE_WARNING; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_SEE_WORK_DATA_WARNING; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_WIPE_DEVICE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CONFIGURED_FAILED_PASSWORD_WIPE_DEVICE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CONFIGURED_FAILED_PASSWORD_WIPE_WORK_PROFILE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ALWAYS_ON_VPN_DEVICE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ALWAYS_ON_VPN_PERSONAL_PROFILE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ALWAYS_ON_VPN_WORK_PROFILE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.APP_CAN_ACCESS_PERSONAL_DATA; -import static android.app.admin.DevicePolicyResources.Strings.Settings.APP_CAN_ACCESS_PERSONAL_PERMISSIONS; -import static android.app.admin.DevicePolicyResources.Strings.Settings.CA_CERTS_DEVICE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.CA_CERTS_PERSONAL_PROFILE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.CA_CERTS_WORK_PROFILE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.CHANGES_MADE_BY_YOUR_ORGANIZATION_ADMIN_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PASSWORD_HEADER; -import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PATTERN_HEADER; -import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PIN_HEADER; -import static android.app.admin.DevicePolicyResources.Strings.Settings.CONNECTED_APPS_SEARCH_KEYWORDS; -import static android.app.admin.DevicePolicyResources.Strings.Settings.CONNECTED_APPS_SHARE_PERMISSIONS_AND_DATA; -import static android.app.admin.DevicePolicyResources.Strings.Settings.CONNECTED_WORK_AND_PERSONAL_APPS_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.CONNECT_APPS_DIALOG_SUMMARY; -import static android.app.admin.DevicePolicyResources.Strings.Settings.CONNECT_APPS_DIALOG_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.CONTACT_YOUR_IT_ADMIN; -import static android.app.admin.DevicePolicyResources.Strings.Settings.CONTROLLED_BY_ADMIN_SUMMARY; -import static android.app.admin.DevicePolicyResources.Strings.Settings.CROSS_PROFILE_CALENDAR_SUMMARY; -import static android.app.admin.DevicePolicyResources.Strings.Settings.CROSS_PROFILE_CALENDAR_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.DEVICE_ADMIN_POLICIES_WARNING; -import static android.app.admin.DevicePolicyResources.Strings.Settings.DEVICE_ADMIN_SETTINGS_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.DEVICE_MANAGED_WITHOUT_NAME; -import static android.app.admin.DevicePolicyResources.Strings.Settings.DEVICE_MANAGED_WITH_NAME; -import static android.app.admin.DevicePolicyResources.Strings.Settings.DEVICE_OWNER_INSTALLED_CERTIFICATE_AUTHORITY_WARNING; -import static android.app.admin.DevicePolicyResources.Strings.Settings.DISABLED_BY_IT_ADMIN_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ENABLE_WORK_PROFILE_SYNC_WITH_PERSONAL_SOUNDS_DIALOG_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ENABLE_WORK_PROFILE_SYNC_WITH_PERSONAL_SOUNDS_DIALOG_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ENTERPRISE_PRIVACY_HEADER; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ERROR_MOVE_DEVICE_ADMIN; -import static android.app.admin.DevicePolicyResources.Strings.Settings.FACE_SETTINGS_FOR_WORK_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.FACE_UNLOCK_DISABLED; -import static android.app.admin.DevicePolicyResources.Strings.Settings.FINGERPRINT_FOR_WORK; -import static android.app.admin.DevicePolicyResources.Strings.Settings.FINGERPRINT_UNLOCK_DISABLED; -import static android.app.admin.DevicePolicyResources.Strings.Settings.FINGERPRINT_UNLOCK_DISABLED_EXPLANATION; -import static android.app.admin.DevicePolicyResources.Strings.Settings.FORGOT_PASSWORD_TEXT; -import static android.app.admin.DevicePolicyResources.Strings.Settings.FORGOT_PASSWORD_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.HOW_TO_DISCONNECT_APPS; -import static android.app.admin.DevicePolicyResources.Strings.Settings.INFORMATION_YOUR_ORGANIZATION_CAN_SEE_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.INSTALL_IN_PERSONAL_PROFILE_TO_CONNECT_PROMPT; -import static android.app.admin.DevicePolicyResources.Strings.Settings.INSTALL_IN_WORK_PROFILE_TO_CONNECT_PROMPT; -import static android.app.admin.DevicePolicyResources.Strings.Settings.IT_ADMIN_POLICY_DISABLING_INFO_URL; -import static android.app.admin.DevicePolicyResources.Strings.Settings.MANAGED_BY; -import static android.app.admin.DevicePolicyResources.Strings.Settings.MANAGED_DEVICE_INFO; -import static android.app.admin.DevicePolicyResources.Strings.Settings.MANAGED_DEVICE_INFO_SUMMARY; -import static android.app.admin.DevicePolicyResources.Strings.Settings.MANAGED_DEVICE_INFO_SUMMARY_WITH_NAME; -import static android.app.admin.DevicePolicyResources.Strings.Settings.MANAGED_PROFILE_SETTINGS_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.MANAGE_DEVICE_ADMIN_APPS; -import static android.app.admin.DevicePolicyResources.Strings.Settings.NEW_DEVICE_ADMIN_WARNING; -import static android.app.admin.DevicePolicyResources.Strings.Settings.NEW_DEVICE_ADMIN_WARNING_SIMPLIFIED; -import static android.app.admin.DevicePolicyResources.Strings.Settings.NO_DEVICE_ADMINS; -import static android.app.admin.DevicePolicyResources.Strings.Settings.NUMBER_OF_DEVICE_ADMINS; -import static android.app.admin.DevicePolicyResources.Strings.Settings.NUMBER_OF_DEVICE_ADMINS_NONE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ONLY_CONNECT_TRUSTED_APPS; -import static android.app.admin.DevicePolicyResources.Strings.Settings.OTHER_OPTIONS_DISABLED_BY_ADMIN; -import static android.app.admin.DevicePolicyResources.Strings.Settings.PASSWORD_RECENTLY_USED; -import static android.app.admin.DevicePolicyResources.Strings.Settings.PERSONAL_CATEGORY_HEADER; -import static android.app.admin.DevicePolicyResources.Strings.Settings.PERSONAL_PROFILE_APP_SUBTEXT; -import static android.app.admin.DevicePolicyResources.Strings.Settings.PIN_RECENTLY_USED; -import static android.app.admin.DevicePolicyResources.Strings.Settings.REENTER_WORK_PROFILE_PASSWORD_HEADER; -import static android.app.admin.DevicePolicyResources.Strings.Settings.REENTER_WORK_PROFILE_PIN_HEADER; -import static android.app.admin.DevicePolicyResources.Strings.Settings.REMOVE_ACCOUNT_FAILED_ADMIN_RESTRICTION; -import static android.app.admin.DevicePolicyResources.Strings.Settings.REMOVE_AND_UNINSTALL_DEVICE_ADMIN; -import static android.app.admin.DevicePolicyResources.Strings.Settings.REMOVE_DEVICE_ADMIN; -import static android.app.admin.DevicePolicyResources.Strings.Settings.REMOVE_WORK_PROFILE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.SELECT_DEVICE_ADMIN_APPS; -import static android.app.admin.DevicePolicyResources.Strings.Settings.SET_PROFILE_OWNER_DIALOG_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.SET_PROFILE_OWNER_POSTSETUP_WARNING; -import static android.app.admin.DevicePolicyResources.Strings.Settings.SET_PROFILE_OWNER_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.SET_WORK_PROFILE_PASSWORD_HEADER; -import static android.app.admin.DevicePolicyResources.Strings.Settings.SET_WORK_PROFILE_PATTERN_HEADER; -import static android.app.admin.DevicePolicyResources.Strings.Settings.SET_WORK_PROFILE_PIN_HEADER; -import static android.app.admin.DevicePolicyResources.Strings.Settings.SHARE_REMOTE_BUGREPORT_DIALOG_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.SHARE_REMOTE_BUGREPORT_FINISHED_REQUEST_CONSENT; -import static android.app.admin.DevicePolicyResources.Strings.Settings.SHARE_REMOTE_BUGREPORT_NOT_FINISHED_REQUEST_CONSENT; -import static android.app.admin.DevicePolicyResources.Strings.Settings.SHARING_REMOTE_BUGREPORT_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.UNINSTALL_DEVICE_ADMIN; -import static android.app.admin.DevicePolicyResources.Strings.Settings.USER_ADMIN_POLICIES_WARNING; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_APPS_CANNOT_ACCESS_NOTIFICATION_SETTINGS; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_CATEGORY_HEADER; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_ADMIN_POLICIES_WARNING; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_ALARM_RINGTONE_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_APP_SUBTEXT; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_PATTERN; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_PIN; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_REMOVE_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_REMOVE_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONTACT_SEARCH_SUMMARY; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONTACT_SEARCH_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_DISABLE_USAGE_ACCESS_WARNING; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_FINGERPRINT_LAST_DELETE_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_INSTALLED_CERTIFICATE_AUTHORITY_WARNING; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_IT_ADMIN_CANT_RESET_SCREEN_LOCK; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_KEYBOARDS_AND_TOOLS; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_LAST_PASSWORD_ATTEMPT_BEFORE_WIPE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_LAST_PATTERN_ATTEMPT_BEFORE_WIPE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_LAST_PIN_ATTEMPT_BEFORE_WIPE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_LOCATION_SWITCH_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_LOCKED_NOTIFICATION_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_LOCK_ATTEMPTS_FAILED; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_LOCK_SCREEN_REDACT_NOTIFICATION_SUMMARY; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_LOCK_SCREEN_REDACT_NOTIFICATION_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_MANAGED_BY; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_NOTIFICATIONS_SECTION_HEADER; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_NOTIFICATION_LISTENER_BLOCKED; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_NOTIFICATION_RINGTONE_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_NOT_AVAILABLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_OFF_CONDITION_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_PASSWORD_REQUIRED; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_PRIVACY_POLICY_INFO; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_PRIVACY_POLICY_INFO_SUMMARY; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_RINGTONE_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_SCREEN_LOCK_SETUP_MESSAGE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_SECURITY_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_SETTING; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_SETTING_OFF_SUMMARY; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_SETTING_ON_SUMMARY; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_SET_UNLOCK_LAUNCH_PICKER_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_SOUND_SETTINGS_SECTION_HEADER; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_SYNC_WITH_PERSONAL_SOUNDS_ACTIVE_SUMMARY; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_UNIFICATION_SEARCH_KEYWORDS; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_UNIFY_LOCKS_DETAIL; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_UNIFY_LOCKS_NONCOMPLIANT; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_UNIFY_LOCKS_SUMMARY; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_UNIFY_LOCKS_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_USER_LABEL; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_USE_PERSONAL_SOUNDS_SUMMARY; -import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_USE_PERSONAL_SOUNDS_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.Settings.YOUR_ACCESS_TO_THIS_DEVICE_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.BIOMETRIC_DIALOG_WORK_LOCK_FAILED_ATTEMPTS; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.BIOMETRIC_DIALOG_WORK_PASSWORD_LAST_ATTEMPT; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.BIOMETRIC_DIALOG_WORK_PATTERN_LAST_ATTEMPT; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.BIOMETRIC_DIALOG_WORK_PIN_LAST_ATTEMPT; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.KEYGUARD_MANAGEMENT_DISCLOSURE; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.KEYGUARD_NAMED_MANAGEMENT_DISCLOSURE; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.ONGOING_PRIVACY_DIALOG_WORK; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_MANAGEMENT; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_MANAGEMENT_CA_CERT; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_MANAGEMENT_NAMED_VPN; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_MANAGEMENT_NETWORK; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_MANAGEMENT_TITLE; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_MANAGEMENT_TWO_NAMED_VPN; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_NAMED_MANAGEMENT; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_PERSONAL_PROFILE_NAMED_VPN; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_VIEW_POLICIES; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_WORK_PROFILE_CA_CERT; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_WORK_PROFILE_NAMED_VPN; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_WORK_PROFILE_NETWORK; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_MANAGEMENT; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_MANAGEMENT_MONITORING; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_MANAGEMENT_MULTIPLE_VPNS; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_MANAGEMENT_NAMED_VPN; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_NAMED_MANAGEMENT; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_NAMED_MANAGEMENT_MONITORING; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_NAMED_MANAGEMENT_MULTIPLE_VPNS; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_NAMED_MANAGEMENT_NAMED_VPN; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_NAMED_WORK_PROFILE_MONITORING; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_PERSONAL_PROFILE_NAMED_VPN; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_WORK_PROFILE_MONITORING; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_WORK_PROFILE_NAMED_VPN; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_WORK_PROFILE_NETWORK; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.STATUS_BAR_WORK_ICON_ACCESSIBILITY; -import static android.app.admin.DevicePolicyResources.Strings.SystemUi.WORK_LOCK_ACCESSIBILITY; - -import android.annotation.StringDef; -import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.os.UserHandle; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.util.HashSet; -import java.util.Set; - /** * Class containing the required identifiers to update device management resources. * - *

See {@link DevicePolicyManager#getDrawable} and - * {@code DevicePolicyManager#getString}. + *

See {@link DevicePolicyResourcesManager#getDrawable} and + * {@link DevicePolicyResourcesManager#getString}. */ public final class DevicePolicyResources { private DevicePolicyResources() {} /** - * Resource identifiers used to update device management-related system drawable resources. - * - * @hide + * An identifier used for: + *

    + *
  • un-updatable resource IDs
    • + *
  • undefined sources
    • + *
*/ - @Retention(RetentionPolicy.SOURCE) - @StringDef(value = { - Drawables.UNDEFINED, - Drawables.WORK_PROFILE_ICON_BADGE, - Drawables.WORK_PROFILE_ICON, - Drawables.WORK_PROFILE_OFF_ICON, - Drawables.WORK_PROFILE_USER_ICON - }) - public @interface UpdatableDrawableId { - } - - /** - * Identifiers to specify the desired style for the updatable device management system - * resource. - * - * @hide - */ - @Retention(RetentionPolicy.SOURCE) - @StringDef(value = { - Drawables.Style.SOLID_COLORED, - Drawables.Style.SOLID_NOT_COLORED, - Drawables.Style.OUTLINE, - Drawables.Style.DEFAULT - }) - public @interface UpdatableDrawableStyle { - } - - /** - * Identifiers to specify the location if the updatable device management system resource. - * - * @hide - */ - @Retention(RetentionPolicy.SOURCE) - @StringDef(value = { - Drawables.Source.UNDEFINED, - Drawables.Source.NOTIFICATION, - Drawables.Source.PROFILE_SWITCH_ANIMATION, - Drawables.Source.HOME_WIDGET, - Drawables.Source.LAUNCHER_OFF_BUTTON, - Drawables.Source.QUICK_SETTINGS, - Drawables.Source.STATUS_BAR - }) - public @interface UpdatableDrawableSource { - } - - /** - * Resource identifiers used to update device management-related string resources. - * - * @hide - */ - @Retention(RetentionPolicy.SOURCE) - @StringDef({ - // Launcher Strings - WORK_PROFILE_EDU, WORK_PROFILE_EDU_ACCEPT, Strings.Launcher.WORK_PROFILE_PAUSED_TITLE, - WORK_PROFILE_PAUSED_DESCRIPTION, WORK_PROFILE_PAUSE_BUTTON, WORK_PROFILE_ENABLE_BUTTON, - ALL_APPS_WORK_TAB, ALL_APPS_PERSONAL_TAB, ALL_APPS_WORK_TAB_ACCESSIBILITY, - ALL_APPS_PERSONAL_TAB_ACCESSIBILITY, WORK_FOLDER_NAME, WIDGETS_WORK_TAB, - WIDGETS_PERSONAL_TAB, DISABLED_BY_ADMIN_MESSAGE, - - // SysUI Strings - QS_MSG_MANAGEMENT, QS_MSG_NAMED_MANAGEMENT, QS_MSG_MANAGEMENT_MONITORING, - QS_MSG_NAMED_MANAGEMENT_MONITORING, QS_MSG_MANAGEMENT_NAMED_VPN, - QS_MSG_NAMED_MANAGEMENT_NAMED_VPN, QS_MSG_MANAGEMENT_MULTIPLE_VPNS, - QS_MSG_NAMED_MANAGEMENT_MULTIPLE_VPNS, QS_MSG_WORK_PROFILE_MONITORING, - QS_MSG_NAMED_WORK_PROFILE_MONITORING, QS_MSG_WORK_PROFILE_NETWORK, - QS_MSG_WORK_PROFILE_NAMED_VPN, QS_MSG_PERSONAL_PROFILE_NAMED_VPN, - QS_DIALOG_MANAGEMENT_TITLE, QS_DIALOG_VIEW_POLICIES, QS_DIALOG_MANAGEMENT, - QS_DIALOG_NAMED_MANAGEMENT, QS_DIALOG_MANAGEMENT_CA_CERT, - QS_DIALOG_WORK_PROFILE_CA_CERT, QS_DIALOG_MANAGEMENT_NETWORK, - QS_DIALOG_WORK_PROFILE_NETWORK, QS_DIALOG_MANAGEMENT_NAMED_VPN, - QS_DIALOG_MANAGEMENT_TWO_NAMED_VPN, QS_DIALOG_WORK_PROFILE_NAMED_VPN, - QS_DIALOG_PERSONAL_PROFILE_NAMED_VPN, BIOMETRIC_DIALOG_WORK_PIN_LAST_ATTEMPT, - BIOMETRIC_DIALOG_WORK_PATTERN_LAST_ATTEMPT, BIOMETRIC_DIALOG_WORK_PASSWORD_LAST_ATTEMPT, - BIOMETRIC_DIALOG_WORK_LOCK_FAILED_ATTEMPTS, STATUS_BAR_WORK_ICON_ACCESSIBILITY, - ONGOING_PRIVACY_DIALOG_WORK, KEYGUARD_MANAGEMENT_DISCLOSURE, - KEYGUARD_NAMED_MANAGEMENT_DISCLOSURE, WORK_LOCK_ACCESSIBILITY, - - // Core Strings - WORK_PROFILE_DELETED_TITLE, WORK_PROFILE_DELETED_FAILED_PASSWORD_ATTEMPTS_MESSAGE, - WORK_PROFILE_DELETED_GENERIC_MESSAGE, WORK_PROFILE_DELETED_ORG_OWNED_MESSAGE, - PERSONAL_APP_SUSPENSION_TITLE, PERSONAL_APP_SUSPENSION_MESSAGE, - PERSONAL_APP_SUSPENSION_SOON_MESSAGE, PERSONAL_APP_SUSPENSION_TURN_ON_PROFILE, - PRINTING_DISABLED_NAMED_ADMIN, LOCATION_CHANGED_TITLE, LOCATION_CHANGED_MESSAGE, - NETWORK_LOGGING_TITLE, NETWORK_LOGGING_MESSAGE, - NOTIFICATION_WORK_PROFILE_CONTENT_DESCRIPTION, NOTIFICATION_CHANNEL_DEVICE_ADMIN, - SWITCH_TO_WORK_LABEL, SWITCH_TO_PERSONAL_LABEL, FORWARD_INTENT_TO_WORK, - FORWARD_INTENT_TO_PERSONAL, RESOLVER_WORK_PROFILE_NOT_SUPPORTED, RESOLVER_PERSONAL_TAB, - RESOLVER_WORK_TAB, RESOLVER_PERSONAL_TAB_ACCESSIBILITY, RESOLVER_WORK_TAB_ACCESSIBILITY, - RESOLVER_CROSS_PROFILE_BLOCKED_TITLE, RESOLVER_CANT_SHARE_WITH_PERSONAL, - RESOLVER_CANT_SHARE_WITH_WORK, RESOLVER_CANT_ACCESS_PERSONAL, RESOLVER_CANT_ACCESS_WORK, - RESOLVER_WORK_PAUSED_TITLE, RESOLVER_NO_WORK_APPS, RESOLVER_NO_PERSONAL_APPS, - CANT_ADD_ACCOUNT_MESSAGE, PACKAGE_INSTALLED_BY_DO, PACKAGE_UPDATED_BY_DO, - PACKAGE_DELETED_BY_DO, UNLAUNCHABLE_APP_WORK_PAUSED_TITLE, - UNLAUNCHABLE_APP_WORK_PAUSED_MESSAGE, PROFILE_ENCRYPTED_TITLE, PROFILE_ENCRYPTED_DETAIL, - PROFILE_ENCRYPTED_MESSAGE, WORK_PROFILE_BADGED_LABEL, - - // DocsUi Strings - WORK_PROFILE_OFF_ERROR_TITLE, WORK_PROFILE_OFF_ENABLE_BUTTON, - CANT_SELECT_WORK_FILES_TITLE, CANT_SELECT_WORK_FILES_MESSAGE, - CANT_SELECT_PERSONAL_FILES_TITLE, CANT_SELECT_PERSONAL_FILES_MESSAGE, - CANT_SAVE_TO_WORK_TITLE, CANT_SAVE_TO_WORK_MESSAGE, CANT_SAVE_TO_PERSONAL_TITLE, - CANT_SAVE_TO_PERSONAL_MESSAGE, CROSS_PROFILE_NOT_ALLOWED_TITLE, - CROSS_PROFILE_NOT_ALLOWED_MESSAGE, PREVIEW_WORK_FILE_ACCESSIBILITY, PERSONAL_TAB, - WORK_TAB, WORK_ACCESSIBILITY, - - // MediaProvider Strings - SWITCH_TO_WORK_MESSAGE, SWITCH_TO_PERSONAL_MESSAGE, BLOCKED_BY_ADMIN_TITLE, - BLOCKED_FROM_PERSONAL_MESSAGE, BLOCKED_FROM_PERSONAL_MESSAGE, - BLOCKED_FROM_WORK_MESSAGE, Strings.MediaProvider.WORK_PROFILE_PAUSED_TITLE, - WORK_PROFILE_PAUSED_MESSAGE, - - // Settings Strings - FACE_SETTINGS_FOR_WORK_TITLE, WORK_PROFILE_FINGERPRINT_LAST_DELETE_MESSAGE, - WORK_PROFILE_IT_ADMIN_CANT_RESET_SCREEN_LOCK, WORK_PROFILE_SCREEN_LOCK_SETUP_MESSAGE, - WORK_PROFILE_SET_UNLOCK_LAUNCH_PICKER_TITLE, - WORK_PROFILE_LAST_PATTERN_ATTEMPT_BEFORE_WIPE, - WORK_PROFILE_LAST_PIN_ATTEMPT_BEFORE_WIPE, - WORK_PROFILE_LAST_PASSWORD_ATTEMPT_BEFORE_WIPE, WORK_PROFILE_LOCK_ATTEMPTS_FAILED, - ACCESSIBILITY_CATEGORY_WORK, ACCESSIBILITY_CATEGORY_PERSONAL, - ACCESSIBILITY_WORK_ACCOUNT_TITLE, ACCESSIBILITY_PERSONAL_ACCOUNT_TITLE, - WORK_PROFILE_LOCATION_SWITCH_TITLE, SET_WORK_PROFILE_PASSWORD_HEADER, - SET_WORK_PROFILE_PIN_HEADER, SET_WORK_PROFILE_PATTERN_HEADER, - CONFIRM_WORK_PROFILE_PASSWORD_HEADER, CONFIRM_WORK_PROFILE_PIN_HEADER, - CONFIRM_WORK_PROFILE_PATTERN_HEADER, REENTER_WORK_PROFILE_PASSWORD_HEADER, - REENTER_WORK_PROFILE_PIN_HEADER, WORK_PROFILE_CONFIRM_PATTERN, WORK_PROFILE_CONFIRM_PIN, - WORK_PROFILE_PASSWORD_REQUIRED, WORK_PROFILE_SECURITY_TITLE, - WORK_PROFILE_UNIFY_LOCKS_TITLE, WORK_PROFILE_UNIFY_LOCKS_SUMMARY, - WORK_PROFILE_UNIFY_LOCKS_DETAIL, WORK_PROFILE_UNIFY_LOCKS_NONCOMPLIANT, - WORK_PROFILE_KEYBOARDS_AND_TOOLS, WORK_PROFILE_NOT_AVAILABLE, WORK_PROFILE_SETTING, - WORK_PROFILE_SETTING_ON_SUMMARY, WORK_PROFILE_SETTING_OFF_SUMMARY, REMOVE_WORK_PROFILE, - DEVICE_OWNER_INSTALLED_CERTIFICATE_AUTHORITY_WARNING, - WORK_PROFILE_INSTALLED_CERTIFICATE_AUTHORITY_WARNING, WORK_PROFILE_CONFIRM_REMOVE_TITLE, - WORK_PROFILE_CONFIRM_REMOVE_MESSAGE, WORK_APPS_CANNOT_ACCESS_NOTIFICATION_SETTINGS, - WORK_PROFILE_SOUND_SETTINGS_SECTION_HEADER, WORK_PROFILE_USE_PERSONAL_SOUNDS_TITLE, - WORK_PROFILE_USE_PERSONAL_SOUNDS_SUMMARY, WORK_PROFILE_RINGTONE_TITLE, - WORK_PROFILE_NOTIFICATION_RINGTONE_TITLE, WORK_PROFILE_ALARM_RINGTONE_TITLE, - WORK_PROFILE_SYNC_WITH_PERSONAL_SOUNDS_ACTIVE_SUMMARY, - ENABLE_WORK_PROFILE_SYNC_WITH_PERSONAL_SOUNDS_DIALOG_TITLE, - ENABLE_WORK_PROFILE_SYNC_WITH_PERSONAL_SOUNDS_DIALOG_MESSAGE, - WORK_PROFILE_NOTIFICATIONS_SECTION_HEADER, WORK_PROFILE_LOCKED_NOTIFICATION_TITLE, - WORK_PROFILE_LOCK_SCREEN_REDACT_NOTIFICATION_TITLE, - WORK_PROFILE_LOCK_SCREEN_REDACT_NOTIFICATION_SUMMARY, - WORK_PROFILE_NOTIFICATION_LISTENER_BLOCKED, CONNECTED_WORK_AND_PERSONAL_APPS_TITLE, - CONNECTED_APPS_SHARE_PERMISSIONS_AND_DATA, ONLY_CONNECT_TRUSTED_APPS, - HOW_TO_DISCONNECT_APPS, CONNECT_APPS_DIALOG_TITLE, CONNECT_APPS_DIALOG_SUMMARY, - APP_CAN_ACCESS_PERSONAL_DATA, APP_CAN_ACCESS_PERSONAL_PERMISSIONS, - INSTALL_IN_WORK_PROFILE_TO_CONNECT_PROMPT, - INSTALL_IN_PERSONAL_PROFILE_TO_CONNECT_PROMPT, WORK_PROFILE_MANAGED_BY, MANAGED_BY, - WORK_PROFILE_DISABLE_USAGE_ACCESS_WARNING, DISABLED_BY_IT_ADMIN_TITLE, - CONTACT_YOUR_IT_ADMIN, WORK_PROFILE_ADMIN_POLICIES_WARNING, USER_ADMIN_POLICIES_WARNING, - DEVICE_ADMIN_POLICIES_WARNING, WORK_PROFILE_OFF_CONDITION_TITLE, - MANAGED_PROFILE_SETTINGS_TITLE, WORK_PROFILE_CONTACT_SEARCH_TITLE, - WORK_PROFILE_CONTACT_SEARCH_SUMMARY, CROSS_PROFILE_CALENDAR_TITLE, - CROSS_PROFILE_CALENDAR_SUMMARY, ALWAYS_ON_VPN_PERSONAL_PROFILE, ALWAYS_ON_VPN_DEVICE, - ALWAYS_ON_VPN_WORK_PROFILE, CA_CERTS_PERSONAL_PROFILE, CA_CERTS_WORK_PROFILE, - CA_CERTS_DEVICE, ADMIN_CAN_LOCK_DEVICE, ADMIN_CAN_WIPE_DEVICE, - ADMIN_CONFIGURED_FAILED_PASSWORD_WIPE_DEVICE, - ADMIN_CONFIGURED_FAILED_PASSWORD_WIPE_WORK_PROFILE, DEVICE_MANAGED_WITHOUT_NAME, - DEVICE_MANAGED_WITH_NAME, WORK_PROFILE_APP_SUBTEXT, PERSONAL_PROFILE_APP_SUBTEXT, - FINGERPRINT_FOR_WORK, FACE_UNLOCK_DISABLED, FINGERPRINT_UNLOCK_DISABLED, - FINGERPRINT_UNLOCK_DISABLED_EXPLANATION, PIN_RECENTLY_USED, PASSWORD_RECENTLY_USED, - MANAGE_DEVICE_ADMIN_APPS, NUMBER_OF_DEVICE_ADMINS_NONE, NUMBER_OF_DEVICE_ADMINS, - FORGOT_PASSWORD_TITLE, FORGOT_PASSWORD_TEXT, ERROR_MOVE_DEVICE_ADMIN, - DEVICE_ADMIN_SETTINGS_TITLE, REMOVE_DEVICE_ADMIN, UNINSTALL_DEVICE_ADMIN, - REMOVE_AND_UNINSTALL_DEVICE_ADMIN, SELECT_DEVICE_ADMIN_APPS, NO_DEVICE_ADMINS, - ACTIVATE_DEVICE_ADMIN_APP, ACTIVATE_THIS_DEVICE_ADMIN_APP, - ACTIVATE_DEVICE_ADMIN_APP_TITLE, NEW_DEVICE_ADMIN_WARNING, - NEW_DEVICE_ADMIN_WARNING_SIMPLIFIED, ACTIVE_DEVICE_ADMIN_WARNING, - SET_PROFILE_OWNER_TITLE, SET_PROFILE_OWNER_DIALOG_TITLE, - SET_PROFILE_OWNER_POSTSETUP_WARNING, OTHER_OPTIONS_DISABLED_BY_ADMIN, - REMOVE_ACCOUNT_FAILED_ADMIN_RESTRICTION, IT_ADMIN_POLICY_DISABLING_INFO_URL, - SHARE_REMOTE_BUGREPORT_DIALOG_TITLE, SHARE_REMOTE_BUGREPORT_FINISHED_REQUEST_CONSENT, - SHARE_REMOTE_BUGREPORT_NOT_FINISHED_REQUEST_CONSENT, SHARING_REMOTE_BUGREPORT_MESSAGE, - MANAGED_DEVICE_INFO, MANAGED_DEVICE_INFO_SUMMARY, MANAGED_DEVICE_INFO_SUMMARY_WITH_NAME, - ENTERPRISE_PRIVACY_HEADER, INFORMATION_YOUR_ORGANIZATION_CAN_SEE_TITLE, - CHANGES_MADE_BY_YOUR_ORGANIZATION_ADMIN_TITLE, YOUR_ACCESS_TO_THIS_DEVICE_TITLE, - ADMIN_CAN_SEE_WORK_DATA_WARNING, ADMIN_CAN_SEE_APPS_WARNING, - ADMIN_CAN_SEE_USAGE_WARNING, ADMIN_CAN_SEE_NETWORK_LOGS_WARNING, - ADMIN_CAN_SEE_BUG_REPORT_WARNING, ADMIN_CAN_SEE_SECURITY_LOGS_WARNING, - ADMIN_ACTION_NONE, ADMIN_ACTION_APPS_INSTALLED, ADMIN_ACTION_APPS_COUNT_ESTIMATED, - ADMIN_ACTIONS_APPS_COUNT_MINIMUM, ADMIN_ACTION_ACCESS_LOCATION, - ADMIN_ACTION_ACCESS_MICROPHONE, ADMIN_ACTION_ACCESS_CAMERA, - ADMIN_ACTION_SET_DEFAULT_APPS, ADMIN_ACTIONS_APPS_COUNT, - ADMIN_ACTION_SET_CURRENT_INPUT_METHOD, ADMIN_ACTION_SET_INPUT_METHOD_NAME, - ADMIN_ACTION_SET_HTTP_PROXY, WORK_PROFILE_PRIVACY_POLICY_INFO_SUMMARY, - WORK_PROFILE_PRIVACY_POLICY_INFO, CONNECTED_APPS_SEARCH_KEYWORDS, - WORK_PROFILE_UNIFICATION_SEARCH_KEYWORDS, ACCOUNTS_SEARCH_KEYWORDS, - CONTROLLED_BY_ADMIN_SUMMARY, WORK_PROFILE_USER_LABEL, WORK_CATEGORY_HEADER, - PERSONAL_CATEGORY_HEADER, - - // PermissionController Strings - WORK_PROFILE_DEFAULT_APPS_TITLE, HOME_MISSING_WORK_PROFILE_SUPPORT_MESSAGE, - BACKGROUND_ACCESS_DISABLED_BY_ADMIN_MESSAGE, BACKGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE, - BACKGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE, FOREGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE, - LOCATION_AUTO_GRANTED_MESSAGE, - - // Dialer Strings - NOTIFICATION_INCOMING_WORK_CALL_TITLE, NOTIFICATION_ONGOING_WORK_CALL_TITLE, - NOTIFICATION_MISSED_WORK_CALL_TITLE, NOTIFICATION_WIFI_WORK_CALL_LABEL, - }) - public @interface UpdatableStringId { - } + public static final String UNDEFINED = "UNDEFINED"; /** * Class containing the identifiers used to update device management-related system drawable. + * + * @hide */ public static final class Drawables { private Drawables() { } - /** - * An ID for any drawable that can't be updated. - */ - public static final String UNDEFINED = "UNDEFINED"; - /** * Specifically used to badge work profile app icons. */ @@ -561,20 +69,6 @@ public final class DevicePolicyResources { */ public static final String WORK_PROFILE_USER_ICON = "WORK_PROFILE_USER_ICON"; - /** - * @hide - */ - public static final Set UPDATABLE_DRAWABLE_IDS = buildDrawablesSet(); - - private static Set buildDrawablesSet() { - Set drawables = new HashSet<>(); - drawables.add(WORK_PROFILE_ICON_BADGE); - drawables.add(WORK_PROFILE_ICON); - drawables.add(WORK_PROFILE_OFF_ICON); - drawables.add(WORK_PROFILE_USER_ICON); - return drawables; - } - /** * Class containing the source identifiers used to update device management-related system * drawable. @@ -584,12 +78,6 @@ public final class DevicePolicyResources { private Source() { } - /** - * A source identifier indicating that the updatable resource is used in a generic - * undefined location. - */ - public static final String UNDEFINED = "UNDEFINED"; - /** * A source identifier indicating that the updatable drawable is used in notifications. */ @@ -622,41 +110,17 @@ public final class DevicePolicyResources { * A source identifier indicating that the updatable drawable is used in the status bar. */ public static final String STATUS_BAR = "STATUS_BAR"; - - /** - * @hide - */ - public static final Set UPDATABLE_DRAWABLE_SOURCES = buildSourcesSet(); - - private static Set buildSourcesSet() { - Set sources = new HashSet<>(); - sources.add(UNDEFINED); - sources.add(NOTIFICATION); - sources.add(PROFILE_SWITCH_ANIMATION); - sources.add(HOME_WIDGET); - sources.add(LAUNCHER_OFF_BUTTON); - sources.add(QUICK_SETTINGS); - sources.add(STATUS_BAR); - return sources; - } } /** * Class containing the style identifiers used to update device management-related system * drawable. */ - @SuppressLint("StaticUtils") public static final class Style { private Style() { } - /** - * A style identifier indicating that the updatable drawable should use the default - * style. - */ - public static final String DEFAULT = "DEFAULT"; - /** * A style identifier indicating that the updatable drawable has a solid color fill. */ @@ -672,20 +136,6 @@ public final class DevicePolicyResources { * A style identifier indicating that the updatable drawable is an outline. */ public static final String OUTLINE = "OUTLINE"; - - /** - * @hide - */ - public static final Set UPDATABLE_DRAWABLE_STYLES = buildStylesSet(); - - private static Set buildStylesSet() { - Set styles = new HashSet<>(); - styles.add(DEFAULT); - styles.add(SOLID_COLORED); - styles.add(SOLID_NOT_COLORED); - styles.add(OUTLINE); - return styles; - } } } @@ -700,29 +150,6 @@ public final class DevicePolicyResources { private Strings() { } - /** - * An ID for any string that can't be updated. - */ - public static final String UNDEFINED = "UNDEFINED"; - - /** - * @hide - */ - public static final Set UPDATABLE_STRING_IDS = buildStringsSet(); - - private static Set buildStringsSet() { - Set strings = new HashSet<>(); - strings.addAll(Settings.buildStringsSet()); - strings.addAll(Launcher.buildStringsSet()); - strings.addAll(SystemUi.buildStringsSet()); - strings.addAll(Core.buildStringsSet()); - strings.addAll(DocumentsUi.buildStringsSet()); - strings.addAll(MediaProvider.buildStringsSet()); - strings.addAll(PermissionController.buildStringsSet()); - strings.addAll(Dialer.buildStringsSet()); - return strings; - } - /** * Class containing the identifiers used to update device management-related system strings * in the Settings package @@ -1747,288 +1174,6 @@ public final class DevicePolicyResources { * Header for items under the personal user */ public static final String PERSONAL_CATEGORY_HEADER = PREFIX + "category_personal"; - - /** - * @hide - */ - static Set buildStringsSet() { - Set strings = new HashSet<>(); - strings.add(FACE_SETTINGS_FOR_WORK_TITLE); - strings.add(WORK_PROFILE_FINGERPRINT_LAST_DELETE_MESSAGE); - strings.add(WORK_PROFILE_IT_ADMIN_CANT_RESET_SCREEN_LOCK); - strings.add(WORK_PROFILE_SCREEN_LOCK_SETUP_MESSAGE); - strings.add(WORK_PROFILE_SET_UNLOCK_LAUNCH_PICKER_TITLE); - strings.add(WORK_PROFILE_LAST_PATTERN_ATTEMPT_BEFORE_WIPE); - strings.add(WORK_PROFILE_LAST_PIN_ATTEMPT_BEFORE_WIPE); - strings.add(WORK_PROFILE_LAST_PASSWORD_ATTEMPT_BEFORE_WIPE); - strings.add(WORK_PROFILE_LOCK_ATTEMPTS_FAILED); - strings.add(ACCESSIBILITY_CATEGORY_WORK); - strings.add(ACCESSIBILITY_CATEGORY_PERSONAL); - strings.add(ACCESSIBILITY_WORK_ACCOUNT_TITLE); - strings.add(ACCESSIBILITY_PERSONAL_ACCOUNT_TITLE); - strings.add(WORK_PROFILE_LOCATION_SWITCH_TITLE); - strings.add(SET_WORK_PROFILE_PASSWORD_HEADER); - strings.add(SET_WORK_PROFILE_PIN_HEADER); - strings.add(SET_WORK_PROFILE_PATTERN_HEADER); - strings.add(CONFIRM_WORK_PROFILE_PASSWORD_HEADER); - strings.add(CONFIRM_WORK_PROFILE_PIN_HEADER); - strings.add(CONFIRM_WORK_PROFILE_PATTERN_HEADER); - strings.add(REENTER_WORK_PROFILE_PASSWORD_HEADER); - strings.add(REENTER_WORK_PROFILE_PIN_HEADER); - strings.add(WORK_PROFILE_CONFIRM_PATTERN); - strings.add(WORK_PROFILE_CONFIRM_PIN); - strings.add(WORK_PROFILE_PASSWORD_REQUIRED); - strings.add(WORK_PROFILE_SECURITY_TITLE); - strings.add(WORK_PROFILE_UNIFY_LOCKS_TITLE); - strings.add(WORK_PROFILE_UNIFY_LOCKS_SUMMARY); - strings.add(WORK_PROFILE_UNIFY_LOCKS_DETAIL); - strings.add(WORK_PROFILE_UNIFY_LOCKS_NONCOMPLIANT); - strings.add(WORK_PROFILE_KEYBOARDS_AND_TOOLS); - strings.add(WORK_PROFILE_NOT_AVAILABLE); - strings.add(WORK_PROFILE_SETTING); - strings.add(WORK_PROFILE_SETTING_ON_SUMMARY); - strings.add(WORK_PROFILE_SETTING_OFF_SUMMARY); - strings.add(REMOVE_WORK_PROFILE); - strings.add(DEVICE_OWNER_INSTALLED_CERTIFICATE_AUTHORITY_WARNING); - strings.add(WORK_PROFILE_INSTALLED_CERTIFICATE_AUTHORITY_WARNING); - strings.add(WORK_PROFILE_CONFIRM_REMOVE_TITLE); - strings.add(WORK_PROFILE_CONFIRM_REMOVE_MESSAGE); - strings.add(WORK_APPS_CANNOT_ACCESS_NOTIFICATION_SETTINGS); - strings.add(WORK_PROFILE_SOUND_SETTINGS_SECTION_HEADER); - strings.add(WORK_PROFILE_USE_PERSONAL_SOUNDS_TITLE); - strings.add(WORK_PROFILE_USE_PERSONAL_SOUNDS_SUMMARY); - strings.add(WORK_PROFILE_RINGTONE_TITLE); - strings.add(WORK_PROFILE_NOTIFICATION_RINGTONE_TITLE); - strings.add(WORK_PROFILE_ALARM_RINGTONE_TITLE); - strings.add(WORK_PROFILE_SYNC_WITH_PERSONAL_SOUNDS_ACTIVE_SUMMARY); - strings.add(ENABLE_WORK_PROFILE_SYNC_WITH_PERSONAL_SOUNDS_DIALOG_TITLE); - strings.add(ENABLE_WORK_PROFILE_SYNC_WITH_PERSONAL_SOUNDS_DIALOG_MESSAGE); - strings.add(WORK_PROFILE_NOTIFICATIONS_SECTION_HEADER); - strings.add(WORK_PROFILE_LOCKED_NOTIFICATION_TITLE); - strings.add(WORK_PROFILE_LOCK_SCREEN_REDACT_NOTIFICATION_TITLE); - strings.add(WORK_PROFILE_LOCK_SCREEN_REDACT_NOTIFICATION_SUMMARY); - strings.add(WORK_PROFILE_NOTIFICATION_LISTENER_BLOCKED); - strings.add(CONNECTED_WORK_AND_PERSONAL_APPS_TITLE); - strings.add(CONNECTED_APPS_SHARE_PERMISSIONS_AND_DATA); - strings.add(ONLY_CONNECT_TRUSTED_APPS); - strings.add(HOW_TO_DISCONNECT_APPS); - strings.add(CONNECT_APPS_DIALOG_TITLE); - strings.add(CONNECT_APPS_DIALOG_SUMMARY); - strings.add(APP_CAN_ACCESS_PERSONAL_DATA); - strings.add(APP_CAN_ACCESS_PERSONAL_PERMISSIONS); - strings.add(INSTALL_IN_WORK_PROFILE_TO_CONNECT_PROMPT); - strings.add(INSTALL_IN_PERSONAL_PROFILE_TO_CONNECT_PROMPT); - strings.add(WORK_PROFILE_MANAGED_BY); - strings.add(MANAGED_BY); - strings.add(WORK_PROFILE_DISABLE_USAGE_ACCESS_WARNING); - strings.add(DISABLED_BY_IT_ADMIN_TITLE); - strings.add(CONTACT_YOUR_IT_ADMIN); - strings.add(WORK_PROFILE_ADMIN_POLICIES_WARNING); - strings.add(USER_ADMIN_POLICIES_WARNING); - strings.add(DEVICE_ADMIN_POLICIES_WARNING); - strings.add(WORK_PROFILE_OFF_CONDITION_TITLE); - strings.add(MANAGED_PROFILE_SETTINGS_TITLE); - strings.add(WORK_PROFILE_CONTACT_SEARCH_TITLE); - strings.add(WORK_PROFILE_CONTACT_SEARCH_SUMMARY); - strings.add(CROSS_PROFILE_CALENDAR_TITLE); - strings.add(CROSS_PROFILE_CALENDAR_SUMMARY); - strings.add(ALWAYS_ON_VPN_PERSONAL_PROFILE); - strings.add(ALWAYS_ON_VPN_DEVICE); - strings.add(ALWAYS_ON_VPN_WORK_PROFILE); - strings.add(CA_CERTS_PERSONAL_PROFILE); - strings.add(CA_CERTS_WORK_PROFILE); - strings.add(CA_CERTS_DEVICE); - strings.add(ADMIN_CAN_LOCK_DEVICE); - strings.add(ADMIN_CAN_WIPE_DEVICE); - strings.add(ADMIN_CONFIGURED_FAILED_PASSWORD_WIPE_DEVICE); - strings.add(ADMIN_CONFIGURED_FAILED_PASSWORD_WIPE_WORK_PROFILE); - strings.add(DEVICE_MANAGED_WITHOUT_NAME); - strings.add(DEVICE_MANAGED_WITH_NAME); - strings.add(WORK_PROFILE_APP_SUBTEXT); - strings.add(PERSONAL_PROFILE_APP_SUBTEXT); - strings.add(FINGERPRINT_FOR_WORK); - strings.add(FACE_UNLOCK_DISABLED); - strings.add(FINGERPRINT_UNLOCK_DISABLED); - strings.add(FINGERPRINT_UNLOCK_DISABLED_EXPLANATION); - strings.add(PIN_RECENTLY_USED); - strings.add(PASSWORD_RECENTLY_USED); - strings.add(MANAGE_DEVICE_ADMIN_APPS); - strings.add(NUMBER_OF_DEVICE_ADMINS_NONE); - strings.add(NUMBER_OF_DEVICE_ADMINS); - strings.add(FORGOT_PASSWORD_TITLE); - strings.add(FORGOT_PASSWORD_TEXT); - strings.add(ERROR_MOVE_DEVICE_ADMIN); - strings.add(DEVICE_ADMIN_SETTINGS_TITLE); - strings.add(REMOVE_DEVICE_ADMIN); - strings.add(UNINSTALL_DEVICE_ADMIN); - strings.add(REMOVE_AND_UNINSTALL_DEVICE_ADMIN); - strings.add(SELECT_DEVICE_ADMIN_APPS); - strings.add(NO_DEVICE_ADMINS); - strings.add(ACTIVATE_DEVICE_ADMIN_APP); - strings.add(ACTIVATE_THIS_DEVICE_ADMIN_APP); - strings.add(ACTIVATE_DEVICE_ADMIN_APP_TITLE); - strings.add(NEW_DEVICE_ADMIN_WARNING); - strings.add(NEW_DEVICE_ADMIN_WARNING_SIMPLIFIED); - strings.add(ACTIVE_DEVICE_ADMIN_WARNING); - strings.add(SET_PROFILE_OWNER_TITLE); - strings.add(SET_PROFILE_OWNER_DIALOG_TITLE); - strings.add(SET_PROFILE_OWNER_POSTSETUP_WARNING); - strings.add(OTHER_OPTIONS_DISABLED_BY_ADMIN); - strings.add(REMOVE_ACCOUNT_FAILED_ADMIN_RESTRICTION); - strings.add(IT_ADMIN_POLICY_DISABLING_INFO_URL); - strings.add(SHARE_REMOTE_BUGREPORT_DIALOG_TITLE); - strings.add(SHARE_REMOTE_BUGREPORT_FINISHED_REQUEST_CONSENT); - strings.add(SHARE_REMOTE_BUGREPORT_NOT_FINISHED_REQUEST_CONSENT); - strings.add(SHARING_REMOTE_BUGREPORT_MESSAGE); - strings.add(MANAGED_DEVICE_INFO); - strings.add(MANAGED_DEVICE_INFO_SUMMARY); - strings.add(MANAGED_DEVICE_INFO_SUMMARY_WITH_NAME); - strings.add(ENTERPRISE_PRIVACY_HEADER); - strings.add(INFORMATION_YOUR_ORGANIZATION_CAN_SEE_TITLE); - strings.add(CHANGES_MADE_BY_YOUR_ORGANIZATION_ADMIN_TITLE); - strings.add(YOUR_ACCESS_TO_THIS_DEVICE_TITLE); - strings.add(ADMIN_CAN_SEE_WORK_DATA_WARNING); - strings.add(ADMIN_CAN_SEE_APPS_WARNING); - strings.add(ADMIN_CAN_SEE_USAGE_WARNING); - strings.add(ADMIN_CAN_SEE_NETWORK_LOGS_WARNING); - strings.add(ADMIN_CAN_SEE_BUG_REPORT_WARNING); - strings.add(ADMIN_CAN_SEE_SECURITY_LOGS_WARNING); - strings.add(ADMIN_ACTION_NONE); - strings.add(ADMIN_ACTION_APPS_INSTALLED); - strings.add(ADMIN_ACTION_APPS_COUNT_ESTIMATED); - strings.add(ADMIN_ACTIONS_APPS_COUNT_MINIMUM); - strings.add(ADMIN_ACTION_ACCESS_LOCATION); - strings.add(ADMIN_ACTION_ACCESS_MICROPHONE); - strings.add(ADMIN_ACTION_ACCESS_CAMERA); - strings.add(ADMIN_ACTION_SET_DEFAULT_APPS); - strings.add(ADMIN_ACTIONS_APPS_COUNT); - strings.add(ADMIN_ACTION_SET_CURRENT_INPUT_METHOD); - strings.add(ADMIN_ACTION_SET_INPUT_METHOD_NAME); - strings.add(ADMIN_ACTION_SET_HTTP_PROXY); - strings.add(WORK_PROFILE_PRIVACY_POLICY_INFO_SUMMARY); - strings.add(WORK_PROFILE_PRIVACY_POLICY_INFO); - strings.add(CONNECTED_APPS_SEARCH_KEYWORDS); - strings.add(WORK_PROFILE_UNIFICATION_SEARCH_KEYWORDS); - strings.add(ACCOUNTS_SEARCH_KEYWORDS); - strings.add(CONTROLLED_BY_ADMIN_SUMMARY); - strings.add(WORK_PROFILE_USER_LABEL); - strings.add(WORK_CATEGORY_HEADER); - strings.add(PERSONAL_CATEGORY_HEADER); - return strings; - } - } - - /** - * Class containing the identifiers used to update device management-related system strings - * in the Launcher package. - * - * @hide - */ - public static final class Launcher { - - private Launcher() { - } - - private static final String PREFIX = "Launcher."; - - /** - * User on-boarding title for work profile apps. - */ - public static final String WORK_PROFILE_EDU = PREFIX + "WORK_PROFILE_EDU"; - - /** - * Action label to finish work profile edu. - */ - public static final String WORK_PROFILE_EDU_ACCEPT = PREFIX + "WORK_PROFILE_EDU_ACCEPT"; - - /** - * Title shown when user opens work apps tab while work profile is paused. - */ - public static final String WORK_PROFILE_PAUSED_TITLE = - PREFIX + "WORK_PROFILE_PAUSED_TITLE"; - - /** - * Description shown when user opens work apps tab while work profile is paused. - */ - public static final String WORK_PROFILE_PAUSED_DESCRIPTION = - PREFIX + "WORK_PROFILE_PAUSED_DESCRIPTION"; - - /** - * Shown on the button to pause work profile. - */ - public static final String WORK_PROFILE_PAUSE_BUTTON = - PREFIX + "WORK_PROFILE_PAUSE_BUTTON"; - - /** - * Shown on the button to enable work profile. - */ - public static final String WORK_PROFILE_ENABLE_BUTTON = - PREFIX + "WORK_PROFILE_ENABLE_BUTTON"; - - /** - * Label on launcher tab to indicate work apps. - */ - public static final String ALL_APPS_WORK_TAB = PREFIX + "ALL_APPS_WORK_TAB"; - - /** - * Label on launcher tab to indicate personal apps. - */ - public static final String ALL_APPS_PERSONAL_TAB = PREFIX + "ALL_APPS_PERSONAL_TAB"; - - /** - * Accessibility description for launcher tab to indicate work apps. - */ - public static final String ALL_APPS_WORK_TAB_ACCESSIBILITY = - PREFIX + "ALL_APPS_WORK_TAB_ACCESSIBILITY"; - - /** - * Accessibility description for launcher tab to indicate personal apps. - */ - public static final String ALL_APPS_PERSONAL_TAB_ACCESSIBILITY = - PREFIX + "ALL_APPS_PERSONAL_TAB_ACCESSIBILITY"; - - /** - * Work folder name. - */ - public static final String WORK_FOLDER_NAME = PREFIX + "WORK_FOLDER_NAME"; - - /** - * Label on widget tab to indicate work app widgets. - */ - public static final String WIDGETS_WORK_TAB = PREFIX + "WIDGETS_WORK_TAB"; - - /** - * Label on widget tab to indicate personal app widgets. - */ - public static final String WIDGETS_PERSONAL_TAB = PREFIX + "WIDGETS_PERSONAL_TAB"; - - /** - * Message shown when a feature is disabled by the admin (e.g. changing wallpaper). - */ - public static final String DISABLED_BY_ADMIN_MESSAGE = - PREFIX + "DISABLED_BY_ADMIN_MESSAGE"; - - /** - * @hide - */ - static Set buildStringsSet() { - Set strings = new HashSet<>(); - strings.add(WORK_PROFILE_EDU); - strings.add(WORK_PROFILE_EDU_ACCEPT); - strings.add(WORK_PROFILE_PAUSED_TITLE); - strings.add(WORK_PROFILE_PAUSED_DESCRIPTION); - strings.add(WORK_PROFILE_PAUSE_BUTTON); - strings.add(WORK_PROFILE_ENABLE_BUTTON); - strings.add(ALL_APPS_WORK_TAB); - strings.add(ALL_APPS_PERSONAL_TAB); - strings.add(ALL_APPS_PERSONAL_TAB_ACCESSIBILITY); - strings.add(ALL_APPS_WORK_TAB_ACCESSIBILITY); - strings.add(WORK_FOLDER_NAME); - strings.add(WIDGETS_WORK_TAB); - strings.add(WIDGETS_PERSONAL_TAB); - strings.add(DISABLED_BY_ADMIN_MESSAGE); - return strings; - } } /** @@ -2272,49 +1417,6 @@ public final class DevicePolicyResources { * Content description for the work profile lock screen. */ public static final String WORK_LOCK_ACCESSIBILITY = PREFIX + "WORK_LOCK_ACCESSIBILITY"; - - /** - * @hide - */ - static Set buildStringsSet() { - Set strings = new HashSet<>(); - strings.add(QS_WORK_PROFILE_LABEL); - strings.add(QS_MSG_MANAGEMENT); - strings.add(QS_MSG_NAMED_MANAGEMENT); - strings.add(QS_MSG_MANAGEMENT_MONITORING); - strings.add(QS_MSG_NAMED_MANAGEMENT_MONITORING); - strings.add(QS_MSG_MANAGEMENT_NAMED_VPN); - strings.add(QS_MSG_NAMED_MANAGEMENT_NAMED_VPN); - strings.add(QS_MSG_MANAGEMENT_MULTIPLE_VPNS); - strings.add(QS_MSG_NAMED_MANAGEMENT_MULTIPLE_VPNS); - strings.add(QS_MSG_WORK_PROFILE_MONITORING); - strings.add(QS_MSG_NAMED_WORK_PROFILE_MONITORING); - strings.add(QS_MSG_WORK_PROFILE_NETWORK); - strings.add(QS_MSG_WORK_PROFILE_NAMED_VPN); - strings.add(QS_MSG_PERSONAL_PROFILE_NAMED_VPN); - strings.add(QS_DIALOG_MANAGEMENT_TITLE); - strings.add(QS_DIALOG_VIEW_POLICIES); - strings.add(QS_DIALOG_MANAGEMENT); - strings.add(QS_DIALOG_NAMED_MANAGEMENT); - strings.add(QS_DIALOG_MANAGEMENT_CA_CERT); - strings.add(QS_DIALOG_WORK_PROFILE_CA_CERT); - strings.add(QS_DIALOG_MANAGEMENT_NETWORK); - strings.add(QS_DIALOG_WORK_PROFILE_NETWORK); - strings.add(QS_DIALOG_MANAGEMENT_NAMED_VPN); - strings.add(QS_DIALOG_MANAGEMENT_TWO_NAMED_VPN); - strings.add(QS_DIALOG_WORK_PROFILE_NAMED_VPN); - strings.add(QS_DIALOG_PERSONAL_PROFILE_NAMED_VPN); - strings.add(BIOMETRIC_DIALOG_WORK_PIN_LAST_ATTEMPT); - strings.add(BIOMETRIC_DIALOG_WORK_PATTERN_LAST_ATTEMPT); - strings.add(BIOMETRIC_DIALOG_WORK_PASSWORD_LAST_ATTEMPT); - strings.add(BIOMETRIC_DIALOG_WORK_LOCK_FAILED_ATTEMPTS); - strings.add(STATUS_BAR_WORK_ICON_ACCESSIBILITY); - strings.add(ONGOING_PRIVACY_DIALOG_WORK); - strings.add(KEYGUARD_MANAGEMENT_DISCLOSURE); - strings.add(KEYGUARD_NAMED_MANAGEMENT_DISCLOSURE); - strings.add(WORK_LOCK_ACCESSIBILITY); - return strings; - } } /** @@ -2614,278 +1716,35 @@ public final class DevicePolicyResources { */ public static final String WORK_PROFILE_BADGED_LABEL = PREFIX + "WORK_PROFILE_BADGED_LABEL"; - - /** - * @hide - */ - static Set buildStringsSet() { - Set strings = new HashSet<>(); - strings.add(WORK_PROFILE_DELETED_TITLE); - strings.add(WORK_PROFILE_DELETED_FAILED_PASSWORD_ATTEMPTS_MESSAGE); - strings.add(WORK_PROFILE_DELETED_GENERIC_MESSAGE); - strings.add(WORK_PROFILE_DELETED_ORG_OWNED_MESSAGE); - strings.add(PERSONAL_APP_SUSPENSION_TITLE); - strings.add(PERSONAL_APP_SUSPENSION_MESSAGE); - strings.add(PERSONAL_APP_SUSPENSION_SOON_MESSAGE); - strings.add(PERSONAL_APP_SUSPENSION_TURN_ON_PROFILE); - strings.add(PRINTING_DISABLED_NAMED_ADMIN); - strings.add(LOCATION_CHANGED_TITLE); - strings.add(LOCATION_CHANGED_MESSAGE); - strings.add(NETWORK_LOGGING_TITLE); - strings.add(NETWORK_LOGGING_MESSAGE); - strings.add(NOTIFICATION_WORK_PROFILE_CONTENT_DESCRIPTION); - strings.add(NOTIFICATION_CHANNEL_DEVICE_ADMIN); - strings.add(SWITCH_TO_WORK_LABEL); - strings.add(SWITCH_TO_PERSONAL_LABEL); - strings.add(FORWARD_INTENT_TO_WORK); - strings.add(FORWARD_INTENT_TO_PERSONAL); - strings.add(RESOLVER_WORK_PROFILE_NOT_SUPPORTED); - strings.add(RESOLVER_PERSONAL_TAB); - strings.add(RESOLVER_WORK_TAB); - strings.add(RESOLVER_PERSONAL_TAB_ACCESSIBILITY); - strings.add(RESOLVER_WORK_TAB_ACCESSIBILITY); - strings.add(RESOLVER_CROSS_PROFILE_BLOCKED_TITLE); - strings.add(RESOLVER_CANT_SHARE_WITH_PERSONAL); - strings.add(RESOLVER_CANT_SHARE_WITH_WORK); - strings.add(RESOLVER_CANT_ACCESS_PERSONAL); - strings.add(RESOLVER_CANT_ACCESS_WORK); - strings.add(RESOLVER_WORK_PAUSED_TITLE); - strings.add(RESOLVER_NO_WORK_APPS); - strings.add(RESOLVER_NO_PERSONAL_APPS); - strings.add(CANT_ADD_ACCOUNT_MESSAGE); - strings.add(PACKAGE_INSTALLED_BY_DO); - strings.add(PACKAGE_UPDATED_BY_DO); - strings.add(PACKAGE_DELETED_BY_DO); - strings.add(UNLAUNCHABLE_APP_WORK_PAUSED_TITLE); - strings.add(UNLAUNCHABLE_APP_WORK_PAUSED_MESSAGE); - strings.add(PROFILE_ENCRYPTED_TITLE); - strings.add(PROFILE_ENCRYPTED_DETAIL); - strings.add(PROFILE_ENCRYPTED_MESSAGE); - strings.add(WORK_PROFILE_BADGED_LABEL); - return strings; - } } /** * Class containing the identifiers used to update device management-related system strings - * in the DocumentsUi package. + * in the Dialer app. + * + * @hide */ - public static final class DocumentsUi { + public static final class Telecomm { - private DocumentsUi() { + private Telecomm() { } - private static final String PREFIX = "DocumentsUi."; + private static final String PREFIX = "Telecomm."; /** - * Title for error message shown when work profile is turned off. + * Missed call notification label, used when there's exactly one missed call from work + * contact. */ - public static final String WORK_PROFILE_OFF_ERROR_TITLE = - PREFIX + "WORK_PROFILE_OFF_ERROR_TITLE"; - - /** - * Button text shown when work profile is turned off. - */ - public static final String WORK_PROFILE_OFF_ENABLE_BUTTON = - PREFIX + "WORK_PROFILE_OFF_ENABLE_BUTTON"; - - /** - * Title for error message shown when a user's IT admin does not allow the user to - * select work files from a personal app. - */ - public static final String CANT_SELECT_WORK_FILES_TITLE = - PREFIX + "CANT_SELECT_WORK_FILES_TITLE"; - - /** - * Message shown when a user's IT admin does not allow the user to select work files - * from a personal app. - */ - public static final String CANT_SELECT_WORK_FILES_MESSAGE = - PREFIX + "CANT_SELECT_WORK_FILES_MESSAGE"; - - /** - * Title for error message shown when a user's IT admin does not allow the user to - * select personal files from a work app. - */ - public static final String CANT_SELECT_PERSONAL_FILES_TITLE = - PREFIX + "CANT_SELECT_PERSONAL_FILES_TITLE"; - - /** - * Message shown when a user's IT admin does not allow the user to select personal files - * from a work app. - */ - public static final String CANT_SELECT_PERSONAL_FILES_MESSAGE = - PREFIX + "CANT_SELECT_PERSONAL_FILES_MESSAGE"; - - /** - * Title for error message shown when a user's IT admin does not allow the user to save - * files from their personal profile to their work profile. - */ - public static final String CANT_SAVE_TO_WORK_TITLE = - PREFIX + "CANT_SAVE_TO_WORK_TITLE"; - - /** - * Message shown when a user's IT admin does not allow the user to save files from their - * personal profile to their work profile. - */ - public static final String CANT_SAVE_TO_WORK_MESSAGE = - PREFIX + "CANT_SAVE_TO_WORK_MESSAGE"; - - /** - * Title for error message shown when a user's IT admin does not allow the user to save - * files from their work profile to their personal profile. - */ - public static final String CANT_SAVE_TO_PERSONAL_TITLE = - PREFIX + "CANT_SAVE_TO_PERSONAL_TITLE"; - - /** - * Message shown when a user's IT admin does not allow the user to save files from their - * work profile to their personal profile. - */ - public static final String CANT_SAVE_TO_PERSONAL_MESSAGE = - PREFIX + "CANT_SAVE_TO_PERSONAL_MESSAGE"; - - /** - * Title for error message shown when a user tries to do something on their work - * device, but that action isn't allowed by their IT admin. - */ - public static final String CROSS_PROFILE_NOT_ALLOWED_TITLE = - PREFIX + "CROSS_PROFILE_NOT_ALLOWED_TITLE"; - - /** - * Message shown when a user tries to do something on their work device, but that action - * isn't allowed by their IT admin. - */ - public static final String CROSS_PROFILE_NOT_ALLOWED_MESSAGE = - PREFIX + "CROSS_PROFILE_NOT_ALLOWED_MESSAGE"; - - /** - * Content description text that's spoken by a screen reader for previewing a work file - * before opening it. Accepts file name as a param. - */ - public static final String PREVIEW_WORK_FILE_ACCESSIBILITY = - PREFIX + "PREVIEW_WORK_FILE_ACCESSIBILITY"; - - /** - * Label for tab and sidebar to indicate personal content. - */ - public static final String PERSONAL_TAB = PREFIX + "PERSONAL_TAB"; - - /** - * Label for tab and sidebar tab to indicate work content - */ - public static final String WORK_TAB = PREFIX + "WORK_TAB"; - - /** - * Accessibility label to indicate the subject(e.g. file/folder) is from work profile. - */ - public static final String WORK_ACCESSIBILITY = PREFIX + "WORK_ACCESSIBILITY"; - - /** - * @hide - */ - static Set buildStringsSet() { - Set strings = new HashSet<>(); - strings.add(WORK_PROFILE_OFF_ERROR_TITLE); - strings.add(WORK_PROFILE_OFF_ENABLE_BUTTON); - strings.add(CANT_SELECT_WORK_FILES_TITLE); - strings.add(CANT_SELECT_WORK_FILES_MESSAGE); - strings.add(CANT_SELECT_PERSONAL_FILES_TITLE); - strings.add(CANT_SELECT_PERSONAL_FILES_MESSAGE); - strings.add(CANT_SAVE_TO_WORK_TITLE); - strings.add(CANT_SAVE_TO_WORK_MESSAGE); - strings.add(CANT_SAVE_TO_PERSONAL_TITLE); - strings.add(CANT_SAVE_TO_PERSONAL_MESSAGE); - strings.add(CROSS_PROFILE_NOT_ALLOWED_TITLE); - strings.add(CROSS_PROFILE_NOT_ALLOWED_MESSAGE); - strings.add(PREVIEW_WORK_FILE_ACCESSIBILITY); - strings.add(PERSONAL_TAB); - strings.add(WORK_TAB); - strings.add(WORK_ACCESSIBILITY); - return strings; - } + public static final String NOTIFICATION_MISSED_WORK_CALL_TITLE = + PREFIX + "NOTIFICATION_MISSED_WORK_CALL_TITLE"; } /** * Class containing the identifiers used to update device management-related system strings - * in the MediaProvider module. - */ - public static final class MediaProvider { - - private MediaProvider() { - } - - private static final String PREFIX = "MediaProvider."; - - /** - * The text shown to switch to the work profile in PhotoPicker. - */ - public static final String SWITCH_TO_WORK_MESSAGE = - PREFIX + "SWITCH_TO_WORK_MESSAGE"; - - /** - * The text shown to switch to the personal profile in PhotoPicker. - */ - public static final String SWITCH_TO_PERSONAL_MESSAGE = - PREFIX + "SWITCH_TO_PERSONAL_MESSAGE"; - - /** - * The title for error dialog in PhotoPicker when the admin blocks cross user - * interaction for the intent. - */ - public static final String BLOCKED_BY_ADMIN_TITLE = - PREFIX + "BLOCKED_BY_ADMIN_TITLE"; - - /** - * The message for error dialog in PhotoPicker when the admin blocks cross user - * interaction from the personal profile. - */ - public static final String BLOCKED_FROM_PERSONAL_MESSAGE = - PREFIX + "BLOCKED_FROM_PERSONAL_MESSAGE"; - - /** - * The message for error dialog in PhotoPicker when the admin blocks cross user - * interaction from the work profile. - */ - public static final String BLOCKED_FROM_WORK_MESSAGE = - PREFIX + "BLOCKED_FROM_WORK_MESSAGE"; - - /** - * The title of the error dialog in PhotoPicker when the user tries to switch to work - * content, but work profile is off. - */ - public static final String WORK_PROFILE_PAUSED_TITLE = - PREFIX + "WORK_PROFILE_PAUSED_TITLE"; - - /** - * The message of the error dialog in PhotoPicker when the user tries to switch to work - * content, but work profile is off. - */ - public static final String WORK_PROFILE_PAUSED_MESSAGE = - PREFIX + "WORK_PROFILE_PAUSED_MESSAGE"; - - /** - * @hide - */ - static Set buildStringsSet() { - Set strings = new HashSet<>(); - strings.add(SWITCH_TO_WORK_MESSAGE); - strings.add(SWITCH_TO_PERSONAL_MESSAGE); - strings.add(BLOCKED_BY_ADMIN_TITLE); - strings.add(BLOCKED_FROM_PERSONAL_MESSAGE); - strings.add(BLOCKED_FROM_WORK_MESSAGE); - strings.add(WORK_PROFILE_PAUSED_TITLE); - strings.add(WORK_PROFILE_PAUSED_MESSAGE); - return strings; - } - } - - /** - * Class containing the identifiers used to update device management-related system strings - * in the PermissionController module. + * in the Permissions module. */ public static final class PermissionController { - + private PermissionController() { } @@ -2930,69 +1789,6 @@ public final class DevicePolicyResources { */ public static final String LOCATION_AUTO_GRANTED_MESSAGE = PREFIX + "LOCATION_AUTO_GRANTED_MESSAGE"; - - /** - * @hide - */ - static Set buildStringsSet() { - Set strings = new HashSet<>(); - strings.add(WORK_PROFILE_DEFAULT_APPS_TITLE); - strings.add(HOME_MISSING_WORK_PROFILE_SUPPORT_MESSAGE); - strings.add(BACKGROUND_ACCESS_DISABLED_BY_ADMIN_MESSAGE); - strings.add(BACKGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE); - strings.add(FOREGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE); - strings.add(LOCATION_AUTO_GRANTED_MESSAGE); - return strings; - } - } - - /** - * Class containing the identifiers used to update device management-related system strings - * in the Dialer app. - */ - public static final class Dialer { - - private Dialer() { - } - - private static final String PREFIX = "Dialer."; - - /** - * The title of the in-call notification for an incoming work call. - */ - public static final String NOTIFICATION_INCOMING_WORK_CALL_TITLE = - PREFIX + "NOTIFICATION_INCOMING_WORK_CALL_TITLE"; - - /** - * The title of the in-call notification for an ongoing work call. - */ - public static final String NOTIFICATION_ONGOING_WORK_CALL_TITLE = - PREFIX + "NOTIFICATION_ONGOING_WORK_CALL_TITLE"; - - /** - * Missed call notification label, used when there's exactly one missed call from work - * contact. - */ - public static final String NOTIFICATION_MISSED_WORK_CALL_TITLE = - PREFIX + "NOTIFICATION_MISSED_WORK_CALL_TITLE"; - - /** - * Label for notification indicating that call is being made over wifi. - */ - public static final String NOTIFICATION_WIFI_WORK_CALL_LABEL = - PREFIX + "NOTIFICATION_WIFI_WORK_CALL_LABEL"; - - /** - * @hide - */ - static Set buildStringsSet() { - Set strings = new HashSet<>(); - strings.add(NOTIFICATION_INCOMING_WORK_CALL_TITLE); - strings.add(NOTIFICATION_ONGOING_WORK_CALL_TITLE); - strings.add(NOTIFICATION_MISSED_WORK_CALL_TITLE); - strings.add(NOTIFICATION_WIFI_WORK_CALL_LABEL); - return strings; - } } } } diff --git a/core/java/android/app/admin/DevicePolicyResourcesManager.java b/core/java/android/app/admin/DevicePolicyResourcesManager.java new file mode 100644 index 0000000000000..06729222dea1c --- /dev/null +++ b/core/java/android/app/admin/DevicePolicyResourcesManager.java @@ -0,0 +1,528 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.app.admin; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.annotation.RequiresPermission; +import android.annotation.SuppressLint; +import android.annotation.SystemApi; +import android.content.Context; +import android.content.res.Resources; +import android.graphics.drawable.Drawable; +import android.graphics.drawable.Icon; +import android.os.RemoteException; +import android.util.DisplayMetrics; +import android.util.Log; + +import java.util.ArrayList; +import java.util.Objects; +import java.util.Set; +import java.util.function.Supplier; + +/** + * Class containing required APIs to set, reset, and get device policy related resources. + */ +public class DevicePolicyResourcesManager { + private static String TAG = "DevicePolicyResourcesManager"; + + private final Context mContext; + private final IDevicePolicyManager mService; + + /** + * @hide + */ + protected DevicePolicyResourcesManager(Context context, IDevicePolicyManager service) { + mContext = context; + mService = service; + } + + /** + * For each {@link DevicePolicyDrawableResource} item in {@code drawables}, if + * {@link DevicePolicyDrawableResource#getDrawableSource()} is not set, it updates the drawable + * resource for the combination of {@link DevicePolicyDrawableResource#getDrawableId()} and + * {@link DevicePolicyDrawableResource#getDrawableStyle()} to the drawable with resource ID + * {@link DevicePolicyDrawableResource#getResourceIdInCallingPackage()}, + * meaning any system UI surface calling {@link #getDrawable} with {@code drawableId} and + * {@code drawableStyle} will get the new resource after this API is called. + * + *

Otherwise, if {@link DevicePolicyDrawableResource#getDrawableSource()} is set, it + * overrides any drawables that was set for the same {@code drawableId} and + * {@code drawableStyle} for the provided source. + * + *

Sends a broadcast with action + * {@link DevicePolicyManager#ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to registered receivers + * when a resource has been updated successfully. + * + *

Important notes to consider when using this API: + *

    + *
  • {@link #getDrawable} references the resource + * {@link DevicePolicyDrawableResource#getResourceIdInCallingPackage()} in the + * calling package each time it gets called. You have to ensure that the resource is always + * available in the calling package as long as it is used as an updated resource. + *
  • You still have to re-call {@code setDrawables} even if you only make changes to the + * content of the resource with ID + * {@link DevicePolicyDrawableResource#getResourceIdInCallingPackage()} as the content might be + * cached and would need updating. + *
+ * + * @param drawables The list of {@link DevicePolicyDrawableResource} to update. + * + * @hide + */ + @SystemApi + @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) + public void setDrawables(@NonNull Set drawables) { + if (mService != null) { + try { + mService.setDrawables(new ArrayList<>(drawables)); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + } + + /** + * Removes all updated drawables for the list of {@code drawableIds} that was previously set by + * calling {@link #setDrawables}, meaning any subsequent calls to {@link #getDrawable} for the + * provided IDs with any {@code drawableStyle} and any {@code drawableSource} will return the + * default drawable from {@code defaultDrawableLoader}. + * + *

Sends a broadcast with action + * {@link DevicePolicyManager#ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to registered receivers + * when a resource has been reset successfully. + * + * @param drawableIds The list of IDs to remove. + * + * @hide + */ + @SystemApi + @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) + public void resetDrawables(@NonNull Set drawableIds) { + if (mService != null) { + try { + mService.resetDrawables(new ArrayList<>(drawableIds)); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + } + + /** + * Returns the appropriate updated drawable for the {@code drawableId} with style + * {@code drawableStyle} if one was set using {@code setDrawables}, otherwise returns the + * drawable from {@code defaultDrawableLoader}. + * + *

Also returns the drawable from {@code defaultDrawableLoader} if {@code drawableId} + * is {@link DevicePolicyResources#UNDEFINED}. + * + *

Calls to this API will not return {@code null} unless no updated drawable was found + * and the call to {@code defaultDrawableLoader} returned {@code null}. + * + *

This API uses the screen density returned from {@link Resources#getConfiguration()}, to + * set a different value use + * {@link #getDrawableForDensity(String, String, int, Supplier)}. + * + *

Callers should register for + * {@link DevicePolicyManager#ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to get notified when a + * resource has been updated. + * + *

Note that each call to this API loads the resource from the package that called + * {@code setDrawables} to set the updated resource. + * + * @param drawableId The drawable ID to get the updated resource for. + * @param drawableStyle The drawable style to use. + * @param defaultDrawableLoader To get the default drawable if no updated drawable was set for + * the provided params. + */ + @Nullable + public Drawable getDrawable( + @NonNull String drawableId, + @NonNull String drawableStyle, + @NonNull Supplier defaultDrawableLoader) { + return getDrawable( + drawableId, drawableStyle, DevicePolicyResources.UNDEFINED, defaultDrawableLoader); + } + + /** + * Similar to {@link #getDrawable(String, String, Supplier)}, but also accepts + * a {@code drawableSource} which could result in returning a different drawable than + * {@link #getDrawable(String, String, Supplier)} if an override was set for that specific + * source. + * + *

If {@code drawableSource} is {@link DevicePolicyResources#UNDEFINED}, it returns the + * appropriate string for {@code drawableId} and {@code drawableStyle} similar to + * {@link #getDrawable(String, String, Supplier)}. + * + *

Calls to this API will not return {@code null} unless no updated drawable was found + * and the call to {@code defaultDrawableLoader} returned {@code null}. + * + *

Callers should register for + * {@link DevicePolicyManager#ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to get notified when a + * resource has been updated. + * + * @param drawableId The drawable ID to get the updated resource for. + * @param drawableStyle The drawable style to use. + * @param drawableSource The source for the caller. + * @param defaultDrawableLoader To get the default drawable if no updated drawable was set for + * the provided params. + */ + @Nullable + public Drawable getDrawable( + @NonNull String drawableId, + @NonNull String drawableStyle, + @NonNull String drawableSource, + @NonNull Supplier defaultDrawableLoader) { + + Objects.requireNonNull(drawableId, "drawableId can't be null"); + Objects.requireNonNull(drawableStyle, "drawableStyle can't be null"); + Objects.requireNonNull(drawableSource, "drawableSource can't be null"); + Objects.requireNonNull(defaultDrawableLoader, "defaultDrawableLoader can't be null"); + + if (drawableId.equals(DevicePolicyResources.UNDEFINED)) { + return ParcelableResource.loadDefaultDrawable(defaultDrawableLoader); + } + if (mService != null) { + try { + ParcelableResource resource = mService.getDrawable( + drawableId, drawableStyle, drawableSource); + if (resource == null) { + return ParcelableResource.loadDefaultDrawable( + defaultDrawableLoader); + } + return resource.getDrawable( + mContext, + /* density= */ 0, + defaultDrawableLoader); + + } catch (RemoteException e) { + Log.e( + TAG, + "Error getting the updated drawable from DevicePolicyManagerService.", + e); + return ParcelableResource.loadDefaultDrawable(defaultDrawableLoader); + } + } + return ParcelableResource.loadDefaultDrawable(defaultDrawableLoader); + } + + /** + * Similar to {@link #getDrawable(String, String, Supplier)}, but also accepts + * {@code density}. See {@link Resources#getDrawableForDensity(int, int, Resources.Theme)}. + * + *

Calls to this API will not return {@code null} unless no updated drawable was found + * and the call to {@code defaultDrawableLoader} returned {@code null}. + * + *

Callers should register for + * {@link DevicePolicyManager#ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to get notified when a + * resource has been updated. + * + * @param drawableId The drawable ID to get the updated resource for. + * @param drawableStyle The drawable style to use. + * @param density The desired screen density indicated by the resource as + * found in {@link DisplayMetrics}. A value of 0 means to use the + * density returned from {@link Resources#getConfiguration()}. + * @param defaultDrawableLoader To get the default drawable if no updated drawable was set for + * the provided params. + */ + @Nullable + public Drawable getDrawableForDensity( + @NonNull String drawableId, + @NonNull String drawableStyle, + int density, + @NonNull Supplier defaultDrawableLoader) { + return getDrawableForDensity( + drawableId, + drawableStyle, + DevicePolicyResources.UNDEFINED, + density, + defaultDrawableLoader); + } + + /** + * Similar to {@link #getDrawable(String, String, String, Supplier)}, but also accepts + * {@code density}. See {@link Resources#getDrawableForDensity(int, int, Resources.Theme)}. + * + *

Calls to this API will not return {@code null} unless no updated drawable was found + * and the call to {@code defaultDrawableLoader} returned {@code null}. + * + *

Callers should register for + * {@link DevicePolicyManager#ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to get notified when a + * resource has been updated. + * + * @param drawableId The drawable ID to get the updated resource for. + * @param drawableStyle The drawable style to use. + * @param drawableSource The source for the caller. + * @param density The desired screen density indicated by the resource as + * found in {@link DisplayMetrics}. A value of 0 means to use the + * density returned from {@link Resources#getConfiguration()}. + * @param defaultDrawableLoader To get the default drawable if no updated drawable was set for + * the provided params. + */ + @Nullable + public Drawable getDrawableForDensity( + @NonNull String drawableId, + @NonNull String drawableStyle, + @NonNull String drawableSource, + int density, + @NonNull Supplier defaultDrawableLoader) { + + Objects.requireNonNull(drawableId, "drawableId can't be null"); + Objects.requireNonNull(drawableStyle, "drawableStyle can't be null"); + Objects.requireNonNull(drawableSource, "drawableSource can't be null"); + Objects.requireNonNull(defaultDrawableLoader, "defaultDrawableLoader can't be null"); + + if (drawableId.equals(DevicePolicyResources.UNDEFINED)) { + return ParcelableResource.loadDefaultDrawable(defaultDrawableLoader); + } + if (mService != null) { + try { + ParcelableResource resource = mService.getDrawable( + drawableId, drawableStyle, drawableSource); + if (resource == null) { + return ParcelableResource.loadDefaultDrawable( + defaultDrawableLoader); + } + return resource.getDrawable(mContext, density, defaultDrawableLoader); + } catch (RemoteException e) { + Log.e( + TAG, + "Error getting the updated drawable from DevicePolicyManagerService.", + e); + return ParcelableResource.loadDefaultDrawable(defaultDrawableLoader); + } + } + return ParcelableResource.loadDefaultDrawable(defaultDrawableLoader); + } + + /** + * Similar to {@link #getDrawable(String, String, String, Supplier)} but returns an + * {@link Icon} instead of a {@link Drawable}. + * + * @param drawableId The drawable ID to get the updated resource for. + * @param drawableStyle The drawable style to use. + * @param drawableSource The source for the caller. + * @param defaultIcon Returned if no updated drawable was set for the provided params. + */ + @Nullable + public Icon getDrawableAsIcon( + @NonNull String drawableId, + @NonNull String drawableStyle, + @NonNull String drawableSource, + @Nullable Icon defaultIcon) { + Objects.requireNonNull(drawableId, "drawableId can't be null"); + Objects.requireNonNull(drawableStyle, "drawableStyle can't be null"); + Objects.requireNonNull(drawableSource, "drawableSource can't be null"); + Objects.requireNonNull(defaultIcon, "defaultIcon can't be null"); + + if (drawableId.equals(DevicePolicyResources.UNDEFINED)) { + return defaultIcon; + } + if (mService != null) { + try { + ParcelableResource resource = mService.getDrawable( + drawableId, drawableStyle, drawableSource); + if (resource == null) { + return defaultIcon; + } + return Icon.createWithResource(resource.getPackageName(), resource.getResourceId()); + } catch (RemoteException e) { + Log.e( + TAG, + "Error getting the updated drawable from DevicePolicyManagerService.", + e); + return defaultIcon; + } + } + return defaultIcon; + } + + /** + * Similar to {@link #getDrawable(String, String, Supplier)} but returns an {@link Icon} + * instead of a {@link Drawable}. + * + * @param drawableId The drawable ID to get the updated resource for. + * @param drawableStyle The drawable style to use. + * @param defaultIcon Returned if no updated drawable was set for the provided params. + */ + @Nullable + public Icon getDrawableAsIcon( + @NonNull String drawableId, + @NonNull String drawableStyle, + @Nullable Icon defaultIcon) { + return getDrawableAsIcon( + drawableId, drawableStyle, DevicePolicyResources.UNDEFINED, defaultIcon); + } + + + /** + * For each {@link DevicePolicyStringResource} item in {@code strings}, it updates the string + * resource for {@link DevicePolicyStringResource#getStringId()} to the string with ID + * {@code callingPackageResourceId}, meaning any system UI surface calling {@link #getString} + * with {@code stringId} will get the new resource after this API is called. + * + *

Sends a broadcast with action + * {@link DevicePolicyManager#ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to registered receivers + * when a resource has been updated successfully. + * + *

Important notes to consider when using this API: + *

    + *
  • {@link #getString} references the resource {@code callingPackageResourceId} in the + * calling package each time it gets called. You have to ensure that the resource is always + * available in the calling package as long as it is used as an updated resource. + *
  • You still have to re-call {@code setStrings} even if you only make changes to the + * content of the resource with ID {@code callingPackageResourceId} as the content might be + * cached and would need updating. + *
+ * + * @param strings The list of {@link DevicePolicyStringResource} to update. + * + * @hide + */ + @SystemApi + @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) + public void setStrings(@NonNull Set strings) { + if (mService != null) { + try { + mService.setStrings(new ArrayList<>(strings)); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + } + + /** + * Removes the updated strings for the list of {@code stringIds} that was previously set by + * calling {@link #setStrings}, meaning any subsequent calls to {@link #getString} for the + * provided IDs will return the default string from {@code defaultStringLoader}. + * + *

Sends a broadcast with action + * {@link DevicePolicyManager#ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to registered receivers + * when a resource has been reset successfully. + * + * @param stringIds The list of IDs to remove the updated resources for. + * + * @hide + */ + @SystemApi + @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) + public void resetStrings(@NonNull Set stringIds) { + if (mService != null) { + try { + mService.resetStrings(new ArrayList<>(stringIds)); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + } + + /** + * Returns the appropriate updated string for the {@code stringId} (see + * {@link DevicePolicyResources.Strings}) if one was set using + * {@code setStrings}, otherwise returns the string from {@code defaultStringLoader}. + * + *

Also returns the string from {@code defaultStringLoader} if {@code stringId} is + * {@link DevicePolicyResources#UNDEFINED}. + * + *

Calls to this API will not return {@code null} unless no updated drawable was found + * and the call to {@code defaultStringLoader} returned {@code null}. + * + *

Callers should register for + * {@link DevicePolicyManager#ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to get notified when a + * resource has been updated. + * + *

Note that each call to this API loads the resource from the package that called + * {@code setStrings} to set the updated resource. + * + * @param stringId The IDs to get the updated resource for. + * @param defaultStringLoader To get the default string if no updated string was set for + * {@code stringId}. + */ + @Nullable + public String getString( + @NonNull String stringId, + @NonNull Supplier defaultStringLoader) { + + Objects.requireNonNull(stringId, "stringId can't be null"); + Objects.requireNonNull(defaultStringLoader, "defaultStringLoader can't be null"); + + if (stringId.equals(DevicePolicyResources.UNDEFINED)) { + return ParcelableResource.loadDefaultString(defaultStringLoader); + } + if (mService != null) { + try { + ParcelableResource resource = mService.getString(stringId); + if (resource == null) { + return ParcelableResource.loadDefaultString(defaultStringLoader); + } + return resource.getString(mContext, defaultStringLoader); + } catch (RemoteException e) { + Log.e( + TAG, + "Error getting the updated string from DevicePolicyManagerService.", + e); + return ParcelableResource.loadDefaultString(defaultStringLoader); + } + } + return ParcelableResource.loadDefaultString(defaultStringLoader); + } + + /** + * Similar to {@link #getString(String, Supplier)} but accepts {@code formatArgs} and returns a + * localized formatted string, substituting the format arguments as defined in + * {@link java.util.Formatter} and {@link java.lang.String#format}, (see + * {@link Resources#getString(int, Object...)}). + * + *

Calls to this API will not return {@code null} unless no updated drawable was found + * and the call to {@code defaultStringLoader} returned {@code null}. + * + * @param stringId The IDs to get the updated resource for. + * @param defaultStringLoader To get the default string if no updated string was set for + * {@code stringId}. + * @param formatArgs The format arguments that will be used for substitution. + */ + @Nullable + @SuppressLint("SamShouldBeLast") + public String getString( + @NonNull String stringId, + @NonNull Supplier defaultStringLoader, + @NonNull Object... formatArgs) { + + Objects.requireNonNull(stringId, "stringId can't be null"); + Objects.requireNonNull(defaultStringLoader, "defaultStringLoader can't be null"); + + if (stringId.equals(DevicePolicyResources.UNDEFINED)) { + return ParcelableResource.loadDefaultString(defaultStringLoader); + } + if (mService != null) { + try { + ParcelableResource resource = mService.getString(stringId); + if (resource == null) { + return ParcelableResource.loadDefaultString(defaultStringLoader); + } + return resource.getString(mContext, defaultStringLoader, formatArgs); + } catch (RemoteException e) { + Log.e( + TAG, + "Error getting the updated string from DevicePolicyManagerService.", + e); + return ParcelableResource.loadDefaultString(defaultStringLoader); + } + } + return ParcelableResource.loadDefaultString(defaultStringLoader); + } +} diff --git a/core/java/android/app/admin/DevicePolicyStringResource.java b/core/java/android/app/admin/DevicePolicyStringResource.java index b36f140807aa0..7e593406c87c7 100644 --- a/core/java/android/app/admin/DevicePolicyStringResource.java +++ b/core/java/android/app/admin/DevicePolicyStringResource.java @@ -28,19 +28,19 @@ import java.util.Objects; /** * Used to pass in the required information for updating an enterprise string resource using - * {@link DevicePolicyManager#setStrings}. + * {@link DevicePolicyResourcesManager#setStrings}. * * @hide */ @SystemApi public final class DevicePolicyStringResource implements Parcelable { - @NonNull private final @DevicePolicyResources.UpdatableStringId String mStringId; + @NonNull private final String mStringId; private final @StringRes int mResourceIdInCallingPackage; @NonNull private ParcelableResource mResource; /** * Creates an object containing the required information for updating an enterprise string - * resource using {@link DevicePolicyManager#setStrings}. + * resource using {@link DevicePolicyResourcesManager#setStrings}. * *

It will be used to update the string defined by {@code stringId} to the string with ID * {@code resourceIdInCallingPackage} in the calling package

@@ -54,14 +54,14 @@ public final class DevicePolicyStringResource implements Parcelable { */ public DevicePolicyStringResource( @NonNull Context context, - @NonNull @DevicePolicyResources.UpdatableStringId String stringId, + @NonNull String stringId, @StringRes int resourceIdInCallingPackage) { this(stringId, resourceIdInCallingPackage, new ParcelableResource( context, resourceIdInCallingPackage, ParcelableResource.RESOURCE_TYPE_STRING)); } private DevicePolicyStringResource( - @NonNull @DevicePolicyResources.UpdatableStringId String stringId, + @NonNull String stringId, @StringRes int resourceIdInCallingPackage, @NonNull ParcelableResource resource) { Objects.requireNonNull(stringId, "stringId must be provided."); @@ -75,7 +75,6 @@ public final class DevicePolicyStringResource implements Parcelable { /** * Returns the ID of the string to update. */ - @DevicePolicyResources.UpdatableStringId @NonNull public String getStringId() { return mStringId; diff --git a/core/java/android/app/admin/ParcelableResource.java b/core/java/android/app/admin/ParcelableResource.java index bcae2846ad423..a29766546551c 100644 --- a/core/java/android/app/admin/ParcelableResource.java +++ b/core/java/android/app/admin/ParcelableResource.java @@ -43,7 +43,8 @@ import java.util.function.Supplier; /** * Used to store the required information to load a resource that was updated using - * {@link DevicePolicyManager#setDrawables} and {@link DevicePolicyManager#setStrings}. + * {@link DevicePolicyResourcesManager#setDrawables} and + * {@link DevicePolicyResourcesManager#setStrings}. * * @hide */ diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DeviceManagementResourcesProvider.java b/services/devicepolicy/java/com/android/server/devicepolicy/DeviceManagementResourcesProvider.java index 6f0330e97482a..bf78c67d5b57a 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DeviceManagementResourcesProvider.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DeviceManagementResourcesProvider.java @@ -16,17 +16,14 @@ package com.android.server.devicepolicy; -import static android.app.admin.DevicePolicyResources.Drawables.Source.UPDATABLE_DRAWABLE_SOURCES; import static android.app.admin.DevicePolicyResources.Drawables.Style; -import static android.app.admin.DevicePolicyResources.Drawables.Style.UPDATABLE_DRAWABLE_STYLES; -import static android.app.admin.DevicePolicyResources.Drawables.UPDATABLE_DRAWABLE_IDS; -import static android.app.admin.DevicePolicyResources.Strings.UPDATABLE_STRING_IDS; import static java.util.Objects.requireNonNull; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.admin.DevicePolicyDrawableResource; +import android.app.admin.DevicePolicyResources; import android.app.admin.DevicePolicyResources.Drawables; import android.app.admin.DevicePolicyStringResource; import android.app.admin.ParcelableResource; @@ -113,7 +110,7 @@ class DeviceManagementResourcesProvider { Objects.requireNonNull(drawableSource, "drawableSource must be provided."); Objects.requireNonNull(resource, "ParcelableResource must be provided."); - if (Drawables.Source.UNDEFINED.equals(drawableSource)) { + if (DevicePolicyResources.UNDEFINED.equals(drawableSource)) { updated |= updateDrawable(drawableId, drawableStyle, resource); } else { updated |= updateDrawableForSource(drawableId, drawableSource, resource); @@ -130,12 +127,6 @@ class DeviceManagementResourcesProvider { private boolean updateDrawable( String drawableId, String drawableStyle, ParcelableResource updatableResource) { - if (!UPDATABLE_DRAWABLE_IDS.contains(drawableId)) { - Log.w(TAG, "Updating a resource for an unknown drawable id " + drawableId); - } - if (!UPDATABLE_DRAWABLE_STYLES.contains(drawableStyle)) { - Log.w(TAG, "Updating a resource for an unknown style id " + drawableStyle); - } synchronized (mLock) { if (!mUpdatedDrawablesForStyle.containsKey(drawableId)) { mUpdatedDrawablesForStyle.put(drawableId, new HashMap<>()); @@ -153,12 +144,6 @@ class DeviceManagementResourcesProvider { // TODO(b/214576716): change this to respect style private boolean updateDrawableForSource( String drawableId, String drawableSource, ParcelableResource updatableResource) { - if (!UPDATABLE_DRAWABLE_IDS.contains(drawableId)) { - Log.w(TAG, "Updating a resource for an unknown drawable id " + drawableId); - } - if (!UPDATABLE_DRAWABLE_SOURCES.contains(drawableSource)) { - Log.w(TAG, "Updating a resource for an unknown source id " + drawableSource); - } synchronized (mLock) { if (!mUpdatedDrawablesForSource.containsKey(drawableId)) { mUpdatedDrawablesForSource.put(drawableId, new HashMap<>()); @@ -195,17 +180,6 @@ class DeviceManagementResourcesProvider { @Nullable ParcelableResource getDrawable( String drawableId, String drawableStyle, String drawableSource) { - if (!UPDATABLE_DRAWABLE_IDS.contains(drawableId)) { - Log.w(TAG, "Getting an updated resource for an unknown drawable id " + drawableId); - } - if (!UPDATABLE_DRAWABLE_STYLES.contains(drawableStyle)) { - Log.w(TAG, "Getting an updated resource for an unknown drawable style " - + drawableStyle); - } - if (!UPDATABLE_DRAWABLE_SOURCES.contains(drawableSource)) { - Log.w(TAG, "Getting an updated resource for an unknown drawable Source " - + drawableSource); - } if (mUpdatedDrawablesForSource.containsKey(drawableId) && mUpdatedDrawablesForSource.get(drawableId).containsKey(drawableSource)) { return mUpdatedDrawablesForSource.get(drawableId).get(drawableSource); @@ -217,10 +191,6 @@ class DeviceManagementResourcesProvider { if (mUpdatedDrawablesForStyle.get(drawableId).containsKey(drawableStyle)) { return mUpdatedDrawablesForStyle.get(drawableId).get(drawableStyle); } - - if (mUpdatedDrawablesForStyle.get(drawableId).containsKey(Style.DEFAULT)) { - return mUpdatedDrawablesForStyle.get(drawableId).get(Style.DEFAULT); - } Log.d(TAG, "No updated drawable found for drawable id " + drawableId); return null; } @@ -249,9 +219,6 @@ class DeviceManagementResourcesProvider { } private boolean updateString(String stringId, ParcelableResource updatableResource) { - if (!UPDATABLE_STRING_IDS.contains(stringId)) { - Log.w(TAG, "Updating a resource for an unknown string id " + stringId); - } synchronized (mLock) { ParcelableResource current = mUpdatedStrings.get(stringId); if (updatableResource.equals(current)) { @@ -282,10 +249,6 @@ class DeviceManagementResourcesProvider { @Nullable ParcelableResource getString(String stringId) { - if (!UPDATABLE_STRING_IDS.contains(stringId)) { - Log.w(TAG, "Getting an updated resource for an unknown string id " + stringId); - } - if (mUpdatedStrings.containsKey(stringId)) { return mUpdatedStrings.get(stringId); } diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java index 4f6038291c913..6788f25fe8aba 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java @@ -158,6 +158,7 @@ import org.hamcrest.Description; import org.hamcrest.Matcher; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.mockito.Mockito; import org.mockito.internal.util.collections.Sets; @@ -186,6 +187,7 @@ import java.util.concurrent.TimeUnit; */ @SmallTest @Presubmit +@Ignore("b/225415867") public class DevicePolicyManagerTest extends DpmTestBase { private static final String TAG = DevicePolicyManagerTest.class.getSimpleName();