From ebc5c3f43b56b8575cb65f189e4e2ef04b566d87 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Mon, 5 Aug 2013 19:44:31 +0800 Subject: [PATCH] fix #31 --- project/Build.scala | 4 ++-- src/main/res/layout/layout_apps.xml | 3 --- src/main/res/values/strings.xml | 4 +--- src/main/scala/com/github/shadowsocks/AppManager.scala | 1 + 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index a51ece76..7e94f205 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -5,8 +5,8 @@ import sbtandroid._ import sbtandroid.AndroidKeys._ object App { - val version = "1.8.0" - val versionCode = 45 + val version = "1.8.1" + val versionCode = 46 } object General { diff --git a/src/main/res/layout/layout_apps.xml b/src/main/res/layout/layout_apps.xml index 8f2a1396..57ebd3bb 100644 --- a/src/main/res/layout/layout_apps.xml +++ b/src/main/res/layout/layout_apps.xml @@ -2,9 +2,6 @@ - \ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index c8fd5697..e14a04e8 100755 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -35,7 +35,7 @@ Individual Proxy Set individual proxy for apps - Select apps to use with Shadowsocks: + Select Apps Bypass Mode Enable this option to bypass selected apps Auto Connect @@ -71,8 +71,6 @@ Reset About Shadowsocks %s - Donate - http://buildbot.sinaapp.com/donate.html Flush DNS Cache Flushing diff --git a/src/main/scala/com/github/shadowsocks/AppManager.scala b/src/main/scala/com/github/shadowsocks/AppManager.scala index 8222e4cc..e0e9f0b6 100644 --- a/src/main/scala/com/github/shadowsocks/AppManager.scala +++ b/src/main/scala/com/github/shadowsocks/AppManager.scala @@ -217,6 +217,7 @@ class AppManager extends SherlockActivity with OnCheckedChangeListener with OnCl protected override def onCreate(savedInstanceState: Bundle) { super.onCreate(savedInstanceState) + getSupportActionBar.setTitle(R.string.proxied_help) this.setContentView(R.layout.layout_apps) this.overlay = View.inflate(this, R.layout.overlay, null).asInstanceOf[TextView] getWindowManager.addView(overlay, new