X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fmenu%2Fmenu_webview.xml;h=a8c38b4ad03e3542da1c841004e1739100acbbca;hb=cdbd0fea022e075e46906307cbf889cac5325dd5;hp=14a8cf0fd97049077c9ecbcca82485489e00f494;hpb=a7e15f550848e50703320e8811d24a7cf0d8d189;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/menu/menu_webview.xml b/app/src/main/res/menu/menu_webview.xml
index 14a8cf0f..a8c38b4a 100644
--- a/app/src/main/res/menu/menu_webview.xml
+++ b/app/src/main/res/menu/menu_webview.xml
@@ -1,7 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
 <!--
-  Copyright 2015 Soren Stoutner
+  Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser <https://privacybrowser.stoutner.com/>.
+  This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
   Privacy Browser is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,72 +22,108 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".Webview">
+    tools:context=".MainWebViewActivity">
 
     <item
-        android:id="@+id/home"
-        android:title="@string/home"
+        android:id="@+id/toggleJavaScript"
+        android:title="@string/javascript"
         android:orderInCategory="10"
-        android:icon="@drawable/ic_home_black_24dp"
-        app:showAsAction="never" />
+        app:showAsAction="always" />
 
     <item
-        android:id="@+id/refresh"
-        android:title="@string/refresh"
+        android:id="@+id/toggleDomStorage"
+        android:title="@string/dom_storage"
         android:orderInCategory="20"
+        android:checkable="true"
         app:showAsAction="never" />
 
+    <!-- toggleSaveFormData does nothing until database storage is implemented
     <item
-        android:id="@+id/back"
-        android:title="@string/back"
+        android:id="@+id/toggleSaveFormData"
+        android:title="@string/saveFormData"
         android:orderInCategory="30"
-        android:icon="@drawable/ic_back"
+        android:checkable="true"
         app:showAsAction="never" />
+        -->
 
     <item
-        android:id="@+id/forward"
-        android:title="@string/forward"
+        android:id="@+id/toggleCookies"
+        android:title="@string/cookies"
         android:orderInCategory="40"
-        android:icon="@drawable/ic_forward"
+        android:checkable="true"
         app:showAsAction="never" />
 
-    <!-- tools:targetApi="11" is required because copy and paste was not available on earlier version of Android. -->
     <item
-        android:id="@+id/copyURL"
-        android:title="@string/copy_URL"
+        android:id="@+id/clearDomStorage"
+        android:title="@string/clear_dom_storage"
         android:orderInCategory="50"
-        tools:targetApi="11"
         app:showAsAction="never" />
 
-    <!-- tools:targetApi="11" is required because copy and paste was not available on earlier version of Android. -->
     <item
-        android:id="@+id/pasteURL"
-        android:title="@string/paste_URL"
+        android:id="@+id/clearCookies"
+        android:title="@string/clear_cookies"
         android:orderInCategory="60"
-        tools:targetApi="11"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/shareURL"
-        android:title="@string/share_URL"
+        android:id="@+id/addToHomescreen"
+        android:title="@string/add_to_home_screen"
         android:orderInCategory="70"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/addToHomescreen"
-        android:title="@string/add_to_home_screen"
+        android:id="@+id/downloads"
+        android:title="@string/downloads"
         android:orderInCategory="80"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/downloads"
-        android:title="@string/downloads"
+        android:id="@+id/navigation"
+        android:title="@string/navigation"
         android:orderInCategory="90"
+        app:showAsAction="never" >
+        <menu>
+            <item
+                android:id="@+id/home"
+                android:title="@string/home"
+                android:orderInCategory="91"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/back"
+                android:title="@string/back"
+                android:orderInCategory="92"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/forward"
+                android:title="@string/forward"
+                android:orderInCategory="93"
+                app:showAsAction="never" />
+        </menu>
+    </item>
+
+    <item
+        android:id="@+id/share"
+        android:title="@string/share"
+        android:orderInCategory="100"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/settings"
+        android:title="@string/settings"
+        android:orderInCategory="110"
         app:showAsAction="never" />
 
     <item
         android:id="@+id/about"
         android:title="@string/about"
-        android:orderInCategory="100"
+        android:orderInCategory="120"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/clearAndExit"
+        android:title="@string/clear_and_exit"
+        android:orderInCategory="130"
         app:showAsAction="never" />
 </menu>