android: Simplify theme definition due to minSdkVersion

diff --git a/src/frontends/android/app/src/main/res/values-v15/styles.xml b/src/frontends/android/app/src/main/res/values-v15/styles.xml
deleted file mode 100644 (file)
index 2b152c4..0000000
--- a/src/frontends/android/app/src/main/res/values-v15/styles.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2016 Tobias Brunner
-
-    Copyright (C) secunet Security Networks AG
-
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
--->
-<resources>
-
-    <style name="ApplicationTheme" parent="ApplicationTheme.Base">
-        <item name="android:activatedBackgroundIndicator">@drawable/activated_background</item>
-        <item name="android:selectableItemBackground">@drawable/activated_background</item>
-    </style>
-
-    <style name="AlertDialogTheme" parent="AlertDialogTheme.Base">
-        <item name="android:windowBackground">@android:color/transparent</item>
-    </style>
-
-</resources>
\ No newline at end of file

diff --git a/src/frontends/android/app/src/main/res/values-v21/styles.xml b/src/frontends/android/app/src/main/res/values-v21/styles.xml
deleted file mode 100644 (file)
index 050c319..0000000
--- a/src/frontends/android/app/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2016 Tobias Brunner
-
-    Copyright (C) secunet Security Networks AG
-
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
--->
-<resources>
-
-    <style name="ApplicationTheme" parent="ApplicationTheme.Base">
-    </style>
-
-    <style name="AlertDialogTheme" parent="AlertDialogTheme.Base">
-    </style>
-
-</resources>
\ No newline at end of file

diff --git a/src/frontends/android/app/src/main/res/values/styles.xml b/src/frontends/android/app/src/main/res/values/styles.xml
index 0ce04b1d93ba2d225ad6905ea97c532f002c614a..8dc8e449968f6665c3a4efe86aeaa982f9edb3b7 100644 (file)
--- a/src/frontends/android/app/src/main/res/values/styles.xml
+++ b/src/frontends/android/app/src/main/res/values/styles.xml
@@ -16,7 +16,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="ApplicationTheme.Base" parent="Theme.AppCompat">
+    <style name="ApplicationTheme" parent="Theme.AppCompat">
         <item name="colorAccent">@color/accent</item>
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
@@ -24,7 +24,7 @@
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
     </style>
 
-    <style name="AlertDialogTheme.Base" parent="Theme.AppCompat.Dialog.Alert">
+    <style name="AlertDialogTheme" parent="Theme.AppCompat.Dialog.Alert">
         <item name="colorAccent">@color/accent</item>
     </style>