summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-12-17 09:51:36 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-12-17 10:44:59 +0100
commit6487cb9c811e43d4e08c58d3063737bf6b975def (patch)
tree002b728562c18e44f012b3a54c3f753a5ca3296b /android
parent6d9b7738b9007e60ab2992065b7a9da7625adcae (diff)
android: show about menu entry in the browser as well
Change-Id: I74a38281dc80790f7593042c205c31a6fc2d2cdc
Diffstat (limited to 'android')
-rw-r--r--android/experimental/LOAndroid3/res/menu/view_menu.xml3
-rw-r--r--android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java6
2 files changed, 8 insertions, 1 deletions
diff --git a/android/experimental/LOAndroid3/res/menu/view_menu.xml b/android/experimental/LOAndroid3/res/menu/view_menu.xml
index dca660ae9aa7..f316f5a7e5df 100644
--- a/android/experimental/LOAndroid3/res/menu/view_menu.xml
+++ b/android/experimental/LOAndroid3/res/menu/view_menu.xml
@@ -11,4 +11,7 @@
android:title="@string/menu_sort_az"/>
<item android:id="@+id/menu_sort_modified"
android:title="@string/menu_sort_modified"/>
+ <item android:id="@+id/action_about"
+ android:title="@string/action_about"
+ android:orderInCategory="100"/>
</menu>
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index 0920ab017fe6..c97e6e91f4b1 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -10,6 +10,7 @@
package org.libreoffice.ui;
import org.libreoffice.R;
+import org.libreoffice.LOAbout;
import org.libreoffice.android.Bootstrap;
import java.io.File;
@@ -84,7 +85,7 @@ import java.nio.ByteBuffer;
import java.nio.IntBuffer;
import java.nio.ByteOrder;
-public class LibreOfficeUIActivity extends Activity implements ActionBar.OnNavigationListener {
+public class LibreOfficeUIActivity extends LOAbout implements ActionBar.OnNavigationListener {
private String tag = "file_manager";
private SharedPreferences prefs;
private File homeDirectory;
@@ -275,6 +276,9 @@ public class LibreOfficeUIActivity extends Activity implements ActionBar.OnNavig
case R.id.menu_sort_modified:
sortFiles(item);
break;
+ case R.id.action_about:
+ showAbout();
+ return true;
default:
return super.onOptionsItemSelected(item);
}