summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorSiqi Liu <me@siqi.fr>2015-03-05 14:26:03 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-03-09 10:16:15 +0100
commit907fdbfcd2563ee2791a50f3a96c4a03a11adb06 (patch)
tree00b1bfb4d815fc1a07bb1d953c4e7063316fbea0 /android
parent2ee313fa8bf33cb197b3e030440fc82808e4f533 (diff)
add getPartsCount() to TileProvider
Change-Id: I8f1f61110d06333bc1140caf13d9e96e669fc231
Diffstat (limited to 'android')
-rw-r--r--android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java17
-rw-r--r--android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java5
-rw-r--r--android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java5
3 files changed, 21 insertions, 6 deletions
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index f9fe8c37e783..0ef12c629251 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -10,6 +10,7 @@ import org.libreoffice.kit.DirectBufferAllocator;
import org.libreoffice.kit.Document;
import org.libreoffice.kit.LibreOfficeKit;
import org.libreoffice.kit.Office;
+import org.libreoffice.R;
import org.mozilla.gecko.TextSelection;
import org.mozilla.gecko.TextSelectionHandle;
@@ -19,6 +20,7 @@ import org.mozilla.gecko.gfx.GeckoLayerClient;
import org.mozilla.gecko.gfx.IntSize;
import org.mozilla.gecko.gfx.LayerView;
+
import java.nio.ByteBuffer;
/**
@@ -147,19 +149,22 @@ public class LOKitTileProvider implements TileProvider, Document.MessageCallback
}
@Override
+ public int getPartsCount() {
+ return mDocument.getParts();
+ }
+
+ @Override
public void onSwipeLeft() {
- Log.d(LOGTAG, "onSwipeLeft received");
- if (mDocument.getDocumentType() == Document.DOCTYPE_PRESENTATION
- && getCurrentPartNumber() < mDocument.getParts()-1) {
+ if (mDocument.getDocumentType() == Document.DOCTYPE_PRESENTATION &&
+ getCurrentPartNumber() < getPartsCount()-1) {
LOKitShell.sendChangePartEvent(getCurrentPartNumber()+1);
}
}
@Override
public void onSwipeRight() {
- Log.d(LOGTAG, "onSwipeRight received");
- if (mDocument.getDocumentType() == Document.DOCTYPE_PRESENTATION
- && getCurrentPartNumber() > 0) {
+ if (mDocument.getDocumentType() == Document.DOCTYPE_PRESENTATION &&
+ getCurrentPartNumber() > 0) {
LOKitShell.sendChangePartEvent(getCurrentPartNumber()-1);
}
}
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
index 09e12ef955ee..8c3403834990 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
@@ -129,6 +129,11 @@ public class MockTileProvider implements TileProvider {
}
@Override
+ public int getPartsCount() {
+ return 0;
+ }
+
+ @Override
public void onSwipeLeft() {
}
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java
index 7fb51d252800..29e64a8fc59a 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java
@@ -43,6 +43,11 @@ public interface TileProvider {
*/
int getCurrentPartNumber();
+ /**
+ * Get the total number of parts.
+ */
+ int getPartsCount();
+
Bitmap thumbnail(int size);
/**