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

Commit 500500ef authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Animate out screenshot UI on back and CLOSE_SYSTEM_DIALOGS" into... 

Merge "Animate out screenshot UI on back and CLOSE_SYSTEM_DIALOGS" into rvc-qpr-dev am: 764e7ac5 am: ff2da0d0

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

Change-Id: I6729b61abeafc4ae5b8497b43ec9089dbee26a25
parents bbdd9828 ff2da0d0

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

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset 
        });

        mScreenshotLayout.setOnKeyListener((v, keyCode, event) -> {

            if (keyCode == KeyEvent.KEYCODE_BACK) {

                dismissScreenshot("back pressed", true);

                dismissScreenshot("back pressed", false);

                return true;

            }

            return false;

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

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public class TakeScreenshotService extends Service { 
        @Override

        public void onReceive(Context context, Intent intent) {

            if (ACTION_CLOSE_SYSTEM_DIALOGS.equals(intent.getAction()) && mScreenshot != null) {

                mScreenshot.dismissScreenshot("close system dialogs", true);

                mScreenshot.dismissScreenshot("close system dialogs", false);

            }

        }

    };