[Libreoffice-commits] core.git: android/experimental vcl/android

[Tor Lillqvist]

 android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java |   21 +++-------
 vcl/android/androidinst.cxx                                                        |   10 +---
 2 files changed, 12 insertions(+), 19 deletions(-)

New commits:
commit 4ceb66d86f508629bd663d16563809524398551e
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Mar 6 09:27:04 2013 +0200

    Drop unused timestamp parameters
    
    Change-Id: I1d825c39cde67c204110b4a787b3ffb290331fe5

diff --git a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
index 065220a..6d66926 100644
--- a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
+++ b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
@@ -47,8 +47,8 @@ public class Desktop
     /* implementend by vcl */
     public static native void renderVCL(Bitmap bitmap);
     public static native void setViewSize(int width, int height);
-    public static native void key(char c, short timestamp);
-    public static native void touch(int action, int x, int y, short timestamp);
+    public static native void key(char c);
+    public static native void touch(int action, int x, int y);
     public static native void zoom(float scale, int x, int y);
 
     /**
@@ -121,11 +121,6 @@ public class Desktop
         }
     }
 
-    static short getTimestamp()
-    {
-        return (short) (System.currentTimeMillis() % Short.MAX_VALUE);
-    }
-
     class BitmapView
         extends View
     {
@@ -222,16 +217,16 @@ public class Desktop
             case KeyEvent.KEYCODE_7:
             case KeyEvent.KEYCODE_8:
             case KeyEvent.KEYCODE_9:
-                Desktop.key((char) ('0' + keyCode - KeyEvent.KEYCODE_0), Desktop.getTimestamp());
+                Desktop.key((char) ('0' + keyCode - KeyEvent.KEYCODE_0));
                 return true;
             case KeyEvent.KEYCODE_DEL:
-                Desktop.key((char) Key.BACKSPACE, Desktop.getTimestamp());
+                Desktop.key((char) Key.BACKSPACE);
                 return true;
             case KeyEvent.KEYCODE_ENTER:
-                Desktop.key((char) Key.RETURN, Desktop.getTimestamp());
+                Desktop.key((char) Key.RETURN);
                 return true;
             case KeyEvent.KEYCODE_TAB:
-                Desktop.key((char) Key.TAB, Desktop.getTimestamp());
+                Desktop.key((char) Key.TAB);
                 return true;
             default:
                 return false;
@@ -272,7 +267,7 @@ public class Desktop
             case MotionEvent.ACTION_DOWN:
             case MotionEvent.ACTION_UP:
             case MotionEvent.ACTION_MOVE:
-                Desktop.touch(event.getActionMasked(), (int) event.getX(), (int) event.getY(), Desktop.getTimestamp());
+                Desktop.touch(event.getActionMasked(), (int) event.getX(), (int) event.getY());
                 break;
             }
 
@@ -302,7 +297,7 @@ public class Desktop
 
         @Override public boolean commitText(CharSequence text, int newCursorPosition) {
             for (int i = 0; i < text.length(); i++) {
-                Desktop.key(text.charAt(i), Desktop.getTimestamp());
+                Desktop.key(text.charAt(i));
             }
             return true;
         }
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 85ae77c..f742c1b 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -916,12 +916,11 @@ Java_org_libreoffice_experimental_desktop_Desktop_setViewSize(JNIEnv * /* env */
     viewHeight = height;
 }
 
-// public static native void key(char c, short timestamp);
+// public static native void key(char c);
 extern "C" SAL_JNI_EXPORT void JNICALL
 Java_org_libreoffice_experimental_desktop_Desktop_key(JNIEnv * /* env */,
                                                       jobject /* clazz */,
-                                                      jchar c,
-                                                      jshort /* timestamp */)
+                                                      jchar c)
 {
     SalFrame *pFocus = AndroidSalInstance::getInstance()->getFocusFrame();
     if (pFocus) {
@@ -933,14 +932,13 @@ Java_org_libreoffice_experimental_desktop_Desktop_key(JNIEnv * /* env */,
         LOGW("No focused frame to emit event on");
 }
 
-// public static native void touch(int action, int x, int y, short timestamp);
+// public static native void touch(int action, int x, int y);
 extern "C" SAL_JNI_EXPORT void JNICALL
 Java_org_libreoffice_experimental_desktop_Desktop_touch(JNIEnv * /* env */,
                                                         jobject /* clazz */,
                                                         jint action,
                                                         jint x,
-                                                        jint y,
-                                                        jshort /* timestamp */)
+                                                        jint y)
 {
     SalFrame *pFocus = AndroidSalInstance::getInstance()->getFocusFrame();
     if (pFocus) {