Sulkta-OSS/straw
3
0
Fork 0
Code Issues 1 Pull requests 11 Projects Releases Packages Wiki Activity Actions

fix conflict

Browse source
This commit is contained in:
Christian Schabesberger 2018-05-27 13:30:23 +02:00
commit f26c4463d1
7 changed files with 436 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/res/values/settings_keys.xml
View file

@ -853,4 +853,22 @@
<item>ZM</item>
<item>ZW</item>
</string-array>
<!-- Limit mobile data usage -->
<string name="limit_mobile_data_usage_key" translatable="false">limit_mobile_data_usage</string>
<string name="limit_data_usage_none_key" translatable="false">limit_data_usage_none</string>
<string-array name="limit_data_usage_values_list">
<item>@string/limit_data_usage_none_key</item>
<item>1080p60</item>
<item>1080p</item>
<item>720p60</item>
<item>720p</item>
<item>480p</item>
<item>360p</item>
<item>240p</item>
<item>144p</item>
</string-array>
</resources>