Twelve: SettingsLib: Simplify collapsed/expanded text appearance

Change-Id: I0b003980a176958c3828e64b9ddb23f8ff766541
LineageOS · Nov 14, 2024 · 8e92762 · 8e92762
1 parent d6b5dc5
commit 8e92762
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
@@ -22,10 +22,9 @@
             style="?attr/collapsingToolbarLayoutLargeStyle"
             android:layout_width="match_parent"
             android:layout_height="179dp"
-            app:collapsedTitleTextAppearance="@style/Theme.SettingsLib.ToolbarCollapsedTextAppearance"
             app:expandedTitleMarginBottom="31dp"
             app:expandedTitleMarginStart="24dp"
-            app:expandedTitleTextAppearance="@style/Theme.SettingsLib.ToolbarExpandedTextAppearance"
+            app:expandedTitleTextAppearance="?attr/textAppearanceDisplaySmall"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
             app:titleCollapseMode="fade"
             app:toolbarId="@id/toolbar">

diff --git a/app/src/main/res/values/themes_settingslib.xml b/app/src/main/res/values/themes_settingslib.xml
@@ -19,14 +19,6 @@
         <item name="dialogCornerRadius">16dp</item>
     </style>
 
-    <!-- Settings collapsing toolbar style -->
-    <style name="Theme.SettingsLib.ToolbarCollapsedTextAppearance" parent="TextAppearance.Material3.ActionBar.Title" />
-
-    <style name="Theme.SettingsLib.ToolbarExpandedTextAppearance" parent="TextAppearance.Material3.HeadlineMedium">
-        <item name="android:drawablePadding">10dp</item>
-        <item name="android:textSize">36sp</item>
-    </style>
-
     <!-- Settings preference style. -->
     <style name="Theme.SettingsLib.PreferenceTheme" parent="PreferenceThemeOverlay">
         <item name="android:divider">@android:color/transparent</item>