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

Commit 1230ac82 authored by Jason Monk's avatar Jason Monk
Browse files

Move DropDownPreference to supportlib 

Change-Id: Ife6799d1136302b805b5191f1a86276c538ca4bf
parent 990c08e3

res/values/attrs.xml

+0 −5
Original line number Diff line number Diff line
@@ -110,11 +110,6 @@ 
    <attr name="confirmDeviceCredentialsSideMargin" format="dimension" />

    <attr name="confirmDeviceCredentialsTopMargin" format="dimension" />



    <declare-styleable name="DropDownPreference">

        <attr name="android:entries" />

        <attr name="android:entryValues" />

    </declare-styleable>



    <declare-styleable name="RestrictedPreference">

        <attr name="userRestriction" format="string"/>

    </declare-styleable>

res/values/themes.xml

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ 


    <style name="PreferenceTheme" parent="@android:style/Theme.DeviceDefault.Settings">

        <item name="@android:preferenceStyle">@style/Preference</item>

        <item name="@dropdownPreferenceStyle">@style/Preference.DropDown.Material</item>

        <item name="@android:preferenceFragmentStyle">@style/PreferenceFragmentStyle</item>



        <item name="apnPreferenceStyle">@style/ApnPreference</item>

res/xml/battery_saver_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -19,9 +19,10 @@ 
        android:key="battery_saver">



    <!-- Turn on automatically -->

    <com.android.settings.DropDownPreference

    <DropDownPreference

            android:key="turn_on_automatically"

            android:title="@string/battery_saver_turn_on_automatically_title"

            android:summary="%s"

            android:persistent="false" />



    <!-- Feature description text -->

res/xml/configure_notification_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -26,9 +26,10 @@ 
            android:persistent="false" />



    <!-- When device is locked -->

    <com.android.settings.DropDownPreference

    <DropDownPreference

            android:key="lock_screen_notifications"

            android:title="@string/lock_screen_notifications_title"

            android:summary="%s"

            android:persistent="false" />



    <PreferenceCategory

res/xml/development_prefs.xml

+3 −2
Original line number Diff line number Diff line
@@ -60,10 +60,11 @@ 
        android:summary="@string/runningservices_settings_summary"

        android:fragment="com.android.settings.applications.RunningServices" />



    <com.android.settings.DropDownPreference

    <DropDownPreference

        android:key="night_mode"

        android:title="@string/night_mode_title"

        android:summary="@string/night_mode_summary"

        android:summary="%s"

        android:persistent="false"

        android:entries="@array/night_mode_entries"

        android:entryValues="@array/night_mode_values" />