summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Leonard <meanderingcode@aetherislands.net>2013-01-30 23:10:26 -0700
committerSean Leonard <meanderingcode@aetherislands.net>2013-01-30 23:10:26 -0700
commit4bcb53cff01cb13530e1011fb6d5ac105be1ba25 (patch)
tree242289db5ea7550dd7674d276ef29e50786c0b45
parent12de321bdd1e6b19dba35b03771f550ce2ddd31c (diff)
Put some About love in the menu
Needs attention, as the AboutFragment does not fill the layout You can still see providerLine Creates Issue #1592
-rw-r--r--res/menu/client_dashboard.xml1
-rw-r--r--src/se/leap/leapclient/Dashboard.java11
2 files changed, 12 insertions, 0 deletions
diff --git a/res/menu/client_dashboard.xml b/res/menu/client_dashboard.xml
index cafeb15e..87e7ae62 100644
--- a/res/menu/client_dashboard.xml
+++ b/res/menu/client_dashboard.xml
@@ -5,6 +5,7 @@
android:orderInCategory="100"
android:showAsAction="never"
android:title="@string/menu_settings"/>
+ <item android:id="@+id/about_leap" android:title="@string/about" android:orderInCategory="110" />
<item android:id="@+id/legacy_interface" android:title="ICS OpenVPN Interface" android:orderInCategory="500" />
</menu> \ No newline at end of file
diff --git a/src/se/leap/leapclient/Dashboard.java b/src/se/leap/leapclient/Dashboard.java
index 50c267b3..3e8f35a4 100644
--- a/src/se/leap/leapclient/Dashboard.java
+++ b/src/se/leap/leapclient/Dashboard.java
@@ -57,6 +57,17 @@ public class Dashboard extends Activity {
Intent intent;
// Handle item selection
switch (item.getItemId()){
+ case R.id.about_leap:
+ // TODO move se.leap.openvpn.AboutFragment into our package
+ Fragment aboutFragment = new AboutFragment();
+ FragmentTransaction trans = getFragmentManager().beginTransaction();
+ trans.replace(R.id.dashboardLayout, aboutFragment);
+ trans.addToBackStack(null);
+ trans.commit();
+
+ //intent = new Intent(this,AboutFragment.class);
+ //startActivity(intent);
+ return true;
case R.id.legacy_interface:
// TODO call se.leap.openvpn.MainActivity
intent = new Intent(this,MainActivity.class);