Merge remote-tracking branch 'origin/cm-14.1' into v1-nougat (b6c2ea94) · Commits · e / os / android_frameworks_base

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

+12 −10

Original line number	Diff line number	Diff line
		@@ -642,8 +642,7 @@ class GlobalScreenshot {
		view.setVisibility(View.GONE);
		mWindowManager.removeView(mScreenshotSelectorLayout);
		final Rect rect = view.getSelectionRect();
		if (rect != null) {
		if (rect.width() != 0 && rect.height() != 0) {
		if (rect != null && rect.width() != 0 && rect.height() != 0) {
		// Need mScreenshotSelectorLayout to handle it after the view disappears
		mScreenshotSelectorLayout.post(new Runnable() {
		public void run() {
		@@ -651,7 +650,10 @@ class GlobalScreenshot {
		rect.left, rect.top, rect.width(), rect.height());
		}
		});
		}
		} else {
		// Clean up if nothing is selected
		// to initialize a new screenshot later
		finisher.run();
		}

		view.stopSelection();