diff options
author | Parménides GV <parmegv@sdf.org> | 2015-02-14 11:48:37 +0100 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2015-02-14 11:48:37 +0100 |
commit | c198dbd9dd583d980ae7e70118f67d09bed8de55 (patch) | |
tree | c2863f28134af00f26299c97bb6a81ed0aa4ed96 /ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/activities/LogWindow.java | |
parent | 9d346be65e6808710b9e814d2899e5888984b4ab (diff) | |
parent | 4028c100a59c45913cb569c4967faaddc090b1f9 (diff) |
Merge branch 'develop'0.9.2
Diffstat (limited to 'ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/activities/LogWindow.java')
-rw-r--r-- | ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/activities/LogWindow.java | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/activities/LogWindow.java b/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/activities/LogWindow.java deleted file mode 100644 index 45f09c8e..00000000 --- a/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/activities/LogWindow.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt - */ - -package de.blinkt.openvpn.activities; - -import android.app.Activity; -import android.os.Bundle; -import android.view.MenuItem; - -import se.leap.bitmaskclient.R; -import de.blinkt.openvpn.fragments.LogFragment; - -/** - * Created by arne on 13.10.13. - */ -public class LogWindow extends Activity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.log_window); - getActionBar().setDisplayHomeAsUpEnabled(true); - - if (savedInstanceState == null) { - getFragmentManager().beginTransaction() - .add(R.id.container, new LogFragment()) - .commit(); - } - - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - return super.onOptionsItemSelected(item); - } -} |