diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2014-02-04 18:07:16 -0800 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2014-02-04 18:07:16 -0800 |
| commit | c49e87b8fd272fabc3f674fa8103b455c3bb5304 (patch) | |
| tree | d79c3f152c8a3fba149430b886b36905f4949cce /res/xml/general_settings.xml | |
| parent | dbf1265f736c00aa31289e75818b1ec56311d31c (diff) | |
| parent | 53be6c97314d2a0c96be8b7c9a3c7e5ae493c901 (diff) | |
Merge branch 'feature/remove-legacy-ics-openvpn-classes-that-wont-be-used' into develop
Also merge branch 'feature/change-or-remove-user-facing-references-to-ics-android' into develop
Diffstat (limited to 'res/xml/general_settings.xml')
| -rw-r--r-- | res/xml/general_settings.xml | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/res/xml/general_settings.xml b/res/xml/general_settings.xml deleted file mode 100644 index 5b4726d3..00000000 --- a/res/xml/general_settings.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" > - - <CheckBoxPreference - android:defaultValue="true" - android:key="netchangereconnect" - android:summary="@string/netchange_summary" - android:title="@string/netchange" /> - <CheckBoxPreference - android:defaultValue="true" - android:key="showlogwindow" - android:summary="@string/show_log_summary" - android:title="@string/show_log_window" /> - <!-- <CheckBoxPreference - android:defaultValue="false" - android:key="statusafterconnect" - android:summary="@string/keppstatus_summary" - android:title="@string/keepstatus" /> --> - <CheckBoxPreference - android:defaultValue="true" - android:key="usesystemproxy" - android:summary="@string/use_system_proxy_summary" - android:title="@string/use_system_proxy" /> - <CheckBoxPreference - android:defaultValue="false" - android:key="restartvpnonboot" - android:summary="@string/onbootrestartsummary" - android:title="@string/onbootrestart" /> - - <PreferenceCategory android:title="Device specifics Hacks" > - <CheckBoxPreference - android:defaultValue="false" - android:key="useCM9Fix" - android:summary="@string/owner_fix_summary" - android:title="@string/owner_fix" /> - <CheckBoxPreference - android:defaultValue="false" - android:key="loadTunModule" - android:summary="@string/setting_loadtun_summary" - android:title="@string/setting_loadtun" /> - </PreferenceCategory> - - -</PreferenceScreen>
\ No newline at end of file |