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

Commit e399caa4 authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge "Announce saving screenshot to work profile" into tm-qpr-dev am: 6b37d717 am: e42c9e67 

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



Change-Id: I7ce5abc778d088f3ca5cd1b72b54a2f3e4a48fd0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 74be42a2 e42c9e67

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -200,6 +200,8 @@ 


    <!-- Informs the user that a screenshot is being saved. [CHAR LIMIT=50] -->

    <string name="screenshot_saving_title">Saving screenshot\u2026</string>

    <!-- Informs the user that a screenshot is being saved. [CHAR LIMIT=50] -->

    <string name="screenshot_saving_work_profile_title">Saving screenshot to work profile\u2026</string>

    <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->

    <string name="screenshot_saved_title">Screenshot saved</string>

    <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java

+9 −2
Original line number Diff line number Diff line
@@ -579,9 +579,16 @@ public class ScreenshotController { 


    private void saveScreenshot(Bitmap screenshot, Consumer<Uri> finisher, Rect screenRect,

            Insets screenInsets, ComponentName topComponent, boolean showFlash, UserHandle owner) {

        withWindowAttached(() ->

        withWindowAttached(() -> {

            if (mFlags.isEnabled(SCREENSHOT_WORK_PROFILE_POLICY)

                    && mUserManager.isManagedProfile(owner.getIdentifier())) {

                mScreenshotView.announceForAccessibility(mContext.getResources().getString(

                        R.string.screenshot_saving_work_profile_title));

            } else {

                mScreenshotView.announceForAccessibility(

                        mContext.getResources().getString(R.string.screenshot_saving_title)));

                        mContext.getResources().getString(R.string.screenshot_saving_title));

            }

        });



        mScreenshotView.reset();