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

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

Merge "Dismiss screenshots on escape key" into udc-dev am: f304ffc9 

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



Change-Id: I8e8fc6102eb2a5dcd15f7e7833a09ad785c73f48
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e26ee459 f304ffc9

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

+5 −5
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ public class ScreenshotController { 
        if (DEBUG_INPUT) {

            Log.d(TAG, "Predictive Back callback dispatched");

        }

        respondToBack();

        respondToKeyDismissal();

    };



    private ScreenshotView mScreenshotView;
@@ -581,7 +581,7 @@ public class ScreenshotController { 
        }

    }



    private void respondToBack() {

    private void respondToKeyDismissal() {

        dismissScreenshot(SCREENSHOT_DISMISSED_OTHER);

    }
@@ -641,11 +641,11 @@ public class ScreenshotController { 
        mScreenshotView.setDefaultTimeoutMillis(mScreenshotHandler.getDefaultTimeoutMillis());



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

            if (keyCode == KeyEvent.KEYCODE_BACK) {

            if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_ESCAPE) {

                if (DEBUG_INPUT) {

                    Log.d(TAG, "onKeyEvent: KeyEvent.KEYCODE_BACK");

                    Log.d(TAG, "onKeyEvent: " + keyCode);

                }

                respondToBack();

                respondToKeyDismissal();

                return true;

            }

            return false;