Set toggleJavaScript MenuItem as showAsAction="always". Update AboutDialog to close...

[PrivacyBrowserAndroid.git] / app / src / main / res / menu / menu_webview.xml

diff --git a/app/src/main/res/menu/menu_webview.xml b/app/src/main/res/menu/menu_webview.xml
index dbe206b17eaae3eb3f1446410bc687df29462dc8..fe01a0bdac9a725687c90de6b8a34c33c32e2da5 100644 (file)
--- a/app/src/main/res/menu/menu_webview.xml
+++ b/app/src/main/res/menu/menu_webview.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2015 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://privacybrowser.stoutner.com/>.
 
@@ -20,79 +20,116 @@
     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"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/toggleDomStorage"
+        android:title="@string/dom_storage"
+        android:orderInCategory="2"
+        android:checkable="true"
+        app:showAsAction="never" />
+
+    <!-- toggleSaveFormData does nothing until database storage is implemented
+    <item
+        android:id="@+id/toggleSaveFormData"
+        android:title="@string/saveFormData"
+        android:orderInCategory="3"
         android:checkable="true"
         app:showAsAction="never" />
+        -->
+
+    <item
+        android:id="@+id/toggleCookies"
+        android:title="@string/cookies"
+        android:orderInCategory="4"
+        android:checkable="true"
+        app:showAsAction="never" />
+
+    <item
+        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="2"
-        android:icon="@drawable/ic_home_black_24dp"
+        android:orderInCategory="10"
         app:showAsAction="never" />
 
     <item
         android:id="@+id/refresh"
         android:title="@string/refresh"
-        android:orderInCategory="3"
+        android:orderInCategory="20"
         app:showAsAction="never" />
 
     <item
         android:id="@+id/back"
         android:title="@string/back"
-        android:orderInCategory="4"
-        android:icon="@drawable/ic_back"
+        android:orderInCategory="30"
         app:showAsAction="never" />
 
     <item
         android:id="@+id/forward"
         android:title="@string/forward"
-        android:orderInCategory="5"
-        android:icon="@drawable/ic_forward"
+        android:orderInCategory="40"
         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="6"
+        android:title="@string/copy_url"
+        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:orderInCategory="7"
+        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:orderInCategory="8"
+        android:title="@string/share_url"
+        android:orderInCategory="70"
         app:showAsAction="never" />
 
     <item
         android:id="@+id/addToHomescreen"
         android:title="@string/add_to_home_screen"
-        android:orderInCategory="9"
+        android:orderInCategory="80"
         app:showAsAction="never" />
 
     <item
         android:id="@+id/downloads"
         android:title="@string/downloads"
-        android:orderInCategory="10"
+        android:orderInCategory="90"
         app:showAsAction="never" />
 
     <item
         android:id="@+id/about"
         android:title="@string/about"
-        android:orderInCategory="11"
+        android:orderInCategory="100"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/clearAndExit"
+        android:title="@string/clear_and_exit"
+        android:orderInCategory="110"
         app:showAsAction="never" />
 </menu>