X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fmenu%2Fmenu_webview.xml;h=92bd7c2fe0aeefe26830174e548eb87318c8ffa1;hb=90ec377a834698621227ec37ca7ed37ae7f69851;hp=18130e28e52088cea8eb2704216bc9acc4979862;hpb=98a82a9c4c67a85f53f019bfa793988bc5fa0336;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/menu/menu_webview.xml b/app/src/main/res/menu/menu_webview.xml
index 18130e28..92bd7c2f 100644
--- a/app/src/main/res/menu/menu_webview.xml
+++ b/app/src/main/res/menu/menu_webview.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
 <!--
   Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
 
@@ -20,20 +22,18 @@
     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=".MainWebView">
 
     <item
         android:id="@+id/toggleJavaScript"
-        android:title="@string/javaScript"
-        android:orderInCategory="1"
-        android:checkable="true"
-        app:showAsAction="never" />
-
+        android:title="@string/javascript"
+        android:orderInCategory="10"
+        app:showAsAction="always" />
 
     <item
         android:id="@+id/toggleDomStorage"
-        android:title="@string/domStorage"
-        android:orderInCategory="2"
+        android:title="@string/dom_storage"
+        android:orderInCategory="20"
         android:checkable="true"
         app:showAsAction="never" />
 
@@ -41,7 +41,7 @@
     <item
         android:id="@+id/toggleSaveFormData"
         android:title="@string/saveFormData"
-        android:orderInCategory="3"
+        android:orderInCategory="30"
         android:checkable="true"
         app:showAsAction="never" />
         -->
@@ -49,80 +49,87 @@
     <item
         android:id="@+id/toggleCookies"
         android:title="@string/cookies"
-        android:orderInCategory="4"
+        android:orderInCategory="40"
         android:checkable="true"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/clearCookies"
-        android:title="@string/clearCookies"
-        android:orderInCategory="5"
-        app:showAsAction="never" />
-
-    <item
-        android:id="@+id/home"
-        android:title="@string/home"
-        android:orderInCategory="10"
-        android:icon="@drawable/ic_home_black_24dp"
-        app:showAsAction="never" />
-
-    <item
-        android:id="@+id/refresh"
-        android:title="@string/refresh"
-        android:orderInCategory="20"
+        android:id="@+id/clearDomStorage"
+        android:title="@string/clear_dom_storage"
+        android:orderInCategory="50"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/back"
-        android:title="@string/back"
-        android:orderInCategory="30"
-        android:icon="@drawable/ic_back"
+        android:id="@+id/clearCookies"
+        android:title="@string/clear_cookies"
+        android:orderInCategory="60"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/forward"
-        android:title="@string/forward"
-        android:orderInCategory="40"
-        android:icon="@drawable/ic_forward"
+        android:id="@+id/addToHomescreen"
+        android:title="@string/add_to_home_screen"
+        android:orderInCategory="70"
         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:orderInCategory="50"
-        tools:targetApi="11"
+        android:id="@+id/downloads"
+        android:title="@string/downloads"
+        android:orderInCategory="80"
         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:orderInCategory="60"
-        tools:targetApi="11"
-        app:showAsAction="never" />
+        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/refresh"
+                android:title="@string/refresh"
+                android:orderInCategory="92"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/back"
+                android:title="@string/back"
+                android:orderInCategory="93"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/forward"
+                android:title="@string/forward"
+                android:orderInCategory="94"
+                app:showAsAction="never" />
+        </menu>
+    </item>
 
     <item
-        android:id="@+id/shareURL"
-        android:title="@string/share_URL"
-        android:orderInCategory="70"
+        android:id="@+id/share"
+        android:title="@string/share"
+        android:orderInCategory="100"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/addToHomescreen"
-        android:title="@string/add_to_home_screen"
-        android:orderInCategory="80"
+        android:id="@+id/settings"
+        android:title="@string/settings"
+        android:orderInCategory="110"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/downloads"
-        android:title="@string/downloads"
-        android:orderInCategory="90"
+        android:id="@+id/about"
+        android:title="@string/about"
+        android:orderInCategory="120"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/about"
-        android:title="@string/about"
-        android:orderInCategory="100"
+        android:id="@+id/clearAndExit"
+        android:title="@string/clear_and_exit"
+        android:orderInCategory="130"
         app:showAsAction="never" />
 </menu>