X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fmenu%2Fwebview_options_menu.xml;h=2761db63311a974255169c1dc31d9ee163d0c29a;hb=1664a6fbaff81fd23a12d5e51ad61616bd0f69bb;hp=fbdca4d2564a3faa60c1ce175086a2f551a4c9da;hpb=1f1fca70679a8bcf4b717fcca5dbf9e32cc56db5;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/menu/webview_options_menu.xml b/app/src/main/res/menu/webview_options_menu.xml
index fbdca4d2..2761db63 100644
--- a/app/src/main/res/menu/webview_options_menu.xml
+++ b/app/src/main/res/menu/webview_options_menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -22,113 +22,141 @@
     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=".activities.MainWebViewActivity">
+    tools:context=".activities.MainWebViewActivity" >
 
     <item
-        android:id="@+id/toggleJavaScript"
+        android:id="@+id/toggle_javascript"
         android:title="@string/javascript"
         android:orderInCategory="10"
         app:showAsAction="ifRoom" />
 
     <item
-        android:id="@+id/toggleFirstPartyCookies"
-        android:title="@string/first_party_cookies"
+        android:id="@+id/add_or_edit_domain"
+        android:title="@string/add_domain_settings"
         android:orderInCategory="20"
-        android:checkable="true"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/toggleThirdPartyCookies"
-        android:title="@string/third_party_cookies"
+        android:id="@+id/toggle_first_party_cookies"
+        android:title="@string/first_party_cookies"
         android:orderInCategory="30"
         android:checkable="true"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/toggleDomStorage"
-        android:title="@string/dom_storage"
+        android:id="@+id/toggle_third_party_cookies"
+        android:title="@string/third_party_cookies"
         android:orderInCategory="40"
         android:checkable="true"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/toggleSaveFormData"
-        android:title="@string/form_data"
+        android:id="@+id/toggle_dom_storage"
+        android:title="@string/dom_storage"
         android:orderInCategory="50"
         android:checkable="true"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/clearCookies"
-        android:title="@string/clear_cookies"
+        android:id="@+id/toggle_save_form_data"
+        android:title="@string/form_data"
         android:orderInCategory="60"
+        android:checkable="true"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/clearDomStorage"
-        android:title="@string/clear_dom_storage"
+        android:id="@+id/clear_data"
+        android:title="@string/clear_data"
         android:orderInCategory="70"
-        app:showAsAction="never" />
+        app:showAsAction="never" >
 
-    <item
-        android:id="@+id/clearFormData"
-        android:title="@string/clear_form_data"
-        android:orderInCategory="80"
-        app:showAsAction="never" />
+        <menu>
+            <item
+                android:id="@+id/clear_cookies"
+                android:title="@string/clear_cookies"
+                android:orderInCategory="71"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/clear_dom_storage"
+                android:title="@string/clear_dom_storage"
+                android:orderInCategory="72"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/clear_form_data"
+                android:title="@string/clear_form_data"
+                android:orderInCategory="73"
+                app:showAsAction="never" />
+        </menu>
+    </item>
 
     <item
-        android:id="@+id/fontSize"
+        android:id="@+id/font_size"
         android:title="@string/font_size"
-        android:orderInCategory="90"
+        android:orderInCategory="80"
         app:showAsAction="never" >
 
         <menu>
             <group android:checkableBehavior="single">
                 <item
-                    android:id="@+id/fontSizeFiftyPercent"
+                    android:id="@+id/font_size_twenty_five_percent"
+                    android:title="@string/twenty_five_percent"
+                    android:orderInCategory="81"
+                    app:showAsAction="never" />
+
+                <item
+                    android:id="@+id/font_size_fifty_percent"
                     android:title="@string/fifty_percent"
-                    android:orderInCategory="91"
+                    android:orderInCategory="82"
                     app:showAsAction="never" />
 
                 <item
-                    android:id="@+id/fontSizeSeventyFivePercent"
+                    android:id="@+id/font_size_seventy_five_percent"
                     android:title="@string/seventy_five_percent"
-                    android:orderInCategory="92"
+                    android:orderInCategory="83"
                     app:showAsAction="never" />
 
                 <item
-                    android:id="@+id/fontSizeOneHundredPercent"
+                    android:id="@+id/font_size_one_hundred_percent"
                     android:title="@string/one_hundred_percent"
-                    android:orderInCategory="93"
+                    android:orderInCategory="84"
                     app:showAsAction="never" />
 
                 <item
-                    android:id="@+id/fontSizeOneHundredTwentyFivePercent"
+                    android:id="@+id/font_size_one_hundred_twenty_five_percent"
                     android:title="@string/one_hundred_twenty_five_percent"
-                    android:orderInCategory="94"
+                    android:orderInCategory="85"
                     app:showAsAction="never" />
 
                 <item
-                    android:id="@+id/fontSizeOneHundredFiftyPercent"
+                    android:id="@+id/font_size_one_hundred_fifty_percent"
                     android:title="@string/one_hundred_fifty_percent"
-                    android:orderInCategory="95"
+                    android:orderInCategory="86"
                     app:showAsAction="never" />
 
                 <item
-                    android:id="@+id/fontSizeOneHundredSeventyFivePercent"
+                    android:id="@+id/font_size_one_hundred_seventy_five_percent"
                     android:title="@string/one_hundred_seventy_five_percent"
-                    android:orderInCategory="96"
+                    android:orderInCategory="87"
                     app:showAsAction="never" />
 
                 <item
-                    android:id="@+id/fontSizeTwoHundredPercent"
+                    android:id="@+id/font_size_two_hundred_percent"
                     android:title="@string/two_hundred_percent"
-                    android:orderInCategory="97"
+                    android:orderInCategory="88"
                     app:showAsAction="never" />
             </group>
         </menu>
     </item>
 
+    <item
+        android:id="@+id/display_images"
+        android:title="@string/display_images"
+        android:orderInCategory="90"
+        android:checkable="true"
+        app:showAsAction="never" />
+
     <item
         android:id="@+id/share"
         android:title="@string/share"
@@ -140,22 +168,21 @@
         android:title="@string/find_on_page"
         android:orderInCategory="110"
         app:showAsAction="never|collapseActionView" />
-
     <item
-        android:id="@+id/refresh"
-        android:title="@string/refresh"
+        android:id="@+id/print"
+        android:title="@string/print"
         android:orderInCategory="120"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/print"
-        android:title="@string/print"
+        android:id="@+id/add_to_homescreen"
+        android:title="@string/add_to_home_screen"
         android:orderInCategory="130"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/addToHomescreen"
-        android:title="@string/add_to_home_screen"
+        android:id="@+id/refresh"
+        android:title="@string/refresh"
         android:orderInCategory="140"
         app:showAsAction="never" />
-</menu>
+</menu>
\ No newline at end of file