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

Merge "Apply SettingsLib SeekBarPreference to Settings" into sc-dev

Browse Source
This commit is contained in:
Edgar Wang
2021-06-08 07:23:54 +00:00
committed by Android (Google) Code Review
parent 5fd29ebeab d6b5bbb5cb
commit 4aad4a88a7
40 changed files with 149 additions and 1264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/values/attrs.xml
View File

@@ -157,13 +157,6 @@
<attr name="textOff" format="reference" />
</declare-styleable>
<!-- For LabeledSeekBarPreference -->
<declare-styleable name="LabeledSeekBarPreference">
<attr name="textStart" format="reference" />
<attr name="textEnd" format="reference" />
<attr name="tickMark" format="reference" />
</declare-styleable>
<declare-styleable name="TintDrawable">
<attr name="android:tint" />
<attr name="android:drawable" />

5
res/values/styles_preference.xml
View File

@@ -23,7 +23,6 @@
<item name="apnPreferenceStyle">@style/ApnPreference</item>
<item name="cardPreferenceStyle">@style/CardPreference</item>
<item name="slicePreferenceStyle">@style/SlicePreference</item>
<item name="seekBarPreferenceStyle">@style/SettingsSeekBarPreference</item>
<item name="twoStateButtonPreferenceStyle">@style/TwoStateButtonPreference</item>
<item name="preferenceFragmentCompatStyle">@style/SettingsPreferenceFragmentStyle</item>
</style>
@@ -44,10 +43,6 @@
<item name="android:layout">@layout/slice_preference_layout</item>
</style>
<style name="SettingsSeekBarPreference" parent="@style/Preference.Material">
<item name="android:layout">@layout/preference_widget_seekbar_settings</item>
</style>
<style name="SyncSwitchPreference" parent="@style/SettingsSwitchPreference.SettingsLib">
<item name="android:widgetLayout">@layout/preference_widget_sync_toggle</item>
</style>