mirror/NetGuard
1
0
Fork 0
mirror of https://github.com/M66B/NetGuard.git synced 2025-02-24 07:10:50 +00:00
Code Issues Releases Wiki Activity

Revert "Wrap preference categories in preference screens"

Browse source 
This reverts commit fd906cd36b.
This commit is contained in:
M66B 2016-04-14 15:17:47 +02:00
parent 006b1a212b
commit 865b0695a9
3 changed files with 489 additions and 526 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/eu/faircode/netguard/ActivitySettings.java
View file

@ -130,7 +130,6 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
PreferenceCategory cat_advanced = (PreferenceCategory) screen.findPreference("category_advanced_options"); PreferenceCategory cat_advanced = (PreferenceCategory) screen.findPreference("category_advanced_options");
PreferenceCategory cat_backup = (PreferenceCategory) screen.findPreference("category_backup"); PreferenceCategory cat_backup = (PreferenceCategory) screen.findPreference("category_backup");
PreferenceCategory cat_development = (PreferenceCategory) screen.findPreference("category_development"); PreferenceCategory cat_development = (PreferenceCategory) screen.findPreference("category_development");
PreferenceScreen screen_development = (PreferenceScreen) screen.findPreference("screen_development");
// Handle auto enable // Handle auto enable
Preference pref_auto_enable = screen.findPreference("auto_enable"); Preference pref_auto_enable = screen.findPreference("auto_enable");
@ -343,7 +342,7 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
// Development // Development
Preference pref_show_resolved = screen.findPreference("show_resolved"); Preference pref_show_resolved = screen.findPreference("show_resolved");
if (!(Util.isDebuggable(this) || Util.getSelfVersionName(this).contains("beta"))) { if (!(Util.isDebuggable(this) || Util.getSelfVersionName(this).contains("beta"))) {
screen.removePreference(screen_development); screen.removePreference(cat_development);
prefs.edit().remove("loglevel").apply(); prefs.edit().remove("loglevel").apply();
} else if (!Util.isDebuggable(this)) } else if (!Util.isDebuggable(this))
cat_development.removePreference(pref_show_resolved); cat_development.removePreference(pref_show_resolved);

18
app/src/main/res/xml-v14/preferences.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceScreen android:title="@string/setting_defaults">
<PreferenceCategory <PreferenceCategory
android:key="category_defaults" android:key="category_defaults"
android:title="@string/setting_defaults"> android:title="@string/setting_defaults">
@ -25,9 +24,7 @@
android:key="whitelist_roaming" android:key="whitelist_roaming"
android:title="@string/setting_whitelist_roaming" /> android:title="@string/setting_whitelist_roaming" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen>
<PreferenceScreen android:title="@string/setting_options">
<PreferenceCategory <PreferenceCategory
android:key="category_options" android:key="category_options"
android:title="@string/setting_options"> android:title="@string/setting_options">
@ -61,9 +58,7 @@
android:summary="@string/summary_update" android:summary="@string/summary_update"
android:title="@string/setting_update" /> android:title="@string/setting_update" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen>
<PreferenceScreen android:title="@string/setting_network_options">
<PreferenceCategory <PreferenceCategory
android:key="category_options" android:key="category_options"
android:title="@string/setting_network_options"> android:title="@string/setting_network_options">
@ -112,9 +107,7 @@
android:summary="@string/summary_national_roaming" android:summary="@string/summary_national_roaming"
android:title="@string/setting_national_roaming" /> android:title="@string/setting_national_roaming" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen>
<PreferenceScreen android:title="@string/setting_advanced_options">
<PreferenceCategory <PreferenceCategory
android:key="category_advanced_options" android:key="category_advanced_options"
android:title="@string/setting_advanced_options"> android:title="@string/setting_advanced_options">
@ -180,9 +173,7 @@
android:inputType="number" android:inputType="number"
android:key="pcap_file_size" /> android:key="pcap_file_size" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen>
<PreferenceScreen android:title="@string/setting_stats_category">
<PreferenceCategory <PreferenceCategory
android:key="category_stats" android:key="category_stats"
android:title="@string/setting_stats_category"> android:title="@string/setting_stats_category">
@ -207,9 +198,7 @@
android:inputType="number" android:inputType="number"
android:key="stats_samples" /> android:key="stats_samples" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen>
<PreferenceScreen android:title="@string/setting_backup">
<PreferenceCategory <PreferenceCategory
android:key="category_backup" android:key="category_backup"
android:title="@string/setting_backup"> android:title="@string/setting_backup">
@ -234,11 +223,7 @@
android:key="hosts_download" android:key="hosts_download"
android:title="@string/setting_hosts_download" /> android:title="@string/setting_hosts_download" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen>
<PreferenceScreen
android:key="screen_development"
android:title="Development">
<PreferenceCategory <PreferenceCategory
android:key="category_development" android:key="category_development"
android:title="Development"> android:title="Development">
@ -253,9 +238,7 @@
android:key="show_resolved" android:key="show_resolved"
android:title="@string/setting_show_resolved" /> android:title="@string/setting_show_resolved" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen>
<PreferenceScreen android:title="@string/setting_technical">
<PreferenceCategory <PreferenceCategory
android:key="category_technical" android:key="category_technical"
android:title="@string/setting_technical"> android:title="@string/setting_technical">
@ -269,5 +252,4 @@
android:key="technical_subscription" android:key="technical_subscription"
android:title="@string/setting_technical_subscription" /> android:title="@string/setting_technical_subscription" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen>
</PreferenceScreen> </PreferenceScreen>

18
app/src/main/res/xml-v21/preferences.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceScreen android:title="@string/setting_defaults">
<PreferenceCategory <PreferenceCategory
android:key="category_defaults" android:key="category_defaults"
android:title="@string/setting_defaults"> android:title="@string/setting_defaults">
@ -25,9 +24,7 @@
android:key="whitelist_roaming" android:key="whitelist_roaming"
android:title="@string/setting_whitelist_roaming" /> android:title="@string/setting_whitelist_roaming" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen>
<PreferenceScreen android:title="@string/setting_options">
<PreferenceCategory <PreferenceCategory
android:key="category_options" android:key="category_options"
android:title="@string/setting_options"> android:title="@string/setting_options">
@ -61,9 +58,7 @@
android:summary="@string/summary_update" android:summary="@string/summary_update"
android:title="@string/setting_update" /> android:title="@string/setting_update" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen>
<PreferenceScreen android:title="@string/setting_network_options">
<PreferenceCategory <PreferenceCategory
android:key="category_options" android:key="category_options"
android:title="@string/setting_network_options"> android:title="@string/setting_network_options">
@ -112,9 +107,7 @@
android:summary="@string/summary_national_roaming" android:summary="@string/summary_national_roaming"
android:title="@string/setting_national_roaming" /> android:title="@string/setting_national_roaming" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen>
<PreferenceScreen android:title="@string/setting_advanced_options">
<PreferenceCategory <PreferenceCategory
android:key="category_advanced_options" android:key="category_advanced_options"
android:title="@string/setting_advanced_options"> android:title="@string/setting_advanced_options">
@ -180,9 +173,7 @@
android:inputType="number" android:inputType="number"
android:key="pcap_file_size" /> android:key="pcap_file_size" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen>
<PreferenceScreen android:title="@string/setting_stats_category">
<PreferenceCategory <PreferenceCategory
android:key="category_stats" android:key="category_stats"
android:title="@string/setting_stats_category"> android:title="@string/setting_stats_category">
@ -207,9 +198,7 @@
android:inputType="number" android:inputType="number"
android:key="stats_samples" /> android:key="stats_samples" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen>
<PreferenceScreen android:title="@string/setting_backup">
<PreferenceCategory <PreferenceCategory
android:key="category_backup" android:key="category_backup"
android:title="@string/setting_backup"> android:title="@string/setting_backup">
@ -234,11 +223,7 @@
android:key="hosts_download" android:key="hosts_download"
android:title="@string/setting_hosts_download" /> android:title="@string/setting_hosts_download" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen>
<PreferenceScreen
android:key="screen_development"
android:title="Development">
<PreferenceCategory <PreferenceCategory
android:key="category_development" android:key="category_development"
android:title="Development"> android:title="Development">
@ -253,9 +238,7 @@
android:key="show_resolved" android:key="show_resolved"
android:title="@string/setting_show_resolved" /> android:title="@string/setting_show_resolved" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen>
<PreferenceScreen android:title="@string/setting_technical">
<PreferenceCategory <PreferenceCategory
android:key="category_technical" android:key="category_technical"
android:title="@string/setting_technical"> android:title="@string/setting_technical">
@ -269,5 +252,4 @@
android:key="technical_subscription" android:key="technical_subscription"
android:title="@string/setting_technical_subscription" /> android:title="@string/setting_technical_subscription" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen>
</PreferenceScreen> </PreferenceScreen>