From 5197f24b70383fc27753f46fda6f84b0493b0c4a Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Sun, 11 Nov 2012 14:33:06 +0000 Subject: Make the action bar home button work. Hook up the action bar home button on ConsoleActivity to return to the host list. --- src/org/connectbot/ActionBarWrapper.java | 8 ++++++++ src/org/connectbot/ConsoleActivity.java | 14 ++++++++++++++ 2 files changed, 22 insertions(+) (limited to 'src') diff --git a/src/org/connectbot/ActionBarWrapper.java b/src/org/connectbot/ActionBarWrapper.java index e3b517c..0c7b65d 100644 --- a/src/org/connectbot/ActionBarWrapper.java +++ b/src/org/connectbot/ActionBarWrapper.java @@ -43,6 +43,9 @@ public abstract class ActionBarWrapper { public void addOnMenuVisibilityListener(OnMenuVisibilityListener listener) { } + public void setDisplayHomeAsUpEnabled(boolean showHomeAsUp) { + } + private static class DummyActionBar extends ActionBarWrapper { } @@ -71,5 +74,10 @@ public abstract class ActionBarWrapper { } }); } + + @Override + public void setDisplayHomeAsUpEnabled(boolean showHomeAsUp) { + actionBar.setDisplayHomeAsUpEnabled(showHomeAsUp); + } } } diff --git a/src/org/connectbot/ConsoleActivity.java b/src/org/connectbot/ConsoleActivity.java index b63e042..a13e77a 100644 --- a/src/org/connectbot/ConsoleActivity.java +++ b/src/org/connectbot/ConsoleActivity.java @@ -404,6 +404,7 @@ public class ConsoleActivity extends Activity { }); actionBar = ActionBarWrapper.getActionBar(this); + actionBar.setDisplayHomeAsUpEnabled(true); actionBar.hide(); actionBar.addOnMenuVisibilityListener(new ActionBarWrapper.OnMenuVisibilityListener() { public void onMenuVisibilityChanged(boolean isVisible) { @@ -827,6 +828,19 @@ public class ConsoleActivity extends Activity { return true; } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case android.R.id.home: + Intent intent = new Intent(this, HostListActivity.class); + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + startActivity(intent); + return true; + default: + return super.onOptionsItemSelected(item); + } + } + @Override public void onOptionsMenuClosed(Menu menu) { super.onOptionsMenuClosed(menu); -- cgit v1.2.3