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

Commit 2dfaafff authored by Miranda Kephart's avatar Miranda Kephart
Browse files

Dismiss screenshots on escape key 

Same handling as when the back key is pressed.

Bug: 276488325
Fix: 276488325
Test: adb shell input keyevent 111
Change-Id: Ib50480b2eb5d32600cad697e25f362585c2b97d1
parent d64b9588

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

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

        if (DEBUG_INPUT) {

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

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

        }

        }

        respondToBack();

        respondToKeyDismissal();

    };

    };





    private ScreenshotView mScreenshotView;

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

        }

    }

    }





    private void respondToBack() {

    private void respondToKeyDismissal() {

        dismissScreenshot(SCREENSHOT_DISMISSED_OTHER);

        dismissScreenshot(SCREENSHOT_DISMISSED_OTHER);

    }

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

        mScreenshotView.setDefaultTimeoutMillis(mScreenshotHandler.getDefaultTimeoutMillis());





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

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

            if (keyCode == KeyEvent.KEYCODE_BACK) {

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

                if (DEBUG_INPUT) {

                if (DEBUG_INPUT) {

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

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

                }

                }

                respondToBack();

                respondToKeyDismissal();

                return true;

                return true;

            }

            }

            return false;

            return false;