LOAndroid3: cleanup & remove obsolete code - LOEvent / LOKitShell

Change-Id: Ia41effca9aa54076290f105a9412bee9e388007d

2 files changed, 4 insertions, 41 deletions

diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
index bf4f98b845da..2814730db095 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
@@ -1,7 +1,6 @@
 package org.libreoffice;
 
 import android.graphics.Rect;
-import android.util.Log;
 
 import org.mozilla.gecko.gfx.IntSize;
 import org.mozilla.gecko.gfx.ViewportMetrics;
@@ -20,9 +19,9 @@ public class LOEvent {
 
     ViewportMetrics viewportMetrics;
 
-    public LOEvent(int type, int width, int height, int widthPixels, int heightPixels, int tileWidth, int tileHeight) {
+    public LOEvent(int type, int widthPixels, int heightPixels, int tileWidth, int tileHeight) {
         mType = type;
-        mTypeString = "Size Changed";
+        mTypeString = "Size Changed: " + widthPixels + " "+ heightPixels;
     }
 
     public LOEvent(int type, IntSize tileSize) {
@@ -45,8 +44,8 @@ public class LOEvent {
         return new LOEvent(DRAW, rect);
     }
 
-    public static LOEvent sizeChanged(int width, int height, int widthPixels, int heightPixels, int tileWidth, int tileHeight) {
-        return new LOEvent(SIZE_CHANGED, width, height, widthPixels, heightPixels, tileWidth, tileHeight);
+    public static LOEvent sizeChanged(int widthPixels, int heightPixels, int tileWidth, int tileHeight) {
+        return new LOEvent(SIZE_CHANGED, widthPixels, heightPixels, tileWidth, tileHeight);
     }
 
     public static LOEvent tileSize(IntSize tileSize) {
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
index e9781ffa4035..4ceeddc99275 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
@@ -2,7 +2,6 @@ package org.libreoffice;
 
 
 import android.util.DisplayMetrics;
-import android.util.Log;
 
 public class LOKitShell {
     private static final String LOGTAG = LOKitShell.class.getSimpleName();
@@ -21,41 +20,6 @@ public class LOKitShell {
         }
     }
 
-    public static void runGecko(String apkPath, String args, String url, boolean restoreSession) {
-        // run gecko -- it will spawn its own thread
-        // GeckoAppShell.nativeInit();
-
-        Log.i(LOGTAG, "post native init");
-
-        // Tell Gecko where the target byte buffer is for rendering
-        //GeckoAppShell.setSoftwareLayerClient(GeckoApp.mAppContext.getSoftwareLayerClient());
-
-        Log.i(LOGTAG, "setSoftwareLayerClient called");
-
-        // First argument is the .apk path
-        String combinedArgs = apkPath + " -greomni " + apkPath;
-        if (args != null)
-            combinedArgs += " " + args;
-        if (url != null)
-            combinedArgs += " -remote " + url;
-        if (restoreSession)
-            combinedArgs += " -restoresession";
-
-        DisplayMetrics metrics = new DisplayMetrics();
-        LibreOfficeMainActivity.mAppContext.getWindowManager().getDefaultDisplay().getMetrics(metrics);
-        combinedArgs += " -width " + metrics.widthPixels + " -height " + metrics.heightPixels;
-
-        LibreOfficeMainActivity.mAppContext.runOnUiThread(new Runnable() {
-            public void run() {
-                geckoLoaded();
-            }
-        });
-    }
-
-    // Called on the UI thread after Gecko loads.
-    private static void geckoLoaded() {
-    }
-
     public static void viewSizeChanged() {
     }