summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2015-02-26 19:36:54 +0900
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-03-02 08:51:00 +0100
commit6c972d2f48786102791bcc62317eaa4b6a9e4451 (patch)
treed870c68a78c7fdd2ff1e591ac7385512cade160a /android
parentb99fe5ebc4c06dfbaf6714ea13ce690fa01988f8 (diff)
android: if in selection state, reset selection on single tap
Change-Id: I8ae76ee4898087998b88ac2e1d73b3843fc00559
Diffstat (limited to 'android')
-rw-r--r--android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java4
-rw-r--r--android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java3
2 files changed, 7 insertions, 0 deletions
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
index 9e328d6f1d96..630ffffda766 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
@@ -52,6 +52,10 @@ public class InvalidationHandler {
}
}
+ public OverlayState getOverlayState() {
+ return mState;
+ }
+
public void setOverlayState(OverlayState state) {
this.mState = state;
}
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index 39a200c5a7ad..334cd442ea0a 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -255,6 +255,9 @@ public class LOKitThread extends Thread {
mInvalidationHandler.setOverlayState(InvalidationHandler.OverlayState.CURSOR);
mTileProvider.mouseButtonDown(documentCoordinate, 1);
mTileProvider.mouseButtonUp(documentCoordinate, 1);
+ if (mInvalidationHandler.getOverlayState() == InvalidationHandler.OverlayState.SELECTION) {
+ mTileProvider.setTextSelectionReset();
+ }
}
}