Merge "Add missing enterprise string" into tm-dev am: b8e9cbcc65 am: 3a929f44ae

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18230548

Change-Id: I8a3e7971f919dc4136ed5dbd8c6d6f6dde676bd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kholoud Mohamed
2022-05-10 21:25:37 +00:00
committed by Automerger Merge Worker
2 changed files with 14 additions and 2 deletions

View File

@@ -46,6 +46,7 @@ import com.android.launcher3.popup.SystemShortcut;
import com.android.launcher3.touch.PagedOrientationHandler;
import com.android.launcher3.util.ResourceBasedOverride;
import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
import com.android.launcher3.views.ActivityContext;
import com.android.quickstep.TaskShortcutFactory.SplitSelectSystemShortcut;
import com.android.quickstep.util.RecentsOrientedState;
import com.android.quickstep.views.OverviewActionsView;
@@ -314,9 +315,14 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
}
protected void showBlockedByPolicyMessage() {
ActivityContext activityContext = ActivityContext.lookupContext(
mThumbnailView.getContext());
String message = activityContext.getStringCache() != null
? activityContext.getStringCache().disabledByAdminMessage
: mThumbnailView.getContext().getString(R.string.blocked_by_policy);
Toast.makeText(
mThumbnailView.getContext(),
R.string.blocked_by_policy,
message,
Toast.LENGTH_LONG).show();
}