Merge "Dismiss screenshots on escape key" into udc-dev (f304ffc9) · Commits · e / os / android_frameworks_base

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

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -289,7 +289,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;
	@@ -581,7 +581,7 @@ public class ScreenshotController {
	}		}
	}		}

	private void respondToBack() {		private void respondToKeyDismissal() {
	dismissScreenshot(SCREENSHOT_DISMISSED_OTHER);		dismissScreenshot(SCREENSHOT_DISMISSED_OTHER);
	}		}

	@@ -641,11 +641,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;