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

Commit fb745d27 authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

am 001e5242: Merge change Icccbd889 into eclair 

Merge commit '001e5242' into eclair-mr2

* commit '001e5242':
  Fix broken handling of the BACK key in PopupWindow. Needed by Launcher2.
parents b1c62ebf 001e5242

core/java/android/widget/PopupWindow.java

+1 −1
Original line number Diff line number Diff line
@@ -1328,7 +1328,7 @@ public class PopupWindow { 
                    getKeyDispatcherState().startTracking(event, this);

                    return true;

                } else if (event.getAction() == KeyEvent.ACTION_UP

                        && event.isTracking() && !event.isCanceled()) {

                        && getKeyDispatcherState().isTracking(event) && !event.isCanceled()) {

                    dismiss();

                    return true;

                }