From e4e45c521ade9eb2f87a97eecffed7e852b09df7 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Mon, 5 Sep 2016 10:00:38 -0700 Subject: [PATCH] Partial additional action button icons implementation. --- app/src/main/AndroidManifest.xml | 8 +- app/src/main/assets/en/about_changelog.html | 4 +- .../privacybrowser/MainWebViewActivity.java | 117 ++++++++++++++++-- .../privacybrowser/SettingsFragment.java | 33 ++--- .../privacybrowser/SslCertificateError.java | 6 - app/src/main/res/drawable/about.xml | 1 + app/src/main/res/drawable/add.xml | 1 + app/src/main/res/drawable/back.xml | 1 + app/src/main/res/drawable/bookmarks.xml | 1 + .../main/res/drawable/cookies_critical.xml | 14 +++ .../main/res/drawable/cookies_disabled.xml | 14 +++ app/src/main/res/drawable/cookies_ghosted.xml | 14 +++ app/src/main/res/drawable/cookies_warning.xml | 15 +++ app/src/main/res/drawable/create_folder.xml | 1 + app/src/main/res/drawable/delete.xml | 1 + .../res/drawable/dom_storage_disabled.xml | 16 +++ .../main/res/drawable/dom_storage_enabled.xml | 16 +++ .../main/res/drawable/dom_storage_ghosted.xml | 16 +++ app/src/main/res/drawable/downloads.xml | 1 + app/src/main/res/drawable/edit.xml | 1 + app/src/main/res/drawable/exit.xml | 1 + .../main/res/drawable/folder_dark_blue.xml | 1 + app/src/main/res/drawable/folder_grey.xml | 1 + .../main/res/drawable/form_data_disabled.xml | 16 +++ .../main/res/drawable/form_data_enabled.xml | 16 +++ app/src/main/res/drawable/forward.xml | 1 + app/src/main/res/drawable/guide.xml | 1 + app/src/main/res/drawable/home.xml | 1 + .../main/res/drawable/javascript_enabled.xml | 3 + .../drawable/move_bookmark_down_disabled.xml | 2 +- .../drawable/move_bookmark_down_enabled.xml | 1 + .../drawable/move_bookmark_up_disabled.xml | 2 +- .../res/drawable/move_bookmark_up_enabled.xml | 1 + app/src/main/res/drawable/move_to_folder.xml | 1 + app/src/main/res/drawable/privacy_mode.xml | 3 + app/src/main/res/drawable/select_all.xml | 1 + app/src/main/res/drawable/settings.xml | 1 + app/src/main/res/drawable/warning.xml | 3 + .../main/res/menu/webview_options_menu.xml | 8 +- app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/strings.xml | 8 ++ 41 files changed, 306 insertions(+), 48 deletions(-) create mode 100644 app/src/main/res/drawable/cookies_critical.xml create mode 100644 app/src/main/res/drawable/cookies_disabled.xml create mode 100644 app/src/main/res/drawable/cookies_ghosted.xml create mode 100644 app/src/main/res/drawable/cookies_warning.xml create mode 100644 app/src/main/res/drawable/dom_storage_disabled.xml create mode 100644 app/src/main/res/drawable/dom_storage_enabled.xml create mode 100644 app/src/main/res/drawable/dom_storage_ghosted.xml create mode 100644 app/src/main/res/drawable/form_data_disabled.xml create mode 100644 app/src/main/res/drawable/form_data_enabled.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a0550338..924d8da8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -40,7 +40,7 @@ android:allowBackup="false" android:fullBackupContent="false" > - @@ -81,6 +82,7 @@ android:theme="@style/PrivacyBrowser.SecondaryActivity" android:parentActivityName=".MainWebViewActivity" android:configChanges="orientation|screenSize" + android:screenOrientation="fullUser" android:persistableMode="persistNever" /> diff --git a/app/src/main/res/drawable/add.xml b/app/src/main/res/drawable/add.xml index 92e17d17..3d1934b0 100644 --- a/app/src/main/res/drawable/add.xml +++ b/app/src/main/res/drawable/add.xml @@ -8,6 +8,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > + diff --git a/app/src/main/res/drawable/back.xml b/app/src/main/res/drawable/back.xml index a49efd8b..7d4bc031 100644 --- a/app/src/main/res/drawable/back.xml +++ b/app/src/main/res/drawable/back.xml @@ -9,6 +9,7 @@ android:viewportWidth="24.0" android:autoMirrored="true" > + diff --git a/app/src/main/res/drawable/bookmarks.xml b/app/src/main/res/drawable/bookmarks.xml index 76762491..34213013 100644 --- a/app/src/main/res/drawable/bookmarks.xml +++ b/app/src/main/res/drawable/bookmarks.xml @@ -8,6 +8,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > + diff --git a/app/src/main/res/drawable/cookies_critical.xml b/app/src/main/res/drawable/cookies_critical.xml new file mode 100644 index 00000000..236b1c5a --- /dev/null +++ b/app/src/main/res/drawable/cookies_critical.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/cookies_disabled.xml b/app/src/main/res/drawable/cookies_disabled.xml new file mode 100644 index 00000000..8a1a5625 --- /dev/null +++ b/app/src/main/res/drawable/cookies_disabled.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/cookies_ghosted.xml b/app/src/main/res/drawable/cookies_ghosted.xml new file mode 100644 index 00000000..d05224c3 --- /dev/null +++ b/app/src/main/res/drawable/cookies_ghosted.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/cookies_warning.xml b/app/src/main/res/drawable/cookies_warning.xml new file mode 100644 index 00000000..c68a9635 --- /dev/null +++ b/app/src/main/res/drawable/cookies_warning.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/create_folder.xml b/app/src/main/res/drawable/create_folder.xml index 0ac318e1..cfc810df 100644 --- a/app/src/main/res/drawable/create_folder.xml +++ b/app/src/main/res/drawable/create_folder.xml @@ -9,6 +9,7 @@ android:viewportWidth="24.0" android:autoMirrored="true" > + diff --git a/app/src/main/res/drawable/delete.xml b/app/src/main/res/drawable/delete.xml index d314874d..00d6fef4 100644 --- a/app/src/main/res/drawable/delete.xml +++ b/app/src/main/res/drawable/delete.xml @@ -8,6 +8,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > + diff --git a/app/src/main/res/drawable/dom_storage_disabled.xml b/app/src/main/res/drawable/dom_storage_disabled.xml new file mode 100644 index 00000000..9541cc62 --- /dev/null +++ b/app/src/main/res/drawable/dom_storage_disabled.xml @@ -0,0 +1,16 @@ + + + + + + + diff --git a/app/src/main/res/drawable/dom_storage_enabled.xml b/app/src/main/res/drawable/dom_storage_enabled.xml new file mode 100644 index 00000000..bc71681d --- /dev/null +++ b/app/src/main/res/drawable/dom_storage_enabled.xml @@ -0,0 +1,16 @@ + + + + + + + diff --git a/app/src/main/res/drawable/dom_storage_ghosted.xml b/app/src/main/res/drawable/dom_storage_ghosted.xml new file mode 100644 index 00000000..9a338ece --- /dev/null +++ b/app/src/main/res/drawable/dom_storage_ghosted.xml @@ -0,0 +1,16 @@ + + + + + + + diff --git a/app/src/main/res/drawable/downloads.xml b/app/src/main/res/drawable/downloads.xml index cd7c5e89..d985eff5 100644 --- a/app/src/main/res/drawable/downloads.xml +++ b/app/src/main/res/drawable/downloads.xml @@ -8,6 +8,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > + diff --git a/app/src/main/res/drawable/edit.xml b/app/src/main/res/drawable/edit.xml index 89a86c32..26e890cd 100644 --- a/app/src/main/res/drawable/edit.xml +++ b/app/src/main/res/drawable/edit.xml @@ -9,6 +9,7 @@ android:viewportWidth="24.0" android:autoMirrored="true" > + diff --git a/app/src/main/res/drawable/exit.xml b/app/src/main/res/drawable/exit.xml index e46cccca..a74375c3 100644 --- a/app/src/main/res/drawable/exit.xml +++ b/app/src/main/res/drawable/exit.xml @@ -9,6 +9,7 @@ android:viewportWidth="24.0" android:autoMirrored="true" > + diff --git a/app/src/main/res/drawable/folder_dark_blue.xml b/app/src/main/res/drawable/folder_dark_blue.xml index ffa94773..ebb3c8ad 100644 --- a/app/src/main/res/drawable/folder_dark_blue.xml +++ b/app/src/main/res/drawable/folder_dark_blue.xml @@ -8,6 +8,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > + diff --git a/app/src/main/res/drawable/folder_grey.xml b/app/src/main/res/drawable/folder_grey.xml index 5710e29a..9bf91cb3 100644 --- a/app/src/main/res/drawable/folder_grey.xml +++ b/app/src/main/res/drawable/folder_grey.xml @@ -8,6 +8,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > + diff --git a/app/src/main/res/drawable/form_data_disabled.xml b/app/src/main/res/drawable/form_data_disabled.xml new file mode 100644 index 00000000..804e5453 --- /dev/null +++ b/app/src/main/res/drawable/form_data_disabled.xml @@ -0,0 +1,16 @@ + + + + + + + diff --git a/app/src/main/res/drawable/form_data_enabled.xml b/app/src/main/res/drawable/form_data_enabled.xml new file mode 100644 index 00000000..a34dadeb --- /dev/null +++ b/app/src/main/res/drawable/form_data_enabled.xml @@ -0,0 +1,16 @@ + + + + + + + diff --git a/app/src/main/res/drawable/forward.xml b/app/src/main/res/drawable/forward.xml index dfa9e066..d10357f6 100644 --- a/app/src/main/res/drawable/forward.xml +++ b/app/src/main/res/drawable/forward.xml @@ -9,6 +9,7 @@ android:viewportWidth="24.0" android:autoMirrored="true" > + diff --git a/app/src/main/res/drawable/guide.xml b/app/src/main/res/drawable/guide.xml index b060597a..cb2c2e88 100644 --- a/app/src/main/res/drawable/guide.xml +++ b/app/src/main/res/drawable/guide.xml @@ -9,6 +9,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > + diff --git a/app/src/main/res/drawable/home.xml b/app/src/main/res/drawable/home.xml index a0696a3e..cb6f8571 100644 --- a/app/src/main/res/drawable/home.xml +++ b/app/src/main/res/drawable/home.xml @@ -8,6 +8,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > + diff --git a/app/src/main/res/drawable/javascript_enabled.xml b/app/src/main/res/drawable/javascript_enabled.xml index 49db0f5d..2280c51e 100644 --- a/app/src/main/res/drawable/javascript_enabled.xml +++ b/app/src/main/res/drawable/javascript_enabled.xml @@ -8,16 +8,19 @@ android:viewportHeight="256.0" android:viewportWidth="256.0" > + + + - + diff --git a/app/src/main/res/drawable/move_bookmark_down_enabled.xml b/app/src/main/res/drawable/move_bookmark_down_enabled.xml index b7a2423e..70d82b84 100644 --- a/app/src/main/res/drawable/move_bookmark_down_enabled.xml +++ b/app/src/main/res/drawable/move_bookmark_down_enabled.xml @@ -8,6 +8,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > + diff --git a/app/src/main/res/drawable/move_bookmark_up_disabled.xml b/app/src/main/res/drawable/move_bookmark_up_disabled.xml index 4ead123a..a610b6d6 100644 --- a/app/src/main/res/drawable/move_bookmark_up_disabled.xml +++ b/app/src/main/res/drawable/move_bookmark_up_disabled.xml @@ -8,7 +8,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/move_bookmark_up_enabled.xml b/app/src/main/res/drawable/move_bookmark_up_enabled.xml index 20a40515..80966186 100644 --- a/app/src/main/res/drawable/move_bookmark_up_enabled.xml +++ b/app/src/main/res/drawable/move_bookmark_up_enabled.xml @@ -8,6 +8,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > + diff --git a/app/src/main/res/drawable/move_to_folder.xml b/app/src/main/res/drawable/move_to_folder.xml index 9b912bb1..67a3adb9 100644 --- a/app/src/main/res/drawable/move_to_folder.xml +++ b/app/src/main/res/drawable/move_to_folder.xml @@ -9,6 +9,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > + diff --git a/app/src/main/res/drawable/privacy_mode.xml b/app/src/main/res/drawable/privacy_mode.xml index 01a0891e..79bdf144 100644 --- a/app/src/main/res/drawable/privacy_mode.xml +++ b/app/src/main/res/drawable/privacy_mode.xml @@ -8,16 +8,19 @@ android:viewportHeight="256.0" android:viewportWidth="256.0" > + + + + diff --git a/app/src/main/res/drawable/settings.xml b/app/src/main/res/drawable/settings.xml index 3b26c788..ece63010 100644 --- a/app/src/main/res/drawable/settings.xml +++ b/app/src/main/res/drawable/settings.xml @@ -8,6 +8,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > + diff --git a/app/src/main/res/drawable/warning.xml b/app/src/main/res/drawable/warning.xml index ff5c18de..636ff113 100644 --- a/app/src/main/res/drawable/warning.xml +++ b/app/src/main/res/drawable/warning.xml @@ -8,16 +8,19 @@ android:viewportHeight="256.0" android:viewportWidth="256.0" > + + + + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" /> #FF64DD17 #FFBBDEFB #FF42A5F5 + #FFF57F17 #FFD50000 #FFFFFFFF #FFFFD600 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 32c7bb35..7eeaaecf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -33,6 +33,14 @@ Privacy Mode JavaScript enabled JavaScript disabled + First-Party Cookies enabled + First-Party Cookies disabled + Third-Party Cookies enabled + Third-Party Cookies disabled + DOM Storage enabled + DOM Storage disabled + Form Data enabled + Form Data disabled Cookies deleted DOM Storage deleted Open Navigation Drawer -- 2.45.2