Remove redundant Global Proxy

src/main/res/layout/layout_apps.xml

@@ -1,36 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="fill_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
     android:duplicateParentState="false">
   <include layout="@layout/toolbar_light_dark"/>
-  <LinearLayout
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:paddingBottom="8dp"
-          android:paddingLeft="48dp"
-          android:paddingStart="48dp"
-          android:paddingTop="8dp"
-          android:background="@android:color/white"
-          android:elevation="1dp" tools:ignore="RtlSymmetry">
-    <TextView
-        android:id="@+id/bypassLabel"
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="wrap_content"
-        android:padding="3dp"
-        android:gravity="center_vertical"
-        android:textSize="18sp"
-        android:text="@string/bypass_apps"/>
+  <LinearLayout android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="40dp"
+                android:paddingStart="40dp"
+                android:elevation="1dp"
+                android:background="@android:color/white"
+                android:orientation="vertical"
+                tools:ignore="RtlSymmetry">
+    <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp">
+      <TextView
+              android:layout_width="0dp"
+              android:layout_weight="1"
+              android:layout_height="wrap_content"
+              android:padding="3dp"
+              android:gravity="center_vertical"
+              android:textSize="18sp"
+              android:text="@string/on"/>
+      <Switch android:checked="true"
+              android:id="@+id/onSwitch"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"/>
+    </LinearLayout>
+    <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp">
+      <TextView
+              android:id="@+id/bypassLabel"
+              android:layout_width="0dp"
+              android:layout_weight="1"
+              android:layout_height="wrap_content"
+              android:padding="3dp"
+              android:gravity="center_vertical"
+              android:textSize="18sp"
+              android:text="@string/bypass_apps"/>
 
-    <Switch
-        android:id="@+id/bypassSwitch"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="6dp"
-        android:layout_marginRight="6dp"/>
+      <Switch
+              android:id="@+id/bypassSwitch"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"/>
+    </LinearLayout>
   </LinearLayout>
   <FrameLayout android:layout_width="fill_parent"
                android:layout_height="0dp"

src/main/res/layout/layout_apps_item.xml

@@ -28,7 +28,7 @@
         android:id="@+id/itemcheck"
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
-        android:layout_marginRight="6dp"/>
+        android:layout_marginRight="8dp"/>
 
   </TableRow>
 </TableLayout>

src/main/res/values-zh/strings.xml

@@ -25,11 +25,9 @@
   <string name="auto_set_gfwlist">国内路由</string>
   <string name="auto_set_gfwlist_summary">绕过所有位于中国的网站</string>
   <string name="route_list">路由</string>
-  <string name="auto_set_proxy">全局代理</string>
-  <string name="auto_set_proxy_summary">设置系统代理</string>
   <string name="proxied_apps">分应用代理</string>
   <string name="proxied_apps_summary">为应用程序分别设置代理</string>
-  <string name="proxied_help">分应用代理</string>
+  <string name="on">开</string>
   <string name="bypass_apps">绕行模式</string>
   <string name="bypass_apps_summary">启用该选项，以使所选应用程序的流量不经过代理</string>
   <string name="auto_connect">自动连接</string>

src/main/res/values/strings.xml

@@ -40,11 +40,9 @@
   <string name="auto_set_gfwlist_summary">Bypass all sites located in China
   </string>
   <string name="route_list">Route</string>
-  <string name="auto_set_proxy">Global Proxy</string>
-  <string name="auto_set_proxy_summary">Set up system-wide proxy</string>
   <string name="proxied_apps">Per-App Proxy</string>
   <string name="proxied_apps_summary">Set proxy for selected apps</string>
-  <string name="proxied_help">Per-App Proxy</string>
+  <string name="on">On</string>
   <string name="bypass_apps">Bypass Mode</string>
   <string name="bypass_apps_summary">Enable this option to bypass selected apps</string>
   <string name="auto_connect">Auto Connect</string>

src/main/res/xml/pref_all.xml

@@ -77,18 +77,10 @@
                 android:summary="@string/ipv6_summary"
                 android:title="@string/ipv6"/>
         <SwitchPreference
-                android:defaultValue="true"
-                android:key="isGlobalProxy"
-                android:disableDependentsState="true"
-                android:summary="@string/auto_set_proxy_summary"
-                android:title="@string/auto_set_proxy"/>
-        <Preference
-                android:key="proxyedApps"
-                android:dependency="isGlobalProxy"
+                android:key="isProxyApps"
+                android:defaultValue="false"
                 android:summary="@string/proxied_apps_summary"
-                android:title="@string/proxied_apps">
-            <intent android:action="com.github.shadowsocks.AppManager"/>
-        </Preference>
+                android:title="@string/proxied_apps"/>
         <SwitchPreference
                 android:key="isUdpDns"
                 android:defaultValue="false"