diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34efa35f8..07653d65c 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,11 +76,11 @@ if(ANDROID OR IOS)
 	SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
 endif(ANDROID OR IOS)
 include(GetGitRevisionDescription)
+git_describe(GIT_REVISION --match "[0-9]*" --abbrev=4 --tags --always)
 if(ANDROID OR IOS)
 	SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
 endif(ANDROID OR IOS)
 
-git_describe(GIT_REVISION --match "[0-9]*" --abbrev=4 --tags --always)
 message(STATUS "Git Revision ${GIT_REVISION}")
 
 # Turn on solution folders (2.8.4+)
diff --git a/client/Android/.gitignore b/client/Android/.gitignore
index 31b2e3c80..5eb07b8f5 100644
--- a/client/Android/.gitignore
+++ b/client/Android/.gitignore
@@ -8,6 +8,7 @@ libs/armeabi*
 AndroidManifest.xml
 local.properties
 !.project
+appcompat_v7
 
 FreeRDPCore/project.properties
 FreeRDPCore/src/com/freerdp/freerdpcore/utils/BuildConfiguration.java
diff --git a/client/Android/CMakeLists.txt b/client/Android/CMakeLists.txt
index b657cf8c0..51521320a 100644
--- a/client/Android/CMakeLists.txt
+++ b/client/Android/CMakeLists.txt
@@ -42,6 +42,11 @@ if(ANDROID_BUILD_JAVA)
 	endif()
 endif(ANDROID_BUILD_JAVA)
 
+set(ANDROID_COMMAND "${ANDROID_SDK}/tools/android")
+if(NOT EXISTS ${ANDROID_COMMAND})
+	message(FATAL_ERROR "android not found but required to build android java")
+endif()
+
 if(ANDROID_BUILD_JAVA_DEBUG)
 	set(ANDROID_BUILD_TYPE "debug")
 else()
@@ -56,5 +61,11 @@ else()
 	set(NDK_DEBUG "0")
 endif()
 
+set(APPCOMPAT_DIR "${CMAKE_CURRENT_BINARY_DIR}/appcompat_v7")
+add_custom_target(copy_appcompat ALL
+  COMMAND ${CMAKE_COMMAND} -E copy_directory ${ANDROID_SDK}/extras/android/support/v7/appcompat ${APPCOMPAT_DIR}
+  COMMAND ${ANDROID_COMMAND} update lib-project -p ${APPCOMPAT_DIR}
+)
+
 add_subdirectory(FreeRDPCore)
 add_subdirectory(aFreeRDP)
diff --git a/client/Android/FreeRDPCore/AndroidManifest.xml.cmake b/client/Android/FreeRDPCore/AndroidManifest.xml.cmake
index d7e944c29..acad13f3f 100644
--- a/client/Android/FreeRDPCore/AndroidManifest.xml.cmake
+++ b/client/Android/FreeRDPCore/AndroidManifest.xml.cmake
@@ -65,7 +65,7 @@
 				android:windowSoftInputMode="stateHidden">
 			</activity>
 			<activity android:name=".presentation.SessionActivity"
-				android:theme="@android:style/Theme.Black.NoTitleBar"
+				android:theme="@style/Theme.AppCompat"
 				android:configChanges="orientation|keyboardHidden|keyboard"
 				android:windowSoftInputMode="adjustResize">
 			</activity>
diff --git a/client/Android/FreeRDPCore/lint.xml b/client/Android/FreeRDPCore/lint.xml
new file mode 100644
index 000000000..ee0eead5b
--- /dev/null
+++ b/client/Android/FreeRDPCore/lint.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+</lint>
\ No newline at end of file
diff --git a/client/Android/FreeRDPCore/project.properties.cmake b/client/Android/FreeRDPCore/project.properties.cmake
index 72b842609..09c72f4a9 100644
--- a/client/Android/FreeRDPCore/project.properties.cmake
+++ b/client/Android/FreeRDPCore/project.properties.cmake
@@ -13,3 +13,4 @@
 # Project target.
 target=android-@ANDROID_APP_TARGET_SDK@
 android.library=true
+android.library.reference.1=../appcompat_v7
diff --git a/client/Android/FreeRDPCore/res/layout/super_bar.xml b/client/Android/FreeRDPCore/res/layout/super_bar.xml
index 85def9b4b..0dc039579 100644
--- a/client/Android/FreeRDPCore/res/layout/super_bar.xml
+++ b/client/Android/FreeRDPCore/res/layout/super_bar.xml
@@ -18,7 +18,6 @@
     android:paddingRight="6dip"
     android:paddingTop="7dip"
     android:paddingBottom="16dip"
-    android:background="@drawable/search_plate"
     android:gravity="center_vertical"
     android:focusable="true"
   	android:descendantFocusability="afterDescendants">
@@ -36,8 +35,6 @@
         android:singleLine="true"
         android:ellipsize="end"
         android:inputType="text"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textColorHint="?android:attr/textColorHint"
         android:drawableLeft="@drawable/icon_edittext_search"
         android:drawableRight="@drawable/icon_edittext_clear"
         />
diff --git a/client/Android/FreeRDPCore/res/menu/bookmark_context_menu.xml b/client/Android/FreeRDPCore/res/menu/bookmark_context_menu.xml
index 6ebfb3470..996ee69eb 100644
--- a/client/Android/FreeRDPCore/res/menu/bookmark_context_menu.xml
+++ b/client/Android/FreeRDPCore/res/menu/bookmark_context_menu.xml
@@ -4,14 +4,17 @@
 
 	<item android:id="@+id/bookmark_connect"
 		  android:title="@string/menu_connect"
+		  android:showAsAction="ifRoom"
 	/>
 
 	<item android:id="@+id/bookmark_edit"
 		  android:title="@string/menu_edit"
+		  android:showAsAction="ifRoom"
 	/>
 
 	<item android:id="@+id/bookmark_delete"
 		  android:title="@string/menu_delete"
+		  android:showAsAction="ifRoom"
 	/>
 	    
 </menu>
diff --git a/client/Android/FreeRDPCore/res/menu/home_menu.xml b/client/Android/FreeRDPCore/res/menu/home_menu.xml
index 21fd280e8..e74287f00 100644
--- a/client/Android/FreeRDPCore/res/menu/home_menu.xml
+++ b/client/Android/FreeRDPCore/res/menu/home_menu.xml
@@ -4,21 +4,21 @@
 	<item android:id="@+id/newBookmark"
 		  android:icon="@drawable/icon_menu_add"
 		  android:title="@string/menu_new_bookmark"
+		  android:showAsAction="ifRoom"
 	/>
 	<item android:id="@+id/appSettings"
 		  android:icon="@drawable/icon_menu_settings"
 		  android:title="@string/menu_app_settings"
+		  android:showAsAction="ifRoom"
 	/>
 	<item android:id="@+id/help"
 		  android:icon="@drawable/icon_menu_help"
 		  android:title="@string/menu_help"
+		  android:showAsAction="ifRoom"
 	/>
 	<item android:id="@+id/about"
 		  android:icon="@drawable/icon_menu_about"
 		  android:title="@string/menu_about"
+		  android:showAsAction="ifRoom"
 	/>
-	<item android:id="@+id/exit"
-		  android:icon="@drawable/icon_menu_exit"
-		  android:title="@string/menu_exit"
-	/>	
 </menu>
diff --git a/client/Android/FreeRDPCore/res/menu/session_menu.xml b/client/Android/FreeRDPCore/res/menu/session_menu.xml
index 63ff36cf7..2017dc1ca 100644
--- a/client/Android/FreeRDPCore/res/menu/session_menu.xml
+++ b/client/Android/FreeRDPCore/res/menu/session_menu.xml
@@ -5,22 +5,27 @@
 	<item android:id="@+id/session_touch_pointer"
 		  android:title="@string/pointer"
 		  android:icon="@drawable/icon_zoom_in"
+		  android:showAsAction="ifRoom"
 	/>
 	 -->
 	<item android:id="@+id/session_touch_pointer"
 		  android:title="@string/menu_touch_pointer"
 		  android:icon="@drawable/icon_menu_touch_pointer"
+		  android:showAsAction="ifRoom"
 	/>
 	<item android:id="@+id/session_sys_keyboard"
 		  android:title="@string/menu_sys_keyboard"
 		  android:icon="@drawable/icon_menu_sys_keyboard"
+		  android:showAsAction="ifRoom"
 	/>
 	<item android:id="@+id/session_ext_keyboard"
 		  android:title="@string/menu_ext_keyboard"
 		  android:icon="@drawable/icon_menu_ext_keyboard"
+		  android:showAsAction="ifRoom"
 	/>
 	<item android:id="@+id/session_disconnect"
 		  android:title="@string/menu_disconnect"
 		  android:icon="@drawable/icon_menu_disconnect"
+		  android:showAsAction="ifRoom"
 	/>
 </menu>
diff --git a/client/Android/FreeRDPCore/res/values-es/strings.xml b/client/Android/FreeRDPCore/res/values-es/strings.xml
index bf2c8a80a..192045a0a 100644
--- a/client/Android/FreeRDPCore/res/values-es/strings.xml
+++ b/client/Android/FreeRDPCore/res/values-es/strings.xml
@@ -23,7 +23,7 @@
     <string name="menu_ext_keyboard">Funcion teclado</string>
     <string name="menu_touch_pointer">Puntero Tactil</string>
     <string name="menu_home">Inicio</string>
-    <string name="menu_disconnect">desconectart</string>
+    <string name="menu_disconnect">Desconectart</string>
     <!-- List section headers -->
     <string name="section_bookmarks">Conexión Manual</string>
     <string name="section_active_sessions">Sesiones Activas</string>
@@ -197,4 +197,6 @@
     <string name="dlg_msg_exit">Esta seguro que desea salir del programa?</string>
     <string name="dlg_title_clear_cert_cache">Borrar Certificados?</string>
     <string name="dlg_msg_clear_cert_cache">Esta seguro que desea borrar todos los certificados?</string>
+    <string name="debug_level">Debug Level</string>
+    <string name="settings_debug">Debug Settings</string>
 </resources>
diff --git a/client/Android/FreeRDPCore/res/values-fr/strings.xml b/client/Android/FreeRDPCore/res/values-fr/strings.xml
index b6e829f06..be4be240c 100644
--- a/client/Android/FreeRDPCore/res/values-fr/strings.xml
+++ b/client/Android/FreeRDPCore/res/values-fr/strings.xml
@@ -196,4 +196,6 @@
     <string name="dlg_msg_exit">"Êtes-vous sûr de vouloir quitter l'application?"</string>
     <string name="dlg_title_clear_cert_cache">"Êtes-vous sûrs de vouloir supprimer les certificats?"</string>
     <string name="dlg_msg_clear_cert_cache">"Êtes-vous sûr de vouloir supprimer tous les certificats mis en cache?"</string>
+    <string name="debug_level">Debug Level</string>
+    <string name="settings_debug">Debug Settings</string>
 </resources>
diff --git a/client/Android/FreeRDPCore/res/values-nl/strings.xml b/client/Android/FreeRDPCore/res/values-nl/strings.xml
index 6a0144944..5a28bb7d9 100644
--- a/client/Android/FreeRDPCore/res/values-nl/strings.xml
+++ b/client/Android/FreeRDPCore/res/values-nl/strings.xml
@@ -197,4 +197,6 @@
     <string name="dlg_msg_exit">Weet u zeker dat u de applicatie wilt sluiten?</string>
     <string name="dlg_title_clear_cert_cache">Verwijder certificaten?</string>
     <string name="dlg_msg_clear_cert_cache">Weet u zeker dat u al uw cache certificaten wilt verwijderen?</string>
+    <string name="debug_level">Debug Level</string>
+    <string name="settings_debug">Debug Settings</string>
 </resources>
diff --git a/client/Android/FreeRDPCore/res/values/strings.xml b/client/Android/FreeRDPCore/res/values/strings.xml
index 8db6cbf94..d2342e0fe 100644
--- a/client/Android/FreeRDPCore/res/values/strings.xml
+++ b/client/Android/FreeRDPCore/res/values/strings.xml
@@ -23,7 +23,7 @@
     <string name="menu_ext_keyboard">Function Keys</string>
     <string name="menu_touch_pointer">Touch Pointer</string>
     <string name="menu_home">home</string>
-    <string name="menu_disconnect">disconnect</string>
+    <string name="menu_disconnect">Disconnect</string>
     <!-- List section headers -->
     <string name="section_bookmarks">Manual Connections</string>
     <string name="section_active_sessions">Active Sessions</string>
diff --git a/client/Android/FreeRDPCore/res/values/theme.xml b/client/Android/FreeRDPCore/res/values/theme.xml
index ef321c4c0..afee509ac 100644
--- a/client/Android/FreeRDPCore/res/values/theme.xml
+++ b/client/Android/FreeRDPCore/res/values/theme.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <resources>
-    <style name="Theme.Settings" parent="android:Theme.Light">
+    <style name="Theme.Settings" parent="@style/Theme.AppCompat">
   		<item name="android:listSeparatorTextViewStyle">@style/SettingsCategory</item>
     </style>
-    <style name="Theme.Main" parent="android:Theme.Light">
+    <style name="Theme.Main" parent="@style/Theme.AppCompat">
     </style>
     <style name="SettingsCategory">
         <item name="android:layout_width">match_parent</item>
diff --git a/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/HomeActivity.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/HomeActivity.java
index 18321b084..53f8f601b 100644
--- a/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/HomeActivity.java
+++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/HomeActivity.java
@@ -363,10 +363,6 @@ public class HomeActivity extends Activity
 			Intent helpIntent = new Intent(this, HelpActivity.class);
 			startActivity(helpIntent);
 		}
-		else if (itemId == R.id.exit)
-		{
-			finish();
-		}
 		else if (itemId == R.id.about)
 		{
 			Intent aboutIntent = new Intent(this, AboutActivity.class);
diff --git a/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/SessionActivity.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/SessionActivity.java
index a75866a46..fcae85a57 100644
--- a/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/SessionActivity.java
+++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/SessionActivity.java
@@ -5,7 +5,7 @@
 
    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. 
    If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
-*/
+ */
 
 package com.freerdp.freerdpcore.presentation;
 
@@ -13,6 +13,41 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.ProgressDialog;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Configuration;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.graphics.drawable.BitmapDrawable;
+import android.inputmethodservice.Keyboard;
+import android.inputmethodservice.KeyboardView;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.support.v7.app.ActionBarActivity;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.ScaleGestureDetector;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewTreeObserver.OnGlobalLayoutListener;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+import android.widget.Toast;
+import android.widget.ZoomControls;
+
 import com.freerdp.freerdpcore.R;
 import com.freerdp.freerdpcore.application.GlobalApp;
 import com.freerdp.freerdpcore.application.GlobalSettings;
@@ -21,51 +56,18 @@ import com.freerdp.freerdpcore.domain.BookmarkBase;
 import com.freerdp.freerdpcore.domain.ConnectionReference;
 import com.freerdp.freerdpcore.domain.ManualBookmark;
 import com.freerdp.freerdpcore.services.LibFreeRDP;
+import com.freerdp.freerdpcore.utils.ClipboardManagerProxy;
 import com.freerdp.freerdpcore.utils.KeyboardMapper;
 import com.freerdp.freerdpcore.utils.Mouse;
-import com.freerdp.freerdpcore.utils.ClipboardManagerProxy;
 
-import android.app.Activity;
-import android.app.Dialog;
-import android.app.AlertDialog;
-import android.app.ProgressDialog;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-import android.graphics.Bitmap;
-import android.graphics.Bitmap.Config;
-import android.graphics.Point;
-import android.graphics.Rect;
-import android.graphics.drawable.BitmapDrawable;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.ScaleGestureDetector;
-import android.view.View;
-import android.view.WindowManager;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
-import android.widget.Toast;
-import android.widget.ZoomControls;
-import android.inputmethodservice.Keyboard;
-import android.inputmethodservice.KeyboardView;
-
-
-public class SessionActivity extends Activity 
-	implements LibFreeRDP.UIEventListener, KeyboardView.OnKeyboardActionListener, ScrollView2D.ScrollView2DListener, 
-			   KeyboardMapper.KeyProcessingListener, SessionView.SessionViewListener, TouchPointerView.TouchPointerListener,
-			   ClipboardManagerProxy.OnClipboardChangedListener
-{	
+public class SessionActivity extends ActionBarActivity implements
+		LibFreeRDP.UIEventListener, KeyboardView.OnKeyboardActionListener,
+		ScrollView2D.ScrollView2DListener,
+		KeyboardMapper.KeyProcessingListener, SessionView.SessionViewListener,
+		TouchPointerView.TouchPointerListener,
+		ClipboardManagerProxy.OnClipboardChangedListener {
 	private class UIHandler extends Handler {
-		
+
 		public static final int REFRESH_SESSIONVIEW = 1;
 		public static final int DISPLAY_TOAST = 2;
 		public static final int HIDE_ZOOMCONTROLS = 3;
@@ -73,223 +75,234 @@ public class SessionActivity extends Activity
 		public static final int SHOW_DIALOG = 5;
 		public static final int GRAPHICS_CHANGED = 6;
 		public static final int SCROLLING_REQUESTED = 7;
-		
+
 		UIHandler() {
 			super();
 		}
-		
+
 		@Override
 		public void handleMessage(Message msg) {
-			switch(msg.what)
-			{
-				case GRAPHICS_CHANGED:
-				{
-					sessionView.onSurfaceChange(session);
-					scrollView.requestLayout();
-					break;
-				}			
-				case REFRESH_SESSIONVIEW:
-				{
-					sessionView.invalidateRegion();
-					break;
-				}					
-				case DISPLAY_TOAST:
-				{
-					Toast errorToast = Toast.makeText(getApplicationContext(), msg.obj.toString(), Toast.LENGTH_LONG);
-					errorToast.show();
-					break;
-				}
-				case HIDE_ZOOMCONTROLS:
-				{
-					zoomControls.hide();
-					break;
-				}
-				case SEND_MOVE_EVENT:
-				{
-			    	LibFreeRDP.sendCursorEvent(session.getInstance(), msg.arg1, msg.arg2, Mouse.getMoveEvent());		
-					break;
-				}				
-				case SHOW_DIALOG:
-				{	
-					// create and show the dialog					
-					((Dialog)msg.obj).show();
-					break;
-				}
-				case SCROLLING_REQUESTED:
-				{
-		    		int scrollX = 0;
-		    		int scrollY = 0;    		
-		    		float[] pointerPos = touchPointerView.getPointerPosition();
+			switch (msg.what) {
+			case GRAPHICS_CHANGED: {
+				sessionView.onSurfaceChange(session);
+				scrollView.requestLayout();
+				break;
+			}
+			case REFRESH_SESSIONVIEW: {
+				sessionView.invalidateRegion();
+				break;
+			}
+			case DISPLAY_TOAST: {
+				Toast errorToast = Toast.makeText(getApplicationContext(),
+						msg.obj.toString(), Toast.LENGTH_LONG);
+				errorToast.show();
+				break;
+			}
+			case HIDE_ZOOMCONTROLS: {
+				zoomControls.hide();
+				break;
+			}
+			case SEND_MOVE_EVENT: {
+				LibFreeRDP.sendCursorEvent(session.getInstance(), msg.arg1,
+						msg.arg2, Mouse.getMoveEvent());
+				break;
+			}
+			case SHOW_DIALOG: {
+				// create and show the dialog
+				((Dialog) msg.obj).show();
+				break;
+			}
+			case SCROLLING_REQUESTED: {
+				int scrollX = 0;
+				int scrollY = 0;
+				float[] pointerPos = touchPointerView.getPointerPosition();
 
-		    		if (pointerPos[0] > (screen_width - touchPointerView.getPointerWidth()))
-		    			scrollX = SCROLLING_DISTANCE;
-		    		else if (pointerPos[0] < 0)
-		    			scrollX = -SCROLLING_DISTANCE;
-		    		
-		    		if (pointerPos[1] > (screen_height - touchPointerView.getPointerHeight()))
-		    			scrollY = SCROLLING_DISTANCE;
-		    		else if (pointerPos[1] < 0)
-		    			scrollY = -SCROLLING_DISTANCE;
-		    		
-		    		scrollView.scrollBy(scrollX, scrollY);
-		    		
-		    		// see if we reached the min/max scroll positions
-		    		if (scrollView.getScrollX() == 0 || scrollView.getScrollX() == (sessionView.getWidth() - scrollView.getWidth()))
-		    			scrollX = 0;	    		
-		    		if (scrollView.getScrollY() == 0 || scrollView.getScrollY() == (sessionView.getHeight() - scrollView.getHeight()))
-		    			scrollY = 0;
-		    		
-		    		if (scrollX != 0 || scrollY != 0)
-		        		uiHandler.sendEmptyMessageDelayed(SCROLLING_REQUESTED, SCROLLING_TIMEOUT);
-		    		else
-		    			Log.v(TAG, "Stopping auto-scroll");
-		    		break;
-				}
+				if (pointerPos[0] > (screen_width - touchPointerView
+						.getPointerWidth()))
+					scrollX = SCROLLING_DISTANCE;
+				else if (pointerPos[0] < 0)
+					scrollX = -SCROLLING_DISTANCE;
+
+				if (pointerPos[1] > (screen_height - touchPointerView
+						.getPointerHeight()))
+					scrollY = SCROLLING_DISTANCE;
+				else if (pointerPos[1] < 0)
+					scrollY = -SCROLLING_DISTANCE;
+
+				scrollView.scrollBy(scrollX, scrollY);
+
+				// see if we reached the min/max scroll positions
+				if (scrollView.getScrollX() == 0
+						|| scrollView.getScrollX() == (sessionView.getWidth() - scrollView
+								.getWidth()))
+					scrollX = 0;
+				if (scrollView.getScrollY() == 0
+						|| scrollView.getScrollY() == (sessionView.getHeight() - scrollView
+								.getHeight()))
+					scrollY = 0;
+
+				if (scrollX != 0 || scrollY != 0)
+					uiHandler.sendEmptyMessageDelayed(SCROLLING_REQUESTED,
+							SCROLLING_TIMEOUT);
+				else
+					Log.v(TAG, "Stopping auto-scroll");
+				break;
+			}
 			}
 		}
-	}	
+	}
 
-	private class PinchZoomListener extends ScaleGestureDetector.SimpleOnScaleGestureListener
-	{
+	private class PinchZoomListener extends
+			ScaleGestureDetector.SimpleOnScaleGestureListener {
 		private float scaleFactor = 1.0f;
 
 		@Override
 		public boolean onScaleBegin(ScaleGestureDetector detector) {
-			scrollView.setScrollEnabled(false);		
+			scrollView.setScrollEnabled(false);
 			return true;
 		}
-		
+
 		@Override
 		public boolean onScale(ScaleGestureDetector detector) {
-		
+
 			// calc scale factor
 			scaleFactor *= detector.getScaleFactor();
-			scaleFactor = Math.max(SessionView.MIN_SCALE_FACTOR, Math.min(scaleFactor, SessionView.MAX_SCALE_FACTOR));
+			scaleFactor = Math.max(SessionView.MIN_SCALE_FACTOR,
+					Math.min(scaleFactor, SessionView.MAX_SCALE_FACTOR));
 			sessionView.setZoom(scaleFactor);
 
-			if(!sessionView.isAtMinZoom() && !sessionView.isAtMaxZoom())
-			{
-				// transform scroll origin to the new zoom space  
-				float transOriginX = scrollView.getScrollX() * detector.getScaleFactor();
-				float transOriginY = scrollView.getScrollY() * detector.getScaleFactor();
-				
-				// transform center point to the zoomed space  
-				float transCenterX = (scrollView.getScrollX() + detector.getFocusX()) * detector.getScaleFactor();
-				float transCenterY = (scrollView.getScrollY() + detector.getFocusY()) * detector.getScaleFactor();
-				
-				// scroll by the difference between the distance of the transformed center/origin point and their old distance (focusX/Y)
-				scrollView.scrollBy((int)((transCenterX - transOriginX) - detector.getFocusX()), (int)((transCenterY - transOriginY) - detector.getFocusY()));				
+			if (!sessionView.isAtMinZoom() && !sessionView.isAtMaxZoom()) {
+				// transform scroll origin to the new zoom space
+				float transOriginX = scrollView.getScrollX()
+						* detector.getScaleFactor();
+				float transOriginY = scrollView.getScrollY()
+						* detector.getScaleFactor();
+
+				// transform center point to the zoomed space
+				float transCenterX = (scrollView.getScrollX() + detector
+						.getFocusX()) * detector.getScaleFactor();
+				float transCenterY = (scrollView.getScrollY() + detector
+						.getFocusY()) * detector.getScaleFactor();
+
+				// scroll by the difference between the distance of the
+				// transformed center/origin point and their old distance
+				// (focusX/Y)
+				scrollView.scrollBy(
+						(int) ((transCenterX - transOriginX) - detector
+								.getFocusX()),
+						(int) ((transCenterY - transOriginY) - detector
+								.getFocusY()));
 			}
-			
-			return true;			
+
+			return true;
 		}
-		
+
 		@Override
-		public void onScaleEnd(ScaleGestureDetector de)
-		{
-			scrollView.setScrollEnabled(true);		
+		public void onScaleEnd(ScaleGestureDetector de) {
+			scrollView.setScrollEnabled(true);
 		}
 	}
 
-	private class LibFreeRDPBroadcastReceiver extends BroadcastReceiver
-	{		
+	private class LibFreeRDPBroadcastReceiver extends BroadcastReceiver {
 		@Override
 		public void onReceive(Context context, Intent intent) {
 			// still got a valid session?
 			if (session == null)
 				return;
-			
-			// is this event for the current session?			
-			if (session.getInstance() != intent.getExtras().getInt(GlobalApp.EVENT_PARAM, -1))
-				return;
-			
-			switch(intent.getExtras().getInt(GlobalApp.EVENT_TYPE, -1))
-			{
-				case GlobalApp.FREERDP_EVENT_CONNECTION_SUCCESS:
-					OnConnectionSuccess(context);
-					break;
 
-				case GlobalApp.FREERDP_EVENT_CONNECTION_FAILURE:
-					OnConnectionFailure(context);
-					break;
-				case GlobalApp.FREERDP_EVENT_DISCONNECTED:
-					OnDisconnected(context);
-					break;
+			// is this event for the current session?
+			if (session.getInstance() != intent.getExtras().getInt(
+					GlobalApp.EVENT_PARAM, -1))
+				return;
+
+			switch (intent.getExtras().getInt(GlobalApp.EVENT_TYPE, -1)) {
+			case GlobalApp.FREERDP_EVENT_CONNECTION_SUCCESS:
+				OnConnectionSuccess(context);
+				break;
+
+			case GlobalApp.FREERDP_EVENT_CONNECTION_FAILURE:
+				OnConnectionFailure(context);
+				break;
+			case GlobalApp.FREERDP_EVENT_DISCONNECTED:
+				OnDisconnected(context);
+				break;
 			}
 		}
-		
-		private void OnConnectionSuccess(Context context)
-		{
+
+		private void OnConnectionSuccess(Context context) {
 			Log.v(TAG, "OnConnectionSuccess");
 
 			// bind session
 			bindSession();
 
-			if(progressDialog != null)
-			{
+			if (progressDialog != null) {
 				progressDialog.dismiss();
 				progressDialog = null;
 			}
-			
+
 			// add hostname to history if quick connect was used
 			Bundle bundle = getIntent().getExtras();
-			if(bundle != null && bundle.containsKey(PARAM_CONNECTION_REFERENCE))
-			{		
-				if(ConnectionReference.isHostnameReference(bundle.getString(PARAM_CONNECTION_REFERENCE)))
-				{
+			if (bundle != null
+					&& bundle.containsKey(PARAM_CONNECTION_REFERENCE)) {
+				if (ConnectionReference.isHostnameReference(bundle
+						.getString(PARAM_CONNECTION_REFERENCE))) {
 					assert session.getBookmark().getType() == BookmarkBase.TYPE_MANUAL;
-					String item = session.getBookmark().<ManualBookmark>get().getHostname();
-					if(!GlobalApp.getQuickConnectHistoryGateway().historyItemExists(item))
-						GlobalApp.getQuickConnectHistoryGateway().addHistoryItem(item);					
+					String item = session.getBookmark().<ManualBookmark> get()
+							.getHostname();
+					if (!GlobalApp.getQuickConnectHistoryGateway()
+							.historyItemExists(item))
+						GlobalApp.getQuickConnectHistoryGateway()
+								.addHistoryItem(item);
 				}
 			}
 		}
-		
-		private void OnConnectionFailure(Context context)
-		{
+
+		private void OnConnectionFailure(Context context) {
 			Log.v(TAG, "OnConnectionFailure");
-			
+
 			// remove pending move events
 			uiHandler.removeMessages(UIHandler.SEND_MOVE_EVENT);
 
-			if(progressDialog != null)
-			{
+			if (progressDialog != null) {
 				progressDialog.dismiss();
 				progressDialog = null;
 			}
 
 			// post error message on UI thread
 			if (!connectCancelledByUser)
-				uiHandler.sendMessage(Message.obtain(null, UIHandler.DISPLAY_TOAST, getResources().getText(R.string.error_connection_failure)));
-			
+				uiHandler.sendMessage(Message.obtain(
+						null,
+						UIHandler.DISPLAY_TOAST,
+						getResources().getText(
+								R.string.error_connection_failure)));
+
 			closeSessionActivity(RESULT_CANCELED);
 		}
 
-		private void OnDisconnected(Context context)
-		{
+		private void OnDisconnected(Context context) {
 			Log.v(TAG, "OnDisconnected");
 
 			// remove pending move events
 			uiHandler.removeMessages(UIHandler.SEND_MOVE_EVENT);
 
-			if(progressDialog != null)
-			{
+			if (progressDialog != null) {
 				progressDialog.dismiss();
 				progressDialog = null;
 			}
-			
+
 			session.setUIEventListener(null);
 			closeSessionActivity(RESULT_OK);
 		}
 	}
-	
+
 	public static final String PARAM_CONNECTION_REFERENCE = "conRef";
 	public static final String PARAM_INSTANCE = "instance";
-	
+
 	private static final float ZOOMING_STEP = 0.5f;
 	private static final int ZOOMCONTROLS_AUTOHIDE_TIMEOUT = 4000;
 
-	// timeout between subsequent scrolling requests when the touch-pointer is at the edge of the session view
+	// timeout between subsequent scrolling requests when the touch-pointer is
+	// at the edge of the session view
 	private static final int SCROLLING_TIMEOUT = 50;
 	private static final int SCROLLING_DISTANCE = 20;
 
@@ -301,23 +314,24 @@ public class SessionActivity extends Activity
 	private KeyboardView keyboardView;
 	private KeyboardView modifiersKeyboardView;
 	private ZoomControls zoomControls;
-	private KeyboardMapper keyboardMapper; 
-	
-	private Keyboard specialkeysKeyboard;	
-	private Keyboard numpadKeyboard;	
-	private Keyboard cursorKeyboard;	
+	private KeyboardMapper keyboardMapper;
+
+	private Keyboard specialkeysKeyboard;
+	private Keyboard numpadKeyboard;
+	private Keyboard cursorKeyboard;
 	private Keyboard modifiersKeyboard;
 
 	private AlertDialog dlgVerifyCertificate;
 	private AlertDialog dlgUserCredentials;
 	private View userCredView;
-	
+
 	private UIHandler uiHandler;
 
 	private int screen_width;
 	private int screen_height;
-	
-	private boolean autoScrollTouchPointer = GlobalSettings.getAutoScrollTouchPointer();
+
+	private boolean autoScrollTouchPointer = GlobalSettings
+			.getAutoScrollTouchPointer();
 	private boolean connectCancelledByUser = false;
 	private boolean sessionRunning = false;
 	private boolean toggleMouseButtons = false;
@@ -336,129 +350,156 @@ public class SessionActivity extends Activity
 	private static final int MAX_DISCARDED_MOVE_EVENTS = 3;
 	private static final int SEND_MOVE_EVENT_TIMEOUT = 150;
 	private int discardedMoveEvents = 0;
-	
+
 	private ClipboardManagerProxy mClipboardManager;
-	
-	private void createDialogs()
-	{
+
+	private void createDialogs() {
 		// build verify certificate dialog
 		dlgVerifyCertificate = new AlertDialog.Builder(this)
-		.setTitle(R.string.dlg_title_verify_certificate)
-		.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {				
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				callbackDialogResult = true;
-				synchronized(dialog)
-				{
-					dialog.notify();					
-				}
-			}
-		})
-		.setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				callbackDialogResult = false;
-				connectCancelledByUser = true;
-				synchronized(dialog)
-				{
-					dialog.notify();					
-				}
-			}
-		})
-		.setCancelable(false)
-		.create();	
-		
+				.setTitle(R.string.dlg_title_verify_certificate)
+				.setPositiveButton(android.R.string.yes,
+						new DialogInterface.OnClickListener() {
+							@Override
+							public void onClick(DialogInterface dialog,
+									int which) {
+								callbackDialogResult = true;
+								synchronized (dialog) {
+									dialog.notify();
+								}
+							}
+						})
+				.setNegativeButton(android.R.string.no,
+						new DialogInterface.OnClickListener() {
+							@Override
+							public void onClick(DialogInterface dialog,
+									int which) {
+								callbackDialogResult = false;
+								connectCancelledByUser = true;
+								synchronized (dialog) {
+									dialog.notify();
+								}
+							}
+						}).setCancelable(false).create();
+
 		// build the dialog
-		userCredView = getLayoutInflater().inflate(R.layout.credentials, null, true);		
+		userCredView = getLayoutInflater().inflate(R.layout.credentials, null,
+				true);
 		dlgUserCredentials = new AlertDialog.Builder(this)
-		.setView(userCredView)
-		.setTitle(R.string.dlg_title_credentials)
-		.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {				
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				callbackDialogResult = true;
-				synchronized(dialog)
-				{
-					dialog.notify();					
-				}
-			}
-		})
-		.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				callbackDialogResult = false;
-				connectCancelledByUser = true;
-				synchronized(dialog)
-				{
-					dialog.notify();		
-				}
-			}
-		})
-		.setCancelable(false)
-		.create();		
+				.setView(userCredView)
+				.setTitle(R.string.dlg_title_credentials)
+				.setPositiveButton(android.R.string.ok,
+						new DialogInterface.OnClickListener() {
+							@Override
+							public void onClick(DialogInterface dialog,
+									int which) {
+								callbackDialogResult = true;
+								synchronized (dialog) {
+									dialog.notify();
+								}
+							}
+						})
+				.setNegativeButton(android.R.string.cancel,
+						new DialogInterface.OnClickListener() {
+							@Override
+							public void onClick(DialogInterface dialog,
+									int which) {
+								callbackDialogResult = false;
+								connectCancelledByUser = true;
+								synchronized (dialog) {
+									dialog.notify();
+								}
+							}
+						}).setCancelable(false).create();
 	}
-	
+
+	private boolean hasHardwareMenuButton() {
+		if (Build.VERSION.SDK_INT <= 10)
+			return true;
+		
+		if (Build.VERSION.SDK_INT >= 14) {
+			boolean rc = false;
+			final ViewConfiguration cfg = ViewConfiguration.get(this);
+						
+			return cfg.hasPermanentMenuKey();
+		}
+		
+		return false;
+	}
+
 	@Override
-	public void onCreate(Bundle savedInstanceState)
-	{				
+	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
 		// show status bar or make fullscreen?
-		if(GlobalSettings.getHideStatusBar())
-			getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		if (GlobalSettings.getHideStatusBar()) {
+			getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+					WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		}
+
 		this.setContentView(R.layout.session);
+		if (hasHardwareMenuButton()) {
+			this.getSupportActionBar().hide();
+		} else
+			this.getSupportActionBar().show();
 
 		Log.v(TAG, "Session.onCreate");
-		
-		// ATTENTION: We use the onGlobalLayout notification to start our session.
-		// This is because only then we can know the exact size of our session when using fit screen
-		// accounting for any status bars etc. that Android might throws on us. A bit weird looking
+
+		// ATTENTION: We use the onGlobalLayout notification to start our
+		// session.
+		// This is because only then we can know the exact size of our session
+		// when using fit screen
+		// accounting for any status bars etc. that Android might throws on us.
+		// A bit weird looking
 		// but this is the only way ...
 		final View activityRootView = findViewById(R.id.session_root_view);
-		activityRootView.getViewTreeObserver().addOnGlobalLayoutListener(new OnGlobalLayoutListener() 
-		{
-			@Override
-			public void onGlobalLayout() {
-				screen_width = activityRootView.getWidth();
-				screen_height = activityRootView.getHeight();
-								
-				// start session
-				if(!sessionRunning && getIntent() != null)
-				{
-					processIntent(getIntent());
-					sessionRunning = true;
-				}
-			}	
-		});
-	
+		activityRootView.getViewTreeObserver().addOnGlobalLayoutListener(
+				new OnGlobalLayoutListener() {
+					@Override
+					public void onGlobalLayout() {
+						screen_width = activityRootView.getWidth();
+						screen_height = activityRootView.getHeight();
+
+						// start session
+						if (!sessionRunning && getIntent() != null) {
+							processIntent(getIntent());
+							sessionRunning = true;
+						}
+					}
+				});
+
 		sessionView = (SessionView) findViewById(R.id.sessionView);
-		sessionView.setScaleGestureDetector(new ScaleGestureDetector(this, new PinchZoomListener()));
+		sessionView.setScaleGestureDetector(new ScaleGestureDetector(this,
+				new PinchZoomListener()));
 		sessionView.setSessionViewListener(this);
 		sessionView.requestFocus();
 
 		touchPointerView = (TouchPointerView) findViewById(R.id.touchPointerView);
 		touchPointerView.setTouchPointerListener(this);
-		
+
 		keyboardMapper = new KeyboardMapper();
 		keyboardMapper.init(this);
 		keyboardMapper.reset(this);
-		
-		modifiersKeyboard = new Keyboard(getApplicationContext(), R.xml.modifiers_keyboard);
-		specialkeysKeyboard = new Keyboard(getApplicationContext(), R.xml.specialkeys_keyboard);
-		numpadKeyboard = new Keyboard(getApplicationContext(), R.xml.numpad_keyboard);
-		cursorKeyboard = new Keyboard(getApplicationContext(), R.xml.cursor_keyboard);
-		
+
+		modifiersKeyboard = new Keyboard(getApplicationContext(),
+				R.xml.modifiers_keyboard);
+		specialkeysKeyboard = new Keyboard(getApplicationContext(),
+				R.xml.specialkeys_keyboard);
+		numpadKeyboard = new Keyboard(getApplicationContext(),
+				R.xml.numpad_keyboard);
+		cursorKeyboard = new Keyboard(getApplicationContext(),
+				R.xml.cursor_keyboard);
+
 		// hide keyboard below the sessionView
-		keyboardView = (KeyboardView)findViewById(R.id.extended_keyboard);
+		keyboardView = (KeyboardView) findViewById(R.id.extended_keyboard);
 		keyboardView.setKeyboard(specialkeysKeyboard);
 		keyboardView.setOnKeyboardActionListener(this);
 
 		modifiersKeyboardView = (KeyboardView) findViewById(R.id.extended_keyboard_header);
 		modifiersKeyboardView.setKeyboard(modifiersKeyboard);
 		modifiersKeyboardView.setOnKeyboardActionListener(this);
-			
+
 		scrollView = (ScrollView2D) findViewById(R.id.sessionScrollView);
-		scrollView.setScrollViewListener(this);		
+		scrollView.setScrollViewListener(this);
 		uiHandler = new UIHandler();
 		libFreeRDPBroadcastReceiver = new LibFreeRDPBroadcastReceiver();
 
@@ -468,7 +509,8 @@ public class SessionActivity extends Activity
 			@Override
 			public void onClick(View v) {
 				resetZoomControlsAutoHideTimeout();
-				zoomControls.setIsZoomInEnabled(sessionView.zoomIn(ZOOMING_STEP));
+				zoomControls.setIsZoomInEnabled(sessionView
+						.zoomIn(ZOOMING_STEP));
 				zoomControls.setIsZoomOutEnabled(true);
 			}
 		});
@@ -476,22 +518,23 @@ public class SessionActivity extends Activity
 			@Override
 			public void onClick(View v) {
 				resetZoomControlsAutoHideTimeout();
-				zoomControls.setIsZoomOutEnabled(sessionView.zoomOut(ZOOMING_STEP));			
+				zoomControls.setIsZoomOutEnabled(sessionView
+						.zoomOut(ZOOMING_STEP));
 				zoomControls.setIsZoomInEnabled(true);
 			}
 		});
-				
+
 		toggleMouseButtons = false;
-		
+
 		createDialogs();
 
 		// register freerdp events broadcast receiver
 		IntentFilter filter = new IntentFilter();
 		filter.addAction(GlobalApp.ACTION_EVENT_FREERDP);
 		registerReceiver(libFreeRDPBroadcastReceiver, filter);
-		
+
 		mClipboardManager = ClipboardManagerProxy.getClipboardManager(this);
-        mClipboardManager.addClipboardChangedListener(this);		
+		mClipboardManager.addClipboardChangedListener(this);
 	}
 
 	@Override
@@ -543,114 +586,112 @@ public class SessionActivity extends Activity
 		// unregister freerdp events broadcast receiver
 		unregisterReceiver(libFreeRDPBroadcastReceiver);
 
-		// remove clipboard listener		
+		// remove clipboard listener
 		mClipboardManager.removeClipboardboardChangedListener(this);
 
 		// free session
 		GlobalApp.freeSession(session.getInstance());
 		session = null;
 	}
-		
+
 	@Override
 	public void onConfigurationChanged(Configuration newConfig) {
-	    super.onConfigurationChanged(newConfig);
-	    	    
-	    // reload keyboard resources (changed from landscape)
-		modifiersKeyboard = new Keyboard(getApplicationContext(), R.xml.modifiers_keyboard);
-		specialkeysKeyboard = new Keyboard(getApplicationContext(), R.xml.specialkeys_keyboard);
-		numpadKeyboard = new Keyboard(getApplicationContext(), R.xml.numpad_keyboard);
-		cursorKeyboard = new Keyboard(getApplicationContext(), R.xml.cursor_keyboard);
+		super.onConfigurationChanged(newConfig);
+
+		// reload keyboard resources (changed from landscape)
+		modifiersKeyboard = new Keyboard(getApplicationContext(),
+				R.xml.modifiers_keyboard);
+		specialkeysKeyboard = new Keyboard(getApplicationContext(),
+				R.xml.specialkeys_keyboard);
+		numpadKeyboard = new Keyboard(getApplicationContext(),
+				R.xml.numpad_keyboard);
+		cursorKeyboard = new Keyboard(getApplicationContext(),
+				R.xml.cursor_keyboard);
 
 		// apply loaded keyboards
 		keyboardView.setKeyboard(specialkeysKeyboard);
 		modifiersKeyboardView.setKeyboard(modifiersKeyboard);
 	}
-	
-	private void processIntent(Intent intent)
-	{
+
+	private void processIntent(Intent intent) {
 		// get either session instance or create one from a bookmark
-		Bundle bundle = intent.getExtras();		
-		if(bundle.containsKey(PARAM_INSTANCE))
-		{
+		Bundle bundle = intent.getExtras();
+		if (bundle.containsKey(PARAM_INSTANCE)) {
 			int inst = bundle.getInt(PARAM_INSTANCE);
 			session = GlobalApp.getSession(inst);
 			bitmap = session.getSurface().getBitmap();
 			bindSession();
-		}
-		else if(bundle.containsKey(PARAM_CONNECTION_REFERENCE))
-		{
+		} else if (bundle.containsKey(PARAM_CONNECTION_REFERENCE)) {
 			BookmarkBase bookmark = null;
 			String refStr = bundle.getString(PARAM_CONNECTION_REFERENCE);
-			if(ConnectionReference.isHostnameReference(refStr))
-			{
+			if (ConnectionReference.isHostnameReference(refStr)) {
 				bookmark = new ManualBookmark();
-				bookmark.<ManualBookmark>get().setHostname(ConnectionReference.getHostname(refStr));			
+				bookmark.<ManualBookmark> get().setHostname(
+						ConnectionReference.getHostname(refStr));
+			} else if (ConnectionReference.isBookmarkReference(refStr)) {
+				if (ConnectionReference.isManualBookmarkReference(refStr))
+					bookmark = GlobalApp.getManualBookmarkGateway().findById(
+							ConnectionReference.getManualBookmarkId(refStr));
+				else
+					assert false;
 			}
-			else if(ConnectionReference.isBookmarkReference(refStr))
-			{
-				if(ConnectionReference.isManualBookmarkReference(refStr))
-					bookmark = GlobalApp.getManualBookmarkGateway().findById(ConnectionReference.getManualBookmarkId(refStr));
-				else 
-					assert false;								
-			}
-			
-			if(bookmark != null)			
-				connect(bookmark);	
+
+			if (bookmark != null)
+				connect(bookmark);
 			else
 				closeSessionActivity(RESULT_CANCELED);
-		}
-		else
-		{
+		} else {
 			// no session found - exit
-			closeSessionActivity(RESULT_CANCELED);		
+			closeSessionActivity(RESULT_CANCELED);
 		}
 	}
-	
-	private void connect(BookmarkBase bookmark)
-	{		
+
+	private void connect(BookmarkBase bookmark) {
 		session = GlobalApp.createSession(bookmark);
 		session.setUIEventListener(this);
-		
+
 		// set writeable data directory
-		LibFreeRDP.setDataDirectory(session.getInstance(), getFilesDir().toString());
-		
-		BookmarkBase.ScreenSettings screenSettings = session.getBookmark().getActiveScreenSettings();
-		Log.v(TAG, "Screen Resolution: " + screenSettings.getResolutionString());	
-		if (screenSettings.isAutomatic())
-		{
-			if((getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE)
-			{
-				// large screen device i.e. tablet: simply use screen info				
-				screenSettings.setHeight(screen_height);				
+		LibFreeRDP.setDataDirectory(session.getInstance(), getFilesDir()
+				.toString());
+
+		BookmarkBase.ScreenSettings screenSettings = session.getBookmark()
+				.getActiveScreenSettings();
+		Log.v(TAG, "Screen Resolution: " + screenSettings.getResolutionString());
+		if (screenSettings.isAutomatic()) {
+			if ((getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE) {
+				// large screen device i.e. tablet: simply use screen info
+				screenSettings.setHeight(screen_height);
 				screenSettings.setWidth(screen_width);
-			}
-			else
-			{
+			} else {
 				// small screen device i.e. phone:
-				// Automatic uses the largest side length of the screen and makes a 16:10 resolution setting out of it 				
-				int screenMax = (screen_width > screen_height) ? screen_width : screen_height;			
-				screenSettings.setHeight(screenMax);				
-				screenSettings.setWidth((int)((float)screenMax * 1.6f));
-			}			
+				// Automatic uses the largest side length of the screen and
+				// makes a 16:10 resolution setting out of it
+				int screenMax = (screen_width > screen_height) ? screen_width
+						: screen_height;
+				screenSettings.setHeight(screenMax);
+				screenSettings.setWidth((int) ((float) screenMax * 1.6f));
+			}
 		}
 		if (screenSettings.isFitScreen()) {
-			screenSettings.setHeight(screen_height);				
-			screenSettings.setWidth(screen_width);			
+			screenSettings.setHeight(screen_height);
+			screenSettings.setWidth(screen_width);
 		}
-		
+
 		progressDialog = new ProgressDialog(this);
 		progressDialog.setTitle(bookmark.getLabel());
-		progressDialog.setMessage(getResources().getText(R.string.dlg_msg_connecting));
-		progressDialog.setButton(ProgressDialog.BUTTON_NEGATIVE, "Cancel", new DialogInterface.OnClickListener() {
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				connectCancelledByUser = true;
-				LibFreeRDP.cancelConnection(session.getInstance());
-			}
-		});
+		progressDialog.setMessage(getResources().getText(
+				R.string.dlg_msg_connecting));
+		progressDialog.setButton(ProgressDialog.BUTTON_NEGATIVE, "Cancel",
+				new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						connectCancelledByUser = true;
+						LibFreeRDP.cancelConnection(session.getInstance());
+					}
+				});
 		progressDialog.setCancelable(false);
 		progressDialog.show();
-		
+
 		Thread thread = new Thread(new Runnable() {
 			public void run() {
 				session.connect();
@@ -658,8 +699,9 @@ public class SessionActivity extends Activity
 		});
 		thread.start();
 	}
-	
-	// binds the current session to the activity by wiring it up with the sessionView and updating all internal objects accordingly
+
+	// binds the current session to the activity by wiring it up with the
+	// sessionView and updating all internal objects accordingly
 	private void bindSession() {
 		Log.v("SessionActivity", "bindSession called");
 		session.setUIEventListener(this);
@@ -668,31 +710,31 @@ public class SessionActivity extends Activity
 		keyboardMapper.reset(this);
 	}
 
-	// displays either the system or the extended keyboard or non of  them 
-	private void showKeyboard(boolean showSystemKeyboard, boolean showExtendedKeyboard) {
+	// displays either the system or the extended keyboard or non of them
+	private void showKeyboard(boolean showSystemKeyboard,
+			boolean showExtendedKeyboard) {
 		// no matter what we are doing ... hide the zoom controls
-		// TODO: this is not working correctly as hiding the keyboard issues a onScrollChange notification showing the control again ...
+		// TODO: this is not working correctly as hiding the keyboard issues a
+		// onScrollChange notification showing the control again ...
 		uiHandler.removeMessages(UIHandler.HIDE_ZOOMCONTROLS);
-		if(zoomControls.getVisibility() == View.VISIBLE)
+		if (zoomControls.getVisibility() == View.VISIBLE)
 			zoomControls.hide();
-		
-		InputMethodManager mgr;		
-		if(showSystemKeyboard)
-		{			
+
+		InputMethodManager mgr;
+		if (showSystemKeyboard) {
 			// hide extended keyboard
 			keyboardView.setVisibility(View.GONE);
 
 			// show system keyboard
 			mgr = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-			if(!mgr.isActive(sessionView))
-				Log.e(TAG, "Failed to show system keyboard: SessionView is not the active view!");
+			if (!mgr.isActive(sessionView))
+				Log.e(TAG,
+						"Failed to show system keyboard: SessionView is not the active view!");
 			mgr.showSoftInput(sessionView, 0);
-		
+
 			// show modifiers keyboard
 			modifiersKeyboardView.setVisibility(View.VISIBLE);
-		}
-		else if(showExtendedKeyboard)
-		{
+		} else if (showExtendedKeyboard) {
 			// hide system keyboard
 			mgr = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 			mgr.hideSoftInputFromWindow(sessionView.getWindowToken(), 0);
@@ -701,57 +743,52 @@ public class SessionActivity extends Activity
 			keyboardView.setKeyboard(specialkeysKeyboard);
 			keyboardView.setVisibility(View.VISIBLE);
 			modifiersKeyboardView.setVisibility(View.VISIBLE);
-		}
-		else
-		{
+		} else {
 			// hide both
 			mgr = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 			mgr.hideSoftInputFromWindow(sessionView.getWindowToken(), 0);
 			keyboardView.setVisibility(View.GONE);
 			modifiersKeyboardView.setVisibility(View.GONE);
-			
+
 			// clear any active key modifiers)
 			keyboardMapper.clearlAllModifiers();
 		}
-				
-		sysKeyboardVisible = showSystemKeyboard; 
+
+		sysKeyboardVisible = showSystemKeyboard;
 		extKeyboardVisible = showExtendedKeyboard;
 	}
-	
+
 	private void closeSessionActivity(int resultCode) {
 		// Go back to home activity (and send intent data back to home)
 		setResult(resultCode, getIntent());
 		finish();
 	}
-	
+
 	// update the state of our modifier keys
 	private void updateModifierKeyStates() {
 		// check if any key is in the keycodes list
-		
-		List<Keyboard.Key> keys = modifiersKeyboard.getKeys();
-		for(Iterator<Keyboard.Key> it = keys.iterator(); it.hasNext(); )
-		{
-			// if the key is a sticky key - just set it to off  
-			Keyboard.Key curKey = it.next();
-			if(curKey.sticky)
-			{
-				switch(keyboardMapper.getModifierState(curKey.codes[0]))
-				{
-					case KeyboardMapper.KEYSTATE_ON:
-						curKey.on = true;
-						curKey.pressed = false;
-						break;
-				
-					case KeyboardMapper.KEYSTATE_OFF:
-						curKey.on = false;
-						curKey.pressed = false;
-						break;
 
-					case KeyboardMapper.KEYSTATE_LOCKED:
-						curKey.on = true;
-						curKey.pressed = true;
-						break;
-				}				
+		List<Keyboard.Key> keys = modifiersKeyboard.getKeys();
+		for (Iterator<Keyboard.Key> it = keys.iterator(); it.hasNext();) {
+			// if the key is a sticky key - just set it to off
+			Keyboard.Key curKey = it.next();
+			if (curKey.sticky) {
+				switch (keyboardMapper.getModifierState(curKey.codes[0])) {
+				case KeyboardMapper.KEYSTATE_ON:
+					curKey.on = true;
+					curKey.pressed = false;
+					break;
+
+				case KeyboardMapper.KEYSTATE_OFF:
+					curKey.on = false;
+					curKey.pressed = false;
+					break;
+
+				case KeyboardMapper.KEYSTATE_LOCKED:
+					curKey.on = true;
+					curKey.pressed = true;
+					break;
+				}
 			}
 		}
 
@@ -760,135 +797,132 @@ public class SessionActivity extends Activity
 	}
 
 	private void sendDelayedMoveEvent(int x, int y) {
-		if(uiHandler.hasMessages(UIHandler.SEND_MOVE_EVENT))
-		{			
+		if (uiHandler.hasMessages(UIHandler.SEND_MOVE_EVENT)) {
 			uiHandler.removeMessages(UIHandler.SEND_MOVE_EVENT);
 			discardedMoveEvents++;
-		}
-		else
+		} else
 			discardedMoveEvents = 0;
 
-		if(discardedMoveEvents > MAX_DISCARDED_MOVE_EVENTS)		
-	    	LibFreeRDP.sendCursorEvent(session.getInstance(), x, y, Mouse.getMoveEvent());
+		if (discardedMoveEvents > MAX_DISCARDED_MOVE_EVENTS)
+			LibFreeRDP.sendCursorEvent(session.getInstance(), x, y,
+					Mouse.getMoveEvent());
 		else
-			uiHandler.sendMessageDelayed(Message.obtain(null, UIHandler.SEND_MOVE_EVENT, x, y), SEND_MOVE_EVENT_TIMEOUT);			
+			uiHandler.sendMessageDelayed(
+					Message.obtain(null, UIHandler.SEND_MOVE_EVENT, x, y),
+					SEND_MOVE_EVENT_TIMEOUT);
 	}
 
 	private void cancelDelayedMoveEvent() {
 		uiHandler.removeMessages(UIHandler.SEND_MOVE_EVENT);
 	}
-		
+
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		getMenuInflater().inflate(R.menu.session_menu, menu);
 		return true;
 	}
-	
+
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		// refer to http://tools.android.com/tips/non-constant-fields why we can't use switch/case here ..
+		// refer to http://tools.android.com/tips/non-constant-fields why we
+		// can't use switch/case here ..
 		int itemId = item.getItemId();
-		
-		if (itemId == R.id.session_touch_pointer)
-		{
+
+		if (itemId == R.id.session_touch_pointer) {
 			// toggle touch pointer
-			if(touchPointerView.getVisibility() == View.VISIBLE)
-			{
+			if (touchPointerView.getVisibility() == View.VISIBLE) {
 				touchPointerView.setVisibility(View.INVISIBLE);
 				sessionView.setTouchPointerPadding(0, 0);
+			} else {
+				touchPointerView.setVisibility(View.VISIBLE);
+				sessionView.setTouchPointerPadding(
+						touchPointerView.getPointerWidth(),
+						touchPointerView.getPointerHeight());
 			}
-			else
-			{
-				touchPointerView.setVisibility(View.VISIBLE);				
-				sessionView.setTouchPointerPadding(touchPointerView.getPointerWidth(), touchPointerView.getPointerHeight());
-			}
-		}
-		else if (itemId == R.id.session_sys_keyboard)
-		{
+		} else if (itemId == R.id.session_sys_keyboard) {
 			showKeyboard(!sysKeyboardVisible, false);
-		}
-		else if (itemId == R.id.session_ext_keyboard)
-		{
+		} else if (itemId == R.id.session_ext_keyboard) {
 			showKeyboard(false, !extKeyboardVisible);
-		}
-		else if (itemId == R.id.session_disconnect)
-		{
+		} else if (itemId == R.id.session_disconnect) {
 			showKeyboard(false, false);
 			LibFreeRDP.disconnect(session.getInstance());
 		}
 
 		return true;
 	}
-	
+
 	@Override
 	public void onBackPressed() {
 		// hide keyboards (if any visible) or send alt+f4 to the session
-		if(sysKeyboardVisible || extKeyboardVisible)
+		if (sysKeyboardVisible || extKeyboardVisible)
 			showKeyboard(false, false);
 		else
 			keyboardMapper.sendAltF4();
 	}
-	
+
 	// android keyboard input handling
-	// We always use the unicode value to process input from the android keyboard except if key modifiers
-	// (like Win, Alt, Ctrl) are activated. In this case we will send the virtual key code to allow key
-	// combinations (like Win + E to open the explorer). 
+	// We always use the unicode value to process input from the android
+	// keyboard except if key modifiers
+	// (like Win, Alt, Ctrl) are activated. In this case we will send the
+	// virtual key code to allow key
+	// combinations (like Win + E to open the explorer).
 	@Override
 	public boolean onKeyDown(int keycode, KeyEvent event) {
 		return keyboardMapper.processAndroidKeyEvent(event);
 	}
-	
+
 	@Override
 	public boolean onKeyUp(int keycode, KeyEvent event) {
-		return keyboardMapper.processAndroidKeyEvent(event);	
+		return keyboardMapper.processAndroidKeyEvent(event);
 	}
 
-	// onKeyMultiple is called for input of some special characters like umlauts and some symbol characters
+	// onKeyMultiple is called for input of some special characters like umlauts
+	// and some symbol characters
 	@Override
 	public boolean onKeyMultiple(int keyCode, int repeatCount, KeyEvent event) {
 		return keyboardMapper.processAndroidKeyEvent(event);
 	}
-	
+
 	// ****************************************************************************
 	// KeyboardView.KeyboardActionEventListener
 	@Override
-    public void onKey(int primaryCode, int[] keyCodes) {
+	public void onKey(int primaryCode, int[] keyCodes) {
 		keyboardMapper.processCustomKeyEvent(primaryCode);
-    }
-
-	@Override
-    public void onText(CharSequence text) {
-    }
-
-	@Override
-    public void swipeRight() {
-    }
-    
-	@Override
-    public void swipeLeft() {
-    }
-
-	@Override
-    public void swipeDown() {
-    }
-
-	@Override
-    public void swipeUp() {
-    }
-    
-	@Override
-    public void onPress(int primaryCode) {
 	}
-    
+
 	@Override
-    public void onRelease(int primaryCode) {
-    }
+	public void onText(CharSequence text) {
+	}
+
+	@Override
+	public void swipeRight() {
+	}
+
+	@Override
+	public void swipeLeft() {
+	}
+
+	@Override
+	public void swipeDown() {
+	}
+
+	@Override
+	public void swipeUp() {
+	}
+
+	@Override
+	public void onPress(int primaryCode) {
+	}
+
+	@Override
+	public void onRelease(int primaryCode) {
+	}
 
 	// ****************************************************************************
 	// KeyboardMapper.KeyProcessingListener implementation
 	@Override
 	public void processVirtualKey(int virtualKeyCode, boolean down) {
-		LibFreeRDP.sendKeyEvent(session.getInstance(), virtualKeyCode, down);	
+		LibFreeRDP.sendKeyEvent(session.getInstance(), virtualKeyCode, down);
 	}
 
 	@Override
@@ -898,32 +932,31 @@ public class SessionActivity extends Activity
 
 	@Override
 	public void switchKeyboard(int keyboardType) {
-		switch(keyboardType)
-		{
-			case KeyboardMapper.KEYBOARD_TYPE_FUNCTIONKEYS:
-				keyboardView.setKeyboard(specialkeysKeyboard);
-				break;
+		switch (keyboardType) {
+		case KeyboardMapper.KEYBOARD_TYPE_FUNCTIONKEYS:
+			keyboardView.setKeyboard(specialkeysKeyboard);
+			break;
 
-			case KeyboardMapper.KEYBOARD_TYPE_NUMPAD:
-				keyboardView.setKeyboard(numpadKeyboard);
-				break;
+		case KeyboardMapper.KEYBOARD_TYPE_NUMPAD:
+			keyboardView.setKeyboard(numpadKeyboard);
+			break;
 
-			case KeyboardMapper.KEYBOARD_TYPE_CURSOR:
-				keyboardView.setKeyboard(cursorKeyboard);
-				break;
-				
-			default:
-				break;
+		case KeyboardMapper.KEYBOARD_TYPE_CURSOR:
+			keyboardView.setKeyboard(cursorKeyboard);
+			break;
+
+		default:
+			break;
 		}
 	}
 
 	@Override
 	public void modifiersChanged() {
-		updateModifierKeyStates();							
+		updateModifierKeyStates();
 	}
 
-	// ****************************************************************************	
-	// LibFreeRDP UI event listener implementation	
+	// ****************************************************************************
+	// LibFreeRDP UI event listener implementation
 	@Override
 	public void OnSettingsChanged(int width, int height, int bpp) {
 
@@ -933,68 +966,82 @@ public class SessionActivity extends Activity
 			bitmap = Bitmap.createBitmap(width, height, Config.RGB_565);
 
 		session.setSurface(new BitmapDrawable(bitmap));
-			
-		// check this settings and initial settings - if they are not equal the server doesn't support our settings
-		// FIXME: the additional check (settings.getWidth() != width + 1) is for the RDVH bug fix to avoid accidental notifications
+
+		// check this settings and initial settings - if they are not equal the
+		// server doesn't support our settings
+		// FIXME: the additional check (settings.getWidth() != width + 1) is for
+		// the RDVH bug fix to avoid accidental notifications
 		// (refer to android_freerdp.c for more info on this problem)
-		BookmarkBase.ScreenSettings settings = session.getBookmark().getActiveScreenSettings();
-		if((settings.getWidth() != width && settings.getWidth() != width + 1) || settings.getHeight() != height || settings.getColors() != bpp)
-			uiHandler.sendMessage(Message.obtain(null, UIHandler.DISPLAY_TOAST, getResources().getText(R.string.info_capabilities_changed)));		
+		BookmarkBase.ScreenSettings settings = session.getBookmark()
+				.getActiveScreenSettings();
+		if ((settings.getWidth() != width && settings.getWidth() != width + 1)
+				|| settings.getHeight() != height
+				|| settings.getColors() != bpp)
+			uiHandler
+					.sendMessage(Message.obtain(
+							null,
+							UIHandler.DISPLAY_TOAST,
+							getResources().getText(
+									R.string.info_capabilities_changed)));
 	}
-	
+
 	@Override
-	public void OnGraphicsUpdate(int x, int y, int width, int height)
-	{
-		LibFreeRDP.updateGraphics(session.getInstance(), bitmap, x, y, width, height);
-		
+	public void OnGraphicsUpdate(int x, int y, int width, int height) {
+		LibFreeRDP.updateGraphics(session.getInstance(), bitmap, x, y, width,
+				height);
+
 		sessionView.addInvalidRegion(new Rect(x, y, x + width, y + height));
-		
-		/* since sessionView can only be modified from the UI thread
-		 * any modifications to it need to be scheduled */
+
+		/*
+		 * since sessionView can only be modified from the UI thread any
+		 * modifications to it need to be scheduled
+		 */
 
 		uiHandler.sendEmptyMessage(UIHandler.REFRESH_SESSIONVIEW);
 	}
 
 	@Override
-	public void OnGraphicsResize(int width, int height, int bpp)
-	{
+	public void OnGraphicsResize(int width, int height, int bpp) {
 		// replace bitmap
 		if (bpp > 16)
 			bitmap = Bitmap.createBitmap(width, height, Config.ARGB_8888);
 		else
 			bitmap = Bitmap.createBitmap(width, height, Config.RGB_565);
 		session.setSurface(new BitmapDrawable(bitmap));
-		
-		/* since sessionView can only be modified from the UI thread
-		 * any modifications to it need to be scheduled */
+
+		/*
+		 * since sessionView can only be modified from the UI thread any
+		 * modifications to it need to be scheduled
+		 */
 		uiHandler.sendEmptyMessage(UIHandler.GRAPHICS_CHANGED);
 	}
-	
-	private boolean callbackDialogResult; 
-	
+
+	private boolean callbackDialogResult;
+
 	@Override
-	public boolean OnAuthenticate(StringBuilder username, StringBuilder domain, StringBuilder password) {
+	public boolean OnAuthenticate(StringBuilder username, StringBuilder domain,
+			StringBuilder password) {
 		// this is where the return code of our dialog will be stored
 		callbackDialogResult = false;
 
 		// set text fields
-		((EditText)userCredView.findViewById(R.id.editTextUsername)).setText(username);
-		((EditText)userCredView.findViewById(R.id.editTextDomain)).setText(domain);
-		((EditText)userCredView.findViewById(R.id.editTextPassword)).setText(password);
-		
-		// start dialog in UI thread		
-		uiHandler.sendMessage(Message.obtain(null, UIHandler.SHOW_DIALOG, dlgUserCredentials));
-		
+		((EditText) userCredView.findViewById(R.id.editTextUsername))
+				.setText(username);
+		((EditText) userCredView.findViewById(R.id.editTextDomain))
+				.setText(domain);
+		((EditText) userCredView.findViewById(R.id.editTextPassword))
+				.setText(password);
+
+		// start dialog in UI thread
+		uiHandler.sendMessage(Message.obtain(null, UIHandler.SHOW_DIALOG,
+				dlgUserCredentials));
+
 		// wait for result
-		try
-		{		
-			synchronized(dlgUserCredentials)
-			{
+		try {
+			synchronized (dlgUserCredentials) {
 				dlgUserCredentials.wait();
 			}
-		}
-		catch(InterruptedException e)
-		{			
+		} catch (InterruptedException e) {
 		}
 
 		// clear buffers
@@ -1003,65 +1050,70 @@ public class SessionActivity extends Activity
 		password.setLength(0);
 
 		// read back user credentials
-		username.append(((EditText)userCredView.findViewById(R.id.editTextUsername)).getText().toString());
-		domain.append(((EditText)userCredView.findViewById(R.id.editTextDomain)).getText().toString());
-		password.append(((EditText)userCredView.findViewById(R.id.editTextPassword)).getText().toString());
+		username.append(((EditText) userCredView
+				.findViewById(R.id.editTextUsername)).getText().toString());
+		domain.append(((EditText) userCredView
+				.findViewById(R.id.editTextDomain)).getText().toString());
+		password.append(((EditText) userCredView
+				.findViewById(R.id.editTextPassword)).getText().toString());
 
 		return callbackDialogResult;
 	}
 
 	@Override
-	public boolean OnVerifiyCertificate(String subject, String issuer, String fingerprint) {
+	public boolean OnVerifiyCertificate(String subject, String issuer,
+			String fingerprint) {
 
 		// see if global settings says accept all
-		if(GlobalSettings.getAcceptAllCertificates())
+		if (GlobalSettings.getAcceptAllCertificates())
 			return true;
-		
+
 		// this is where the return code of our dialog will be stored
 		callbackDialogResult = false;
 
 		// set message
-		String msg = getResources().getString(R.string.dlg_msg_verify_certificate);
-		msg = msg + "\n\nSubject: " + subject + "\nIssuer: " + issuer + "\nFingerprint: " + fingerprint;
+		String msg = getResources().getString(
+				R.string.dlg_msg_verify_certificate);
+		msg = msg + "\n\nSubject: " + subject + "\nIssuer: " + issuer
+				+ "\nFingerprint: " + fingerprint;
 		dlgVerifyCertificate.setMessage(msg);
-		
-		// start dialog in UI thread		
-		uiHandler.sendMessage(Message.obtain(null, UIHandler.SHOW_DIALOG, dlgVerifyCertificate));
-		
+
+		// start dialog in UI thread
+		uiHandler.sendMessage(Message.obtain(null, UIHandler.SHOW_DIALOG,
+				dlgVerifyCertificate));
+
 		// wait for result
-		try
-		{		
-			synchronized(dlgVerifyCertificate)
-			{				
+		try {
+			synchronized (dlgVerifyCertificate) {
 				dlgVerifyCertificate.wait();
 			}
+		} catch (InterruptedException e) {
 		}
-		catch(InterruptedException e)
-		{			
-		}
-		
+
 		return callbackDialogResult;
 	}
-	
+
 	@Override
-	public void OnRemoteClipboardChanged(String data)
-	{
+	public void OnRemoteClipboardChanged(String data) {
 		Log.v(TAG, "OnRemoteClipboardChanged: " + data);
-		mClipboardManager.setClipboardData(data);				
-    }
-	
-	// ****************************************************************************	
+		mClipboardManager.setClipboardData(data);
+	}
+
+	// ****************************************************************************
 	// ScrollView2DListener implementation
 	private void resetZoomControlsAutoHideTimeout() {
 		uiHandler.removeMessages(UIHandler.HIDE_ZOOMCONTROLS);
-		uiHandler.sendEmptyMessageDelayed(UIHandler.HIDE_ZOOMCONTROLS, ZOOMCONTROLS_AUTOHIDE_TIMEOUT);		
+		uiHandler.sendEmptyMessageDelayed(UIHandler.HIDE_ZOOMCONTROLS,
+				ZOOMCONTROLS_AUTOHIDE_TIMEOUT);
 	}
-	
+
 	@Override
-	public void onScrollChanged(ScrollView2D scrollView, int x, int y, int oldx, int oldy) {
+	public void onScrollChanged(ScrollView2D scrollView, int x, int y,
+			int oldx, int oldy) {
 		zoomControls.setIsZoomInEnabled(!sessionView.isAtMaxZoom());
 		zoomControls.setIsZoomOutEnabled(!sessionView.isAtMinZoom());
-		if(!GlobalSettings.getHideZoomControls() && zoomControls.getVisibility() != View.VISIBLE)
+		if (!GlobalSettings.getHideZoomControls()
+				&& zoomControls.getVisibility() != View.VISIBLE)
 			zoomControls.show();
 		resetZoomControlsAutoHideTimeout();
 	}
@@ -1069,41 +1121,45 @@ public class SessionActivity extends Activity
 	// ****************************************************************************
 	// SessionView.SessionViewListener
 	@Override
-	public void onSessionViewBeginTouch()
-	{
-		scrollView.setScrollEnabled(false);		
+	public void onSessionViewBeginTouch() {
+		scrollView.setScrollEnabled(false);
 	}
 
 	@Override
-	public void onSessionViewEndTouch()
-	{
-		scrollView.setScrollEnabled(true);		
+	public void onSessionViewEndTouch() {
+		scrollView.setScrollEnabled(true);
 	}
 
 	@Override
-	public void onSessionViewLeftTouch(int x, int y, boolean down) {		
-		if(!down)
+	public void onSessionViewLeftTouch(int x, int y, boolean down) {
+		if (!down)
 			cancelDelayedMoveEvent();
 
-		LibFreeRDP.sendCursorEvent(session.getInstance(), x, y, toggleMouseButtons ? Mouse.getRightButtonEvent(down) : Mouse.getLeftButtonEvent(down));        			
+		LibFreeRDP.sendCursorEvent(
+				session.getInstance(),
+				x,
+				y,
+				toggleMouseButtons ? Mouse.getRightButtonEvent(down) : Mouse
+						.getLeftButtonEvent(down));
 
 		if (!down)
 			toggleMouseButtons = false;
 	}
 
-	public void onSessionViewRightTouch(int x, int y, boolean down) {		
+	public void onSessionViewRightTouch(int x, int y, boolean down) {
 		if (!down)
 			toggleMouseButtons = !toggleMouseButtons;
 	}
 
 	@Override
 	public void onSessionViewMove(int x, int y) {
-		sendDelayedMoveEvent(x, y);		
+		sendDelayedMoveEvent(x, y);
 	}
-	
+
 	@Override
-	public void onSessionViewScroll(boolean down) {		
-    	LibFreeRDP.sendCursorEvent(session.getInstance(), 0, 0, Mouse.getScrollEvent(down));        					
+	public void onSessionViewScroll(boolean down) {
+		LibFreeRDP.sendCursorEvent(session.getInstance(), 0, 0,
+				Mouse.getScrollEvent(down));
 	}
 
 	// ****************************************************************************
@@ -1115,54 +1171,61 @@ public class SessionActivity extends Activity
 	}
 
 	private Point mapScreenCoordToSessionCoord(int x, int y) {
-		int mappedX = (int)((float)(x + scrollView.getScrollX()) / sessionView.getZoom());
-		int mappedY = (int)((float)(y + scrollView.getScrollY()) / sessionView.getZoom());
-		if(mappedX > bitmap.getWidth())
+		int mappedX = (int) ((float) (x + scrollView.getScrollX()) / sessionView
+				.getZoom());
+		int mappedY = (int) ((float) (y + scrollView.getScrollY()) / sessionView
+				.getZoom());
+		if (mappedX > bitmap.getWidth())
 			mappedX = bitmap.getWidth();
-		if(mappedY > bitmap.getHeight())
+		if (mappedY > bitmap.getHeight())
 			mappedY = bitmap.getHeight();
-		return new Point(mappedX, mappedY);  
+		return new Point(mappedX, mappedY);
 	}
-	
+
 	@Override
 	public void onTouchPointerLeftClick(int x, int y, boolean down) {
 		Point p = mapScreenCoordToSessionCoord(x, y);
-    	LibFreeRDP.sendCursorEvent(session.getInstance(), p.x, p.y, Mouse.getLeftButtonEvent(down));
+		LibFreeRDP.sendCursorEvent(session.getInstance(), p.x, p.y,
+				Mouse.getLeftButtonEvent(down));
 	}
 
 	@Override
 	public void onTouchPointerRightClick(int x, int y, boolean down) {
 		Point p = mapScreenCoordToSessionCoord(x, y);
-    	LibFreeRDP.sendCursorEvent(session.getInstance(), p.x, p.y, Mouse.getRightButtonEvent(down));        			
+		LibFreeRDP.sendCursorEvent(session.getInstance(), p.x, p.y,
+				Mouse.getRightButtonEvent(down));
 	}
 
 	@Override
 	public void onTouchPointerMove(int x, int y) {
 		Point p = mapScreenCoordToSessionCoord(x, y);
-    	LibFreeRDP.sendCursorEvent(session.getInstance(), p.x, p.y, Mouse.getMoveEvent());
-    	
-    	if (autoScrollTouchPointer && !uiHandler.hasMessages(UIHandler.SCROLLING_REQUESTED))
-    	{
+		LibFreeRDP.sendCursorEvent(session.getInstance(), p.x, p.y,
+				Mouse.getMoveEvent());
+
+		if (autoScrollTouchPointer
+				&& !uiHandler.hasMessages(UIHandler.SCROLLING_REQUESTED)) {
 			Log.v(TAG, "Starting auto-scroll");
-    		uiHandler.sendEmptyMessageDelayed(UIHandler.SCROLLING_REQUESTED, SCROLLING_TIMEOUT);
-    	}
+			uiHandler.sendEmptyMessageDelayed(UIHandler.SCROLLING_REQUESTED,
+					SCROLLING_TIMEOUT);
+		}
 	}
-	
+
 	@Override
 	public void onTouchPointerScroll(boolean down) {
-    	LibFreeRDP.sendCursorEvent(session.getInstance(), 0, 0, Mouse.getScrollEvent(down));        					
+		LibFreeRDP.sendCursorEvent(session.getInstance(), 0, 0,
+				Mouse.getScrollEvent(down));
 	}
 
 	@Override
 	public void onTouchPointerToggleKeyboard() {
-		showKeyboard(!sysKeyboardVisible, false);				
+		showKeyboard(!sysKeyboardVisible, false);
 	}
 
 	@Override
 	public void onTouchPointerToggleExtKeyboard() {
-		showKeyboard(false, !extKeyboardVisible);		
+		showKeyboard(false, !extKeyboardVisible);
 	}
-	
+
 	@Override
 	public void onTouchPointerResetScrollZoom() {
 		sessionView.setZoom(1.0f);
@@ -1175,5 +1238,5 @@ public class SessionActivity extends Activity
 	public void onClipboardChanged(String data) {
 		Log.v(TAG, "onClipboardChanged: " + data);
 		LibFreeRDP.sendClipboardData(session.getInstance(), data);
-	}	
+	}
 }
diff --git a/client/Android/aFreeRDP/lint.xml b/client/Android/aFreeRDP/lint.xml
new file mode 100644
index 000000000..ee0eead5b
--- /dev/null
+++ b/client/Android/aFreeRDP/lint.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+</lint>
\ No newline at end of file
diff --git a/client/Android/aFreeRDP/proguard-project.txt b/client/Android/aFreeRDP/proguard-project.txt
new file mode 100644
index 000000000..f2fe1559a
--- /dev/null
+++ b/client/Android/aFreeRDP/proguard-project.txt
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/cmake/ConfigOptionsAndroid.cmake b/cmake/ConfigOptionsAndroid.cmake
index e6ae84dd3..0ba7193d8 100644
--- a/cmake/ConfigOptionsAndroid.cmake
+++ b/cmake/ConfigOptionsAndroid.cmake
@@ -27,7 +27,7 @@ option(ANDROID_BUILD_JAVA "Automatically android java code - build type depends
 option(ANDROID_BUILD_JAVA_DEBUG "Create a android debug package" ${JAVA_DEBUG_DEFAULT})
 
 set(ANDROID_APP_VERSION 3 CACHE STRING "Application version")
-set(ANDROID_APP_TARGET_SDK 11 CACHE STRING "Application target android SDK")
+set(ANDROID_APP_TARGET_SDK 14 CACHE STRING "Application target android SDK")
 set(ANDROID_APP_MIN_SDK 9 CACHE STRING "Application minimum android SDK requirement")
 set(ANDROID_APP_GOOGLE_TARGET_SDK "16" CACHE STRING "Application target google SDK")