Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 751bafe6 authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "Rename SettingsPreferenceTheme to PreferenceTheme.SettingsBase" into sc-dev

parents 7206a574 e0c507d5
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@
  limitations under the License.
  -->
<resources>
    <!--DEPRECATED. It will remove after all of client team migrated to new style. -->
    <!--DEPRECATED. It will be removed after all of client teams migrated to new style. -->
    <style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay">
        <item name="preferenceCategoryStyle">@style/SettingsCategoryPreference</item>
        <item name="preferenceStyle">@style/SettingsPreference</item>
@@ -28,7 +28,7 @@
        <item name="footerPreferenceStyle">@style/Preference.Material</item>
    </style>

    <style name="SettingsPreferenceTheme" parent="@style/PreferenceThemeOverlay">
    <style name="PreferenceTheme.SettingsBase" parent="@style/PreferenceThemeOverlay">
        <item name="preferenceCategoryStyle">@style/SettingsCategoryPreference</item>
        <item name="preferenceStyle">@style/SettingsPreference</item>
        <item name="checkBoxPreferenceStyle">@style/SettingsCheckBoxPreference</item>
+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@
        <item name="android:textAppearanceListItem">@style/TextAppearance.PreferenceTitle</item>
        <item name="android:listPreferredItemPaddingStart">@dimen/preference_padding_start</item>
        <item name="android:listPreferredItemPaddingEnd">@dimen/preference_padding_end</item>
        <item name="preferenceTheme">@style/SettingsPreferenceTheme</item>
        <item name="preferenceTheme">@style/PreferenceTheme.SettingsBase</item>
    </style>

    <!-- Using in SubSettings page including injected settings page -->