diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-04-08 18:57:55 +0900 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-04-13 09:07:02 +0200 |
| commit | 3e6d192b048b4742a5cf522c1414aaa6a7ed3dee (patch) | |
| tree | 1b398317f02ad0125cb1e7dcf270946889cd688a /android | |
| parent | android: reposition the viewport to the cursor at key event (diff) | |
| download | core-3e6d192b048b4742a5cf522c1414aaa6a7ed3dee.tar.gz core-3e6d192b048b4742a5cf522c1414aaa6a7ed3dee.zip | |
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
Diffstat (limited to 'android')
| -rw-r--r-- | android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java | 1 | ||||
| -rw-r--r-- | android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ScrollbarLayer.java | 2 |
2 files changed, 1 insertions, 2 deletions
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; } |