X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fmenu%2Fmenu_webview.xml;h=29a57e557401a62d506be2cf9d8b9ab14828c853;hb=218e03269d47ababa71ae0dcec7b6ea8fef20454;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..29a57e55 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,19 +22,17 @@
     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:title="@string/javascript"
         android:orderInCategory="1"
-        android:checkable="true"
-        app:showAsAction="never" />
-
+        app:showAsAction="always" />
 
     <item
         android:id="@+id/toggleDomStorage"
-        android:title="@string/domStorage"
+        android:title="@string/dom_storage"
         android:orderInCategory="2"
         android:checkable="true"
         app:showAsAction="never" />
@@ -54,16 +54,21 @@
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/clearCookies"
-        android:title="@string/clearCookies"
+        android:id="@+id/clearDomStorage"
+        android:title="@string/clear_dom_storage"
         android:orderInCategory="5"
         app:showAsAction="never" />
 
+    <item
+        android:id="@+id/clearCookies"
+        android:title="@string/clear_cookies"
+        android:orderInCategory="6"
+        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
@@ -76,20 +81,18 @@
         android:id="@+id/back"
         android:title="@string/back"
         android:orderInCategory="30"
-        android:icon="@drawable/ic_back"
         app:showAsAction="never" />
 
     <item
         android:id="@+id/forward"
         android:title="@string/forward"
         android:orderInCategory="40"
-        android:icon="@drawable/ic_forward"
         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:title="@string/copy_url"
         android:orderInCategory="50"
         tools:targetApi="11"
         app:showAsAction="never" />
@@ -97,14 +100,14 @@
     <!-- 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:title="@string/paste_url"
         android:orderInCategory="60"
         tools:targetApi="11"
         app:showAsAction="never" />
 
     <item
         android:id="@+id/shareURL"
-        android:title="@string/share_URL"
+        android:title="@string/share_url"
         android:orderInCategory="70"
         app:showAsAction="never" />
 
@@ -120,9 +123,21 @@
         android:orderInCategory="90"
         app:showAsAction="never" />
 
+    <item
+        android:id="@+id/settings"
+        android:title="@string/settings"
+        android:orderInCategory="100"
+        app:showAsAction="never" />
+
     <item
         android:id="@+id/about"
         android:title="@string/about"
-        android:orderInCategory="100"
+        android:orderInCategory="110"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/clearAndExit"
+        android:title="@string/clear_and_exit"
+        android:orderInCategory="120"
         app:showAsAction="never" />
 </menu>