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

Commit 77a89a6c authored by Antony Sargent's avatar Antony Sargent
Browse files

Migrate some preference theme attributes from SettingsLib 

We've moved some preference style definitions from SettingsLib into the
Support Library, with a goal of letting us use them in more places and
avoid duplication.

Bug: 64689839
Test: manual
Change-Id: I49eca13943eb15d2c3f4fb099f439060f9c60cff
parent 16fd2e9a

packages/SettingsLib/res/layout/preference_dropdown_material_settings.xml

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2017 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->





<!-- Based off frameworks/base/core/res/res/layout/preference_dropdown_material.xml

     except that icon space in this layout is always reserved -->

<FrameLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">



    <Spinner

        android:id="@+id/spinner"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/preference_no_icon_padding_start"

        android:visibility="invisible" />



    <include layout="@layout/preference_material"/>



</FrameLayout>
 
 No newline at end of file

packages/SettingsLib/res/values/styles_support_preference.xml

+1 −60
Original line number Diff line number Diff line
@@ -20,73 +20,14 @@ 


    <dimen name="preference_no_icon_padding_start">72dp</dimen>



    <!-- Fragment style -->

    <style name="PreferenceFragmentStyle.SettingsBase" parent="@*android:style/PreferenceFragment.Material">

        <item name="allowDividerAfterLastItem">false</item>

    </style>



    <!-- Preferences -->

    <style name="Preference.SettingsBase" parent="@style/Preference.Material">

        <item name="allowDividerAbove">false</item>

        <item name="allowDividerBelow">true</item>

        <item name="singleLineTitle">false</item>

        <item name="iconSpaceReserved">true</item>

    </style>



    <!-- Preference category -->

    <style name="Preference.Category.SettingsBase" parent="@style/Preference.Category.Material">

        <item name="allowDividerAbove">true</item>

        <item name="allowDividerBelow">true</item>

        <item name="android:layout">@layout/preference_category_material_settings</item>

    </style>



    <!-- Preference screen -->

    <style name="Preference.Screen.SettingsBase" parent="@style/Preference.PreferenceScreen.Material">

        <item name="allowDividerAbove">false</item>

        <item name="allowDividerBelow">true</item>

        <item name="iconSpaceReserved">true</item>

    </style>



    <!-- Footer Preferences -->

    <style name="Preference.FooterPreference.SettingsBase" parent="Preference.SettingsBase">

    <style name="Preference.FooterPreference.SettingsBase" parent="@style/Preference.Material">

        <item name="android:layout">@layout/preference_footer</item>

        <item name="allowDividerAbove">true</item>

    </style>



    <!-- Dropdown Preferences -->

    <style name="Preference.DropdownPreference.SettingsBase" parent="Preference.SettingsBase">

        <item name="android:layout">@layout/preference_dropdown_material_settings</item>

    </style>



    <!-- Switch Preferences -->

    <style name="Preference.SwitchPreference.SettingsBase" parent="@style/Preference.SwitchPreference.Material">

        <item name="allowDividerAbove">false</item>

        <item name="allowDividerBelow">true</item>

        <item name="iconSpaceReserved">true</item>

        <item name="singleLineTitle">false</item>

    </style>



    <!-- EditText Preferences -->

    <style name="Preference.EditTextPreference.SettingsBase"

           parent="@style/Preference.DialogPreference.EditTextPreference.Material">

        <item name="allowDividerAbove">false</item>

        <item name="allowDividerBelow">true</item>

        <item name="iconSpaceReserved">true</item>

        <item name="singleLineTitle">false</item>

    </style>



    <style name="PreferenceThemeOverlay.SettingsBase" parent="@style/PreferenceThemeOverlay.v14.Material">

        <!-- Parent path frameworks/support/v14/preference/res/values/themes.xml -->

        <item name="android:scrollbars">vertical</item>

        <item name="preferenceFragmentStyle">@style/PreferenceFragmentStyle.SettingsBase</item>

        <item name="preferenceCategoryStyle">@style/Preference.Category.SettingsBase</item>

        <item name="preferenceScreenStyle">@style/Preference.Screen.SettingsBase</item>

        <item name="preferenceStyle">@style/Preference.SettingsBase</item>

        <item name="dialogPreferenceStyle">@style/Preference.SettingsBase</item>

        <item name="editTextPreferenceStyle">@style/Preference.EditTextPreference.SettingsBase</item>

        <item name="footerPreferenceStyle">@style/Preference.FooterPreference.SettingsBase</item>

        <item name="switchPreferenceStyle">@style/Preference.SwitchPreference.SettingsBase</item>

        <item name="dropdownPreferenceStyle">@style/Preference.DropdownPreference.SettingsBase</item>

    </style>



</resources>
 
 No newline at end of file