From 8dceb159d9c2be3880e1937336ef9c4b35cbb1f9 Mon Sep 17 00:00:00 2001
From: Maxime Graulich <maxime.graulich@gmail.com>
Date: Wed, 2 Apr 2014 13:10:12 +0000
Subject: [PATCH] Android: add back button to About Activity
---
.../Android/src/org/geuz/onelab/AboutActivity.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/AboutActivity.java b/contrib/mobile/Android/src/org/geuz/onelab/AboutActivity.java
index b46b23274b..ab8d73c24e 100644
--- a/contrib/mobile/Android/src/org/geuz/onelab/AboutActivity.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/AboutActivity.java
@@ -3,12 +3,15 @@ package org.geuz.onelab;
import java.lang.String;
import android.app.Activity;
+import android.content.Intent;
+import android.view.MenuItem;
import android.webkit.WebView;
public class AboutActivity extends Activity{
protected void onCreate(android.os.Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ getActionBar().setDisplayHomeAsUpEnabled(true);
WebView webview = new WebView(this);
String aboutGmsh = Gmsh.getAboutGmsh();
String aboutGetDP = Gmsh.getAboutGetDP();
@@ -24,5 +27,13 @@ public class AboutActivity extends Activity{
webview.loadDataWithBaseURL("", aboutOnelab + aboutGmsh + aboutGetDP, "text/html", "UTF-8", "");
setContentView(webview);
}
-
+ @Override
+ public boolean onMenuItemSelected(int featureId, MenuItem item) {
+ if(item.getItemId() == android.R.id.home) {
+ Intent returnIntent = new Intent();
+ this.setResult(RESULT_CANCELED, returnIntent);
+ this.finish();
+ }
+ return super.onMenuItemSelected(featureId, item);
+ }
}
--
GitLab