More WP chooser/resolver strings (d19254d3) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java

+9 −22

Original line number	Diff line number	Diff line
		@@ -221,33 +221,20 @@ public class ChooserMultiProfilePagerAdapter extends AbstractMultiProfilePagerAd

		@Override
		protected void showNoPersonalAppsAvailableEmptyState(ResolverListAdapter listAdapter) {
		if (mIsSendAction) {
		showEmptyState(listAdapter,
		R.drawable.ic_no_apps,
		R.string.resolver_no_personal_apps_available_share,
		R.string.resolver_no_personal_apps_available,
		/* subtitleRes */ 0);
		} else {
		showEmptyState(listAdapter,
		R.drawable.ic_no_apps,
		R.string.resolver_no_personal_apps_available_resolve,
		/* subtitleRes */ 0);
		}

		}

		@Override
		protected void showNoWorkAppsAvailableEmptyState(ResolverListAdapter listAdapter) {
		if (mIsSendAction) {
		showEmptyState(listAdapter,
		R.drawable.ic_no_apps,
		R.string.resolver_no_work_apps_available_share,
		/* subtitleRes */ 0);
		} else {
		showEmptyState(listAdapter,
		R.drawable.ic_no_apps,
		R.string.resolver_no_work_apps_available_resolve,
		R.string.resolver_no_work_apps_available,
		/* subtitleRes */ 0);
		}
		}

		void setEmptyStateBottomOffset(int bottomOffset) {
		mBottomOffset = bottomOffset;

core/java/com/android/internal/app/ResolverMultiProfilePagerAdapter.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -221,7 +221,7 @@ public class ResolverMultiProfilePagerAdapter extends AbstractMultiProfilePagerA
		protected void showNoPersonalAppsAvailableEmptyState(ResolverListAdapter listAdapter) {
		showEmptyState(listAdapter,
		R.drawable.ic_no_apps,
		R.string.resolver_no_personal_apps_available_resolve,
		R.string.resolver_no_personal_apps_available,
		/* subtitleRes */ 0);
		}

		@@ -229,7 +229,7 @@ public class ResolverMultiProfilePagerAdapter extends AbstractMultiProfilePagerA
		protected void showNoWorkAppsAvailableEmptyState(ResolverListAdapter listAdapter) {
		showEmptyState(listAdapter,
		R.drawable.ic_no_apps,
		R.string.resolver_no_work_apps_available_resolve,
		R.string.resolver_no_work_apps_available,
		/* subtitleRes */ 0);
		}

core/res/res/values/strings.xml

+5 −9

Original line number	Diff line number	Diff line
		@@ -5662,15 +5662,11 @@
		<!-- Button text. This button turns on a user's work profile so they can access their work apps and data. [CHAR LIMIT=NONE] -->
		<string name="resolver_switch_on_work">Tap to turn on</string>

		<!-- Error message. This text lets the user know that their current work apps don't support the specific content that they're trying to share. [CHAR LIMIT=NONE] -->
		<string name="resolver_no_work_apps_available_share">No work apps can support this content</string>
		<!-- Error message. This text lets the user know that their current work apps can't open this specific content. [CHAR LIMIT=NONE] -->
		<string name="resolver_no_work_apps_available_resolve">No work apps can open this content</string>

		<!-- Error message. This text lets the user know that their current personal apps don't support the specific content that they're trying to share. [CHAR LIMIT=NONE] -->
		<string name="resolver_no_personal_apps_available_share">No personal apps can support this content</string>
		<!-- Error message. This text lets the user know that their current personal apps can't open this specific content. [CHAR LIMIT=NONE] -->
		<string name="resolver_no_personal_apps_available_resolve">No personal apps can open this content</string>
		<!-- Error message. This text lets the user know that their current work apps don't support the specific content. [CHAR LIMIT=NONE] -->
		<string name="resolver_no_work_apps_available">No work apps</string>

		<!-- Error message. This text lets the user know that their current personal apps don't support the specific content. [CHAR LIMIT=NONE] -->
		<string name="resolver_no_personal_apps_available">No personal apps</string>

		<!-- Dialog title. User must choose between opening content in a cross-profile app or same-profile browser. [CHAR LIMIT=NONE] -->
		<string name="miniresolver_open_in_personal">Open in <xliff:g id="app" example="YouTube">%s</xliff:g> in personal profile?</string>

core/res/res/values/symbols.xml

+2 −4

Original line number	Diff line number	Diff line
		@@ -4102,10 +4102,8 @@
		<java-symbol type="string" name="resolver_cant_access_work_apps_explanation" />
		<java-symbol type="string" name="resolver_cant_access_personal_apps_explanation" />
		<java-symbol type="string" name="resolver_turn_on_work_apps" />
		<java-symbol type="string" name="resolver_no_work_apps_available_share" />
		<java-symbol type="string" name="resolver_no_work_apps_available_resolve" />
		<java-symbol type="string" name="resolver_no_personal_apps_available_share" />
		<java-symbol type="string" name="resolver_no_personal_apps_available_resolve" />
		<java-symbol type="string" name="resolver_no_work_apps_available" />
		<java-symbol type="string" name="resolver_no_personal_apps_available" />
		<java-symbol type="string" name="resolver_switch_on_work" />
		<java-symbol type="drawable" name="ic_work_apps_off" />
		<java-symbol type="drawable" name="ic_sharing_disabled" />

core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -1660,7 +1660,7 @@ public class ChooserActivityTest {
		onView(withText(R.string.resolver_work_tab)).perform(click());
		waitForIdle();

		onView(withText(R.string.resolver_no_work_apps_available_share))
		onView(withText(R.string.resolver_no_work_apps_available))
		.check(matches(isDisplayed()));
		}

		@@ -1711,7 +1711,7 @@ public class ChooserActivityTest {
		onView(withText(R.string.resolver_work_tab)).perform(click());
		waitForIdle();

		onView(withText(R.string.resolver_no_work_apps_available_share))
		onView(withText(R.string.resolver_no_work_apps_available))
		.check(matches(isDisplayed()));
		}

		@@ -2146,7 +2146,7 @@ public class ChooserActivityTest {
		onView(withText(R.string.resolver_work_tab)).perform(click());
		waitForIdle();

		onView(withText(R.string.resolver_no_work_apps_available_resolve))
		onView(withText(R.string.resolver_no_work_apps_available))
		.check(matches(isDisplayed()));
		}