android: isVisible, setVisible for CanvasElement + common impl.

Change-Id: I10382cf00e4e5953d1ebae1b25f72d04a644cff1

4 files changed, 32 insertions, 2 deletions

diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CanvasElement.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CanvasElement.java
index 094894b205cb..da3ff6eaaf27 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CanvasElement.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CanvasElement.java
@@ -28,5 +28,16 @@ public interface CanvasElement {
      * @param y - y coordinate of the
      */
     boolean contains(float x, float y);
+
+    /**
+     * Return if element is visible.
+     */
+    boolean isVisible();
+
+    /**
+     * Set element visibility.
+     * @param visible - is element visible
+     */
+    void setVisible(boolean visible);
 }
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CommonCanvasElement.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CommonCanvasElement.java
new file mode 100644
index 000000000000..45cbf10b0769
--- /dev/null
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CommonCanvasElement.java
@@ -0,0 +1,19 @@
+package org.libreoffice.canvas;
+
+/**
+ * Common implementation to canvas elements.
+ */
+public abstract class CommonCanvasElement implements CanvasElement {
+
+    private boolean mVisible = true;
+
+    @Override
+    public boolean isVisible() {
+        return mVisible;
+    }
+
+    @Override
+    public void setVisible(boolean visible) {
+        mVisible = visible;
+    }
+}
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java
index 2ba05f33416d..cb5f9fefd14b 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java
@@ -23,7 +23,7 @@ import static org.libreoffice.canvas.GraphicSelectionHandle.HandlePosition;
  * This class is responsible to draw and reposition the selection
  * rectangle.
  */
-public class GraphicSelection implements CanvasElement {
+public class GraphicSelection extends CommonCanvasElement {
     private final Paint mPaintStroke;
     private final Paint mPaintFill;
     public RectF mRectangle = new RectF();
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java
index 2c9f7ed23205..4eebfe9352e3 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java
@@ -19,7 +19,7 @@ import android.graphics.RectF;
  * position and perform a hit test to determine if the selection handle was
  * touched.
  */
-public class GraphicSelectionHandle implements CanvasElement {
+public class GraphicSelectionHandle extends CommonCanvasElement {
     /**
      * The factor used to inflate the hit area.
      */