diff --git a/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java b/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java
index dd837fc2194c3..922f96e96765c 100644
--- a/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java
+++ b/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java
@@ -194,12 +194,12 @@ public class ChooserMultiProfilePagerAdapter extends AbstractMultiProfilePagerAd
if (mIsSendAction) {
showEmptyState(activeListAdapter,
R.drawable.ic_sharing_disabled,
- R.string.resolver_cant_share_with_work_apps,
+ R.string.resolver_cross_profile_blocked,
R.string.resolver_cant_share_with_work_apps_explanation);
} else {
showEmptyState(activeListAdapter,
R.drawable.ic_sharing_disabled,
- R.string.resolver_cant_access_work_apps,
+ R.string.resolver_cross_profile_blocked,
R.string.resolver_cant_access_work_apps_explanation);
}
}
@@ -209,12 +209,12 @@ public class ChooserMultiProfilePagerAdapter extends AbstractMultiProfilePagerAd
if (mIsSendAction) {
showEmptyState(activeListAdapter,
R.drawable.ic_sharing_disabled,
- R.string.resolver_cant_share_with_personal_apps,
+ R.string.resolver_cross_profile_blocked,
R.string.resolver_cant_share_with_personal_apps_explanation);
} else {
showEmptyState(activeListAdapter,
R.drawable.ic_sharing_disabled,
- R.string.resolver_cant_access_personal_apps,
+ R.string.resolver_cross_profile_blocked,
R.string.resolver_cant_access_personal_apps_explanation);
}
}
diff --git a/core/java/com/android/internal/app/ResolverMultiProfilePagerAdapter.java b/core/java/com/android/internal/app/ResolverMultiProfilePagerAdapter.java
index 2464fc737a1fc..a2f014c86ec16 100644
--- a/core/java/com/android/internal/app/ResolverMultiProfilePagerAdapter.java
+++ b/core/java/com/android/internal/app/ResolverMultiProfilePagerAdapter.java
@@ -205,7 +205,7 @@ public class ResolverMultiProfilePagerAdapter extends AbstractMultiProfilePagerA
protected void showNoPersonalToWorkIntentsEmptyState(ResolverListAdapter activeListAdapter) {
showEmptyState(activeListAdapter,
R.drawable.ic_sharing_disabled,
- R.string.resolver_cant_access_work_apps,
+ R.string.resolver_cross_profile_blocked,
R.string.resolver_cant_access_work_apps_explanation);
}
@@ -213,7 +213,7 @@ public class ResolverMultiProfilePagerAdapter extends AbstractMultiProfilePagerA
protected void showNoWorkToPersonalIntentsEmptyState(ResolverListAdapter activeListAdapter) {
showEmptyState(activeListAdapter,
R.drawable.ic_sharing_disabled,
- R.string.resolver_cant_access_personal_apps,
+ R.string.resolver_cross_profile_blocked,
R.string.resolver_cant_access_personal_apps_explanation);
}
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 8a0f91d1e66ee..e2974bce694c2 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -5635,30 +5635,24 @@
Work view
-
- Can\u2019t share this with work apps
+
+ Blocked by your IT admin
- Your IT admin doesn\u2019t allow you to share this content with apps in your work profile
+ This content can\u2019t be shared with work apps
-
- Can\u2019t open this with work apps
- Your IT admin doesn\u2019t allow you to open this content with apps in your work profile
+ This content can\u2019t be opened with work apps
-
- Can\u2019t share this with personal apps
- Your IT admin doesn\u2019t allow you to share this content with apps in your personal profile
+ This content can\u2019t be shared with personal apps
-
- Can\u2019t open this with personal apps
- Your IT admin doesn\u2019t allow you to open this content with apps in your personal profile
+ This content can\u2019t be opened with personal apps
Work profile is paused
- Turn on
+ Tap to turn on
No work apps can support this content
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index c628638a051e4..01374b1870cf6 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -4095,13 +4095,10 @@
-
+
-
-
-
diff --git a/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java b/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java
index 4c58ad3d7f8d1..80d47a936e694 100644
--- a/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java
+++ b/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java
@@ -1608,14 +1608,13 @@ public class ChooserActivityTest {
onView(withId(R.id.contentPanel))
.perform(swipeUp());
- onView(withText(R.string.resolver_cant_share_with_work_apps))
+ onView(withText(R.string.resolver_cross_profile_blocked))
.check(matches(isDisplayed()));
}
@Test
public void testWorkTab_workProfileDisabled_emptyStateShown() {
// enable the work tab feature flag
- ResolverActivity.ENABLE_TABBED_VIEW = true;
markWorkProfileUserAvailable();
int workProfileTargets = 4;
List personalResolvedComponentInfos =
@@ -1627,6 +1626,7 @@ public class ChooserActivityTest {
Intent sendIntent = createSendTextIntent();
sendIntent.setType("TestType");
+ ResolverActivity.ENABLE_TABBED_VIEW = true;
final ChooserWrapperActivity activity =
mActivityRule.launchActivity(Intent.createChooser(sendIntent, "work tab test"));
waitForIdle();
@@ -1686,7 +1686,7 @@ public class ChooserActivityTest {
onView(withText(R.string.resolver_work_tab)).perform(click());
waitForIdle();
- onView(withText(R.string.resolver_cant_share_with_work_apps))
+ onView(withText(R.string.resolver_cross_profile_blocked))
.check(matches(isDisplayed()));
}
@@ -2116,7 +2116,7 @@ public class ChooserActivityTest {
onView(withId(R.id.contentPanel))
.perform(swipeUp());
- onView(withText(R.string.resolver_cant_access_work_apps))
+ onView(withText(R.string.resolver_cross_profile_blocked))
.check(matches(isDisplayed()));
}
diff --git a/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java b/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java
index 7dc5a8b58f914..68287caa8bbd2 100644
--- a/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java
+++ b/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java
@@ -650,7 +650,7 @@ public class ResolverActivityTest {
onView(withId(R.id.contentPanel))
.perform(swipeUp());
- onView(withText(R.string.resolver_cant_access_work_apps))
+ onView(withText(R.string.resolver_cross_profile_blocked))
.check(matches(isDisplayed()));
}
@@ -726,7 +726,7 @@ public class ResolverActivityTest {
onView(withText(R.string.resolver_work_tab)).perform(click());
waitForIdle();
- onView(withText(R.string.resolver_cant_access_work_apps))
+ onView(withText(R.string.resolver_cross_profile_blocked))
.check(matches(isDisplayed()));
}