diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2013-10-13 17:53:59 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2013-10-13 17:53:59 +0200 |
| commit | 1295b8f844f914feeeef245229ca166b93ca37cd (patch) | |
| tree | 508dfed686b140da66893b509a94615b53bd150f /src/de/blinkt/openvpn/MainActivity.java | |
| parent | d2dc6fa6fc12ca876bb3dcf099ec6694dc7ef061 (diff) | |
Working LogFragment
--HG--
rename : res/layout-w720dp/logwindow.xml => res/layout-w720dp/log_fragment.xml
rename : res/layout/logwindow.xml => res/layout/log_fragment.xml
rename : src/de/blinkt/openvpn/LogWindow.java => src/de/blinkt/openvpn/fragments/LogFragment.java
Diffstat (limited to 'src/de/blinkt/openvpn/MainActivity.java')
| -rw-r--r-- | src/de/blinkt/openvpn/MainActivity.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/de/blinkt/openvpn/MainActivity.java b/src/de/blinkt/openvpn/MainActivity.java index afe08e2e..75cfa689 100644 --- a/src/de/blinkt/openvpn/MainActivity.java +++ b/src/de/blinkt/openvpn/MainActivity.java @@ -6,11 +6,7 @@ import android.app.Activity; import android.app.Fragment; import android.app.FragmentTransaction; import android.content.Intent; -import de.blinkt.openvpn.fragments.AboutFragment; -import de.blinkt.openvpn.fragments.FaqFragment; -import de.blinkt.openvpn.fragments.GeneralSettings; -import de.blinkt.openvpn.fragments.SendDumpFragment; -import de.blinkt.openvpn.fragments.VPNProfileList; +import de.blinkt.openvpn.fragments.*; public class MainActivity extends Activity { @@ -24,13 +20,16 @@ public class MainActivity extends Activity { Tab generalTab = bar.newTab().setText(R.string.generalsettings); Tab faqtab = bar.newTab().setText(R.string.faq); Tab abouttab = bar.newTab().setText(R.string.about); + Tab logtab = bar.newTab().setText("Log"); vpnListTab.setTabListener(new TabListener<VPNProfileList>("profiles", VPNProfileList.class)); generalTab.setTabListener(new TabListener<GeneralSettings>("settings", GeneralSettings.class)); faqtab.setTabListener(new TabListener<FaqFragment>("faq", FaqFragment.class)); abouttab.setTabListener(new TabListener<AboutFragment>("about", AboutFragment.class)); + logtab.setTabListener(new TabListener<LogFragment>("log",LogFragment.class)); bar.addTab(vpnListTab); + bar.addTab(logtab); bar.addTab(generalTab); bar.addTab(faqtab); bar.addTab(abouttab); |