Merge branch 'feature/establish-an-upstream-relationship-with-ics-openvpn-codebase-#5381' into develop

1 files changed, 38 insertions, 34 deletions

diff --git a/app/src/main/res/menu/logmenu.xml b/app/src/main/res/menu/logmenu.xml
index c4087585..c498eefc 100644
--- a/app/src/main/res/menu/logmenu.xml
+++ b/app/src/main/res/menu/logmenu.xml
@@ -1,34 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>

-<menu xmlns:android="http://schemas.android.com/apk/res/android" >

-    <item

-        android:id="@+id/clearlog"

-        android:icon="@drawable/ic_menu_trash_holo_light"

-        android:showAsAction="ifRoom|withText"

-        android:title="@string/clear_log"

-        android:titleCondensed="@string/clear"/>

-    <item

-        android:id="@+id/cancel"

-        android:icon="@android:drawable/ic_menu_close_clear_cancel"

-        android:showAsAction="ifRoom|withText"

-        android:title="@string/cancel_connection"

-        android:titleCondensed="@string/cancel"/>

-    <item

-        android:id="@+id/info"

-        android:icon="@android:drawable/ic_menu_info_details"

-        android:showAsAction="ifRoom|withText"

-        android:title="@string/show_connection_details"

-        android:titleCondensed="@string/info"/>

-

-    <item

-        android:id="@+id/send"

-        android:icon="@android:drawable/ic_menu_share"

-        android:showAsAction="ifRoom|withText"

-        android:title="@string/send_logfile"

-        android:titleCondensed="@string/send"/>

-    <item

-        android:alphabeticShortcut="e"

-        android:icon="@android:drawable/ic_menu_edit"

-        android:showAsAction="withText|ifRoom"

-        android:title="@string/edit_vpn"/>

-

-</menu>

+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+
+    <item
+            android:id="@+id/toggle_time"
+            android:alphabeticShortcut="t"
+            android:icon="@android:drawable/ic_menu_view"
+            android:showAsAction="withText|ifRoom"
+            android:title="@string/logview_options" />
+
+    <item
+            android:id="@+id/clearlog"
+            android:icon="@android:drawable/ic_menu_delete"
+            android:showAsAction="ifRoom|withText"
+            android:title="@string/clear_log"
+            android:titleCondensed="@string/clear"/>
+    <item
+            android:id="@+id/send"
+            android:icon="@android:drawable/ic_menu_share"
+            android:showAsAction="ifRoom|withText"
+            android:title="@string/send_logfile"
+            android:titleCondensed="@string/send"/>
+
+    <item
+            android:id="@+id/cancel"
+            android:icon="@android:drawable/ic_menu_close_clear_cancel"
+            android:showAsAction="ifRoom|withText"
+            android:title="@string/cancel_connection_long"
+            android:titleCondensed="@string/cancel_connection"/>
+    <item
+            android:id="@+id/edit_vpn"
+            android:alphabeticShortcut="e"
+            android:icon="@android:drawable/ic_menu_edit"
+            android:showAsAction="withText|ifRoom"
+            android:title="@string/edit_vpn"/>
+
+</menu>
\ No newline at end of file