commit f1f8bfb76448496ce5056f101d1d40a35167a964
author Yigit Boyar <yboyar@google.com> Wed Mar 16 20:27:20 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 16 20:27:21 2016 +0000
tree d8c156223e5a59e4a15565513b30d4a0f89a5c87
parent 7f245435c5e5e1a30d3b9a24400daec659e6c58e
parent 759f9fed70adf0f6e955b0ecca5b21ab5a42ac0d

Merge "DO NOT MERGE Fix conditional when checking for confirm key." into nyc-dev

core/java/android/widget/GridView.java

diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java
index 1321221..6d7313d 100644
--- a/core/java/android/widget/GridView.java
+++ b/core/java/android/widget/GridView.java
@@ -1644,7 +1644,7 @@
         boolean handled = false;
         int action = event.getAction();
         if (KeyEvent.isConfirmKey(keyCode)
-                && event.hasNoModifiers() && action == KeyEvent.ACTION_UP) {
+                && event.hasNoModifiers() && action != KeyEvent.ACTION_UP) {
             handled = resurrectSelectionIfNeeded();
             if (!handled && event.getRepeatCount() == 0 && getChildCount() > 0) {
                 keyPressed();