summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.com>2014-07-08 16:49:56 +0200
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2014-07-10 11:17:55 +0200
commit019cf5e8f900f6ff35183e37d9a139aea2d54c85 (patch)
tree3c4e36093033e1be656f57959b175e4b8e32d10c
parentdd1fbacd25e7f871fd415d4139ecde97f65dacfa (diff)
LOAndroid3: Expose LOKitThread in MainActivity
Change-Id: I7919e2469e1db87af6d2e0fbb3a476f4ca86d4d7
-rw-r--r--android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java11
1 files changed, 4 insertions, 7 deletions
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 0f12208d885e..1d267d938e85 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -7,14 +7,11 @@ import android.util.DisplayMetrics;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.View;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import org.mozilla.gecko.gfx.GeckoSoftwareLayerClient;
import org.mozilla.gecko.gfx.LayerController;
-import org.mozilla.gecko.gfx.LayerView;
public class LibreOfficeMainActivity extends Activity {
@@ -61,7 +58,6 @@ public class LibreOfficeMainActivity extends Activity {
mAppContext = this;
super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_main);
Log.w(LOGTAG, "zerdatime " + SystemClock.uptimeMillis() + " - onCreate");
@@ -82,15 +78,16 @@ public class LibreOfficeMainActivity extends Activity {
mGeckoLayout.addView(mLayerController.getView(), 0);
}
- mLayerController.notifyLayerClientOfGeometryChange();
-
sLOKitThread = new LOKitThread();
sLOKitThread.start();
-
Log.w(LOGTAG, "zerdatime " + SystemClock.uptimeMillis() + " - UI almost up");
}
+ public LOKitThread getLOKitThread() {
+ return sLOKitThread;
+ }
+
public static GeckoSoftwareLayerClient getLayerClient() {
return mLayerClient;
}