From 43fbf3c5b517c749c821a8a1e501a55d40519984 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Fri, 9 Mar 2018 21:55:37 +0100
Subject: remove pre api 21 theme

---
 libs/MemorizingTrustManager/res/values-v21/themes.xml             | 7 -------
 libs/MemorizingTrustManager/res/values/themes.xml                 | 7 -------
 .../src/de/duenndns/ssl/MemorizingActivity.java                   | 8 ++++----
 3 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 libs/MemorizingTrustManager/res/values-v21/themes.xml
 delete mode 100644 libs/MemorizingTrustManager/res/values/themes.xml

(limited to 'libs')

diff --git a/libs/MemorizingTrustManager/res/values-v21/themes.xml b/libs/MemorizingTrustManager/res/values-v21/themes.xml
deleted file mode 100644
index c2bd573f0..000000000
--- a/libs/MemorizingTrustManager/res/values-v21/themes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="ConversationsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar" />
-    <style name="ConversationsTheme.Dark" parent="android:Theme.Material" />
-
-</resources>
\ No newline at end of file
diff --git a/libs/MemorizingTrustManager/res/values/themes.xml b/libs/MemorizingTrustManager/res/values/themes.xml
deleted file mode 100644
index 2b0643154..000000000
--- a/libs/MemorizingTrustManager/res/values/themes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="ConversationsTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar" />
-    <style name="ConversationsTheme.Dark" parent="@android:style/Theme.Holo" />
-
-</resources>
\ No newline at end of file
diff --git a/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingActivity.java b/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingActivity.java
index dd1649c94..29b192093 100644
--- a/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingActivity.java
+++ b/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingActivity.java
@@ -49,7 +49,7 @@ public class MemorizingActivity extends Activity
     @Override
     public void onCreate(Bundle savedInstanceState) {
         LOGGER.log(Level.FINE, "onCreate");
-        setTheme(findTheme());
+//        setTheme(findTheme());
         super.onCreate(savedInstanceState);
     }
 
@@ -84,9 +84,9 @@ public class MemorizingActivity extends Activity
         finish();
     }
 
-    protected int findTheme() {
-        return getPreferences().getString(THEME, getResources().getString(R.string.theme)).equals("dark") ? R.style.ConversationsTheme_Dark : R.style.ConversationsTheme;
-    }
+//    protected int findTheme() {
+//        return getPreferences().getString(THEME, getResources().getString(R.string.theme)).equals("dark") ? R.style.ConversationsTheme_Dark : R.style.ConversationsTheme;
+//    }
 
     protected SharedPreferences getPreferences() {
         return PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-- 
cgit v1.2.3