From bcabe422a6a685e02b22305f8c66a1472c058eec Mon Sep 17 00:00:00 2001
From: Afzal Najam <AfzalivE@users.noreply.github.com>
Date: Tue, 27 Aug 2019 17:07:51 -0400
Subject: [PATCH] Closes #4718 - Update site permissions layout (#4953)

---
 .../res/xml/site_permissions_preferences.xml  | 56 +++++++++----------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/app/src/main/res/xml/site_permissions_preferences.xml b/app/src/main/res/xml/site_permissions_preferences.xml
index 914ee7e86..f3d9cc515 100644
--- a/app/src/main/res/xml/site_permissions_preferences.xml
+++ b/app/src/main/res/xml/site_permissions_preferences.xml
@@ -5,37 +5,35 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <androidx.preference.Preference
+            android:icon="@drawable/ic_camera_enabled"
+            android:key="@string/pref_key_phone_feature_camera"
+            android:title="@string/preference_phone_feature_camera"
+            android:summary="@string/preference_option_phone_feature_ask_to_allow"/>
+
+    <androidx.preference.Preference
+            android:icon="@drawable/ic_location_enabled"
+            android:key="@string/pref_key_phone_feature_location"
+            android:title="@string/preference_phone_feature_location"
+            android:summary="@string/preference_option_phone_feature_ask_to_allow"/>
+
+    <androidx.preference.Preference
+            android:icon="@drawable/ic_microphone_enabled"
+            android:key="@string/pref_key_phone_feature_microphone"
+            android:title="@string/preference_phone_feature_microphone"
+            android:summary="@string/preference_option_phone_feature_ask_to_allow"/>
+
+    <androidx.preference.Preference
+            android:icon="@drawable/ic_notifications_enabled"
+            android:key="@string/pref_key_phone_feature_notification"
+            android:title="@string/preference_phone_feature_notification"
+            android:summary="@string/preference_option_phone_feature_ask_to_allow"
+            app:allowDividerBelow="true"/>
+
     <androidx.preference.Preference
             android:icon="@drawable/ic_internet"
             android:key="@string/pref_key_show_site_exceptions"
-            android:title="@string/preference_exceptions"/>
+            android:title="@string/preference_exceptions"
+            app:allowDividerAbove="true"/>
 
-    <androidx.preference.PreferenceCategory
-        android:title="@string/permissions_header"
-        app:iconSpaceReserved="false"
-        app:allowDividerAbove="false">
-        <androidx.preference.Preference
-                android:icon="@drawable/ic_camera_enabled"
-                android:key="@string/pref_key_phone_feature_camera"
-                android:title="@string/preference_phone_feature_camera"
-                android:summary="@string/preference_option_phone_feature_ask_to_allow"/>
-
-        <androidx.preference.Preference
-                android:icon="@drawable/ic_location_enabled"
-                android:key="@string/pref_key_phone_feature_location"
-                android:title="@string/preference_phone_feature_location"
-                android:summary="@string/preference_option_phone_feature_ask_to_allow"/>
-
-        <androidx.preference.Preference
-                android:icon="@drawable/ic_microphone_enabled"
-                android:key="@string/pref_key_phone_feature_microphone"
-                android:title="@string/preference_phone_feature_microphone"
-                android:summary="@string/preference_option_phone_feature_ask_to_allow"/>
-
-        <androidx.preference.Preference
-                android:icon="@drawable/ic_notifications_enabled"
-                android:key="@string/pref_key_phone_feature_notification"
-                android:title="@string/preference_phone_feature_notification"
-                android:summary="@string/preference_option_phone_feature_ask_to_allow"/>
-    </androidx.preference.PreferenceCategory>
 </androidx.preference.PreferenceScreen>