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

Commit cc16feb7 authored by Antony Sargent's avatar Antony Sargent
Browse files

Update style names due to theme migration 

This updates some theme names to go along with a change to migrate some
theme elements from SettingsLib to the support library.

Bug: 64689839
Test: manual
Change-Id: I31b96c321def78bbb49239faae6ba8e73aacd2fa
parent c61ed635

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) 2016 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

res/values/styles_preference.xml

+4 −4
Original line number Diff line number Diff line
@@ -20,19 +20,19 @@ 
<resources>



    <!-- Fragment style -->

    <style name="SettingsPreferenceFragmentStyle" parent="@style/PreferenceFragmentStyle.SettingsBase">

    <style name="SettingsPreferenceFragmentStyle" parent="@style/PreferenceFragment.Material">

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

    </style>



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

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

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

    </style>



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

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

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

    </style>



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

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

        <item name="android:widgetLayout">@layout/preference_widget_sync_toggle</item>

    </style>