From 33e04c13cff080d1fe31597a8b45079af4531298 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Tue, 22 Oct 2019 19:42:24 +0200 Subject: [PATCH 1/2] simplify autocrypt summary layout --- .../preference_divider_explain_autocrypt.xml | 19 ------------------- res/xml/preferences_advanced.xml | 9 +++++---- 2 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 res/layout/preference_divider_explain_autocrypt.xml diff --git a/res/layout/preference_divider_explain_autocrypt.xml b/res/layout/preference_divider_explain_autocrypt.xml deleted file mode 100644 index d7b2a1fad..000000000 --- a/res/layout/preference_divider_explain_autocrypt.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/xml/preferences_advanced.xml b/res/xml/preferences_advanced.xml index 3f9c19f4d..785f71f55 100644 --- a/res/xml/preferences_advanced.xml +++ b/res/xml/preferences_advanced.xml @@ -3,16 +3,17 @@ - - + + - + From 0e38854a5fbe6f09c9d224867b1fb33144e9aefc Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Tue, 22 Oct 2019 19:47:38 +0200 Subject: [PATCH 2/2] simplify preference divider --- res/drawable/preference_divider_dark.xml | 9 --------- res/drawable/preference_divider_light.xml | 9 --------- res/layout/preference_divider.xml | 14 -------------- res/values/attrs.xml | 2 -- res/values/themes.xml | 4 ---- res/xml/preferences_advanced.xml | 3 --- res/xml/preferences_app_protection.xml | 2 -- res/xml/preferences_chats.xml | 5 ----- 8 files changed, 48 deletions(-) delete mode 100644 res/drawable/preference_divider_dark.xml delete mode 100644 res/drawable/preference_divider_light.xml delete mode 100644 res/layout/preference_divider.xml diff --git a/res/drawable/preference_divider_dark.xml b/res/drawable/preference_divider_dark.xml deleted file mode 100644 index 9cd03f899..000000000 --- a/res/drawable/preference_divider_dark.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/res/drawable/preference_divider_light.xml b/res/drawable/preference_divider_light.xml deleted file mode 100644 index ecc2f14aa..000000000 --- a/res/drawable/preference_divider_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/res/layout/preference_divider.xml b/res/layout/preference_divider.xml deleted file mode 100644 index 4b63b780d..000000000 --- a/res/layout/preference_divider.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 701f9c32f..684380186 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -119,8 +119,6 @@ - - diff --git a/res/values/themes.xml b/res/values/themes.xml index 00ebd9b15..f5a1de853 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -202,8 +202,6 @@ @color/delta_primary_dark - @drawable/preference_divider_light - @drawable/ic_group_grey600_24dp @style/PreferenceThemeOverlay.Fix @@ -348,8 +346,6 @@ @color/core_white - @drawable/preference_divider_dark - @drawable/ic_group_white_24dp @style/PreferenceThemeOverlay.Fix @color/black diff --git a/res/xml/preferences_advanced.xml b/res/xml/preferences_advanced.xml index 785f71f55..96e9881cc 100644 --- a/res/xml/preferences_advanced.xml +++ b/res/xml/preferences_advanced.xml @@ -13,7 +13,6 @@ android:summary="@string/autocrypt_explain"/> - @@ -45,7 +44,6 @@ android:summary="@string/pref_auto_folder_moves_explain"/> - @@ -59,7 +57,6 @@ android:title="Delete e-mails from server" /> - diff --git a/res/xml/preferences_app_protection.xml b/res/xml/preferences_app_protection.xml index 265ffd4a5..403fdedc6 100644 --- a/res/xml/preferences_app_protection.xml +++ b/res/xml/preferences_app_protection.xml @@ -15,7 +15,6 @@ - @@ -33,7 +32,6 @@ - diff --git a/res/xml/preferences_chats.xml b/res/xml/preferences_chats.xml index 924f11da2..c81fb1b70 100644 --- a/res/xml/preferences_chats.xml +++ b/res/xml/preferences_chats.xml @@ -33,8 +33,6 @@ - - -