Merge branch 'opaque_keyboard_in_aspice'

Author: iiordanov

BUILDING

@@ -53,6 +53,8 @@
    - You may have to select the "Android private libraries" entry in
        Project Properties->Java Build Path->Order and Export
      if you have it.
+   - Enable requesting the RECORD_AUDIO permission in AndroidManifest.xml with the following sed command:
+     sed -i 's/<!--RECORD_AUDIO-->/<uses-permission android:name="android.permission.RECORD_AUDIO"><\/uses-permission>/g' AndroidManifest.xml
 
 Please inform me if (6) needs to be expanded (i.e. if you needed to do
 anything else in addition to the above.

eclipse_projects/Opaque/AndroidManifest.xml

@@ -13,6 +13,8 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
     <uses-permission android:name="android.permission.RECORD_AUDIO"></uses-permission>
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
+    <uses-feature android:name="android.hardware.microphone" android:required="false"/>
 
     <supports-screens
         android:xlargeScreens="true"

eclipse_projects/Opaque/jni/src/android/android-io.c

@@ -109,15 +109,12 @@ JNIEXPORT void JNICALL
 Java_com_undatech_opaque_SpiceCommunicator_SpiceKeyEvent(JNIEnv * env, jobject  obj, jboolean down, jint hardware_keycode) {
     SpiceDisplay* display = global_display;
     SpiceDisplayPrivate* d = SPICE_DISPLAY_GET_PRIVATE(display);
-    int scancode;
 
     SPICE_DEBUG("%s %s: keycode: %d", __FUNCTION__, "Key", hardware_keycode);
 
     if (!d->inputs)
     	return;
 
-    scancode = win32key2spice(hardware_keycode);
-    //scancode = hardware_keycode;
     if (down) {
         send_key(display, hardware_keycode, 1);
     } else {

eclipse_projects/Opaque/src/com/undatech/opaque/SpiceCommunicator.java

@@ -30,7 +30,6 @@
 import android.os.Handler;
 
 import com.gstreamer.GStreamer;
-import com.undatech.opaque.input.KeycodeMap;
 import com.undatech.opaque.input.RemoteKeyboard;
 import com.undatech.opaque.input.RemoteSpicePointer;
 
@@ -305,7 +304,6 @@ private void sendModifierKeys(boolean keyDown) {
 	}
 
 	public void writeKeyEvent(int key, int metaState, boolean keyDown) {
-		// Just updates the meta state for now.
 		if (keyDown) {
 			remoteMetaState = metaState;
 			sendModifierKeys (true);