From 9716849bb96302c93e182d68e0b59ee17d94ef68 Mon Sep 17 00:00:00 2001
From: Mateo Hernandez <mateoeh@openmailbox.org>
Date: Wed, 19 Apr 2017 19:21:04 -0500
Subject: [PATCH] Fix preference divider crash on KitKat

Closes #6546
Fixes #6544
// FREEBIE
---
 res/drawable/preference_divider_dark.xml      | 19 +++++++++++++++++++
 ...vider.xml => preference_divider_light.xml} |  4 ++--
 res/layout/preference_divider.xml             |  2 +-
 res/values/attrs.xml                          |  3 +--
 res/values/themes.xml                         |  6 ++----
 5 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 res/drawable/preference_divider_dark.xml
 rename res/drawable/{preference_divider.xml => preference_divider_light.xml} (76%)

diff --git a/res/drawable/preference_divider_dark.xml b/res/drawable/preference_divider_dark.xml
new file mode 100644
index 0000000000..09a9f2470f
--- /dev/null
+++ b/res/drawable/preference_divider_dark.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape>
+            <padding android:top="1dp" android:right="0dp" android:bottom="0dp" android:left="0dp" />
+            <solid android:color="#101010" />
+        </shape>
+    </item>
+
+    <item>
+        <shape>
+            <padding android:top="1dp" android:right="0dp" android:bottom="0dp" android:left="0dp" />
+            <solid android:color="#222222" />
+            <size android:height="20dp"/>
+        </shape>
+    </item>
+
+</layer-list>
diff --git a/res/drawable/preference_divider.xml b/res/drawable/preference_divider_light.xml
similarity index 76%
rename from res/drawable/preference_divider.xml
rename to res/drawable/preference_divider_light.xml
index b960d19983..a7ce0c1b96 100644
--- a/res/drawable/preference_divider.xml
+++ b/res/drawable/preference_divider_light.xml
@@ -4,14 +4,14 @@
     <item>
         <shape>
             <padding android:top="1dp" android:right="0dp" android:bottom="0dp" android:left="0dp" />
-            <solid android:color="?preference_divider_background_dark" />
+            <solid android:color="#d4d4d4" />
         </shape>
     </item>
 
     <item>
         <shape>
             <padding android:top="1dp" android:right="0dp" android:bottom="0dp" android:left="0dp" />
-            <solid android:color="?preference_divider_background_light" />
+            <solid android:color="#dddddd" />
             <size android:height="20dp"/>
         </shape>
     </item>
diff --git a/res/layout/preference_divider.xml b/res/layout/preference_divider.xml
index 9456a59401..045cf65e49 100644
--- a/res/layout/preference_divider.xml
+++ b/res/layout/preference_divider.xml
@@ -9,6 +9,6 @@
     <View
             android:layout_width="match_parent"
             android:layout_height="10dp"
-            android:background="@drawable/preference_divider"/>
+            android:background="?pref_divider"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index a95aadf7f3..9a268ab854 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -125,8 +125,7 @@
     <attr name="pref_ic_devices" format="reference" />
     <attr name="pref_ic_advanced" format="reference" />
 
-    <attr name="preference_divider_background_light" format="color" />
-    <attr name="preference_divider_background_dark" format="color"/>
+    <attr name="pref_divider" format="reference" />
 
     <attr name="app_protect_timeout_picker_color" format="reference"/>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 7d0caf9282..718485e2f4 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -216,8 +216,7 @@
         <item name="pref_ic_devices">@drawable/ic_laptop_black_24dp</item>
         <item name="pref_ic_advanced">@drawable/ic_advanced_black_24dp</item>
 
-        <item name="preference_divider_background_light">#dddddd</item>
-        <item name="preference_divider_background_dark">#d4d4d4</item>
+        <item name="pref_divider">@drawable/preference_divider_light</item>
 
         <item name="app_protect_timeout_picker_color">@style/BetterPickersDialogFragment.Light</item>
 
@@ -349,8 +348,7 @@
         <item name="pref_ic_devices">@drawable/ic_laptop_white_24dp</item>
         <item name="pref_ic_advanced">@drawable/ic_advanced_white_24dp</item>
 
-        <item name="preference_divider_background_light">#222222</item>
-        <item name="preference_divider_background_dark">#101010</item>
+        <item name="pref_divider">@drawable/preference_divider_dark</item>
 
         <item name="app_protect_timeout_picker_color">@style/BetterPickersDialogFragment</item>