diff --git a/go/quickstep/src/com/android/launcher3/AppSharing.java b/go/quickstep/src/com/android/launcher3/AppSharing.java index c287446744..e717937749 100644 --- a/go/quickstep/src/com/android/launcher3/AppSharing.java +++ b/go/quickstep/src/com/android/launcher3/AppSharing.java @@ -39,6 +39,7 @@ import com.android.launcher3.model.AppShareabilityManager.ShareabilityStatus; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.popup.PopupDataProvider; import com.android.launcher3.popup.SystemShortcut; +import com.android.launcher3.views.ActivityContext; import java.io.File; @@ -191,9 +192,14 @@ public final class AppSharing { } private void showCannotShareToast(Context context) { + ActivityContext activityContext = ActivityContext.lookupContext(context); + String blockedByMessage = activityContext.getStringCache() != null + ? activityContext.getStringCache().disabledByAdminMessage + : context.getString(R.string.blocked_by_policy); + CharSequence text = (mSharingEnabledForUser) ? context.getText(R.string.toast_p2p_app_not_shareable) - : context.getText(R.string.blocked_by_policy); + : blockedByMessage; int duration = Toast.LENGTH_SHORT; Toast.makeText(context, text, duration).show(); } diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java index f53491bd04..3ef1332a87 100644 --- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java +++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java @@ -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(); }