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

Use preference theme from SettingsLib

Browse Source 
Bug: 36663882
Test: rerun robotests
Change-Id: I9f0f51a9d070191f5bf8f3315fef4d997d6213c3
This commit is contained in:
Fan Zhang
2017-07-07 10:39:33 -07:00
parent 5c279e4bce
commit f559395603
8 changed files with 71 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
res/values/styles_preference.xml
View File

@@ -19,64 +19,21 @@
<!-- Things unrelated to preference framework UI customization should go to other styles files -->
<resources>
<dimen name="preference_no_icon_padding_start">72dp</dimen>
<!-- Fragment style -->
<style name="PreferenceFragmentStyle" parent="@*android:style/PreferenceFragment.Material">
<style name="SettingsPreferenceFragmentStyle" parent="@style/PreferenceFragmentStyle.SettingsBase">
<item name="android:layout">@layout/preference_list_fragment</item>
<item name="allowDividerAfterLastItem">false</item>
</style>
<!-- Preferences -->
<style name="SettingsPreference" 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>
<style name="ApnPreference" parent="SettingsPreference">
<style name="ApnPreference" parent="Preference.SettingsBase">
<item name="android:layout">@layout/apn_preference_layout</item>
</style>
<style name="FooterPreference" parent="SettingsPreference">
<item name="android:layout">@layout/preference_footer</item>
<item name="allowDividerAbove">true</item>
</style>
<style name="EditTextPreference"
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>
<item name="android:dialogLayout">@layout/preference_dialog_edittext</item>
</style>
<style name="SettingsDropdownPreference" parent="SettingsPreference">
<item name="android:layout">@layout/preference_dropdown_material_settings</item>
</style>
<style name="SettingsDialogPreference" parent="SettingsPreference" />
<style name="SettingsPreferenceCategory" 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>
<style name="SettingsSeekBarPreference" parent="SettingsPreference">
<style name="SettingsSeekBarPreference" parent="Preference.SettingsBase">
<item name="android:layout">@layout/preference_widget_seekbar_settings</item>
</style>
<style name="SettingsSwitchPreference" 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>
<style name="SyncSwitchPreference" parent="SettingsPreference">
<style name="SyncSwitchPreference" parent="Preference.SettingsBase">
<item name="android:widgetLayout">@layout/preference_widget_sync_toggle</item>
</style>
</resources>

13
res/values/themes.xml
View File

@@ -122,19 +122,10 @@
<item name="android:windowAnimationStyle">@android:style/Animation.Activity</item>
</style>
<style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay.v14.Material">
<!-- Parent path frameworks/support/v14/preference/res/values/themes.xml -->
<item name="android:scrollbars">vertical</item>
<style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay.SettingsBase">
<item name="preferenceFragmentStyle">@style/SettingsPreferenceFragmentStyle</item>
<item name="apnPreferenceStyle">@style/ApnPreference</item>
<item name="footerPreferenceStyle">@style/FooterPreference</item>
<item name="dialogPreferenceStyle">@style/SettingsDialogPreference</item>
<item name="dropdownPreferenceStyle">@style/SettingsDropdownPreference</item>
<item name="editTextPreferenceStyle">@style/EditTextPreference</item>
<item name="preferenceCategoryStyle">@style/SettingsPreferenceCategory</item>
<item name="preferenceFragmentStyle">@style/PreferenceFragmentStyle</item>
<item name="preferenceStyle">@style/SettingsPreference</item>
<item name="seekBarPreferenceStyle">@style/SettingsSeekBarPreference</item>
<item name="switchPreferenceStyle">@style/SettingsSwitchPreference</item>
</style>
<style name="PreferenceTheme.SetupWizard" parent="PreferenceTheme">