Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f4ca44c authored by Alison Cichowlas's avatar Alison Cichowlas Committed by Automerger Merge Worker
Browse files

Merge "Update strings - chooser/resolver WP strings." into sc-dev am: edfb697d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13973973

Change-Id: Icecd0e9a90de20a62307c4cccfd46c516c06dbca
parents 078c6c3a edfb697d

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

+4 −4
Original line number Diff line number Diff line
@@ -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);

        }

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -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);

    }

core/res/res/values/strings.xml

+7 −13
Original line number Diff line number Diff line
@@ -5635,30 +5635,24 @@ 
    <!-- Accessibility label for the work tab button. [CHAR LIMIT=NONE] -->

    <string name="resolver_work_tab_accessibility">Work view</string>



    <!-- Title of a screen. This text lets the user know that their IT admin doesn't allow them to share this specific content with work apps. [CHAR LIMIT=NONE] -->

    <string name="resolver_cant_share_with_work_apps">Can\u2019t share this with work apps</string>

    <!-- Title of a screen. This text lets the user know that their IT admin doesn't allow them to share this content across profiles. [CHAR LIMIT=NONE] -->

    <string name="resolver_cross_profile_blocked">Blocked by your IT admin</string>

    <!-- Error message. This text is explaining that the user's IT admin doesn't allow this specific content to be shared with apps in the work profile. [CHAR LIMIT=NONE] -->

    <string name="resolver_cant_share_with_work_apps_explanation">Your IT admin doesn\u2019t allow you to share this content with apps in your work profile</string>

    <string name="resolver_cant_share_with_work_apps_explanation">This content can\u2019t be shared with work apps</string>



    <!-- Title of an error screen. This error message lets the user know that their IT admin doesn't allow them to open this specific content with a work app. [CHAR LIMIT=NONE] -->

    <string name="resolver_cant_access_work_apps">Can\u2019t open this with work apps</string>

    <!-- Error message. This message lets the user know that their IT admin doesn't allow them to open this specific content with an app in their work profile. [CHAR LIMIT=NONE] -->

    <string name="resolver_cant_access_work_apps_explanation">Your IT admin doesn\u2019t allow you to open this content with apps in your work profile</string>

    <string name="resolver_cant_access_work_apps_explanation">This content can\u2019t be opened with work apps</string>



    <!-- Title of a screen. This text lets the user know that their IT admin doesn't allow them to share this specific content with personal apps. [CHAR LIMIT=NONE] -->

    <string name="resolver_cant_share_with_personal_apps">Can\u2019t share this with personal apps</string>

    <!-- Error message. This text is explaining that the user's IT admin doesn't allow them to share this specific content with apps in their personal profile. [CHAR LIMIT=NONE] -->

    <string name="resolver_cant_share_with_personal_apps_explanation">Your IT admin doesn\u2019t allow you to share this content with apps in your personal profile</string>

    <string name="resolver_cant_share_with_personal_apps_explanation">This content can\u2019t be shared with personal apps</string>



    <!-- Title of an error screen. This error message lets the user know that their IT admin doesn't allow them to open this specific content with a personal app. [CHAR LIMIT=NONE] -->

    <string name="resolver_cant_access_personal_apps">Can\u2019t open this with personal apps</string>

    <!-- Error message. This message lets the user know that their IT admin doesn't allow them to open this specific content with an app in their personal profile. [CHAR LIMIT=NONE] -->

    <string name="resolver_cant_access_personal_apps_explanation">Your IT admin doesn\u2019t allow you to open this content with apps in your personal profile</string>

    <string name="resolver_cant_access_personal_apps_explanation">This content can\u2019t be opened with personal apps</string>



    <!-- Error message. This text lets the user know that they need to turn on work apps in order to share or open content. There's also a button a user can tap to turn on the apps. [CHAR LIMIT=NONE] -->

    <string name="resolver_turn_on_work_apps">Work profile is paused</string>

    <!-- 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">Turn on</string>

    <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>

core/res/res/values/symbols.xml

+1 −4
Original line number Diff line number Diff line
@@ -4095,13 +4095,10 @@ 
  <java-symbol type="id" name="resolver_empty_state_container" />

  <java-symbol type="id" name="button_bar_container" />

  <java-symbol type="id" name="title_container" />

  <java-symbol type="string" name="resolver_cant_share_with_work_apps" />

  <java-symbol type="string" name="resolver_cross_profile_blocked" />

  <java-symbol type="string" name="resolver_cant_share_with_work_apps_explanation" />

  <java-symbol type="string" name="resolver_cant_share_with_personal_apps" />

  <java-symbol type="string" name="resolver_cant_share_with_personal_apps_explanation" />

  <java-symbol type="string" name="resolver_cant_access_work_apps" />

  <java-symbol type="string" name="resolver_cant_access_work_apps_explanation" />

  <java-symbol type="string" name="resolver_cant_access_personal_apps" />

  <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" />

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

+4 −4
Original line number Diff line number Diff line
@@ -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<ResolvedComponentInfo> 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()));

    }