1
0
Fork 0
mirror of https://github.com/M66B/NetGuard.git synced 2024-12-26 01:38:07 +00:00

Merge pull request #376 from licaon-kter/patch-3

Hosts lists loading should depend on filter
This commit is contained in:
Marcel Bokhorst 2016-03-17 07:08:03 +01:00
commit dc191df24d
2 changed files with 4 additions and 0 deletions

View file

@ -195,11 +195,13 @@
android:title="@string/setting_import" /> android:title="@string/setting_import" />
<Preference <Preference
android:key="hosts_import" android:key="hosts_import"
android:dependency="filter"
android:title="@string/setting_hosts" /> android:title="@string/setting_hosts" />
<EditTextPreference <EditTextPreference
android:defaultValue="http://www.netguard.me/hosts" android:defaultValue="http://www.netguard.me/hosts"
android:hint="http://www.netguard.me/hosts" android:hint="http://www.netguard.me/hosts"
android:key="hosts_url" android:key="hosts_url"
android:dependency="filter"
android:title="@string/setting_hosts_url" /> android:title="@string/setting_hosts_url" />
<Preference <Preference
android:dependency="hosts_url" android:dependency="hosts_url"

View file

@ -195,11 +195,13 @@
android:title="@string/setting_import" /> android:title="@string/setting_import" />
<Preference <Preference
android:key="hosts_import" android:key="hosts_import"
android:dependency="filter"
android:title="@string/setting_hosts" /> android:title="@string/setting_hosts" />
<EditTextPreference <EditTextPreference
android:defaultValue="http://www.netguard.me/hosts" android:defaultValue="http://www.netguard.me/hosts"
android:hint="http://www.netguard.me/hosts" android:hint="http://www.netguard.me/hosts"
android:key="hosts_url" android:key="hosts_url"
android:dependency="filter"
android:title="@string/setting_hosts_url" /> android:title="@string/setting_hosts_url" />
<Preference <Preference
android:dependency="hosts_url" android:dependency="hosts_url"