From 2b136fac4f88a095c28976675db67c88f5e82ff9 Mon Sep 17 00:00:00 2001
From: Anjani Kumar <anjanik012@gmail.com>
Date: Sun, 12 Jul 2020 00:57:45 +0530
Subject: [PATCH] Remove string.xml's version(v28) qualifier

---
 res/values-v28/strings.xml                                | 8 --------
 res/values/strings.xml                                    | 6 ++++++
 .../kde/kdeconnect/UserInterface/SettingsFragment.java    | 6 +++++-
 3 files changed, 11 insertions(+), 9 deletions(-)
 delete mode 100644 res/values-v28/strings.xml

diff --git a/res/values-v28/strings.xml b/res/values-v28/strings.xml
deleted file mode 100644
index f53bcd2e..00000000
--- a/res/values-v28/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="theme_list">
-        <item>System Default</item>
-        <item>Light</item>
-        <item>Dark</item>
-    </string-array>
-</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c938291c..66baf019 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -413,6 +413,12 @@
       <item>Dark</item>
     </string-array>
 
+    <string-array name="theme_list_v28">
+      <item>System Default</item>
+      <item>Light</item>
+      <item>Dark</item>
+    </string-array>
+
     <string-array name="theme_list_values" translatable="false">
       <item>default</item>
       <item>light</item>
diff --git a/src/org/kde/kdeconnect/UserInterface/SettingsFragment.java b/src/org/kde/kdeconnect/UserInterface/SettingsFragment.java
index a2ce3a4b..47bd7368 100644
--- a/src/org/kde/kdeconnect/UserInterface/SettingsFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/SettingsFragment.java
@@ -71,7 +71,11 @@ public class SettingsFragment extends PreferenceFragmentCompat {
         themeSelector.setKey("theme_pref");
         themeSelector.setTitle(R.string.theme_dialog_title);
         themeSelector.setDialogTitle(R.string.theme_dialog_title);
-        themeSelector.setEntries(R.array.theme_list);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            themeSelector.setEntries(R.array.theme_list_v28);
+        } else {
+            themeSelector.setEntries(R.array.theme_list);
+        }
         themeSelector.setEntryValues(R.array.theme_list_values);
         themeSelector.setDefaultValue(ThemeUtil.DEFAULT_MODE);
         themeSelector.setSummaryProvider(ListPreference.SimpleSummaryProvider.getInstance());