From d46d1d4e484cd13a5c897e9aaa695548028f29e9 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Fri, 4 Jul 2014 23:03:58 +0200
Subject: [PATCH] Use normal theme instead of dialog theme for repo/node
 settings.

This caused problems as dialogs don't have an ActionBar, and adding
ActionBar explicitly gives problems with old API levels. Closes #51.
---
 src/main/AndroidManifest.xml         |  6 ++----
 src/main/res/values-large/styles.xml |  4 ----
 src/main/res/values/styles.xml       | 10 ----------
 3 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 src/main/res/values-large/styles.xml
 delete mode 100644 src/main/res/values/styles.xml

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 563da2e6..a027e554 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -46,11 +46,9 @@
 		<service android:name=".syncthing.SyncthingService" />
 
 		<activity
-				android:name=".gui.RepoSettingsActivity"
-				android:theme="@style/DialogWhenLarge" />
+				android:name=".gui.RepoSettingsActivity" />
 		<activity
-				android:name=".gui.NodeSettingsActivity"
-				android:theme="@style/DialogWhenLarge" />
+				android:name=".gui.NodeSettingsActivity" />
 		<activity
 				android:name=".gui.FolderPickerActivity"
 				android:label="@string/folder_picker_title" >
diff --git a/src/main/res/values-large/styles.xml b/src/main/res/values-large/styles.xml
deleted file mode 100644
index b7e42215..00000000
--- a/src/main/res/values-large/styles.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<style name="DialogWhenLarge" parent="android:Theme.Holo.DialogWhenLarge" />
-</resources>
\ No newline at end of file
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
deleted file mode 100644
index 12ed96ab..00000000
--- a/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<style name="DialogWhenLargeCompat" parent="DialogWhenLarge">
-		<item name="android:windowIsFloating">false</item>
-		<item name="android:windowContentOverlay">@null</item>
-		<item name="android:windowSoftInputMode">stateAlwaysHidden</item>
-		<!--<item name="android:windowActionModeOverlay">true</item>-->
-		<item name="android:windowIsTranslucent">true</item>
-	</style>
-</resources>