Add timestamps to log window

--HG--
extra : rebase_source : cbcf8f519b4a2c616a645636653fe711304a5942

2 files changed, 8 insertions, 1 deletions

diff --git a/res/menu/logmenu.xml b/res/menu/logmenu.xml
index bb810df0..0cc95b69 100644
--- a/res/menu/logmenu.xml
+++ b/res/menu/logmenu.xml
@@ -1,5 +1,6 @@
 <?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"

@@ -18,7 +19,6 @@
         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"

@@ -31,5 +31,11 @@
         android:icon="@android:drawable/ic_menu_edit"

         android:showAsAction="withText|ifRoom"

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

+    <item

+        android:id="@+id/toggle_time"

+        android:alphabeticShortcut="e"

+        android:icon="@android:drawable/ic_menu_week"

+        android:showAsAction="withText|ifRoom"

+        android:title="@string/toggle_timestamps"/>

 

 </menu>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6e406b8b..679681a0 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -264,5 +264,6 @@
     <string name="encryption_cipher">Encryption cipher</string>
     <string name="packet_auth">Packets authentication</string>
     <string name="auth_dialog_title">Enter packet authentication method</string>
+    <string name="toggle_timestamps">Toggle timestamps</string>
 
 </resources>
\ No newline at end of file