From 740dcc3ca96ff86588a9e3f25bd69f7868e72ab7 Mon Sep 17 00:00:00 2001 From: Mygod Date: Tue, 24 Feb 2015 22:34:14 +0800 Subject: [PATCH 1/3] providing up navigation --- src/main/AndroidManifest.xml | 3 ++- src/main/scala/com/github/shadowsocks/AppManager.scala | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 4765cf72..80407076 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -65,7 +65,8 @@ + android:label="@string/app_name" + android:parentActivityName=".Shadowsocks"> diff --git a/src/main/scala/com/github/shadowsocks/AppManager.scala b/src/main/scala/com/github/shadowsocks/AppManager.scala index 2ec7c37c..a56307d3 100644 --- a/src/main/scala/com/github/shadowsocks/AppManager.scala +++ b/src/main/scala/com/github/shadowsocks/AppManager.scala @@ -259,6 +259,9 @@ class AppManager extends Activity with OnCheckedChangeListener with OnClickListe } Toast.makeText(this, R.string.action_import_err, Toast.LENGTH_SHORT).show() return false + case android.R.id.home => + navigateUpTo(getParentActivityIntent) + return true } super.onOptionsItemSelected(item) } @@ -274,7 +277,9 @@ class AppManager extends Activity with OnCheckedChangeListener with OnClickListe handler = new Handler() - getActionBar.setTitle(R.string.proxied_help) + val actionBar = getActionBar + actionBar.setTitle(R.string.proxied_help) + actionBar.setDisplayHomeAsUpEnabled(true) this.setContentView(R.layout.layout_apps) this.overlay = View.inflate(this, R.layout.overlay, null).asInstanceOf[TextView] getWindowManager.addView(overlay, new From 8611a66cdcceeee4835f5891bab3f5555c67ab19 Mon Sep 17 00:00:00 2001 From: Mygod Date: Tue, 24 Feb 2015 22:38:32 +0800 Subject: [PATCH 2/3] fix indent --- src/main/scala/com/github/shadowsocks/AppManager.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/com/github/shadowsocks/AppManager.scala b/src/main/scala/com/github/shadowsocks/AppManager.scala index a56307d3..c9ac2144 100644 --- a/src/main/scala/com/github/shadowsocks/AppManager.scala +++ b/src/main/scala/com/github/shadowsocks/AppManager.scala @@ -261,7 +261,7 @@ class AppManager extends Activity with OnCheckedChangeListener with OnClickListe return false case android.R.id.home => navigateUpTo(getParentActivityIntent) - return true + return true } super.onOptionsItemSelected(item) } From 0d54d9cd9bafecfa2c15229f388eb7cd12b0e025 Mon Sep 17 00:00:00 2001 From: Mygod Date: Tue, 24 Feb 2015 22:52:57 +0800 Subject: [PATCH 3/3] bugfix --- src/main/scala/com/github/shadowsocks/AppManager.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/com/github/shadowsocks/AppManager.scala b/src/main/scala/com/github/shadowsocks/AppManager.scala index c9ac2144..ea5427db 100644 --- a/src/main/scala/com/github/shadowsocks/AppManager.scala +++ b/src/main/scala/com/github/shadowsocks/AppManager.scala @@ -277,7 +277,7 @@ class AppManager extends Activity with OnCheckedChangeListener with OnClickListe handler = new Handler() - val actionBar = getActionBar + val actionBar = getActionBar() actionBar.setTitle(R.string.proxied_help) actionBar.setDisplayHomeAsUpEnabled(true) this.setContentView(R.layout.layout_apps)