Merge pull request #1922 from akallabeth/android-ui-fix-clean

Android ui menu fix

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+)

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

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)

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>

client/Android/FreeRDPCore/lint.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+</lint>

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

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"
         />

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>

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>

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>

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>

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>

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>

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>

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>

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);

client/Android/aFreeRDP/lint.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+</lint>

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 *;
+#}

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")