Merge branch 'dev' into pr2335
This commit is contained in:
commit
6ead95b5d2
423 changed files with 3413 additions and 4301 deletions
|
|
@ -61,6 +61,16 @@
|
|||
app:singleLineTitle="false"
|
||||
app:iconSpaceReserved="false" />
|
||||
|
||||
<ListPreference
|
||||
android:defaultValue="@string/progressive_load_interval_default_value"
|
||||
android:entries="@array/progressive_load_interval_descriptions"
|
||||
android:entryValues="@array/progressive_load_interval_values"
|
||||
android:key="@string/progressive_load_interval_key"
|
||||
android:summary="@string/progressive_load_interval_summary"
|
||||
android:title="@string/progressive_load_interval_title"
|
||||
app:singleLineTitle="false"
|
||||
app:iconSpaceReserved="false" />
|
||||
|
||||
<PreferenceCategory
|
||||
android:layout="@layout/settings_category_header_layout"
|
||||
android:title="@string/settings_category_player_title"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue