diff --git a/mobile/src/main/res/values-v21/strings.xml b/mobile/src/main/res/values-v21/strings.xml deleted file mode 100644 index 4cb3b9a0..00000000 --- a/mobile/src/main/res/values-v21/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - @string/proxied_apps_summary_v21 - diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml index 19fb1f71..8bb3c62c 100644 --- a/mobile/src/main/res/values/strings.xml +++ b/mobile/src/main/res/values/strings.xml @@ -50,8 +50,7 @@ GFW List China List Apps VPN mode - Configure VPN mode for selected apps, not available on Android 4.x - Configure VPN mode for selected apps + Configure VPN mode for selected apps On Bypass Mode Enable this option to bypass selected apps diff --git a/mobile/src/main/scala/com/github/shadowsocks/ProfileConfigFragment.scala b/mobile/src/main/scala/com/github/shadowsocks/ProfileConfigFragment.scala index 7675a68d..8e127252 100644 --- a/mobile/src/main/scala/com/github/shadowsocks/ProfileConfigFragment.scala +++ b/mobile/src/main/scala/com/github/shadowsocks/ProfileConfigFragment.scala @@ -66,12 +66,14 @@ class ProfileConfigFragment extends PreferenceFragment with OnMenuItemClickListe findPreference(Key.password).setSummary("\u2022" * 32) } isProxyApps = findPreference(Key.proxyApps).asInstanceOf[SwitchPreference] - isProxyApps.setEnabled(Utils.isLollipopOrAbove && app.usingVpnMode) - isProxyApps.setOnPreferenceClickListener(_ => { - startActivity(new Intent(getActivity, classOf[AppManager])) - isProxyApps.setChecked(true) - false - }) + if (Build.VERSION.SDK_INT < 21) isProxyApps.getParent.removePreference(isProxyApps) else { + isProxyApps.setEnabled(app.usingVpnMode) + isProxyApps.setOnPreferenceClickListener(_ => { + startActivity(new Intent(getActivity, classOf[AppManager])) + isProxyApps.setChecked(true) + false + }) + } plugin = findPreference(Key.plugin).asInstanceOf[IconListPreference] pluginConfigure = findPreference(Key.pluginConfigure).asInstanceOf[EditTextPreference] plugin.unknownValueSummary = getString(R.string.plugin_unknown)