From 50bce42940c72bd6c42d20d22a3e1e5491e6562e Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 19 Apr 2018 17:55:59 +0200
Subject: [PATCH] switch to com.android.support:preference-v14 for Material
 themes

---
 app/build.gradle                              |   2 +-
 .../fdroid/fdroid/CompatibilityChecker.java   |   2 +-
 .../java/org/fdroid/fdroid/Preferences.java   |   2 +-
 .../java/org/fdroid/fdroid/UpdateService.java |   2 +-
 app/src/main/res/values/styles.xml            |   4 +-
 app/src/main/res/xml/preferences.xml          | 161 ++++++++++--------
 app/src/main/res/xml/preferences_panic.xml    |  48 +++---
 7 files changed, 120 insertions(+), 101 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c8f51844c..1f8322f42 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     implementation 'com.android.support:support-vector-drawable:27.1.1'
     implementation 'com.android.support.constraint:constraint-layout:1.1.0'
     implementation 'com.android.support:palette-v7:27.1.1'
-    implementation 'com.android.support:preference-v7:27.1.1'
+    implementation 'com.android.support:preference-v14:27.1.1'
 
     implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
     implementation 'com.google.zxing:core:3.3.2'
diff --git a/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java b/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java
index 1cd3db664..576431f6e 100644
--- a/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java
+++ b/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java
@@ -5,8 +5,8 @@ import android.content.SharedPreferences;
 import android.content.pm.FeatureInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
+import android.support.v7.preference.PreferenceManager;
 import org.fdroid.fdroid.compat.SupportedArchitectures;
 import org.fdroid.fdroid.data.Apk;
 
diff --git a/app/src/main/java/org/fdroid/fdroid/Preferences.java b/app/src/main/java/org/fdroid/fdroid/Preferences.java
index 28e8f2035..f465100fc 100644
--- a/app/src/main/java/org/fdroid/fdroid/Preferences.java
+++ b/app/src/main/java/org/fdroid/fdroid/Preferences.java
@@ -3,7 +3,7 @@ package org.fdroid.fdroid;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build;
-import android.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceManager;
 import android.util.Log;
 import info.guardianproject.netcipher.NetCipher;
 import org.fdroid.fdroid.net.ConnectivityMonitorService;
diff --git a/app/src/main/java/org/fdroid/fdroid/UpdateService.java b/app/src/main/java/org/fdroid/fdroid/UpdateService.java
index 73f7591cd..f96dbea91 100644
--- a/app/src/main/java/org/fdroid/fdroid/UpdateService.java
+++ b/app/src/main/java/org/fdroid/fdroid/UpdateService.java
@@ -36,9 +36,9 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Process;
 import android.os.SystemClock;
-import android.preference.PreferenceManager;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.content.LocalBroadcastManager;
+import android.support.v7.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 04ed6ef7b..c883929da 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -23,7 +23,7 @@
         <item name="appListItem">#ffffff</item>
         <item name="lightGrayTextColor">#a6a6a6</item>
         <item name="antiFeaturesWarning">@drawable/ic_warning_white_24dp</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
 
     <style name="AppBaseThemeLight" parent="Theme.AppCompat.Light.NoActionBar">
@@ -48,7 +48,7 @@
         <item name="appListItem">#424242</item>
         <item name="lightGrayTextColor">#4a4a4a</item>
         <item name="antiFeaturesWarning">@drawable/ic_warning_black_24dp</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
 
     <style name="AppBaseThemeNight" parent="AppThemeDark">
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index e0968cb37..4f6ebd311 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,55 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceScreen android:title="@string/about_title">
+<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <android.support.v7.preference.PreferenceScreen android:title="@string/about_title">
         <intent
                 android:action="android.intent.action.MAIN"
                 android:targetPackage="@string/applicationId"
                 android:targetClass="org.fdroid.fdroid.AboutActivity"/>
-    </PreferenceScreen>
-    <PreferenceCategory android:title="@string/preference_category__my_apps">
-        <PreferenceScreen android:title="@string/preference_manage_installed_apps">
+    </android.support.v7.preference.PreferenceScreen>
+
+    <android.support.v7.preference.PreferenceCategory android:title="@string/preference_category__my_apps">
+        <android.support.v7.preference.PreferenceScreen android:title="@string/preference_manage_installed_apps">
             <intent
                     android:action="android.intent.action.MAIN"
                     android:targetPackage="@string/applicationId"
                     android:targetClass="org.fdroid.fdroid.views.installed.InstalledAppsActivity"/>
-        </PreferenceScreen>
-        <PreferenceScreen
+        </android.support.v7.preference.PreferenceScreen>
+        <android.support.v7.preference.PreferenceScreen
                 android:title="@string/menu_manage"
                 android:summary="@string/repositories_summary">
             <intent
                     android:action="android.intent.action.MAIN"
                     android:targetPackage="@string/applicationId"
                     android:targetClass="org.fdroid.fdroid.views.ManageReposActivity"/>
-        </PreferenceScreen>
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/updates">
-        <ListPreference android:title="@string/update_interval"
-                        android:key="updateInterval"
-                        android:defaultValue="24"
-                        android:entries="@array/updateIntervalNames"
-                        android:entryValues="@array/updateIntervalValues"/>
-        <CheckBoxPreference android:title="@string/automatic_scan_wifi"
-                            android:defaultValue="false"
-                            android:key="updateOnWifiOnly"/>
-        <CheckBoxPreference android:title="@string/update_auto_download"
-                            android:summary="@string/update_auto_download_summary"
-                            android:defaultValue="false"
-                            android:key="updateAutoDownload"/>
-        <CheckBoxPreference android:title="@string/notify"
-                            android:defaultValue="true"
-                            android:key="updateNotify"/>
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/display"
-                        android:key="pref_category_display">
-        <ListPreference android:title="@string/pref_language"
-                        android:key="language"/>
-        <ListPreference android:title="@string/theme"
-                        android:key="theme"
-                        android:defaultValue="light"
-                        android:entries="@array/themeNames"
-                        android:entryValues="@array/themeValues"/>
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/appcompatibility">
+        </android.support.v7.preference.PreferenceScreen>
+    </android.support.v7.preference.PreferenceCategory>
+
+    <android.support.v7.preference.PreferenceCategory android:title="@string/updates">
+        <android.support.v7.preference.ListPreference
+                android:title="@string/update_interval"
+                android:key="updateInterval"
+                android:defaultValue="24"
+                android:entries="@array/updateIntervalNames"
+                android:entryValues="@array/updateIntervalValues"/>
+        <android.support.v7.preference.CheckBoxPreference
+                android:title="@string/only_on_wifi"
+                android:defaultValue="false"
+                android:key="updateOnWifiOnly"/>
+        <android.support.v7.preference.CheckBoxPreference
+                android:title="@string/update_auto_download"
+                android:summary="@string/update_auto_download_summary"
+                android:defaultValue="false"
+                android:key="updateAutoDownload"/>
+        <android.support.v7.preference.CheckBoxPreference
+                android:title="@string/notify"
+                android:defaultValue="true"
+                android:key="updateNotify"/>
+    </android.support.v7.preference.PreferenceCategory>
+
+    <android.support.v7.preference.PreferenceCategory android:title="@string/display"
+                                                      android:key="pref_category_display">
+        <ListPreference
+                android:title="@string/pref_language"
+                android:key="language"/>
+        <ListPreference
+                android:title="@string/theme"
+                android:key="theme"
+                android:defaultValue="light"
+                android:entries="@array/themeNames"
+                android:entryValues="@array/themeValues"/>
+    </android.support.v7.preference.PreferenceCategory>
+
+    <android.support.v7.preference.PreferenceCategory android:title="@string/appcompatibility">
         <CheckBoxPreference android:title="@string/show_incompat_versions"
                             android:defaultValue="false"
                             android:key="incompatibleVersions"/>
@@ -62,18 +73,20 @@
         <CheckBoxPreference android:title="@string/force_touch_apps"
                             android:defaultValue="false"
                             android:key="ignoreTouchscreen"/>
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/local_repo">
+    </android.support.v7.preference.PreferenceCategory>
+
+    <android.support.v7.preference.PreferenceCategory android:title="@string/local_repo">
         <EditTextPreference
                 android:key="localRepoName"
                 android:title="@string/local_repo_name"/>
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/proxy">
-        <CheckBoxPreference
+    </android.support.v7.preference.PreferenceCategory>
+
+    <android.support.v7.preference.PreferenceCategory android:title="@string/proxy">
+        <android.support.v7.preference.CheckBoxPreference
                 android:key="useTor"
                 android:summary="@string/useTorSummary"
                 android:title="@string/useTor"/>
-        <CheckBoxPreference
+        <android.support.v7.preference.CheckBoxPreference
                 android:defaultValue="false"
                 android:key="enableProxy"
                 android:title="@string/enable_proxy_title"
@@ -88,45 +101,48 @@
                 android:title="@string/proxy_port"
                 android:summary="@string/proxy_port_summary"
                 android:dependency="enableProxy"/>
-    </PreferenceCategory>
+    </android.support.v7.preference.PreferenceCategory>
 
-    <PreferenceCategory
+    <android.support.v7.preference.PreferenceCategory
             android:key="pref_category_privacy"
             android:title="@string/privacy">
 
-        <CheckBoxPreference
+        <android.support.v7.preference.CheckBoxPreference
                 android:defaultValue="false"
                 android:key="preventScreenshots"
                 android:summary="@string/preventScreenshots_summary"
                 android:title="@string/preventScreenshots_title"/>
 
-        <CheckBoxPreference
+        <android.support.v7.preference.CheckBoxPreference
                 android:defaultValue="false"
                 android:key="hideOnLongPressSearch"
                 android:summary="@string/hide_on_long_search_press_summary"
                 android:title="@string/hide_on_long_search_press_title"/>
 
-        <PreferenceScreen
+        <android.support.v7.preference.PreferenceScreen
                 android:summary="@string/panic_settings_summary"
                 android:title="@string/panic_settings">
             <intent
                     android:action="android.intent.action.MAIN"
                     android:targetClass="org.fdroid.fdroid.views.panic.PanicPreferencesActivity"
                     android:targetPackage="@string/applicationId"/>
-        </PreferenceScreen>
+        </android.support.v7.preference.PreferenceScreen>
 
-    </PreferenceCategory>
+    </android.support.v7.preference.PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/other"
-                        android:key="pref_category_other">
-        <ListPreference android:title="@string/cache_downloaded"
-                        android:key="keepCacheFor"
-                        android:defaultValue="86400000"
-                        android:entries="@array/keepCacheNames"
-                        android:entryValues="@array/keepCacheValues"/>
-        <CheckBoxPreference android:title="@string/expert"
-                            android:defaultValue="false"
-                            android:key="expert"/>
+    <android.support.v7.preference.PreferenceCategory
+            android:title="@string/other"
+            android:key="pref_category_other">
+        <ListPreference
+                android:title="@string/cache_downloaded"
+                android:key="keepCacheFor"
+                android:defaultValue="86400000"
+                android:entries="@array/keepCacheNames"
+                android:entryValues="@array/keepCacheValues"/>
+        <android.support.v7.preference.CheckBoxPreference
+                android:title="@string/expert"
+                android:defaultValue="false"
+                android:key="expert"/>
         <CheckBoxPreference
                 android:key="unstableUpdates"
                 android:title="@string/unstable_updates"
@@ -145,14 +161,17 @@
                 android:summary="@string/force_old_index_summary"
                 android:defaultValue="false"
                 android:dependency="expert"/>
-        <CheckBoxPreference android:title="@string/system_installer"
-                            android:defaultValue="false"
-                            android:key="privilegedInstaller"
-                            android:persistent="false"
-                            android:dependency="expert"/>
-        <Preference android:title="@string/uninstall_system"
-                    android:summary="@string/uninstall_system_summary"
-                    android:key="uninstallPrivilegedApp"
-                    android:dependency="expert"/>
-    </PreferenceCategory>
-</PreferenceScreen>
+        <CheckBoxPreference
+                android:title="@string/system_installer"
+                android:defaultValue="false"
+                android:key="privilegedInstaller"
+                android:persistent="false"
+                android:dependency="expert"/>
+        <Preference
+                android:title="@string/uninstall_system"
+                android:summary="@string/uninstall_system_summary"
+                android:key="uninstallPrivilegedApp"
+                android:dependency="expert"/>
+    </android.support.v7.preference.PreferenceCategory>
+
+</android.support.v7.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_panic.xml b/app/src/main/res/xml/preferences_panic.xml
index 275510943..e26d3eabb 100644
--- a/app/src/main/res/xml/preferences_panic.xml
+++ b/app/src/main/res/xml/preferences_panic.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<android.support.v7.preference.PreferenceScreen
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools">
 
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="pref_panic_exit"
-        android:summary="@string/panic_exit_summary"
-        android:title="@string/panic_exit_title"/>
+    <android.support.v7.preference.CheckBoxPreference
+            android:defaultValue="true"
+            android:key="pref_panic_exit"
+            android:summary="@string/panic_exit_summary"
+            android:title="@string/panic_exit_title"/>
 
-    <PreferenceCategory
-        android:key="pref_panic_destructive_actions"
-        android:title="@string/panic_destructive_actions">
+    <android.support.v7.preference.PreferenceCategory
+            android:key="pref_panic_destructive_actions"
+            android:title="@string/panic_destructive_actions">
 
-        <ListPreference
-            android:key="pref_panic_app"
-            android:summary="@string/panic_app_setting_summary"
-            android:title="@string/panic_app_setting_title"
-            tools:icon="@drawable/ic_cancel"/>
+        <android.support.v7.preference.ListPreference
+                android:key="pref_panic_app"
+                android:summary="@string/panic_app_setting_summary"
+                android:title="@string/panic_app_setting_title"
+                tools:icon="@drawable/ic_cancel"/>
 
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:enabled="false"
-            android:key="pref_panic_hide"
-            android:summary="@string/panic_hide_summary"
-            android:title="@string/panic_hide_title"/>
+        <android.support.v7.preference.CheckBoxPreference
+                android:defaultValue="false"
+                android:enabled="false"
+                android:key="pref_panic_hide"
+                android:summary="@string/panic_hide_summary"
+                android:title="@string/panic_hide_title"/>
 
-    </PreferenceCategory>
+    </android.support.v7.preference.PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</android.support.v7.preference.PreferenceScreen>
\ No newline at end of file