Fix bug 2185026 - back button in context menu now calls onContextMenuClosed() (6024ca5c) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/view/menu/MenuDialogHelper.java

+13 −5

Original line number	Diff line number	Diff line
		@@ -101,13 +101,21 @@ public class MenuDialogHelper implements DialogInterface.OnKeyListener, DialogIn
		}
		}
		}
		} else if (event.getAction() == KeyEvent.ACTION_UP
		&& event.isTracking() && !event.isCanceled()) {
		} else if (event.getAction() == KeyEvent.ACTION_UP && !event.isCanceled()) {
		Window win = mDialog.getWindow();
		if (win != null) {
		View decor = win.getDecorView();
		if (decor != null) {
		KeyEvent.DispatcherState ds = decor.getKeyDispatcherState();
		if (ds != null && ds.isTracking(event)) {
		mMenu.close(true);
		dialog.dismiss();
		return true;
		}
		}
		}
		}
		}

		// Menu shortcut matching
		return mMenu.performShortcut(keyCode, event, 0);