Merge with default branch

--HG--
branch : ovpn3

1 files changed, 12 insertions, 2 deletions

diff --git a/src/de/blinkt/openvpn/LogWindow.java b/src/de/blinkt/openvpn/LogWindow.java
index 69d1f859..4d2047f8 100644
--- a/src/de/blinkt/openvpn/LogWindow.java
+++ b/src/de/blinkt/openvpn/LogWindow.java
@@ -262,9 +262,18 @@ public class LogWindow extends ListActivity implements StateListener  {
 				Toast.makeText(this, R.string.log_no_last_vpn, Toast.LENGTH_LONG).show();
 			}
 
+		} else if(item.getItemId() == android.R.id.home) {
+			// This is called when the Home (Up) button is pressed
+			// in the Action Bar.
+			Intent parentActivityIntent = new Intent(this, MainActivity.class);
+			parentActivityIntent.addFlags(
+					Intent.FLAG_ACTIVITY_CLEAR_TOP |
+					Intent.FLAG_ACTIVITY_NEW_TASK);
+			startActivity(parentActivityIntent);
+			finish();
+			return true;
 
 		}
-
 		return super.onOptionsItemSelected(item);
 
 	}
@@ -350,7 +359,8 @@ public class LogWindow extends ListActivity implements StateListener  {
 		lv.setAdapter(ladapter);
 
 		mSpeedView = (TextView) findViewById(R.id.speed);
-		
+		getActionBar().setDisplayHomeAsUpEnabled(true);
+
         Intent intent = new Intent(getBaseContext(), OpenVpnService.class);
         intent.setAction(OpenVpnService.START_SERVICE);