Commit ebc5c3f4 authored by Max Lv's avatar Max Lv

fix #31

parent cb8908e4
...@@ -5,8 +5,8 @@ import sbtandroid._ ...@@ -5,8 +5,8 @@ import sbtandroid._
import sbtandroid.AndroidKeys._ import sbtandroid.AndroidKeys._
object App { object App {
val version = "1.8.0" val version = "1.8.1"
val versionCode = 45 val versionCode = 46
} }
object General { object General {
......
...@@ -2,9 +2,6 @@ ...@@ -2,9 +2,6 @@
<LinearLayout android:layout_width="fill_parent" <LinearLayout android:layout_width="fill_parent"
android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:duplicateParentState="false"> android:orientation="vertical" android:duplicateParentState="false">
<TextView android:text="@string/proxied_help"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:textSize="16sp" android:padding="3dp"/>
<ListView android:layout_width="fill_parent" <ListView android:layout_width="fill_parent"
android:layout_height="wrap_content" android:id="@+id/applistview"/> android:layout_height="wrap_content" android:id="@+id/applistview"/>
</LinearLayout> </LinearLayout>
\ No newline at end of file
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<string name="proxied_apps">Individual Proxy</string> <string name="proxied_apps">Individual Proxy</string>
<string name="proxied_apps_summary">Set individual proxy for apps <string name="proxied_apps_summary">Set individual proxy for apps
</string> </string>
<string name="proxied_help">Select apps to use with Shadowsocks:</string> <string name="proxied_help">Select Apps</string>
<string name="bypass_apps">Bypass Mode</string> <string name="bypass_apps">Bypass Mode</string>
<string name="bypass_apps_summary">Enable this option to bypass selected apps</string> <string name="bypass_apps_summary">Enable this option to bypass selected apps</string>
<string name="auto_connect">Auto Connect</string> <string name="auto_connect">Auto Connect</string>
...@@ -71,8 +71,6 @@ ...@@ -71,8 +71,6 @@
<string name="recovery">Reset</string> <string name="recovery">Reset</string>
<string name="about">About</string> <string name="about">About</string>
<string name="about_title">Shadowsocks %s</string> <string name="about_title">Shadowsocks %s</string>
<string name="donate">Donate</string>
<string name="donate_address">http://buildbot.sinaapp.com/donate.html</string>
<string name="flush_dnscache">Flush DNS Cache</string> <string name="flush_dnscache">Flush DNS Cache</string>
<string name="flushing">Flushing</string> <string name="flushing">Flushing</string>
......
...@@ -217,6 +217,7 @@ class AppManager extends SherlockActivity with OnCheckedChangeListener with OnCl ...@@ -217,6 +217,7 @@ class AppManager extends SherlockActivity with OnCheckedChangeListener with OnCl
protected override def onCreate(savedInstanceState: Bundle) { protected override def onCreate(savedInstanceState: Bundle) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
getSupportActionBar.setTitle(R.string.proxied_help)
this.setContentView(R.layout.layout_apps) this.setContentView(R.layout.layout_apps)
this.overlay = View.inflate(this, R.layout.overlay, null).asInstanceOf[TextView] this.overlay = View.inflate(this, R.layout.overlay, null).asInstanceOf[TextView]
getWindowManager.addView(overlay, new getWindowManager.addView(overlay, new
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment