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

[Tomaž Vajngerl]

 android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java     |    2 --
 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java |   10 ++++++++++
 desktop/source/lib/lokandroid.cxx                                             |    4 ++++
 3 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit d0bf9ca2fbf33d2ab881c8c65f4f3e59cc17c052
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Tue Jan 13 17:28:13 2015 +0900

    android: add method to force showing of soft keyboard
    
    Change-Id: Iadf2ed580b75b2b1fcb0067617a2d79ca707d54a

diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
index b59bba8..0d2b067 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
@@ -24,6 +24,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.FrameLayout;
 
 import org.libreoffice.LibreOfficeMainActivity;
@@ -350,6 +351,15 @@ public class LayerView extends FrameLayout {
         }
     }
 
+    public void showSoftKeyboard() {
+        View view = mSurfaceView != null ? mSurfaceView : mTextureView;
+
+        if (view.requestFocus()) {
+            InputMethodManager inputMethodManager = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+            inputMethodManager.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
+        }
+    }
+
     private class SurfaceTextureListener implements TextureView.SurfaceTextureListener {
         public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
             // We don't do this for surfaceCreated above because it is always followed by a surfaceChanged,
commit 5eb7a15bef7d32678389a07d58a3bf9b68d514ce
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Tue Jan 13 17:27:20 2015 +0900

    android: remove unneeded comment & clean whitespace
    
    Change-Id: I55514bf47683bb0e7823892a3afd3dd23dc13e2f

diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index 4063a84..7459580 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -41,7 +41,6 @@ public class LOKitThread extends Thread implements TileProvider.TileInvalidation
 
     private void tileRerender(ComposedTileLayer composedTileLayer, SubTile tile) {
         if (composedTileLayer.isStillValid(tile.id) && !tile.markedForRemoval) {
-            Log.i(LOGTAG, "Redrawing tile " + tile.id);
             mLayerClient.beginDrawing();
             mTileProvider.rerenderTile(tile.getImage(), tile.id.x, tile.id.y, tile.id.size, tile.id.zoom);
             tile.invalidate();
@@ -50,7 +49,6 @@ public class LOKitThread extends Thread implements TileProvider.TileInvalidation
         }
     }
 
-
     /** Handle the geometry change + draw. */
     private void redraw() {
         if (mLayerClient == null || mTileProvider == null) {
commit cf9e6292585410885f67dc8b46445420d67edbad
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Tue Jan 13 17:21:06 2015 +0900

    jni: if documentLoad returns NULL don't call NewDirectByteBuffer
    
    Change-Id: I847a7b90c0f85bb59869ecaca037145221e16e7f

diff --git a/desktop/source/lib/lokandroid.cxx b/desktop/source/lib/lokandroid.cxx
index 773cba5..cd3f6b5 100644
--- a/desktop/source/lib/lokandroid.cxx
+++ b/desktop/source/lib/lokandroid.cxx
@@ -138,6 +138,10 @@ extern "C" SAL_JNI_EXPORT jobject JNICALL Java_org_libreoffice_kit_Office_docume
     LibreOfficeKit* pLibreOfficeKit = getHandle<LibreOfficeKit>(pEnv, aObject);
 
     LibreOfficeKitDocument* pDocument = pLibreOfficeKit->pClass->documentLoad(pLibreOfficeKit, aCloneDocumentPath);
+
+    if (pDocument == NULL)
+        return NULL;
+
     jobject aHandle = pEnv->NewDirectByteBuffer((void*) pDocument, sizeof(LibreOfficeKitDocument));
 
     return aHandle;