From 6487cb9c811e43d4e08c58d3063737bf6b975def Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Wed, 17 Dec 2014 09:51:36 +0100
Subject: android: show about menu entry in the browser as well

Change-Id: I74a38281dc80790f7593042c205c31a6fc2d2cdc
---
 android/experimental/LOAndroid3/res/menu/view_menu.xml              | 3 +++
 .../src/java/org/libreoffice/ui/LibreOfficeUIActivity.java          | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'android')

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);
         }
-- 
cgit