PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move DropDownPreference to supportlib"

Browse Source
This commit is contained in:
Jason Monk
2015-12-15 18:02:53 +00:00
committed by Android (Google) Code Review
parent 4582dab08e 1230ac820e
commit b69b96042c
22 changed files with 44 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/attrs.xml
View File

@@ -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>

1
res/values/themes.xml
View File

@@ -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>