Add files using upload-large-folder tool

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/cpp/android_event.c

@@ -0,0 +1,398 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Implementation
+ * Android Event System
+ *
+ * Copyright 2010-2012 Marc-Andre Moreau <[email protected]>
+ * Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+ *
+ * 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/.
+ */
+
+#include <freerdp/config.h>
+
+#include <winpr/crt.h>
+
+#include <freerdp/freerdp.h>
+#include <freerdp/log.h>
+
+#define TAG CLIENT_TAG("android")
+
+#include "android_freerdp.h"
+#include "android_cliprdr.h"
+
+BOOL android_push_event(freerdp* inst, ANDROID_EVENT* event)
+{
+	androidContext* aCtx = (androidContext*)inst->context;
+
+	if (aCtx->event_queue->count >= aCtx->event_queue->size)
+	{
+		int new_size;
+		void* new_events;
+		new_size = aCtx->event_queue->size * 2;
+		new_events = realloc((void*)aCtx->event_queue->events, sizeof(ANDROID_EVENT*) * new_size);
+
+		if (!new_events)
+			return FALSE;
+
+		aCtx->event_queue->events = new_events;
+		aCtx->event_queue->size = new_size;
+	}
+
+	aCtx->event_queue->events[(aCtx->event_queue->count)++] = event;
+	return SetEvent(aCtx->event_queue->isSet);
+}
+
+static ANDROID_EVENT* android_peek_event(ANDROID_EVENT_QUEUE* queue)
+{
+	ANDROID_EVENT* event;
+
+	if (queue->count < 1)
+		return NULL;
+
+	event = queue->events[0];
+	return event;
+}
+
+static ANDROID_EVENT* android_pop_event(ANDROID_EVENT_QUEUE* queue)
+{
+	ANDROID_EVENT* event;
+
+	if (queue->count < 1)
+		return NULL;
+
+	event = queue->events[0];
+	(queue->count)--;
+
+	for (size_t i = 0; i < queue->count; i++)
+	{
+		queue->events[i] = queue->events[i + 1];
+	}
+
+	return event;
+}
+
+static BOOL android_process_event(ANDROID_EVENT_QUEUE* queue, freerdp* inst)
+{
+	rdpContext* context;
+
+	WINPR_ASSERT(queue);
+	WINPR_ASSERT(inst);
+
+	context = inst->context;
+	WINPR_ASSERT(context);
+
+	while (android_peek_event(queue))
+	{
+		BOOL rc = FALSE;
+		androidContext* afc = (androidContext*)context;
+		ANDROID_EVENT* event = android_pop_event(queue);
+
+		WINPR_ASSERT(event);
+
+		switch (event->type)
+		{
+			case EVENT_TYPE_KEY:
+			{
+				ANDROID_EVENT_KEY* key_event = (ANDROID_EVENT_KEY*)event;
+
+				rc = freerdp_input_send_keyboard_event(context->input, key_event->flags,
+				                                       key_event->scancode);
+			}
+			break;
+
+			case EVENT_TYPE_KEY_UNICODE:
+			{
+				ANDROID_EVENT_KEY* key_event = (ANDROID_EVENT_KEY*)event;
+
+				rc = freerdp_input_send_unicode_keyboard_event(context->input, key_event->flags,
+				                                               key_event->scancode);
+			}
+			break;
+
+			case EVENT_TYPE_CURSOR:
+			{
+				ANDROID_EVENT_CURSOR* cursor_event = (ANDROID_EVENT_CURSOR*)event;
+
+				rc = freerdp_input_send_mouse_event(context->input, cursor_event->flags,
+				                                    cursor_event->x, cursor_event->y);
+			}
+			break;
+
+			case EVENT_TYPE_CLIPBOARD:
+			{
+				ANDROID_EVENT_CLIPBOARD* clipboard_event = (ANDROID_EVENT_CLIPBOARD*)event;
+				UINT32 formatId = ClipboardRegisterFormat(afc->clipboard, "text/plain");
+				UINT32 size = clipboard_event->data_length;
+
+				if (size)
+					ClipboardSetData(afc->clipboard, formatId, clipboard_event->data, size);
+				else
+					ClipboardEmpty(afc->clipboard);
+
+				rc = (android_cliprdr_send_client_format_list(afc->cliprdr) == CHANNEL_RC_OK);
+			}
+			break;
+
+			case EVENT_TYPE_DISCONNECT:
+			default:
+				break;
+		}
+
+		android_event_free(event);
+
+		if (!rc)
+			return FALSE;
+	}
+
+	return TRUE;
+}
+
+HANDLE android_get_handle(freerdp* inst)
+{
+	androidContext* aCtx;
+
+	if (!inst || !inst->context)
+		return NULL;
+
+	aCtx = (androidContext*)inst->context;
+
+	if (!aCtx->event_queue || !aCtx->event_queue->isSet)
+		return NULL;
+
+	return aCtx->event_queue->isSet;
+}
+
+BOOL android_check_handle(freerdp* inst)
+{
+	androidContext* aCtx;
+
+	if (!inst || !inst->context)
+		return FALSE;
+
+	aCtx = (androidContext*)inst->context;
+
+	if (!aCtx->event_queue || !aCtx->event_queue->isSet)
+		return FALSE;
+
+	if (WaitForSingleObject(aCtx->event_queue->isSet, 0) == WAIT_OBJECT_0)
+	{
+		if (!ResetEvent(aCtx->event_queue->isSet))
+			return FALSE;
+
+		if (!android_process_event(aCtx->event_queue, inst))
+			return FALSE;
+	}
+
+	return TRUE;
+}
+
+ANDROID_EVENT_KEY* android_event_key_new(int flags, UINT16 scancode)
+{
+	ANDROID_EVENT_KEY* event = (ANDROID_EVENT_KEY*)calloc(1, sizeof(ANDROID_EVENT_KEY));
+
+	if (!event)
+		return NULL;
+
+	event->type = EVENT_TYPE_KEY;
+	event->flags = flags;
+	event->scancode = scancode;
+	return event;
+}
+
+static void android_event_key_free(ANDROID_EVENT_KEY* event)
+{
+	free(event);
+}
+
+ANDROID_EVENT_KEY* android_event_unicodekey_new(UINT16 flags, UINT16 key)
+{
+	ANDROID_EVENT_KEY* event;
+	event = (ANDROID_EVENT_KEY*)calloc(1, sizeof(ANDROID_EVENT_KEY));
+
+	if (!event)
+		return NULL;
+
+	event->type = EVENT_TYPE_KEY_UNICODE;
+	event->flags = flags;
+	event->scancode = key;
+	return event;
+}
+
+static void android_event_unicodekey_free(ANDROID_EVENT_KEY* event)
+{
+	free(event);
+}
+
+ANDROID_EVENT_CURSOR* android_event_cursor_new(UINT16 flags, UINT16 x, UINT16 y)
+{
+	ANDROID_EVENT_CURSOR* event;
+	event = (ANDROID_EVENT_CURSOR*)calloc(1, sizeof(ANDROID_EVENT_CURSOR));
+
+	if (!event)
+		return NULL;
+
+	event->type = EVENT_TYPE_CURSOR;
+	event->x = x;
+	event->y = y;
+	event->flags = flags;
+	return event;
+}
+
+static void android_event_cursor_free(ANDROID_EVENT_CURSOR* event)
+{
+	free(event);
+}
+
+ANDROID_EVENT* android_event_disconnect_new(void)
+{
+	ANDROID_EVENT* event;
+	event = (ANDROID_EVENT*)calloc(1, sizeof(ANDROID_EVENT));
+
+	if (!event)
+		return NULL;
+
+	event->type = EVENT_TYPE_DISCONNECT;
+	return event;
+}
+
+static void android_event_disconnect_free(ANDROID_EVENT* event)
+{
+	free(event);
+}
+
+ANDROID_EVENT_CLIPBOARD* android_event_clipboard_new(const void* data, size_t data_length)
+{
+	ANDROID_EVENT_CLIPBOARD* event;
+	event = (ANDROID_EVENT_CLIPBOARD*)calloc(1, sizeof(ANDROID_EVENT_CLIPBOARD));
+
+	if (!event)
+		return NULL;
+
+	event->type = EVENT_TYPE_CLIPBOARD;
+
+	if (data)
+	{
+		event->data = calloc(data_length + 1, sizeof(char));
+
+		if (!event->data)
+		{
+			free(event);
+			return NULL;
+		}
+
+		memcpy(event->data, data, data_length);
+		event->data_length = data_length + 1;
+	}
+
+	return event;
+}
+
+static void android_event_clipboard_free(ANDROID_EVENT_CLIPBOARD* event)
+{
+	if (event)
+	{
+		free(event->data);
+		free(event);
+	}
+}
+
+BOOL android_event_queue_init(freerdp* inst)
+{
+	androidContext* aCtx = (androidContext*)inst->context;
+	ANDROID_EVENT_QUEUE* queue;
+	queue = (ANDROID_EVENT_QUEUE*)calloc(1, sizeof(ANDROID_EVENT_QUEUE));
+
+	if (!queue)
+	{
+		WLog_ERR(TAG, "android_event_queue_init: memory allocation failed");
+		return FALSE;
+	}
+
+	queue->size = 16;
+	queue->count = 0;
+	queue->isSet = CreateEventA(NULL, TRUE, FALSE, NULL);
+
+	if (!queue->isSet)
+	{
+		free(queue);
+		return FALSE;
+	}
+
+	queue->events = (ANDROID_EVENT**)calloc(queue->size, sizeof(ANDROID_EVENT*));
+
+	if (!queue->events)
+	{
+		WLog_ERR(TAG, "android_event_queue_init: memory allocation failed");
+		(void)CloseHandle(queue->isSet);
+		free(queue);
+		return FALSE;
+	}
+
+	aCtx->event_queue = queue;
+	return TRUE;
+}
+
+void android_event_queue_uninit(freerdp* inst)
+{
+	androidContext* aCtx;
+	ANDROID_EVENT_QUEUE* queue;
+
+	if (!inst || !inst->context)
+		return;
+
+	aCtx = (androidContext*)inst->context;
+	queue = aCtx->event_queue;
+
+	if (queue)
+	{
+		if (queue->isSet)
+		{
+			(void)CloseHandle(queue->isSet);
+			queue->isSet = NULL;
+		}
+
+		if (queue->events)
+		{
+			free(queue->events);
+			queue->events = NULL;
+			queue->size = 0;
+			queue->count = 0;
+		}
+
+		free(queue);
+	}
+}
+
+void android_event_free(ANDROID_EVENT* event)
+{
+	if (!event)
+		return;
+
+	switch (event->type)
+	{
+		case EVENT_TYPE_KEY:
+			android_event_key_free((ANDROID_EVENT_KEY*)event);
+			break;
+
+		case EVENT_TYPE_KEY_UNICODE:
+			android_event_unicodekey_free((ANDROID_EVENT_KEY*)event);
+			break;
+
+		case EVENT_TYPE_CURSOR:
+			android_event_cursor_free((ANDROID_EVENT_CURSOR*)event);
+			break;
+
+		case EVENT_TYPE_DISCONNECT:
+			android_event_disconnect_free((ANDROID_EVENT*)event);
+			break;
+
+		case EVENT_TYPE_CLIPBOARD:
+			android_event_clipboard_free((ANDROID_EVENT_CLIPBOARD*)event);
+			break;
+
+		default:
+			break;
+	}
+}

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.h

@@ -0,0 +1,43 @@
+/*
+   Android JNI Client Layer
+
+   Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+   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/.
+*/
+
+#ifndef FREERDP_CLIENT_ANDROID_FREERDP_H
+#define FREERDP_CLIENT_ANDROID_FREERDP_H
+
+#include <jni.h>
+
+#include <winpr/crt.h>
+#include <winpr/clipboard.h>
+
+#include <freerdp/freerdp.h>
+#include <freerdp/client/cliprdr.h>
+
+#include "android_event.h"
+
+typedef struct
+{
+	rdpClientContext common;
+
+	ANDROID_EVENT_QUEUE* event_queue;
+	HANDLE thread;
+
+	BOOL is_connected;
+
+	BOOL clipboardSync;
+	wClipboard* clipboard;
+	UINT32 numServerFormats;
+	UINT32 requestedFormatId;
+	HANDLE clipboardRequestEvent;
+	CLIPRDR_FORMAT* serverFormats;
+	CliprdrClientContext* cliprdr;
+	UINT32 clipboardCapabilities;
+} androidContext;
+
+#endif /* FREERDP_CLIENT_ANDROID_FREERDP_H */

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp_jni.h

@@ -0,0 +1,27 @@
+/*
+   FreeRDP: A Remote Desktop Protocol client.
+   Android FreeRDP JNI Definitions
+
+   Copyright 2010 Marc-Andre Moreau <[email protected]>
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+#ifndef FREERDP_CLIENT_ANDROID_FREERDP_JNI_H
+#define FREERDP_CLIENT_ANDROID_FREERDP_JNI_H
+
+#define JAVA_LIBFREERDP_CLASS "com/freerdp/freerdpcore/services/LibFreeRDP"
+#define JAVA_CONTEXT_CLASS "android/content/Context"
+#define JAVA_FILE_CLASS "java/io/File"
+
+#endif /* FREERDP_CLIENT_ANDROID_FREERDP_JNI_H */

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/cpp/android_jni_callback.c

@@ -0,0 +1,226 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Implementation
+ * Android JNI Callback Helpers
+ *
+ * Copyright 2011-2013 Thincast Technologies GmbH, Author: Martin Fleisz
+ *
+ * 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/.
+ */
+
+#include <freerdp/config.h>
+
+#include <stdio.h>
+
+#include "android_jni_callback.h"
+#include "android_freerdp_jni.h"
+
+#include <freerdp/log.h>
+#define TAG CLIENT_TAG("android.callback")
+
+static JavaVM* jVM;
+static jobject jLibFreeRDPObject;
+
+static const char* jLibFreeRDPPath = JAVA_LIBFREERDP_CLASS;
+
+static void jni_load_class(JNIEnv* env, const char* path, jobject* objptr)
+{
+	jclass class;
+	jmethodID method;
+	jobject object;
+	WLog_DBG(TAG, "jni_load_class: %s", path);
+	class = (*env)->FindClass(env, path);
+
+	if (!class)
+	{
+		WLog_ERR(TAG, "jni_load_class: failed to find class %s", path);
+		goto finish;
+	}
+
+	method = (*env)->GetMethodID(env, class, "<init>", "()V");
+
+	if (!method)
+	{
+		WLog_ERR(TAG, "jni_load_class: failed to find class constructor of %s", path);
+		goto finish;
+	}
+
+	object = (*env)->NewObject(env, class, method);
+
+	if (!object)
+	{
+		WLog_ERR(TAG, "jni_load_class: failed create new object of %s", path);
+		goto finish;
+	}
+
+	(*objptr) = (*env)->NewGlobalRef(env, object);
+finish:
+
+	while (0)
+		;
+}
+
+jint init_callback_environment(JavaVM* vm, JNIEnv* env)
+{
+	jVM = vm;
+	jni_load_class(env, jLibFreeRDPPath, &jLibFreeRDPObject);
+	return JNI_VERSION_1_6;
+}
+
+/* attach current thread to jvm */
+jboolean jni_attach_thread(JNIEnv** env)
+{
+	if ((*jVM)->GetEnv(jVM, (void**)env, JNI_VERSION_1_4) != JNI_OK)
+	{
+		WLog_DBG(TAG, "android_java_callback: attaching current thread");
+		(*jVM)->AttachCurrentThread(jVM, env, NULL);
+
+		if ((*jVM)->GetEnv(jVM, (void**)env, JNI_VERSION_1_4) != JNI_OK)
+		{
+			WLog_ERR(TAG, "android_java_callback: failed to obtain current JNI environment");
+		}
+
+		return JNI_TRUE;
+	}
+
+	return JNI_FALSE;
+}
+
+/* attach current thread to JVM */
+void jni_detach_thread()
+{
+	(*jVM)->DetachCurrentThread(jVM);
+}
+
+/* callback with void result */
+static void java_callback_void(jobject obj, const char* callback, const char* signature,
+                               va_list args)
+{
+	jclass jObjClass;
+	jmethodID jCallback;
+	jboolean attached;
+	JNIEnv* env;
+	WLog_DBG(TAG, "java_callback: %s (%s)", callback, signature);
+	attached = jni_attach_thread(&env);
+	jObjClass = (*env)->GetObjectClass(env, obj);
+
+	if (!jObjClass)
+	{
+		WLog_ERR(TAG, "android_java_callback: failed to get class reference");
+		goto finish;
+	}
+
+	jCallback = (*env)->GetStaticMethodID(env, jObjClass, callback, signature);
+
+	if (!jCallback)
+	{
+		WLog_ERR(TAG, "android_java_callback: failed to get method id");
+		goto finish;
+	}
+
+	(*env)->CallStaticVoidMethodV(env, jObjClass, jCallback, args);
+finish:
+
+	if (attached == JNI_TRUE)
+		jni_detach_thread();
+}
+
+/* callback with bool result */
+static jboolean java_callback_bool(jobject obj, const char* callback, const char* signature,
+                                   va_list args)
+{
+	jclass jObjClass;
+	jmethodID jCallback;
+	jboolean attached;
+	jboolean res = JNI_FALSE;
+	JNIEnv* env;
+	WLog_DBG(TAG, "java_callback: %s (%s)", callback, signature);
+	attached = jni_attach_thread(&env);
+	jObjClass = (*env)->GetObjectClass(env, obj);
+
+	if (!jObjClass)
+	{
+		WLog_ERR(TAG, "android_java_callback: failed to get class reference");
+		goto finish;
+	}
+
+	jCallback = (*env)->GetStaticMethodID(env, jObjClass, callback, signature);
+
+	if (!jCallback)
+	{
+		WLog_ERR(TAG, "android_java_callback: failed to get method id");
+		goto finish;
+	}
+
+	res = (*env)->CallStaticBooleanMethodV(env, jObjClass, jCallback, args);
+finish:
+
+	if (attached == JNI_TRUE)
+		jni_detach_thread();
+
+	return res;
+}
+
+/* callback with int result */
+static jint java_callback_int(jobject obj, const char* callback, const char* signature,
+                              va_list args)
+{
+	jclass jObjClass;
+	jmethodID jCallback;
+	jboolean attached;
+	jint res = -1;
+	JNIEnv* env;
+	WLog_DBG(TAG, "java_callback: %s (%s)", callback, signature);
+	attached = jni_attach_thread(&env);
+	jObjClass = (*env)->GetObjectClass(env, obj);
+
+	if (!jObjClass)
+	{
+		WLog_ERR(TAG, "android_java_callback: failed to get class reference");
+		goto finish;
+	}
+
+	jCallback = (*env)->GetStaticMethodID(env, jObjClass, callback, signature);
+
+	if (!jCallback)
+	{
+		WLog_ERR(TAG, "android_java_callback: failed to get method id");
+		goto finish;
+	}
+
+	res = (*env)->CallStaticIntMethodV(env, jObjClass, jCallback, args);
+finish:
+
+	if (attached == JNI_TRUE)
+		jni_detach_thread();
+
+	return res;
+}
+
+/* callback to freerdp class */
+void freerdp_callback(const char* callback, const char* signature, ...)
+{
+	va_list vl;
+	va_start(vl, signature);
+	java_callback_void(jLibFreeRDPObject, callback, signature, vl);
+	va_end(vl);
+}
+
+jboolean freerdp_callback_bool_result(const char* callback, const char* signature, ...)
+{
+	va_list vl;
+	va_start(vl, signature);
+	jboolean res = java_callback_bool(jLibFreeRDPObject, callback, signature, vl);
+	va_end(vl);
+	return res;
+}
+
+jint freerdp_callback_int_result(const char* callback, const char* signature, ...)
+{
+	va_list vl;
+	va_start(vl, signature);
+	jint res = java_callback_int(jLibFreeRDPObject, callback, signature, vl);
+	va_end(vl);
+	return res;
+}

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/cpp/android_jni_utils.h

@@ -0,0 +1,36 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Implementation
+ * Android Event System
+ *
+ * Copyright 2013 Felix Long
+ * Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+ *
+ * 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/.
+ */
+#ifndef FREERDP_CLIENT_ANDROID_JNI_UTILS_H
+#define FREERDP_CLIENT_ANDROID_JNI_UTILS_H
+
+#include <jni.h>
+#include <freerdp/api.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+	FREERDP_LOCAL JNIEnv* getJNIEnv();
+	FREERDP_LOCAL JavaVM* getJavaVM();
+
+	FREERDP_LOCAL char* get_string_from_string_builder(JNIEnv* env, jobject strBuilder);
+	FREERDP_LOCAL jobject create_string_builder(JNIEnv* env, char* initialStr);
+	FREERDP_LOCAL jstring jniNewStringUTF(JNIEnv* env, const char* in, int len);
+
+	FREERDP_LOCAL extern JavaVM* g_JavaVm;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREERDP_CLIENT_ANDROID_JNI_UTILS_H */

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/values-pt-rBR/strings.xml

@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Button labels -->
+    <string name="yes">Sim</string>
+    <string name="no">Não</string>
+    <string name="cancel">Cancelar</string>
+    <string name="cont">Continuar</string>
+    <string name="login">Login</string>
+    <string name="logout">Sair</string>
+    <!-- Home menu items -->
+    <string name="menu_exit">Saída</string>
+    <string name="menu_about">Sobre</string>
+    <string name="menu_help">Ajuda</string>
+    <string name="menu_new_bookmark">Nova conexão</string>
+    <string name="menu_app_settings">Configurações</string>
+    <!-- Bookmark menu items -->
+    <string name="menu_title_bookmark">Conexão</string>
+    <string name="menu_connect">Conectar</string>
+    <string name="menu_edit">Editar</string>
+    <string name="menu_delete">Excluir</string>
+    <!-- Session menu items -->
+    <string name="menu_sys_keyboard">Teclado</string>
+    <string name="menu_ext_keyboard">Teclas de função</string>
+    <string name="menu_touch_pointer">Ponteiro de toque</string>
+    <string name="menu_home">início</string>
+    <string name="menu_disconnect">Desconectar</string>
+    <!-- List section headers -->
+    <string name="section_bookmarks">Conexões manuais</string>
+    <string name="section_active_sessions">Sessões ativas</string>
+    <!-- Search strings -->
+    <string name="search_hint">Conectar ao computador</string>
+    <!-- List placeholder labels -->
+    <string name="list_placeholder_login">Log in</string>
+    <string name="list_placeholder_no_servers">Nenhum servidor</string>
+    <string name="list_placeholder_connecting">Conectando &#8230;</string>
+    <string name="list_placeholder_disconnecting">Desconectando  &#8230;</string>
+    <string name="list_placeholder_connection_error">Conexão perdida</string>
+    <string name="list_placeholder_wrong_password">Senha incorreta</string>
+    <string name="list_placeholder_invalid_username">Nome de usuário inválido</string>
+    <string name="list_placeholder_add_bookmark">Adicionar conexão</string>
+    <!-- Bookmark settings strings -->
+    <string name="settings_cat_host">Host</string>
+    <string name="settings_label">Identificador</string>
+    <string name="settings_hostname">Nome de Host</string>
+    <string name="settings_port">Porta</string>
+    <string name="settings_cat_credentials">Credenciais</string>
+    <string name="settings_credentials">Credenciais</string>
+    <string name="settings_username">Nome de usuário</string>
+    <string name="settings_password">Senha</string>
+    <string name="settings_domain">Domínio</string>
+    <string name="settings_cat_settings">Configurações</string>
+    <string name="settings_screen">Tela</string>
+    <string name="settings_cat_screen">Configurações da tela</string>
+    <string name="settings_colors">Cores</string>
+    <string-array name="colors_array">
+        <item>Paleta de cores (8 Bit)</item>
+        <item>Definição alta (15 Bit)</item>
+        <item>Definição alta (16 Bit)</item>
+        <item>Definição real (24 Bit)</item>
+        <item>Definição máxima (32 Bit)</item>
+    </string-array>
+    <string name="settings_resolution">Resolução</string>
+    <string name="resolution_automatic">Automática</string>
+    <string name="resolution_fit">Preencher a tela</string>
+    <string name="resolution_custom">Personalizada</string>
+    <string-array name="resolutions_array">
+        <item>Automática</item>
+        <item>Preencher a tela</item>
+        <item>Personalizada</item>
+        <item>640x480</item>
+        <item>720x480</item>
+        <item>800x600</item>
+        <item>1024x768</item>
+        <item>1280x1024</item>
+        <item>1440x900</item>
+        <item>1920x1080</item>
+        <item>1920x1200</item>
+    </string-array>
+    <string name="settings_width">Largura</string>
+    <string name="settings_height">Altura</string>
+    <string name="settings_performance">Desempenho</string>
+    <string name="settings_cat_performance">Configurações de desempenho</string>
+    <string name="settings_perf_remotefx">RemoteFX</string>
+    <string name="settings_perf_wallpaper">Fundo da área de trabalho</string>
+    <string name="settings_perf_font_smoothing">Alisamento da fonte</string>
+    <string name="settings_perf_desktop_composition">Composição da área de trabalho</string>
+    <string name="settings_perf_full_window_drag">Conteúdo das janelas ao deslocar</string>
+    <string name="settings_perf_menu_animation">Animação do menu</string>
+    <string name="settings_perf_theming">Estilo visual</string>
+    <string name="settings_advanced">Avançado</string>
+    <string name="settings_cat_advanced">Configurações avançadas</string>
+    <string name="settings_enable_3g_settings">Configurações 3G</string>
+    <string name="settings_screen_3g">Tela 3G</string>
+    <string name="settings_performance_3g">Desempenho 3G</string>
+    <string name="settings_cat_gateway">Gateway</string>
+    <string name="settings_enable_gateway_settings">Ativar Gateway</string>
+    <string name="settings_gateway_settings">Configurações do Gateway</string>
+    <string name="settings_redirect_sdcard">Redirecionar SD card</string>
+    <string name="settings_redirect_sound">Redirecionar som</string>
+    <string-array name="redirect_sound_array">
+        <item>Não reproduzir</item>
+        <item>Reproduzir no servidor</item>
+        <item>Reproduzir no dispositivo</item>
+    </string-array>
+    <string name="settings_redirect_microphone">Redirecionar microfone</string>
+    <string name="settings_security">Segurança</string>
+    <string-array name="security_array">
+        <item>Automática</item>
+        <item>RDP</item>
+        <item>TLS</item>
+        <item>NLA</item>
+    </string-array>
+    <string name="settings_remote_program">Programa remoto</string>
+    <string name="settings_work_dir">Pasta de trabalho</string>
+    <string name="settings_async_channel">Canal Async</string>
+    <string name="settings_async_update">Atualização Async</string>
+    <string name="settings_console_mode">Modo Console</string>
+    <!-- App settings strings -->
+    <string name="settings_password_present">*******</string>
+    <string name="settings_password_empty">não definido</string>
+    <string name="settings_cat_ui">Interface do usuário</string>
+    <string name="settings_ui_hide_status_bar">Ocultar barra de status</string>
+    <string name="settings_ui_hide_action_bar">Ocultar barra de ação</string>
+    <string name="settings_ui_hide_zoom_controls">Ocultar controles de zoom</string>
+    <string name="settings_ui_swap_mouse_buttons">Trocar os botões do mouse</string>
+    <string name="settings_ui_invert_scrolling">Inverter a rolagem</string>
+    <string name="settings_ui_auto_scroll_touchpointer">Rolagem automática do ponteiro de toque</string>
+    <string name="settings_ui_ask_on_exit">Mostrar diálogo ao sair</string>
+    <string name="settings_ui_use_back_as_altf4">Usar o botão "voltar" como Alt+F4</string>
+    <string name="settings_cat_power">Economia de energia</string>
+    <string name="settings_cat_client">Cliente</string>
+    <string name="settings_power_disconnect_timeout">Fechar as conexões inativas</string>
+    <string name="settings_cat_security">Segurança</string>
+    <string name="settings_security_accept_certificates">Aceitar todos os certificados</string>
+    <string name="settings_security_clear_certificate_cache">Excluir o cache do certificado</string>
+    <string name="settings_description_after_minutes">Após %1$d minutos</string>
+    <string name="settings_description_disabled">Desativado</string>
+    <!-- Activity titles -->
+    <string name="title_bookmark_settings">Configurações de conexão</string>
+    <string name="title_application_settings">Configurações</string>
+    <string name="title_home">aFreeRDP - FreeRDP para Android</string>
+    <string name="title_create_shortcut">Conexões de RDP</string>
+    <string name="title_help">Ajuda</string>
+    <string name="title_about">Sobre</string>
+    <!-- Error message strings -->
+    <string name="error_bookmark_incomplete_title">Cancelar sem salvar?</string>
+    <string name="error_bookmark_incomplete">Clique no "Cancelar" para anular!\nClique no "Continuar" para completar os campos necessários!</string>
+    <string name="error_connection_failure">Não foi possível estabelecer uma conexão com o servidor!</string>
+    <!-- Info message strings -->
+    <string name="info_capabilities_changed">As configurações da tela mudaram para aquelas que são suportadas pelo servidor.</string>
+    <string name="info_reset_success">O Cache de certificados foi excluído.</string>
+    <string name="info_reset_failed">Não foi possível excluir o cache do certificado!</string>
+    <!-- Dialog strings -->
+    <string name="dlg_title_verify_certificate">Verificar o certificado</string>
+    <string name="dlg_msg_verify_certificate">A identidade do computador remoto não pode ser verificada. Você quer conectar de qualquer forma?</string>
+    <string name="dlg_title_credentials">Por favor, digite suas credenciais</string>
+    <string name="dlg_title_create_shortcut">Criar atalho</string>
+    <string name="dlg_msg_create_shortcut">Nome do atalho:</string>
+    <string name="dlg_msg_connecting">Conectando &#8230;</string>
+    <string name="dlg_msg_logging_in">Efetuando login &#8230;</string>
+    <string name="dlg_title_about">Sobre aFreeRDP</string>
+    <string name="dlg_title_create_bookmark_after_qc">Salvar as configurações da conexão?</string>
+    <string name="dlg_msg_create_bookmark_after_qc">Quer salvar as suas configurações da conexão não salvas?</string>
+    <string name="dlg_title_save_bookmark">Salvar conexão?</string>
+    <string name="dlg_save_bookmark">Quer salvar quaisquer alterações feitas nas configurações de conexão?</string>
+    <string name="dlg_dont_show_again">Não pergunte de novo</string>
+    <string name="dlg_title_exit">Sair do App?</string>
+    <string name="dlg_msg_exit">Tem certeza de que quer sair do App?</string>
+    <string name="dlg_title_clear_cert_cache">Excluir os certificados?</string>
+    <string name="dlg_msg_clear_cert_cache">Tem certeza de que quer excluir todos os seus certificados do cache?</string>
+    <string name="debug_level">Nível de depuração</string>
+    <string name="settings_debug">Ajustes de depuração</string>
+    <string name="preference_title_client">Cliente</string>
+    <string name="preference_title_client_name">Nome do cliente</string>        
+</resources>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/values/attrs.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="separator_frame_color">#9AB6CD</color>
+    <color name="separator_background_color">#C2D6E6</color>
+    <color name="separator_text_color">#164E76</color>
+    <color name="button_text_color">@android:color/black</color>
+
+    <declare-styleable name="IntEditTextPreference">
+        <attr name="bounds_min" format="integer" />
+        <attr name="bounds_max" format="integer" />
+        <attr name="bounds_default" format="integer" />
+    </declare-styleable>
+
+</resources>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/values/strings.xml

@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Button labels -->
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
+    <string name="cancel">Cancel</string>
+    <string name="cont">Continue</string>
+    <string name="login">Log in</string>
+    <string name="logout">Log out</string>
+    <!-- Home menu items -->
+    <string name="menu_exit">Exit</string>
+    <string name="menu_about">About</string>
+    <string name="menu_help">Help</string>
+    <string name="menu_new_bookmark">New Connection</string>
+    <string name="menu_app_settings">Settings</string>
+    <!-- Bookmark menu items -->
+    <string name="menu_title_bookmark">Connection</string>
+    <string name="menu_connect">Connect</string>
+    <string name="menu_edit">Edit</string>
+    <string name="menu_delete">Delete</string>
+    <!-- Session menu items -->
+    <string name="menu_sys_keyboard">Keyboard</string>
+    <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>
+    <!-- List section headers -->
+    <string name="section_bookmarks">Manual Connections</string>
+    <string name="section_active_sessions">Active Sessions</string>
+    <!-- Search strings -->
+    <string name="search_hint">Connect to Computer</string>
+    <!-- List placeholder labels -->
+    <string name="list_placeholder_login">Log in</string>
+    <string name="list_placeholder_no_servers">No Servers</string>
+    <string name="list_placeholder_connecting">Connecting &#8230;</string>
+    <string name="list_placeholder_disconnecting">Disconnecting &#8230;</string>
+    <string name="list_placeholder_connection_error">Connection Lost</string>
+    <string name="list_placeholder_wrong_password">Wrong Password</string>
+    <string name="list_placeholder_invalid_username">Invalid Username</string>
+    <string name="list_placeholder_add_bookmark">Add Connection</string>
+    <!-- Bookmark settings strings -->
+    <string name="settings_cat_host">Host</string>
+    <string name="settings_label">Label</string>
+    <string name="settings_hostname">Hostname</string>
+    <string name="settings_port">Port</string>
+    <string name="settings_cat_credentials">Credentials</string>
+    <string name="settings_credentials">Credentials</string>
+    <string name="settings_username">Username</string>
+    <string name="settings_password">Password</string>
+    <string name="settings_domain">Domain</string>
+    <string name="settings_cat_settings">Settings</string>
+    <string name="settings_screen">Screen</string>
+    <string name="settings_cat_screen">Screen Settings</string>
+    <string name="settings_colors">Colors</string>
+    <string-array name="colors_array">
+        <item>Palette (8 Bit)</item>
+        <item>High Color (15 Bit)</item>
+        <item>High Color (16 Bit)</item>
+        <item>True Color (24 Bit)</item>
+        <item>Highest Quality (32 Bit)</item>
+    </string-array>
+    <!-- This array is used as is in code,
+	do not translate! -->
+    <string-array name="colors_values_array" translatable="false">
+        <item>8</item>
+        <item>15</item>
+        <item>16</item>
+        <item>24</item>
+        <item>32</item>
+    </string-array>
+    <string name="settings_resolution">Resolution</string>
+    <string name="resolution_automatic">Automatic</string>
+    <string name="resolution_fit">Fit screen</string>
+    <string name="resolution_custom">Custom</string>
+    <string-array name="resolutions_array">
+        <item>Automatic</item>
+        <item>Fit Screen</item>
+        <item>Custom</item>
+        <item>640x480</item>
+        <item>720x480</item>
+        <item>800x600</item>
+        <item>1024x768</item>
+        <item>1280x1024</item>
+        <item>1440x900</item>
+        <item>1920x1080</item>
+        <item>1920x1200</item>
+    </string-array>
+    <!-- This array is used as is in code,
+	do not translate! -->
+    <string-array name="resolutions_values_array" translatable="false">
+        <item>automatic</item>
+        <item>fitscreen</item>
+        <item>custom</item>
+        <item>640x480</item>
+        <item>720x480</item>
+        <item>800x600</item>
+        <item>1024x768</item>
+        <item>1280x1024</item>
+        <item>1440x900</item>
+        <item>1920x1080</item>
+        <item>1920x1200</item>
+    </string-array>
+    <string name="settings_width">Width</string>
+    <string name="settings_height">Height</string>
+    <string name="settings_performance">Performance</string>
+    <string name="settings_cat_performance">Performance Settings</string>
+    <string name="settings_perf_remotefx">RemoteFX</string>
+    <string name="settings_perf_gfx" translatable="false">GFX</string>
+    <string name="settings_perf_gfx_h264" translatable="false">H264</string>
+    <string name="settings_perf_wallpaper">Desktop Background</string>
+    <string name="settings_perf_font_smoothing">Font Smoothing</string>
+    <string name="settings_perf_desktop_composition">Desktop Composition</string>
+    <string name="settings_perf_full_window_drag">Window contents while dragging</string>
+    <string name="settings_perf_menu_animation">Menu Animation</string>
+    <string name="settings_perf_theming">Visual Styles</string>
+    <string name="settings_advanced">Advanced</string>
+    <string name="settings_cat_advanced">Advanced Settings</string>
+    <string name="settings_enable_3g_settings">3G Settings</string>
+    <string name="settings_screen_3g">3G Screen</string>
+    <string name="settings_performance_3g">3G Performance</string>
+    <string name="settings_cat_gateway">Gateway</string>
+    <string name="settings_enable_gateway_settings">Enable Gateway</string>
+    <string name="settings_gateway_settings">Gateway Settings</string>
+    <string name="settings_redirect_sdcard">Redirect SD card</string>
+    <string name="settings_redirect_sound">Redirect Sound</string>
+    <string-array name="redirect_sound_array">
+        <item>Do not play</item>
+        <item>Play on Server</item>
+        <item>Play on Device</item>
+    </string-array>
+    <!-- This array is used as is in code,
+	do not translate! -->
+    <string-array name="redirect_sound_values_array" translatable="false">
+        <item>2</item>
+        <item>1</item>
+        <item>0</item>
+    </string-array>
+    <string name="settings_redirect_microphone">Redirect Microphone</string>
+    <string name="settings_security">Security</string>
+    <string-array name="security_array">
+        <item>Automatic</item>
+        <item>RDP</item>
+        <item>TLS</item>
+        <item>NLA</item>
+    </string-array>
+    <!-- This array is used as is in code,
+	do not translate! -->
+    <string-array name="security_values_array" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+    <string name="settings_remote_program">Remote Program</string>
+    <string name="settings_work_dir">Working Directory</string>
+    <string name="settings_async_channel">Async channel</string>
+    <string name="settings_async_update">Async update</string>
+    <string name="settings_console_mode">Console Mode</string>
+    <!-- App settings strings -->
+    <string name="settings_password_present">*******</string>
+    <string name="settings_password_empty">not set</string>
+    <string name="settings_cat_ui">User Interface</string>
+    <string name="settings_ui_hide_status_bar">Hide Status Bar</string>
+    <string name="settings_ui_hide_action_bar">Hide Action Bar</string>
+    <string name="settings_ui_hide_zoom_controls">Hide Zoom Controls</string>
+    <string name="settings_ui_swap_mouse_buttons">Swap Mouse Buttons</string>
+    <string name="settings_ui_invert_scrolling">Invert Scrolling</string>
+    <string name="settings_ui_auto_scroll_touchpointer">Touch Pointer Auto Scroll</string>
+    <string name="settings_ui_ask_on_exit">Show Dialog on Exit</string>
+    <string name="settings_ui_use_back_as_altf4">Use \"back\" button as Alt+F4</string>
+    <string name="settings_cat_power">Power Saving</string>
+    <string name="settings_cat_client">Client</string>
+    <string name="settings_power_disconnect_timeout">Close idle Connections</string>
+    <string name="settings_cat_security">Security</string>
+    <string name="settings_security_accept_certificates">Accept all Certificates</string>
+    <string name="settings_security_clear_certificate_cache">Clear Certificate Cache</string>
+    <string name="settings_description_after_minutes">After %1$d Minutes</string>
+    <string name="settings_description_disabled">Disabled</string>
+    <!-- Activity titles -->
+    <string name="title_bookmark_settings">Connection Settings</string>
+    <string name="title_application_settings">Settings</string>
+    <string name="title_home">aFreeRDP - FreeRDP for Android</string>
+    <string name="title_create_shortcut">RDP Connections</string>
+    <string name="title_help">Help</string>
+    <string name="title_about">About</string>
+    <!-- Error message strings -->
+    <string name="error_bookmark_incomplete_title">Cancel without saving?</string>
+    <string name="error_bookmark_incomplete">Press "Cancel" to abort!\nPress "Continue" to specify the required fields!</string>
+    <string name="error_connection_failure">Could not establish a connection to the server!</string>
+    <!-- Info message strings -->
+    <string name="info_capabilities_changed">Screen settings changed to ones supported by the server instead.</string>
+    <string name="info_reset_success">Certificate cache deleted.</string>
+    <string name="info_reset_failed">Could not delete the certificate cache!</string>
+    <!-- Dialog strings -->
+    <string name="dlg_title_verify_certificate">Verify Certificate</string>
+    <string name="dlg_msg_verify_certificate">The identity of the remote computer cannot be verified. Do you want to connect anyway?</string>
+    <string name="dlg_title_credentials">Please enter your credentials</string>
+    <string name="dlg_title_create_shortcut">Create Shortcut</string>
+    <string name="dlg_msg_create_shortcut">Shortcut name:</string>
+    <string name="dlg_msg_connecting">Connecting &#8230;</string>
+    <string name="dlg_msg_logging_in">Logging in &#8230;</string>
+    <string name="dlg_title_about">About aFreeRDP</string>
+    <string name="dlg_title_create_bookmark_after_qc">Save Connection Settings?</string>
+    <string name="dlg_msg_create_bookmark_after_qc">Do you want to save your unsaved connection settings?</string>
+    <string name="dlg_title_save_bookmark">Save Connection?</string>
+    <string name="dlg_save_bookmark">Do you want to save any changes you made to the connection settings?</string>
+    <string name="dlg_dont_show_again">Do not ask again</string>
+    <string name="dlg_title_exit">Exit App?</string>
+    <string name="dlg_msg_exit">Are you sure you want to exit the app?</string>
+    <string name="dlg_title_clear_cert_cache">Delete Certificates?</string>
+    <string name="dlg_msg_clear_cert_cache">Are you sure you want to delete all your cached certificates?</string>
+    <string name="debug_level">Debug Level</string>
+    <string name="settings_debug">Debug Settings</string>
+    <string name="preference_title_client">Client</string>
+    <string name="preference_key_client_name" translatable="false">preference_key_client_name</string>
+    <string name="preference_title_client_name">Client Name</string>
+    <string name="preference_default_client_name" translatable="false">aFreeRDP</string>
+    <string name="preference_key_accept_certificates" translatable="false">security.accept_certificates</string>
+    <string name="preference_key_security_clear_certificate_cache" translatable="false">security.clear_certificate_cache</string>
+    <string name="preference_key_power_disconnect_timeout" translatable="false">power.disconnect_timeout</string>
+    <string name="preference_key_ui_hide_status_bar" translatable="false">ui.hide_status_bar</string>
+    <string name="preference_key_ui_ask_on_exit" translatable="false">ui.ask_on_exit</string>
+    <string name="preference_key_ui_auto_scroll_touchpointer" translatable="false">ui.auto_scroll_touchpointer</string>
+    <string name="preference_key_ui_invert_scrolling" translatable="false">ui.invert_scrolling</string>
+    <string name="preference_key_ui_swap_mouse_buttons" translatable="false">ui.swap_mouse_buttons</string>
+    <string name="preference_key_ui_hide_zoom_controls" translatable="false">ui.hide_zoom_controls</string>
+    <string name="preference_key_ui_hide_action_bar" translatable="false">ui.hide_action_bar</string>
+    <string name="preference_key_ui_use_back_as_altf4" translatable="false">ui.use_back_as_altf4</string>
+    <string-array name="debug_array" translatable="false">
+        <item>OFF</item>
+        <item>FATAL</item>
+        <item>ERROR</item>
+        <item>WARN</item>
+        <item>INFO</item>
+        <item>DEBUG</item>
+        <item>TRACE</item>
+    </string-array>
+    <!-- This array is used as is in code,
+	do not translate! -->
+    <string-array name="debug_values_array" translatable="false">
+        <item>OFF</item>
+        <item>FATAL</item>
+        <item>ERROR</item>
+        <item>WARN</item>
+        <item>INFO</item>
+        <item>DEBUG</item>
+        <item>TRACE</item>
+    </string-array>
+
+    <string name="preference_key_h264_3g" translatable="false">bookmark.perf_gfx_h264</string>
+    <string name="preference_key_h264" translatable="false">bookmark.perf_gfx_h264</string>
+</resources>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/values/theme.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+
+    <style name="Theme.Settings" parent="@style/Theme.AppCompat.Light.DarkActionBar">
+        <item name="android:listSeparatorTextViewStyle">@style/SettingsCategory</item>
+    </style>
+
+    <style name="Theme.Main" parent="@style/Theme.AppCompat.Light.DarkActionBar"></style>
+
+    <style name="SettingsCategory">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">25dip</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:paddingLeft">5sp</item>
+        <item name="android:layout_margin">2dp</item>
+        <item name="android:background">@drawable/separator_background</item>
+    </style>
+
+    <style name="ButtonText">
+        <item name="android:gravity">center</item>
+        <item name="android:layout_margin">2dp</item>
+        <item name="android:textSize">18dp</item>
+        <item name="android:padding">6dp</item>
+        <item name="android:background">@drawable/button_background</item>
+    </style>
+
+    <style name="LabelText">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textColor">@android:color/primary_text_light</item>
+        <item name="android:layout_margin">2dp</item>
+        <item name="android:textSize">14dp</item>
+    </style>
+
+    <style name="GetStartedHeaderText">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textColor">@android:color/primary_text_light</item>
+        <item name="android:textSize">18dp</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:paddingTop">10dp</item>
+        <item name="android:paddingBottom">10dp</item>
+        <item name="android:paddingLeft">4dp</item>
+        <item name="android:paddingRight">4dp</item>
+    </style>
+
+    <style name="GetStartedText">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textColor">@android:color/primary_text_light</item>
+        <item name="android:textSize">15dp</item>
+        <item name="android:paddingLeft">4dp</item>
+        <item name="android:paddingRight">4dp</item>
+        <item name="android:paddingTop">5dp</item>
+        <item name="android:paddingBottom">5dp</item>
+
+    </style>
+</resources>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/xml/cursor_keyboard.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+/*
+   Cursor Keyboard Layout
+
+   Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+   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/.
+*/
+ --><!--
+
+  Cursor Keyboard layout
+  
+  Button Arrangement 
+
+  
+                 
+  Fn      Up      Backsp
+  123 Le  Dn  Ri  Enter
+    
+-->
+
+<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+    android:horizontalGap="0px"
+    android:keyHeight="@dimen/key_height"
+    android:keyWidth="20%p"
+    android:verticalGap="0px">
+
+    <Row>
+        <Key
+            android:codes="@integer/keycode_specialkeys_keyboard"
+            android:keyEdgeFlags="left"
+            android:keyLabel="Fn" />
+        <Key
+            android:codes="@integer/keycode_up"
+            android:horizontalGap="20%p"
+            android:iconPreview="@drawable/sym_keyboard_up_arrow_black"
+            android:keyIcon="@drawable/sym_keyboard_up_arrow" />
+        <Key
+            android:codes="@integer/keycode_backspace"
+            android:horizontalGap="20%p"
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_delete" />
+    </Row>
+
+    <Row android:rowEdgeFlags="bottom">
+        <Key
+            android:codes="@integer/keycode_numpad_keyboard"
+            android:keyLabel="123" />
+        <Key
+            android:codes="@integer/keycode_left"
+            android:iconPreview="@drawable/sym_keyboard_left_arrow_black"
+            android:keyIcon="@drawable/sym_keyboard_left_arrow" />
+        <Key
+            android:codes="@integer/keycode_down"
+            android:iconPreview="@drawable/sym_keyboard_down_arrow_black"
+            android:keyIcon="@drawable/sym_keyboard_down_arrow" />
+        <Key
+            android:codes="@integer/keycode_right"
+            android:iconPreview="@drawable/sym_keyboard_right_arrow_black"
+            android:keyIcon="@drawable/sym_keyboard_right_arrow" />
+        <Key
+            android:codes="@integer/keycode_enter"
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_return" />
+    </Row>
+</Keyboard>
+    

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/xml/modifiers_keyboard.xml

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+/*
+   Modifier Keys Layout
+
+   Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+   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/.
+*/
+ --><!--
+
+  Modifiers Keyboard layout
+  
+  Button Arrangement 
+
+  
+  ESC  SHIFT  CTRL  Win  ALT
+    
+-->
+
+<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+    android:horizontalGap="0px"
+    android:keyHeight="@dimen/key_height"
+    android:keyWidth="14%p"
+    android:verticalGap="0px">
+
+    <Row>
+        <Key
+            android:codes="@integer/keycode_esc"
+            android:keyEdgeFlags="left"
+            android:keyLabel="Esc" />
+        <Key
+            android:codes="@integer/keycode_toggle_shift"
+            android:isModifier="true"
+            android:isSticky="true"
+            android:keyLabel="Shift" />
+        <Key
+            android:codes="@integer/keycode_toggle_ctrl"
+            android:isModifier="true"
+            android:isSticky="true"
+            android:keyLabel="Ctrl" />
+        <Key
+            android:codes="@integer/keycode_toggle_win"
+            android:iconPreview="@drawable/sym_keyboard_winkey_black"
+            android:isModifier="true"
+            android:isSticky="true"
+            android:keyIcon="@drawable/sym_keyboard_winkey" />
+        <Key
+            android:codes="@integer/keycode_toggle_alt"
+            android:isModifier="true"
+            android:isSticky="true"
+            android:keyEdgeFlags="right"
+            android:keyLabel="Alt" />
+    </Row>
+
+    <!--
+        <Row>
+            <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift"
+                    android:keyWidth="15%p" android:isModifier="true"
+                    android:isSticky="true" android:keyEdgeFlags="left"/>
+            <Key android:codes="122" android:keyLabel="z"/>
+            <Key android:codes="120" android:keyLabel="x"/>
+            <Key android:codes="99" android:keyLabel="c"/>
+            <Key android:codes="118" android:keyLabel="v"/>
+            <Key android:codes="98" android:keyLabel="b"/>
+            <Key android:codes="110" android:keyLabel="n"/>
+            <Key android:codes="109" android:keyLabel="m"/>
+            <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete"
+                    android:keyWidth="15%p" android:keyEdgeFlags="right"
+                    android:isRepeatable="true"/>
+        </Row>
+
+        <Row android:rowEdgeFlags="bottom">
+            <Key android:codes="-3" android:keyIcon="@drawable/sym_keyboard_done"
+                    android:keyWidth="20%p" android:keyEdgeFlags="left"/>
+            <Key android:codes="-2" android:keyLabel="123" android:keyWidth="15%p"/>
+            <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
+                    android:keyWidth="30%p" android:isRepeatable="true"/>
+            <Key android:codes="46,44" android:keyLabel=". ,"
+                    android:keyWidth="15%p"/>
+            <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
+                    android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+        </Row>
+     -->
+</Keyboard>
+    

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/xml/performance_flags.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+/*
+   Bookmark Performance Settings Layout
+
+   Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+   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/.
+*/
+ -->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory android:title="@string/settings_cat_performance">
+        <CheckBoxPreference
+            android:key="bookmark.perf_remotefx"
+            android:title="@string/settings_perf_remotefx" />
+        <CheckBoxPreference
+            android:key="bookmark.perf_gfx"
+            android:title="@string/settings_perf_gfx" />
+        <CheckBoxPreference
+            android:dependency="bookmark.perf_gfx"
+            android:key="@string/preference_key_h264"
+            android:title="@string/settings_perf_gfx_h264" />
+        <CheckBoxPreference
+            android:key="bookmark.perf_wallpaper"
+            android:title="@string/settings_perf_wallpaper" />
+        <CheckBoxPreference
+            android:key="bookmark.perf_font_smoothing"
+            android:title="@string/settings_perf_font_smoothing" />
+        <CheckBoxPreference
+            android:key="bookmark.perf_desktop_composition"
+            android:title="@string/settings_perf_desktop_composition" />
+        <CheckBoxPreference
+            android:key="bookmark.perf_window_dragging"
+            android:title="@string/settings_perf_full_window_drag" />
+        <CheckBoxPreference
+            android:key="bookmark.perf_menu_animation"
+            android:title="@string/settings_perf_menu_animation" />
+        <CheckBoxPreference
+            android:key="bookmark.perf_themes"
+            android:title="@string/settings_perf_theming" />
+    </PreferenceCategory>
+</PreferenceScreen>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/xml/performance_flags_3g.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+/*
+   Bookmark 3G Performance Settings Layout
+
+   Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+   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/.
+*/
+ -->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory android:title="@string/settings_cat_performance">
+        <CheckBoxPreference
+            android:key="bookmark.perf_remotefx_3g"
+            android:title="@string/settings_perf_remotefx" />
+        <CheckBoxPreference
+            android:key="bookmark.perf_gfx_3g"
+            android:title="@string/settings_perf_gfx" />
+        <CheckBoxPreference
+            android:dependency="bookmark.perf_gfx_3g"
+            android:key="@string/preference_key_h264_3g"
+            android:title="@string/settings_perf_gfx_h264" />
+        <CheckBoxPreference
+            android:key="bookmark.perf_wallpaper_3g"
+            android:title="@string/settings_perf_wallpaper" />
+        <CheckBoxPreference
+            android:key="bookmark.perf_font_smoothing_3g"
+            android:title="@string/settings_perf_font_smoothing" />
+        <CheckBoxPreference
+            android:key="bookmark.perf_desktop_composition_3g"
+            android:title="@string/settings_perf_desktop_composition" />
+        <CheckBoxPreference
+            android:key="bookmark.perf_window_dragging_3g"
+            android:title="@string/settings_perf_full_window_drag" />
+        <CheckBoxPreference
+            android:key="bookmark.perf_menu_animation_3g"
+            android:title="@string/settings_perf_menu_animation" />
+        <CheckBoxPreference
+            android:key="bookmark.perf_themes_3g"
+            android:title="@string/settings_perf_theming" />
+    </PreferenceCategory>
+</PreferenceScreen>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/xml/screen_settings.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+/*
+   Bookmark Screen Settings Layout
+
+   Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+   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/.
+*/
+ -->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:freerdp="http://schemas.android.com/apk/res-auto">
+    <PreferenceCategory android:title="@string/settings_cat_screen">
+        <com.freerdp.freerdpcore.utils.IntListPreference
+            android:entries="@array/colors_array"
+            android:entryValues="@array/colors_values_array"
+            android:key="bookmark.colors"
+            android:summary="Color depth"
+            android:title="@string/settings_colors" />
+        <ListPreference
+            android:entries="@array/resolutions_array"
+            android:entryValues="@array/resolutions_values_array"
+            android:key="bookmark.resolution"
+            android:summary="XXX"
+            android:title="@string/settings_resolution" />
+        <com.freerdp.freerdpcore.utils.IntEditTextPreference
+            android:key="bookmark.width"
+            android:title="@string/settings_width"
+            android:singleLine="true"
+            freerdp:bounds_default="640"
+            freerdp:bounds_max="65536"
+            freerdp:bounds_min="640" />
+        <com.freerdp.freerdpcore.utils.IntEditTextPreference
+            android:key="bookmark.height"
+            android:title="@string/settings_height"
+            android:singleLine="true"
+            freerdp:bounds_default="480"
+            freerdp:bounds_max="65536"
+            freerdp:bounds_min="480" />
+    </PreferenceCategory>
+</PreferenceScreen>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/xml/screen_settings_3g.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+/*
+   Bookmark 3G Screen Settings Layout
+
+   Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+   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/.
+*/
+ -->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:freerdp="http://schemas.android.com/apk/res-auto">
+    <PreferenceCategory android:title="@string/settings_cat_screen">
+        <com.freerdp.freerdpcore.utils.IntListPreference
+            android:entries="@array/colors_array"
+            android:entryValues="@array/colors_values_array"
+            android:key="bookmark.colors_3g"
+            android:summary="Color depth"
+            android:title="@string/settings_colors" />
+        <ListPreference
+            android:entries="@array/resolutions_array"
+            android:entryValues="@array/resolutions_values_array"
+            android:key="bookmark.resolution_3g"
+            android:summary="XXX"
+            android:title="@string/settings_resolution" />
+        <com.freerdp.freerdpcore.utils.IntEditTextPreference
+            android:key="bookmark.width_3g"
+            android:singleLine="true"
+            android:title="@string/settings_width"
+            freerdp:bounds_default="640"
+            freerdp:bounds_max="65536"
+            freerdp:bounds_min="640" />
+        <com.freerdp.freerdpcore.utils.IntEditTextPreference
+            android:key="bookmark.height_3g"
+            android:singleLine="true"
+            android:title="@string/settings_height"
+            freerdp:bounds_default="480"
+            freerdp:bounds_max="65536"
+            freerdp:bounds_min="480" />
+    </PreferenceCategory>
+</PreferenceScreen>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/xml/settings_app_headers.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
+    <header
+        android:fragment="com.freerdp.freerdpcore.presentation.ApplicationSettingsActivity$ClientPreferenceFragment"
+        android:icon="@android:drawable/ic_menu_preferences"
+        android:title="@string/settings_cat_client" />
+
+    <header
+        android:fragment="com.freerdp.freerdpcore.presentation.ApplicationSettingsActivity$UiPreferenceFragment"
+        android:icon="@android:drawable/ic_menu_view"
+        android:title="@string/settings_cat_ui" />
+
+    <header
+        android:fragment="com.freerdp.freerdpcore.presentation.ApplicationSettingsActivity$PowerPreferenceFragment"
+        android:icon="@android:drawable/ic_menu_manage"
+        android:title="@string/settings_cat_power" />
+
+    <header
+        android:fragment="com.freerdp.freerdpcore.presentation.ApplicationSettingsActivity$SecurityPreferenceFragment"
+        android:icon="@android:drawable/ic_secure"
+        android:title="@string/settings_cat_security" />
+</preference-headers>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/xml/settings_app_power.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:freerdp="http://schemas.android.com/apk/res-auto">
+    <com.freerdp.freerdpcore.utils.IntEditTextPreference
+        android:inputType="number"
+        android:singleLine="true"
+        android:key="@string/preference_key_power_disconnect_timeout"
+        android:numeric="integer"
+        android:title="@string/settings_power_disconnect_timeout"
+        freerdp:bounds_default="5"
+        freerdp:bounds_max="30"
+        freerdp:bounds_min="0" />
+</PreferenceScreen>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/xml/settings_app_security.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <CheckBoxPreference
+        android:key="@string/preference_key_accept_certificates"
+        android:title="@string/settings_security_accept_certificates" />
+    <Preference
+        android:key="@string/preference_key_security_clear_certificate_cache"
+        android:title="@string/settings_security_clear_certificate_cache"/>
+</PreferenceScreen>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/xml/settings_app_ui.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="@string/preference_key_ui_hide_status_bar"
+        android:title="@string/settings_ui_hide_status_bar" />
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="@string/preference_key_ui_hide_zoom_controls"
+        android:title="@string/settings_ui_hide_zoom_controls" />
+    <CheckBoxPreference
+        android:key="@string/preference_key_ui_swap_mouse_buttons"
+        android:title="@string/settings_ui_swap_mouse_buttons" />
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="@string/preference_key_ui_invert_scrolling"
+        android:title="@string/settings_ui_invert_scrolling" />
+    <CheckBoxPreference
+        android:key="@string/preference_key_ui_auto_scroll_touchpointer"
+        android:title="@string/settings_ui_auto_scroll_touchpointer" />
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="@string/preference_key_ui_ask_on_exit"
+        android:title="@string/settings_ui_ask_on_exit" />
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="@string/preference_key_ui_hide_action_bar"
+        android:title="@string/settings_ui_hide_action_bar" />
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="@string/preference_key_ui_use_back_as_altf4"
+        android:title="@string/settings_ui_use_back_as_altf4" />
+</PreferenceScreen>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/xml/specialkeys_keyboard.xml

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+/*
+   Special Keys Keyboard Layout
+
+   Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+   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/.
+*/
+ --><!--
+
+  Special Keys Keyboard layout
+  
+  Button Arrangement 
+  
+  F1  F2  F3  F4  F5  F6    
+  F7  F8  F9  F10 F11 F12
+  cur TAB INS HOM PgUp Win
+  123 Prt DEL END PgDn Ctx
+    
+-->
+
+<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+    android:horizontalGap="0px"
+    android:keyHeight="@dimen/key_height"
+    android:keyWidth="16.6%p"
+    android:verticalGap="0px">
+
+    <Row>
+        <Key
+            android:codes="@integer/keycode_F1"
+            android:keyEdgeFlags="left"
+            android:keyLabel="F1" />
+        <Key
+            android:codes="@integer/keycode_F2"
+            android:keyLabel="F2" />
+        <Key
+            android:codes="@integer/keycode_F3"
+            android:keyLabel="F3" />
+        <Key
+            android:codes="@integer/keycode_F4"
+            android:keyLabel="F4" />
+        <Key
+            android:codes="@integer/keycode_F5"
+            android:keyLabel="F5" />
+        <Key
+            android:codes="@integer/keycode_F6"
+            android:keyLabel="F6" />
+    </Row>
+
+    <Row>
+        <Key
+            android:codes="@integer/keycode_F7"
+            android:keyEdgeFlags="left"
+            android:keyLabel="F7" />
+        <Key
+            android:codes="@integer/keycode_F8"
+            android:keyLabel="F8" />
+        <Key
+            android:codes="@integer/keycode_F9"
+            android:keyLabel="F9" />
+        <Key
+            android:codes="@integer/keycode_F10"
+            android:keyLabel="F10" />
+        <Key
+            android:codes="@integer/keycode_F11"
+            android:keyLabel="F11" />
+        <Key
+            android:codes="@integer/keycode_F12"
+            android:keyEdgeFlags="right"
+            android:keyLabel="F12" />
+    </Row>
+
+    <Row>
+        <Key
+            android:codes="@integer/keycode_cursor_keyboard"
+            android:iconPreview="@drawable/sym_keyboard_arrows_black"
+            android:keyEdgeFlags="left"
+            android:keyIcon="@drawable/sym_keyboard_arrows" />
+        <Key
+            android:codes="@integer/keycode_tab"
+            android:keyLabel="Tab" />
+        <Key
+            android:codes="@integer/keycode_insert"
+            android:keyLabel="Ins" />
+        <Key
+            android:codes="@integer/keycode_home"
+            android:keyLabel="Hom" />
+        <Key
+            android:codes="@integer/keycode_pgup"
+            android:keyLabel="PgUp" />
+        <Key
+            android:codes="@integer/keycode_win"
+            android:iconPreview="@drawable/sym_keyboard_winkey_black"
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_winkey" />
+    </Row>
+
+    <Row android:rowEdgeFlags="bottom">
+        <Key
+            android:codes="@integer/keycode_numpad_keyboard"
+            android:keyEdgeFlags="left"
+            android:keyLabel="123" />
+        <Key
+            android:codes="@integer/keycode_print"
+            android:keyLabel="Print" />
+        <Key
+            android:codes="@integer/keycode_delete"
+            android:keyLabel="Del" />
+        <Key
+            android:codes="@integer/keycode_end"
+            android:keyLabel="End" />
+        <Key
+            android:codes="@integer/keycode_pgdn"
+            android:keyLabel="PgDn" />
+        <Key
+            android:codes="@integer/keycode_menu"
+            android:iconPreview="@drawable/sym_keyboard_menu_black"
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_menu" />
+    </Row>
+</Keyboard>
+