Kaydet (Commit) bd065f5a authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl Kaydeden (comit) Miklos Vajna

android: Add key events in TileProvider & pass key events to LOK

Change-Id: Id0a93f1c4199082b3c67802955082d04831ec124
üst 89d41753
...@@ -147,6 +147,9 @@ public class LOKitThread extends Thread implements TileProvider.TileInvalidation ...@@ -147,6 +147,9 @@ public class LOKitThread extends Thread implements TileProvider.TileInvalidation
case LOEvent.TOUCH: case LOEvent.TOUCH:
touch(event.mTouchType, event.mMotionEvent); touch(event.mTouchType, event.mMotionEvent);
break; break;
case LOEvent.KEY_PRESS:
mTileProvider.keyPress(event.mKeyEvent);
break;
} }
} }
......
...@@ -3,6 +3,7 @@ package org.libreoffice; ...@@ -3,6 +3,7 @@ package org.libreoffice;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.RectF; import android.graphics.RectF;
import android.util.Log; import android.util.Log;
import android.view.KeyEvent;
import org.libreoffice.kit.DirectBufferAllocator; import org.libreoffice.kit.DirectBufferAllocator;
import org.libreoffice.kit.Document; import org.libreoffice.kit.Document;
...@@ -272,6 +273,11 @@ public class LOKitTileProvider implements TileProvider, Document.MessageCallback ...@@ -272,6 +273,11 @@ public class LOKitTileProvider implements TileProvider, Document.MessageCallback
this.tileInvalidationCallback = tileInvalidationCallback; this.tileInvalidationCallback = tileInvalidationCallback;
} }
@Override
public void keyPress(KeyEvent keyEvent) {
mOffice.postKeyEvent(Office.KEY_PRESS, keyEvent.getKeyCode());
}
@Override @Override
protected void finalize() throws Throwable { protected void finalize() throws Throwable {
......
package org.libreoffice; package org.libreoffice;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.view.KeyEvent;
import org.mozilla.gecko.gfx.BufferedCairoImage; import org.mozilla.gecko.gfx.BufferedCairoImage;
import org.mozilla.gecko.gfx.CairoImage; import org.mozilla.gecko.gfx.CairoImage;
...@@ -86,6 +87,10 @@ public class MockTileProvider implements TileProvider { ...@@ -86,6 +87,10 @@ public class MockTileProvider implements TileProvider {
public void registerInvalidationCallback(TileInvalidationCallback tileInvalidationCallback) { public void registerInvalidationCallback(TileInvalidationCallback tileInvalidationCallback) {
} }
@Override
public void keyPress(KeyEvent keyEvent) {
}
@Override @Override
public void changePart(int partIndex) { public void changePart(int partIndex) {
} }
......
...@@ -3,6 +3,7 @@ package org.libreoffice; ...@@ -3,6 +3,7 @@ package org.libreoffice;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.RectF; import android.graphics.RectF;
import android.view.KeyEvent;
import org.mozilla.gecko.gfx.CairoImage; import org.mozilla.gecko.gfx.CairoImage;
import org.mozilla.gecko.gfx.IntSize; import org.mozilla.gecko.gfx.IntSize;
...@@ -33,6 +34,8 @@ public interface TileProvider { ...@@ -33,6 +34,8 @@ public interface TileProvider {
void registerInvalidationCallback(TileProvider.TileInvalidationCallback tileInvalidationCallback); void registerInvalidationCallback(TileProvider.TileInvalidationCallback tileInvalidationCallback);
void keyPress(KeyEvent keyEvent);
/** /**
* Callback to retrieve invalidation calls * Callback to retrieve invalidation calls
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment