Inline/rename non-default Settings styles

The PreferenceScreenLayout and PreferenceMediumText styles are
non-standard and not used in the default settings screens, so inlining/
renaming them to discourage reuse.

Fixing the Clear Browsing Data text style is tracked in crbug.com/1081933.
Cleanup of the homepage editor change is not tracked because it will
eventually be replaced through theHomepageSettingsUIConversion.

Bug: 1077375
Change-Id: I955c4364770e68eb84c14fa3832450ccf1f56303
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2254714
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Reviewed-by: Wenyu Fu <wenyufu@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#780519}

chrome/android/java/res/layout/clear_browsing_important_dialog_listview.xml

@@ -18,7 +18,7 @@
         android:paddingBottom="7dip"
         android:paddingStart="24dp"
         android:paddingEnd="15dp"
-        android:textAppearance="@style/TextAppearance.PreferenceMediumText"
+        android:textAppearance="@style/TextAppearance.ClearBrowsingDataText"
         android:text="@string/clear_browsing_data_important_dialog_text"/>
 
     <ListView

chrome/android/java/res/layout/homepage_editor.xml

@@ -24,7 +24,9 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/homepage_url"
-                style="@style/PreferenceScreenLayout"
+                android:paddingTop="16dp"
+                android:paddingStart="@dimen/pref_autofill_content_spacing"
+                android:paddingEnd="@dimen/pref_autofill_content_spacing"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
                 <!-- TODO(crbug.com/900912): Fix and remove lint ignore -->

chrome/android/java/res/values/styles.xml

@@ -222,14 +222,7 @@
     <style name="SettingsActionBarModern" parent="@style/Widget.AppCompat.Light.ActionBar.Solid">
       <item name="titleTextStyle">@style/TextAppearance.Headline.Primary</item>
     </style>
-    <style name="PreferenceScreenLayout">
-        <item name="android:paddingTop">16dp</item>
 
-        <!-- Additional padding is applied to each of the controls inside the layout, making this
-             a 16dp padding overall. -->
-        <item name="android:paddingStart">@dimen/pref_autofill_content_spacing</item>
-        <item name="android:paddingEnd">@dimen/pref_autofill_content_spacing</item>
-    </style>
     <style name="TextAppearance.AccessibilityTextPreference">
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
@@ -589,6 +582,11 @@
     <style name="TextAppearance.SearchEngineRecentTitle" parent="TextAppearance.RobotoMediumStyle">
         <item name="android:textColor">@color/default_text_color_link</item>
     </style>
+    <!-- TODO(crbug.com/1081933): Replace with a standard text appearance. -->
+    <style name="TextAppearance.ClearBrowsingDataText">
+        <item name="android:textSize">18sp</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    </style>
 
     <!-- New Tab Page -->
     <style name="NewTabPageRecyclerView">

components/browser_ui/settings/android/java/res/values/styles.xml

@@ -29,12 +29,6 @@
         <item name="android:textAppearance">@style/TextAppearance.TextMedium.Secondary</item>
     </style>
 
-    <!-- TODO(crbug.com/1077375): Consider removing this text style. -->
-    <style name="TextAppearance.PreferenceMediumText" tools:ignore="UnusedResources">
-        <item name="android:textSize">18sp</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-    </style>
-
     <style name="PreferenceLayout">
         <item name="android:background">?android:attr/activatedBackgroundIndicator</item>
         <item name="android:minHeight">?android:attr/listPreferredItemHeightSmall</item>