[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - android/experimental

[Miklos Vajna]

 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ScrollbarLayer.java |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 78a418ea1e37c34513887974a51d46e0d9435ff6
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Mar 13 12:13:19 2015 +0100

    android: hide soft keyboard when scrolling
    
    Change-Id: Ia840cd68d7af7a6948ad5766b56a3dc27cb8795b

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 ddd4a0a..589bc7a 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
@@ -13,8 +13,10 @@ import android.graphics.PorterDuff;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.opengl.GLES20;
+import android.util.Log;
 
 import org.libreoffice.kit.DirectBufferAllocator;
+import org.libreoffice.LibreOfficeMainActivity;
 import org.mozilla.gecko.util.FloatUtils;
 
 import java.nio.ByteBuffer;
@@ -24,6 +26,7 @@ import java.nio.FloatBuffer;
  * Draws a small rect. This is scaled to become a scrollbar.
  */
 public class ScrollbarLayer extends TileLayer {
+    private static String LOGTAG = LayerView.class.getName();
     public static final long FADE_DELAY = 500; // milliseconds before fade-out starts
     private static final float FADE_AMOUNT = 0.03f; // how much (as a percent) the scrollbar should fade per frame
 
@@ -204,6 +207,9 @@ public class ScrollbarLayer extends TileLayer {
         beginTransaction(); // called on compositor thread
         mOpacity = 1.0f;
         endTransaction();
+
+        // Scrollbar is now visible, scrolling will start: hide the soft keyboard.
+        LibreOfficeMainActivity.mAppContext.hideSoftKeyboard();
         return true;
     }
 
@@ -445,3 +451,5 @@ public class ScrollbarLayer extends TileLayer {
         return new RectF(barStart, bottom - BAR_SIZE, barEnd, bottom);
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */