From 311fe5c604fe2b85bda58b0005af22a65eee6397 Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Mon, 14 Feb 2022 18:13:40 +0600
Subject: [PATCH 1/9] 4871-R-Crash_on_font_preview_page

issue: https://gitlab.e.foundation/e/backlog/-/issues/4871

App crash on update font from `Settings/Display/Advanced/Font size`
section because textAppearance is not loading for textView perfectly.
---
 res/layout/font_size_preview.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/layout/font_size_preview.xml b/res/layout/font_size_preview.xml
index 669ece05341..36cab553a6a 100644
--- a/res/layout/font_size_preview.xml
+++ b/res/layout/font_size_preview.xml
@@ -36,25 +36,25 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/font_size_preview_text_headline"
-                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Headline"/>
+                android:textAppearance="@android:style/TextAppearance.DeviceDefault.Headline"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/font_size_preview_text_title"
-                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Title"/>
+                android:textAppearance="@android:style/TextAppearance.DeviceDefault.Title"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/font_size_preview_text_subtitle"
-                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"/>
+                android:textAppearance="@android:style/TextAppearance.DeviceDefault.Subhead"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/font_size_preview_text_body"
-                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"/>
+                android:textAppearance="@android:style/TextAppearance.DeviceDefault.Body1"/>
         </LinearLayout>
     </view>
 </ScrollView>
-- 
GitLab


From 228e0ceee1784a73977fd3fc3f64886c4db3e0aa Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Tue, 15 Feb 2022 20:10:09 +0600
Subject: [PATCH 2/9] WIP: remove textAppearanch from font_size_preview

---
 res/layout/font_size_preview.xml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/res/layout/font_size_preview.xml b/res/layout/font_size_preview.xml
index 36cab553a6a..eb3ce77b3df 100644
--- a/res/layout/font_size_preview.xml
+++ b/res/layout/font_size_preview.xml
@@ -35,26 +35,22 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/font_size_preview_text_headline"
-                android:textAppearance="@android:style/TextAppearance.DeviceDefault.Headline"/>
+                android:text="@string/font_size_preview_text_headline"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/font_size_preview_text_title"
-                android:textAppearance="@android:style/TextAppearance.DeviceDefault.Title"/>
+                android:text="@string/font_size_preview_text_title"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/font_size_preview_text_subtitle"
-                android:textAppearance="@android:style/TextAppearance.DeviceDefault.Subhead"/>
+                android:text="@string/font_size_preview_text_subtitle"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/font_size_preview_text_body"
-                android:textAppearance="@android:style/TextAppearance.DeviceDefault.Body1"/>
+                android:text="@string/font_size_preview_text_body"/>
         </LinearLayout>
     </view>
 </ScrollView>
-- 
GitLab


From 56ef8f6c181d170150c08da881b9e2a611072706 Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Tue, 22 Feb 2022 21:27:55 +0600
Subject: [PATCH 3/9] WIP: set TouchBlockingFrameLayout as mother layout

---
 res/layout/font_size_preview.xml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/res/layout/font_size_preview.xml b/res/layout/font_size_preview.xml
index eb3ce77b3df..a4b6c9277b0 100644
--- a/res/layout/font_size_preview.xml
+++ b/res/layout/font_size_preview.xml
@@ -19,7 +19,7 @@
     android:layout_height="match_parent"
     android:fillViewport="true" >
 
-    <view class="com.android.settings.TouchBlockingFrameLayout"
+    <com.android.settings.TouchBlockingFrameLayout
         android:id="@+id/frame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -40,17 +40,20 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/font_size_preview_text_title"/>
+                android:text="@string/font_size_preview_text_title"
+                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Title"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/font_size_preview_text_subtitle"/>
+                android:text="@string/font_size_preview_text_subtitle"
+                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/font_size_preview_text_body"/>
+                android:text="@string/font_size_preview_text_body"
+                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"/>
         </LinearLayout>
-    </view>
+    </com.android.settings.TouchBlockingFrameLayout>
 </ScrollView>
-- 
GitLab


From 80dea106416df9918477e8abec28c67befa77c86 Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Tue, 22 Feb 2022 21:45:33 +0600
Subject: [PATCH 4/9] WIP: add missing headLine textAppearance

---
 res/layout/font_size_preview.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/layout/font_size_preview.xml b/res/layout/font_size_preview.xml
index a4b6c9277b0..13f8b5747f6 100644
--- a/res/layout/font_size_preview.xml
+++ b/res/layout/font_size_preview.xml
@@ -35,7 +35,8 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/font_size_preview_text_headline"/>
+                android:text="@string/font_size_preview_text_headline"
+                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Headline"/>
 
             <TextView
                 android:layout_width="match_parent"
-- 
GitLab


From 27238d971603a2046169c2c42904a4267ec7fc33 Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Tue, 22 Feb 2022 23:22:25 +0600
Subject: [PATCH 5/9] WIP: add custom style with missing textColorLink
 attribute

---
 res/layout/font_size_preview.xml | 12 ++++++------
 res/values/styles.xml            | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/res/layout/font_size_preview.xml b/res/layout/font_size_preview.xml
index 13f8b5747f6..515433ac9ac 100644
--- a/res/layout/font_size_preview.xml
+++ b/res/layout/font_size_preview.xml
@@ -19,7 +19,7 @@
     android:layout_height="match_parent"
     android:fillViewport="true" >
 
-    <com.android.settings.TouchBlockingFrameLayout
+    <view class="com.android.settings.TouchBlockingFrameLayout"
         android:id="@+id/frame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -36,25 +36,25 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/font_size_preview_text_headline"
-                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Headline"/>
+                android:textAppearance="@style/customHeadlineStyle"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/font_size_preview_text_title"
-                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Title"/>
+                android:textAppearance="@style/customTitleStyle"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/font_size_preview_text_subtitle"
-                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"/>
+                android:textAppearance="@style/customSubheadStyle"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/font_size_preview_text_body"
-                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"/>
+                android:textAppearance="@style/customBody1Style"/>
         </LinearLayout>
-    </com.android.settings.TouchBlockingFrameLayout>
+    </view>
 </ScrollView>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index fb022248c74..073bf80e1b5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -803,4 +803,19 @@
         <item name="android:tint">@lineageos.platform:color/color_default_accent</item>
     </style>
 
+    <style name="customHeadlineStyle" parent="@*android:style/TextAppearance.DeviceDefault.Headline">
+        <item name="android:textColorLink">@lineageos.platform:color/color_default_accent</item>
+    </style>
+
+    <style name="customTitleStyle" parent="@*android:style/TextAppearance.DeviceDefault.Title">
+        <item name="android:textColorLink">@lineageos.platform:color/color_default_accent</item>
+    </style>
+
+    <style name="customSubheadStyle" parent="@*android:style/TextAppearance.DeviceDefault.Subhead">
+        <item name="android:textColorLink">@lineageos.platform:color/color_default_accent</item>
+    </style>
+
+    <style name="customBody1Style" parent="@*android:style/TextAppearance.DeviceDefault.Body1">
+        <item name="android:textColorLink">@lineageos.platform:color/color_default_accent</item>
+    </style>
 </resources>
-- 
GitLab


From a4ef8ee99ba036dffd2432cd49ef555b974422b1 Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Wed, 23 Feb 2022 02:05:57 +0600
Subject: [PATCH 6/9] WIP: add custom style with missing attributes

---
 res/values/styles.xml | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 073bf80e1b5..ec6279d2916 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -804,18 +804,54 @@
     </style>
 
     <style name="customHeadlineStyle" parent="@*android:style/TextAppearance.DeviceDefault.Headline">
+        <item name="textColor">@lineageos.platform:color/color_default_primary_text</item>
+        <item name="android:textColor">@lineageos.platform:color/color_default_primary_text</item>
+        <item name="android:textColorHint">@lineageos.platform:color/color_default_secondary_text</item>
+        <item name="android:textColorHighlight">@lineageos.platform:color/color_default_accent</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:lineSpacingMultiplier">@dimen/text_line_spacing_multiplier_material</item>
         <item name="android:textColorLink">@lineageos.platform:color/color_default_accent</item>
+        <item name="android:textColorPrimary">@lineageos.platform:color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@lineageos.platform:color/color_default_secondary_text</item>
     </style>
 
     <style name="customTitleStyle" parent="@*android:style/TextAppearance.DeviceDefault.Title">
+        <item name="textColor">@lineageos.platform:color/color_default_primary_text</item>
+        <item name="android:textColor">@lineageos.platform:color/color_default_primary_text</item>
+        <item name="android:textColorHint">@lineageos.platform:color/color_default_secondary_text</item>
+        <item name="android:textColorHighlight">@lineageos.platform:color/color_default_accent</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:lineSpacingMultiplier">@dimen/text_line_spacing_multiplier_material</item>
         <item name="android:textColorLink">@lineageos.platform:color/color_default_accent</item>
+        <item name="android:textColorPrimary">@lineageos.platform:color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@lineageos.platform:color/color_default_secondary_text</item>
     </style>
 
     <style name="customSubheadStyle" parent="@*android:style/TextAppearance.DeviceDefault.Subhead">
+        <item name="textColor">@lineageos.platform:color/color_default_primary_text</item>
+        <item name="android:textColor">@lineageos.platform:color/color_default_primary_text</item>
+        <item name="android:textColorHint">@lineageos.platform:color/color_default_secondary_text</item>
+        <item name="android:textColorHighlight">@lineageos.platform:color/color_default_accent</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:lineSpacingMultiplier">@dimen/text_line_spacing_multiplier_material</item>
         <item name="android:textColorLink">@lineageos.platform:color/color_default_accent</item>
+        <item name="android:textColorPrimary">@lineageos.platform:color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@lineageos.platform:color/color_default_secondary_text</item>
     </style>
 
     <style name="customBody1Style" parent="@*android:style/TextAppearance.DeviceDefault.Body1">
+        <item name="textColor">@lineageos.platform:color/color_default_primary_text</item>
+        <item name="android:textColor">@lineageos.platform:color/color_default_primary_text</item>
+        <item name="android:textColorHint">@lineageos.platform:color/color_default_secondary_text</item>
+        <item name="android:textColorHighlight">@lineageos.platform:color/color_default_accent</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:lineSpacingMultiplier">@dimen/text_line_spacing_multiplier_material</item>
         <item name="android:textColorLink">@lineageos.platform:color/color_default_accent</item>
+        <item name="android:textColorPrimary">@lineageos.platform:color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@lineageos.platform:color/color_default_secondary_text</item>
     </style>
 </resources>
-- 
GitLab


From 4f0bf3631204d4f7fe1ac076393e40fc1324ffe4 Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Wed, 23 Feb 2022 08:28:26 +0600
Subject: [PATCH 7/9] WIP: fix typo

---
 res/values/styles.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/res/values/styles.xml b/res/values/styles.xml
index ec6279d2916..b7a8bb2f728 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -810,7 +810,6 @@
         <item name="android:textColorHighlight">@lineageos.platform:color/color_default_accent</item>
         <item name="android:textSize">16sp</item>
         <item name="android:fontFamily">sans-serif</item>
-        <item name="android:lineSpacingMultiplier">@dimen/text_line_spacing_multiplier_material</item>
         <item name="android:textColorLink">@lineageos.platform:color/color_default_accent</item>
         <item name="android:textColorPrimary">@lineageos.platform:color/color_default_primary_text</item>
         <item name="android:textColorSecondary">@lineageos.platform:color/color_default_secondary_text</item>
@@ -823,7 +822,6 @@
         <item name="android:textColorHighlight">@lineageos.platform:color/color_default_accent</item>
         <item name="android:textSize">16sp</item>
         <item name="android:fontFamily">sans-serif</item>
-        <item name="android:lineSpacingMultiplier">@dimen/text_line_spacing_multiplier_material</item>
         <item name="android:textColorLink">@lineageos.platform:color/color_default_accent</item>
         <item name="android:textColorPrimary">@lineageos.platform:color/color_default_primary_text</item>
         <item name="android:textColorSecondary">@lineageos.platform:color/color_default_secondary_text</item>
@@ -836,7 +834,6 @@
         <item name="android:textColorHighlight">@lineageos.platform:color/color_default_accent</item>
         <item name="android:textSize">16sp</item>
         <item name="android:fontFamily">sans-serif</item>
-        <item name="android:lineSpacingMultiplier">@dimen/text_line_spacing_multiplier_material</item>
         <item name="android:textColorLink">@lineageos.platform:color/color_default_accent</item>
         <item name="android:textColorPrimary">@lineageos.platform:color/color_default_primary_text</item>
         <item name="android:textColorSecondary">@lineageos.platform:color/color_default_secondary_text</item>
@@ -849,7 +846,6 @@
         <item name="android:textColorHighlight">@lineageos.platform:color/color_default_accent</item>
         <item name="android:textSize">16sp</item>
         <item name="android:fontFamily">sans-serif</item>
-        <item name="android:lineSpacingMultiplier">@dimen/text_line_spacing_multiplier_material</item>
         <item name="android:textColorLink">@lineageos.platform:color/color_default_accent</item>
         <item name="android:textColorPrimary">@lineageos.platform:color/color_default_primary_text</item>
         <item name="android:textColorSecondary">@lineageos.platform:color/color_default_secondary_text</item>
-- 
GitLab


From f68d8135e2377155cb63c85782ee2b41d24b83e9 Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Wed, 23 Feb 2022 16:38:42 +0600
Subject: [PATCH 8/9] WIP: fix preview TextView issue for display size settings

---
 res/layout/conversation_message_content.xml | 6 ++++--
 res/layout/conversation_message_icon.xml    | 3 ++-
 res/values/styles.xml                       | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/res/layout/conversation_message_content.xml b/res/layout/conversation_message_content.xml
index bdb0ea73632..2b0c0ac1ed8 100644
--- a/res/layout/conversation_message_content.xml
+++ b/res/layout/conversation_message_content.xml
@@ -31,13 +31,15 @@
             android:id="@+id/message_text"
             android:textSize="@dimen/conversation_message_text_size"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/customTitleStyle" />
 
         <TextView
             android:id="@+id/message_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="@dimen/conversation_status_text_size" />
+            android:textSize="@dimen/conversation_status_text_size"
+            android:textAppearance="@style/customBody1Style" />
 
     </com.android.settings.display.MessageBubbleBackground>
 
diff --git a/res/layout/conversation_message_icon.xml b/res/layout/conversation_message_icon.xml
index 9f9f0ac76e8..157671173dc 100644
--- a/res/layout/conversation_message_icon.xml
+++ b/res/layout/conversation_message_icon.xml
@@ -21,4 +21,5 @@
     android:fontFamily="sans-serif"
     android:textStyle="bold"
     android:textSize="@dimen/conversation_message_contact_icon_text_size"
-    android:gravity="center" />
+    android:gravity="center"
+    android:textAppearance="@style/customTitleStyle" />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b7a8bb2f728..3524a9390a8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -808,7 +808,7 @@
         <item name="android:textColor">@lineageos.platform:color/color_default_primary_text</item>
         <item name="android:textColorHint">@lineageos.platform:color/color_default_secondary_text</item>
         <item name="android:textColorHighlight">@lineageos.platform:color/color_default_accent</item>
-        <item name="android:textSize">16sp</item>
+        <item name="android:textSize">24sp</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textColorLink">@lineageos.platform:color/color_default_accent</item>
         <item name="android:textColorPrimary">@lineageos.platform:color/color_default_primary_text</item>
@@ -820,7 +820,7 @@
         <item name="android:textColor">@lineageos.platform:color/color_default_primary_text</item>
         <item name="android:textColorHint">@lineageos.platform:color/color_default_secondary_text</item>
         <item name="android:textColorHighlight">@lineageos.platform:color/color_default_accent</item>
-        <item name="android:textSize">16sp</item>
+        <item name="android:textSize">18sp</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textColorLink">@lineageos.platform:color/color_default_accent</item>
         <item name="android:textColorPrimary">@lineageos.platform:color/color_default_primary_text</item>
@@ -832,7 +832,7 @@
         <item name="android:textColor">@lineageos.platform:color/color_default_primary_text</item>
         <item name="android:textColorHint">@lineageos.platform:color/color_default_secondary_text</item>
         <item name="android:textColorHighlight">@lineageos.platform:color/color_default_accent</item>
-        <item name="android:textSize">16sp</item>
+        <item name="android:textSize">20sp</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textColorLink">@lineageos.platform:color/color_default_accent</item>
         <item name="android:textColorPrimary">@lineageos.platform:color/color_default_primary_text</item>
-- 
GitLab


From e4afcc986c539833c7851723b418feeb4fa6da1f Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Wed, 23 Feb 2022 22:26:37 +0600
Subject: [PATCH 9/9] WIP: fix zoom preview styling

---
 res/layout/screen_zoom_activity.xml         |  2 +-
 res/layout/screen_zoom_preview_1.xml        |  2 +-
 res/layout/screen_zoom_preview_app_icon.xml |  2 +-
 res/layout/screen_zoom_preview_settings.xml | 52 ++++++++++-----------
 res/values/styles.xml                       | 12 +++++
 5 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/res/layout/screen_zoom_activity.xml b/res/layout/screen_zoom_activity.xml
index 4cfa7b6ae98..0d6906b014f 100644
--- a/res/layout/screen_zoom_activity.xml
+++ b/res/layout/screen_zoom_activity.xml
@@ -93,7 +93,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/screen_zoom_summary"
                 android:layout_marginBottom="16dp"
-                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead" />
+                android:textAppearance="@style/customSubheadStyle" />
         </LinearLayout>
     </LinearLayout>
 </ScrollView>
diff --git a/res/layout/screen_zoom_preview_1.xml b/res/layout/screen_zoom_preview_1.xml
index 65d27ee6896..39598c0cfd1 100644
--- a/res/layout/screen_zoom_preview_1.xml
+++ b/res/layout/screen_zoom_preview_1.xml
@@ -28,7 +28,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="?android:attr/colorBackgroundFloating"
+            android:background="@lineageos.platform:color/color_default_foreground"
             android:paddingTop="@dimen/conversation_message_list_padding"
             android:paddingStart="@dimen/conversation_message_list_padding"
             android:paddingEnd="@dimen/conversation_message_list_padding"
diff --git a/res/layout/screen_zoom_preview_app_icon.xml b/res/layout/screen_zoom_preview_app_icon.xml
index 1d564107757..5ff5db8d00d 100644
--- a/res/layout/screen_zoom_preview_app_icon.xml
+++ b/res/layout/screen_zoom_preview_app_icon.xml
@@ -37,5 +37,5 @@
         android:ellipsize="end"
         android:gravity="center_horizontal|top"
         android:singleLine="true"
-        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Caption" />
+        android:textAppearance="@style/customCaptionStyle" />
 </LinearLayout>
diff --git a/res/layout/screen_zoom_preview_settings.xml b/res/layout/screen_zoom_preview_settings.xml
index 3401fcf1971..5afeadb47da 100644
--- a/res/layout/screen_zoom_preview_settings.xml
+++ b/res/layout/screen_zoom_preview_settings.xml
@@ -18,7 +18,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true"
-    android:background="?android:attr/colorBackgroundFloating"
+    android:background="@lineageos.platform:color/color_default_foreground"
     android:importantForAccessibility="noHideDescendants">
 
     <view class="com.android.settings.TouchBlockingFrameLayout"
@@ -43,7 +43,7 @@
                     android:layout_width="48dp"
                     android:layout_height="48dp"
                     android:src="@drawable/ic_settings_wireless"
-                    android:tint="?android:attr/colorAccent"
+                    android:tint="@lineageos.platform:color/color_default_accent"
                     android:scaleType="center" />
 
                 <LinearLayout
@@ -57,16 +57,16 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/wifi_settings"
-                        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-                        android:textColor="?android:attr/textColorPrimary" />
+                        android:textAppearance="@style/customSubheadStyle"
+                        android:textColor="@lineageos.platform:color/color_default_primary_text" />
 
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/wifi_display_status_not_available"
-                        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-                        android:textColor="?android:attr/textColorSecondary" />
+                        android:textAppearance="@style/customBody1Style"
+                        android:textColor="@lineageos.platform:color/color_default_secondary_text" />
                 </LinearLayout>
             </LinearLayout>
 
@@ -82,7 +82,7 @@
                     android:layout_width="48dp"
                     android:layout_height="48dp"
                     android:src="@drawable/ic_settings_data_usage"
-                    android:tint="?android:attr/colorAccent"
+                    android:tint="@lineageos.platform:color/color_default_accent"
                     android:scaleType="center" />
 
                 <LinearLayout
@@ -96,15 +96,15 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/data_usage_summary_title"
-                        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-                        android:textColor="?android:attr/textColorPrimary" />
+                        android:textAppearance="@style/customSubheadStyle"
+                        android:textColor="@lineageos.platform:color/color_default_primary_text" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/no_data_usage"
-                        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-                        android:textColor="?android:attr/textColorSecondary" />
+                        android:textAppearance="@style/customBody1Style"
+                        android:textColor="@lineageos.platform:color/color_default_secondary_text" />
                 </LinearLayout>
             </LinearLayout>
 
@@ -120,7 +120,7 @@
                     android:layout_width="48dp"
                     android:layout_height="48dp"
                     android:src="@drawable/ic_settings_display"
-                    android:tint="?android:attr/colorAccent"
+                    android:tint="@lineageos.platform:color/color_default_accent"
                     android:scaleType="center" />
 
                 <LinearLayout
@@ -134,15 +134,15 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/display_settings_title"
-                        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-                        android:textColor="?android:attr/textColorPrimary" />
+                        android:textAppearance="@style/customSubheadStyle"
+                        android:textColor="@lineageos.platform:color/color_default_primary_text" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/display_summary_example"
-                        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-                        android:textColor="?android:attr/textColorSecondary" />
+                        android:textAppearance="@style/customBody1Style"
+                        android:textColor="@lineageos.platform:color/color_default_secondary_text" />
                 </LinearLayout>
             </LinearLayout>
 
@@ -158,7 +158,7 @@
                     android:layout_width="48dp"
                     android:layout_height="48dp"
                     android:src="@drawable/ic_settings_sound"
-                    android:tint="?android:attr/colorAccent"
+                    android:tint="@lineageos.platform:color/color_default_accent"
                     android:scaleType="center" />
 
                 <LinearLayout
@@ -172,15 +172,15 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/sound_settings"
-                        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-                        android:textColor="?android:attr/textColorPrimary" />
+                        android:textAppearance="@style/customSubheadStyle"
+                        android:textColor="@lineageos.platform:color/color_default_primary_text" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/sound_settings_example_summary"
-                        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-                        android:textColor="?android:attr/textColorSecondary" />
+                        android:textAppearance="@style/customBody1Style"
+                        android:textColor="@lineageos.platform:color/color_default_secondary_text" />
                 </LinearLayout>
             </LinearLayout>
 
@@ -196,7 +196,7 @@
                     android:layout_width="48dp"
                     android:layout_height="48dp"
                     android:src="@drawable/ic_settings_applications"
-                    android:tint="?android:attr/colorAccent"
+                    android:tint="@lineageos.platform:color/color_default_accent"
                     android:scaleType="center" />
 
                 <LinearLayout
@@ -210,15 +210,15 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/applications_settings"
-                        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-                        android:textColor="?android:attr/textColorPrimary" />
+                        android:textAppearance="@style/customSubheadStyle"
+                        android:textColor="@lineageos.platform:color/color_default_primary_text" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/apps_summary_example"
-                        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-                        android:textColor="?android:attr/textColorSecondary" />
+                        android:textAppearance="@style/customBody1Style"
+                        android:textColor="@lineageos.platform:color/color_default_secondary_text" />
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3524a9390a8..562952abe02 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -850,4 +850,16 @@
         <item name="android:textColorPrimary">@lineageos.platform:color/color_default_primary_text</item>
         <item name="android:textColorSecondary">@lineageos.platform:color/color_default_secondary_text</item>
     </style>
+
+    <style name="customCaptionStyle" parent="@*android:style/TextAppearance.DeviceDefault.Caption">
+        <item name="textColor">@lineageos.platform:color/color_default_secondary_text</item>
+        <item name="android:textColor">@lineageos.platform:color/color_default_secondary_text</item>
+        <item name="android:textColorHint">@lineageos.platform:color/color_default_secondary_text</item>
+        <item name="android:textColorHighlight">@lineageos.platform:color/color_default_accent</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textColorLink">@lineageos.platform:color/color_default_accent</item>
+        <item name="android:textColorPrimary">@lineageos.platform:color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@lineageos.platform:color/color_default_secondary_text</item>
+    </style>
 </resources>
-- 
GitLab