Merge remote branch 'goog/master' into merge4

Conflicts:
	java/res/values/strings.xml

Change-Id: Iee1abd3c11e07f681b9f7a280c3621a0c33ffc90

1 files changed, 9 insertions, 0 deletions

diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
index a0366c273..8f1ec6591 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
@@ -124,6 +124,11 @@ public class LatinKeyboardBaseView extends View implements PointerTracker.UIProx
         void onText(CharSequence text);
 
         /**
+         * Called when user released a finger outside any key.
+         */
+        void onCancel();
+
+        /**
          * Called when the user quickly moves the finger from right to
          * left.
          */
@@ -1005,6 +1010,10 @@ public class LatinKeyboardBaseView extends View implements PointerTracker.UIProx
                 dismissPopupKeyboard();
             }
 
+            public void onCancel() {
+                dismissPopupKeyboard();
+            }
+
             public void swipeLeft() {
             }
             public void swipeRight() {