From f8148e712b2f5b1ccf14e35ce95f79b994c2d1b5 Mon Sep 17 00:00:00 2001
From: Martin Fleisz <mfleisz@thinstuff.at>
Date: Tue, 24 Jun 2014 03:03:28 -0700
Subject: [PATCH] Changed android default theme to
 AppCompat.Light.DarkActionBar. Removed inverted text color from exit dialog.

---
 client/Android/FreeRDPCore/AndroidManifest.xml.cmake                | 3 ++-
 client/Android/FreeRDPCore/res/values/theme.xml                     | 6 ++----
 .../src/com/freerdp/freerdpcore/presentation/HomeActivity.java      | 1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/client/Android/FreeRDPCore/AndroidManifest.xml.cmake b/client/Android/FreeRDPCore/AndroidManifest.xml.cmake
index acad13f..1e50d7c 100644
--- a/client/Android/FreeRDPCore/AndroidManifest.xml.cmake
+++ b/client/Android/FreeRDPCore/AndroidManifest.xml.cmake
@@ -25,6 +25,7 @@
 		android:xlargeScreens="true" />
 
 	<application
+		android:theme="@style/Theme.Main"
 		android:debuggable="@ANDROID_DEBUG_ENABLE@">
 
 		<!-- Activity to create shortcuts -->
@@ -65,7 +66,7 @@
 				android:windowSoftInputMode="stateHidden">
 			</activity>
 			<activity android:name=".presentation.SessionActivity"
-				android:theme="@style/Theme.AppCompat"
+				android:theme="@style/Theme.Main"
 				android:configChanges="orientation|keyboardHidden|keyboard"
 				android:windowSoftInputMode="adjustResize">
 			</activity>
diff --git a/client/Android/FreeRDPCore/res/values/theme.xml b/client/Android/FreeRDPCore/res/values/theme.xml
index afee509..5457b19 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="@style/Theme.AppCompat">
+    <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">
+    <style name="Theme.Main" parent="@style/Theme.AppCompat.Light.DarkActionBar">
     </style>
     <style name="SettingsCategory">
         <item name="android:layout_width">match_parent</item>
@@ -13,12 +13,10 @@
         <item name="android:textSize">14sp</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:paddingLeft">5sp</item>        
-        <item name="android:textColor">@color/separator_text_color</item>
         <item name="android:layout_margin">2dp</item>
 		<item name="android:background">@drawable/separator_background</item>
         </style>
     <style name="ButtonText">
-        <item name="android:textColor">@color/button_text_color</item>
         <item name="android:gravity">center</item>
         <item name="android:layout_margin">2dp</item>
         <item name="android:textSize">18dp</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 53f8f60..62ec20f 100644
--- a/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/HomeActivity.java
+++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/HomeActivity.java
@@ -291,7 +291,6 @@ public class HomeActivity extends Activity
 		if (GlobalSettings.getAskOnExit())
 		{
 			final CheckBox cb = new CheckBox(this);
-			cb.setTextAppearance(this, android.R.style.TextAppearance_Medium_Inverse);
 			cb.setChecked(!GlobalSettings.getAskOnExit());
 			cb.setText(R.string.dlg_dont_show_again);
 			
-- 
2.7.4