<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
+ Copyright © 2015-2018 Soren Stoutner <soren@stoutner.com>.
This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
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=".MainWebViewActivity">
+ tools:context=".activities.MainWebViewActivity" >
<item
- android:id="@+id/toggleJavaScript"
+ android:id="@+id/toggle_javascript"
android:title="@string/javascript"
- android:orderInCategory="10"
- app:showAsAction="always" />
+ android:orderInCategory="100"
+ app:showAsAction="ifRoom" />
+
+ <item
+ android:id="@+id/add_or_edit_domain"
+ android:title="@string/add_domain_settings"
+ android:orderInCategory="200"
+ app:showAsAction="never" />
<item
- android:id="@+id/toggleFirstPartyCookies"
+ android:id="@+id/toggle_first_party_cookies"
android:title="@string/first_party_cookies"
- android:orderInCategory="20"
+ android:orderInCategory="300"
android:checkable="true"
app:showAsAction="never" />
<item
- android:id="@+id/toggleThirdPartyCookies"
+ android:id="@+id/toggle_third_party_cookies"
android:title="@string/third_party_cookies"
- android:orderInCategory="30"
+ android:orderInCategory="400"
android:checkable="true"
app:showAsAction="never" />
<item
- android:id="@+id/toggleDomStorage"
+ android:id="@+id/toggle_dom_storage"
android:title="@string/dom_storage"
- android:orderInCategory="40"
+ android:orderInCategory="500"
android:checkable="true"
app:showAsAction="never" />
<item
- android:id="@+id/toggleSaveFormData"
+ android:id="@+id/toggle_save_form_data"
android:title="@string/form_data"
- android:orderInCategory="50"
+ android:orderInCategory="600"
android:checkable="true"
app:showAsAction="never" />
<item
- android:id="@+id/clearCookies"
- android:title="@string/clear_cookies"
- android:orderInCategory="60"
- app:showAsAction="never" />
+ android:id="@+id/clear_data"
+ android:title="@string/clear_data"
+ android:orderInCategory="700"
+ app:showAsAction="never" >
- <item
- android:id="@+id/clearDomStorage"
- android:title="@string/clear_dom_storage"
- android:orderInCategory="70"
- app:showAsAction="never" />
+ <menu>
+ <item
+ android:id="@+id/clear_cookies"
+ android:title="@string/clear_cookies"
+ android:orderInCategory="710"
+ app:showAsAction="never" />
+
+ <item
+ android:id="@+id/clear_dom_storage"
+ android:title="@string/clear_dom_storage"
+ android:orderInCategory="720"
+ app:showAsAction="never" />
+
+ <item
+ android:id="@+id/clear_form_data"
+ android:title="@string/clear_form_data"
+ android:orderInCategory="730"
+ app:showAsAction="never" />
+ </menu>
+ </item>
<item
- android:id="@+id/clearFormData"
- android:title="@string/clear_form_data"
- android:orderInCategory="80"
- app:showAsAction="never" />
+ android:id="@+id/blocklists"
+ android:title="@string/blocklists"
+ android:orderInCategory="800"
+ app:showAsAction="never" >
+
+ <menu>
+ <item
+ android:id="@+id/easylist"
+ android:title="@string/easylist"
+ android:orderInCategory="810"
+ android:checkable="true"
+ app:showAsAction="never" />
+
+ <item
+ android:id="@+id/easyprivacy"
+ android:title="@string/easyprivacy"
+ android:orderInCategory="820"
+ android:checkable="true"
+ app:showAsAction="never" />
+
+ <item
+ android:id="@+id/fanboys_annoyance_list"
+ android:title="@string/options_fanboys_annoyance_list"
+ android:orderInCategory="830"
+ android:checkable="true"
+ app:showAsAction="never" />
+
+ <item
+ android:id="@+id/fanboys_social_blocking_list"
+ android:title="@string/options_fanboys_social_blocking_list"
+ android:orderInCategory="840"
+ android:checkable="true"
+ app:showAsAction="never" />
+
+ <item
+ android:id="@+id/ultraprivacy"
+ android:title="@string/ultraprivacy"
+ android:orderInCategory="850"
+ android:checkable="true"
+ app:showAsAction="never" />
+
+ <item
+ android:id="@+id/block_all_third_party_requests"
+ android:title="@string/options_block_all_third_party_requests"
+ android:orderInCategory="860"
+ android:checkable="true"
+ app:showAsAction="never" />
+ </menu>
+ </item>
<item
- android:id="@+id/fontSize"
- android:title="@string/font_size"
- android:orderInCategory="90"
+ android:id="@+id/layout"
+ android:title="@string/layout"
+ android:orderInCategory="900"
app:showAsAction="never" >
<menu>
- <group android:checkableBehavior="single">
- <item
- android:id="@+id/fontSizeFiftyPercent"
- android:title="@string/fifty_percent"
- android:orderInCategory="91"
- app:showAsAction="never" />
-
- <item
- android:id="@+id/fontSizeSeventyFivePercent"
- android:title="@string/seventy_five_percent"
- android:orderInCategory="92"
- app:showAsAction="never" />
-
- <item
- android:id="@+id/fontSizeOneHundredPercent"
- android:title="@string/one_hundred_percent"
- android:orderInCategory="93"
- app:showAsAction="never" />
-
- <item
- android:id="@+id/fontSizeOneHundredTwentyFivePercent"
- android:title="@string/one_hundred_twenty_five_percent"
- android:orderInCategory="94"
- app:showAsAction="never" />
-
- <item
- android:id="@+id/fontSizeOneHundredFiftyPercent"
- android:title="@string/one_hundred_fifty_percent"
- android:orderInCategory="95"
- app:showAsAction="never" />
-
- <item
- android:id="@+id/fontSizeOneHundredSeventyFivePercent"
- android:title="@string/one_hundred_seventy_five_percent"
- android:orderInCategory="96"
- app:showAsAction="never" />
-
- <item
- android:id="@+id/fontSizeTwoHundredPercent"
- android:title="@string/two_hundred_percent"
- android:orderInCategory="97"
- app:showAsAction="never" />
- </group>
+ <item
+ android:id="@+id/font_size"
+ android:title="@string/font_size"
+ android:orderInCategory="910"
+ app:showAsAction="never" >
+
+ <menu>
+ <group android:checkableBehavior="single">
+ <item
+ android:id="@+id/font_size_twenty_five_percent"
+ android:title="@string/twenty_five_percent"
+ android:orderInCategory="911"
+ app:showAsAction="never" />
+
+ <item
+ android:id="@+id/font_size_fifty_percent"
+ android:title="@string/fifty_percent"
+ android:orderInCategory="912"
+ app:showAsAction="never" />
+
+ <item
+ android:id="@+id/font_size_seventy_five_percent"
+ android:title="@string/seventy_five_percent"
+ android:orderInCategory="913"
+ app:showAsAction="never" />
+
+ <item
+ android:id="@+id/font_size_one_hundred_percent"
+ android:title="@string/one_hundred_percent"
+ android:orderInCategory="914"
+ app:showAsAction="never" />
+
+ <item
+ android:id="@+id/font_size_one_hundred_twenty_five_percent"
+ android:title="@string/one_hundred_twenty_five_percent"
+ android:orderInCategory="915"
+ app:showAsAction="never" />
+
+ <item
+ android:id="@+id/font_size_one_hundred_fifty_percent"
+ android:title="@string/one_hundred_fifty_percent"
+ android:orderInCategory="916"
+ app:showAsAction="never" />
+
+ <item
+ android:id="@+id/font_size_one_hundred_seventy_five_percent"
+ android:title="@string/one_hundred_seventy_five_percent"
+ android:orderInCategory="917"
+ app:showAsAction="never" />
+
+ <item
+ android:id="@+id/font_size_two_hundred_percent"
+ android:title="@string/two_hundred_percent"
+ android:orderInCategory="918"
+ app:showAsAction="never" />
+ </group>
+ </menu>
+ </item>
+
+ <item
+ android:id="@+id/swipe_to_refresh"
+ android:title="@string/swipe_to_refresh_options_menu"
+ android:orderInCategory="920"
+ android:checkable="true"
+ app:showAsAction="never" />
+
+ <item
+ android:id="@+id/display_images"
+ android:title="@string/display_images"
+ android:orderInCategory="930"
+ android:checkable="true"
+ app:showAsAction="never" />
+
+ <item
+ android:id="@+id/view_source"
+ android:title="@string/view_source"
+ android:orderInCategory="940"
+ app:showAsAction="never" />
</menu>
</item>
<item
android:id="@+id/share"
android:title="@string/share"
- android:orderInCategory="100"
+ android:orderInCategory="1000"
+ app:showAsAction="never" />
+
+ <item
+ android:id="@+id/find_on_page"
+ android:title="@string/find_on_page"
+ android:orderInCategory="1100"
+ app:showAsAction="never|collapseActionView" />
+ <item
+ android:id="@+id/print"
+ android:title="@string/print"
+ android:orderInCategory="1200"
app:showAsAction="never" />
<item
- android:id="@+id/addToHomescreen"
+ android:id="@+id/add_to_homescreen"
android:title="@string/add_to_home_screen"
- android:orderInCategory="110"
+ android:orderInCategory="1300"
app:showAsAction="never" />
<item
android:id="@+id/refresh"
android:title="@string/refresh"
- android:orderInCategory="120"
+ android:orderInCategory="1400"
+ app:showAsAction="never" />
+
+ <item
+ android:id="@+id/ad_consent"
+ android:title="@string/ad_consent"
+ android:orderInCategory="1500"
app:showAsAction="never" />
-</menu>
+</menu>
\ No newline at end of file