[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - android/experimental
Tomaž Vajngerl
tomaz.vajngerl at collabora.co.uk
Mon Feb 16 19:40:02 PST 2015
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java | 1
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/TextSelection.java | 6 +---
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/TextSelectionHandle.java | 13 ++++------
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ZoomConstraints.java | 3 --
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java | 1
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FloatSize.java | 3 --
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java | 5 ---
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/InputConnectionHandler.java | 2 -
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java | 5 ---
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java | 1
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java | 3 --
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/util/FloatUtils.java | 2 -
12 files changed, 11 insertions(+), 34 deletions(-)
New commits:
commit fab9a76f044e7f2bbaebd7d83ff008baf2129a42
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Tue Feb 17 12:39:09 2015 +0900
android: organise imports
Change-Id: I4ba05594215564ee06c0bf9b8dff47f46e6bf451
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index 0ea2829..b76a684 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -7,7 +7,6 @@ import android.util.Log;
import android.view.KeyEvent;
import android.view.MotionEvent;
-import org.mozilla.gecko.gfx.BufferedCairoImage;
import org.mozilla.gecko.gfx.CairoImage;
import org.mozilla.gecko.gfx.ComposedTileLayer;
import org.mozilla.gecko.gfx.GeckoLayerClient;
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/TextSelection.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/TextSelection.java
index 2ae1539..2f05e4f 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/TextSelection.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/TextSelection.java
@@ -9,16 +9,14 @@ import android.graphics.RectF;
import android.util.Log;
import android.view.View;
-import org.json.JSONArray;
-import org.json.JSONObject;
import org.libreoffice.LOKitShell;
-import org.libreoffice.LibreOfficeMainActivity;
import org.libreoffice.R;
import org.mozilla.gecko.gfx.Layer;
import org.mozilla.gecko.gfx.LayerView;
import org.mozilla.gecko.util.FloatUtils;
-import static org.mozilla.gecko.TextSelectionHandle.HandleType.*;
+import static org.mozilla.gecko.TextSelectionHandle.HandleType.MIDDLE;
+import static org.mozilla.gecko.TextSelectionHandle.HandleType.START;
public class TextSelection extends Layer {
private static final String LOGTAG = "GeckoTextSelection";
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/TextSelectionHandle.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/TextSelectionHandle.java
index 6f85db9..6b07a3f 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/TextSelectionHandle.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/TextSelectionHandle.java
@@ -4,13 +4,6 @@
package org.mozilla.gecko;
-import org.libreoffice.LOKitShell;
-import org.libreoffice.R;
-import org.mozilla.gecko.gfx.ImmutableViewportMetrics;
-import org.mozilla.gecko.gfx.LayerView;
-
-import org.json.JSONObject;
-
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.PointF;
@@ -21,6 +14,12 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.RelativeLayout;
+import org.json.JSONObject;
+import org.libreoffice.LOKitShell;
+import org.libreoffice.R;
+import org.mozilla.gecko.gfx.ImmutableViewportMetrics;
+import org.mozilla.gecko.gfx.LayerView;
+
public class TextSelectionHandle extends ImageView implements View.OnTouchListener {
private static final String LOGTAG = TextSelectionHandle.class.getSimpleName();
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ZoomConstraints.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ZoomConstraints.java
index 4ac49f7..eba0dfe 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ZoomConstraints.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ZoomConstraints.java
@@ -5,9 +5,6 @@
package org.mozilla.gecko;
-import org.json.JSONException;
-import org.json.JSONObject;
-
public final class ZoomConstraints {
private final boolean mAllowZoom;
private final boolean mAllowDoubleTapZoom;
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java
index ab9a637..f622c44 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java
@@ -6,6 +6,7 @@
package org.mozilla.gecko.gfx;
import android.graphics.RectF;
+
import org.mozilla.gecko.util.FloatUtils;
/*
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FloatSize.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FloatSize.java
index dd9c1b3..7b18373 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FloatSize.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FloatSize.java
@@ -5,10 +5,9 @@
package org.mozilla.gecko.gfx;
-import org.mozilla.gecko.util.FloatUtils;
-
import org.json.JSONException;
import org.json.JSONObject;
+import org.mozilla.gecko.util.FloatUtils;
public class FloatSize {
public final float width, height;
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
index 35f0b20..98f3221 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
@@ -6,17 +6,12 @@
package org.mozilla.gecko.gfx;
import android.content.Context;
-import android.graphics.Color;
import android.graphics.PointF;
import android.graphics.RectF;
import android.util.DisplayMetrics;
-import android.util.Log;
-import org.libreoffice.LOEvent;
import org.libreoffice.LOKitShell;
-import org.libreoffice.LOKitThread;
import org.mozilla.gecko.ZoomConstraints;
-import org.mozilla.gecko.util.FloatUtils;
import java.util.List;
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/InputConnectionHandler.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/InputConnectionHandler.java
index 6fef53f..d460c19 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/InputConnectionHandler.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/InputConnectionHandler.java
@@ -1,8 +1,8 @@
package org.mozilla.gecko.gfx;
+import android.view.KeyEvent;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputConnection;
-import android.view.KeyEvent;
public interface InputConnectionHandler
{
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java
index e924bcf..b1aea36 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java
@@ -5,15 +5,10 @@
package org.mozilla.gecko.gfx;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.Point;
import android.graphics.Rect;
import android.graphics.RectF;
-import android.graphics.Region;
-import android.graphics.RegionIterator;
import android.opengl.GLES20;
import android.opengl.GLSurfaceView;
import android.os.SystemClock;
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java
index 76b8d27..1d901a0 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java
@@ -10,7 +10,6 @@ import android.util.Log;
import android.view.MotionEvent;
import org.json.JSONException;
-import org.mozilla.gecko.gfx.PointUtils;
import java.util.LinkedList;
import java.util.ListIterator;
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java
index 4ac5146..1c227de 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java
@@ -6,15 +6,12 @@
package org.mozilla.gecko.gfx;
import android.content.Context;
-import android.os.Build;
import android.os.SystemClock;
import android.util.Log;
import android.view.GestureDetector;
import android.view.MotionEvent;
import android.view.View;
-import org.mozilla.gecko.OnInterceptTouchListener;
-
import java.util.LinkedList;
import java.util.Queue;
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/util/FloatUtils.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/util/FloatUtils.java
index b4bb249..a48266c 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/util/FloatUtils.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/util/FloatUtils.java
@@ -7,8 +7,6 @@ package org.mozilla.gecko.util;
import android.graphics.PointF;
-import java.lang.IllegalArgumentException;
-
public final class FloatUtils {
private FloatUtils() {}
More information about the Libreoffice-commits
mailing list