From 3e6d192b048b4742a5cf522c1414aaa6a7ed3dee Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Wed, 8 Apr 2015 18:57:55 +0900 Subject: android: hide keyboard on scrolling at a more correct location When animation happens the scrollbars appear. This hides the keyboard when the user types and the viewport is repositioned. With this change, trigger the keyboard hiding only when we really do scrolling (panning). Change-Id: I17dc651a6641e807a386d5184868412dd6710a28 --- .../src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java | 1 + .../LOAndroid3/src/java/org/mozilla/gecko/gfx/ScrollbarLayer.java | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'android/experimental') diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java index 0811c26105a1..f758681a4515 100644 --- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java +++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java @@ -418,6 +418,7 @@ public class JavaPanZoomController } else { setState(PanZoomState.PANNING); } + LibreOfficeMainActivity.mAppContext.hideSoftKeyboard(); } private float panDistance(MotionEvent move) { diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ScrollbarLayer.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ScrollbarLayer.java index 589bc7af63ac..09229d88bfcc 100644 --- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ScrollbarLayer.java +++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ScrollbarLayer.java @@ -208,8 +208,6 @@ public class ScrollbarLayer extends TileLayer { mOpacity = 1.0f; endTransaction(); - // Scrollbar is now visible, scrolling will start: hide the soft keyboard. - LibreOfficeMainActivity.mAppContext.hideSoftKeyboard(); return true; } -- cgit v1.2.3