Add icons to the settings activity. Implements https://redmine.stoutner.com/issues...
authorSoren Stoutner <soren@stoutner.com>
Sun, 21 May 2017 03:09:03 +0000 (20:09 -0700)
committerSoren Stoutner <soren@stoutner.com>
Sun, 21 May 2017 03:09:03 +0000 (20:09 -0700)
35 files changed:
app/src/main/assets/de/about_licenses.html
app/src/main/assets/en/about_licenses.html
app/src/main/assets/en/images/ic_call_to_action.png [new file with mode: 0644]
app/src/main/assets/en/images/ic_fullscreen.png [new file with mode: 0644]
app/src/main/assets/en/images/ic_refresh.png [new file with mode: 0644]
app/src/main/assets/en/images/ic_smartphone.png [new file with mode: 0644]
app/src/main/assets/es/about_licenses.html
app/src/main/assets/it/about_licenses.html
app/src/main/assets/zh-rTW/about_licenses.html
app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
app/src/main/res/drawable/full_screen_disabled.xml [new file with mode: 0644]
app/src/main/res/drawable/full_screen_enabled.xml [new file with mode: 0644]
app/src/main/res/drawable/hide_system_bars_disabled.xml [new file with mode: 0644]
app/src/main/res/drawable/hide_system_bars_enabled.xml [new file with mode: 0644]
app/src/main/res/drawable/hide_system_bars_ghosted.xml [new file with mode: 0644]
app/src/main/res/drawable/home.xml [deleted file]
app/src/main/res/drawable/home_enabled.xml [new file with mode: 0644]
app/src/main/res/drawable/home_ghosted.xml [new file with mode: 0644]
app/src/main/res/drawable/more_disabled.xml [new file with mode: 0644]
app/src/main/res/drawable/more_enabled.xml [new file with mode: 0644]
app/src/main/res/drawable/refresh_disabled.xml [new file with mode: 0644]
app/src/main/res/drawable/refresh_enabled.xml [new file with mode: 0644]
app/src/main/res/drawable/search_custom_url_disabled.xml [new file with mode: 0644]
app/src/main/res/drawable/search_ghosted.xml [new file with mode: 0644]
app/src/main/res/drawable/translucent_bar_disabled.xml [new file with mode: 0644]
app/src/main/res/drawable/translucent_bar_enabled.xml [new file with mode: 0644]
app/src/main/res/drawable/translucent_bar_ghosted.xml [new file with mode: 0644]
app/src/main/res/drawable/user_agent_enabled.xml [deleted file]
app/src/main/res/menu/webview_navigation_menu.xml
app/src/main/res/values-es/strings.xml
app/src/main/res/values-it/strings.xml
app/src/main/res/values-zh-rTW/strings.xml
app/src/main/res/values/strings.xml
app/src/main/res/xml/preferences.xml

index 645c0c691e2e283f48608b0f3541788a3bbf55a6..ddd730db96cd482b6ced8114f8b2dab999b1fe06 100644 (file)
@@ -60,8 +60,8 @@
             are derived from ic_security and ic_language, which are part of the <a href="https://material.io/icons/">Android Material icon set</a> and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
             The full text of the license is below. Modifications copyright © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="../en/images/orbot.png"> orbot is a modified version of <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">the status icon from the Orbot project</a>, which is copyright
-            2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
-            The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+            2009-2010 Nathan Freitas, The Guardian Project. It is released under the <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">3-clause BSD license</a>.
+            The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="../en/images/cookie.png"> cookie was created by Google.
             It is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a> and can be downloaded from <a href="https://materialdesignicons.com/icon/cookie">Material Design Icons</a>. It is unchanged except for layout
             information like color and size.</p>
@@ -72,6 +72,7 @@
         <p><img class="icon" src="../en/images/ic_arrow_forward.png"> ic_arrow_forward.</p>
         <p><img class="icon" src="../en/images/ic_bookmark_border.png"> ic_bookmark_border.</p>
         <p><img class="icon" src="../en/images/ic_bug_report.png"> ic_bug_report.</p>
+        <p><img class="icon" src="../en/images/ic_call_to_action.png"> ic_call_to_action.</p>
         <p><img class="icon" src="../en/images/ic_chrome_reader_mode.png"> ic_chrome_reader_mode.</p>
         <p><img class="icon" src="../en/images/ic_close.png"> ic_close.</p>
         <p><img class="icon" src="../en/images/ic_create_new_folder.png"> ic_create_new_folder.</p>
@@ -86,6 +87,7 @@
         <p><img class="icon" src="../en/images/ic_find_in_page.png"> ic_find_in_page.</p>
         <p><img class="icon" src="../en/images/ic_folder.png"> ic_folder.</p>
         <p><img class="icon" src="../en/images/ic_folder_special.png"> ic_folder_special.</p>
+        <p><img class="icon" src="../en/images/ic_fullscreen.png"> ic_fullscreen.</p>
         <p><img class="icon" src="../en/images/ic_home.png"> ic_home.</p>
         <p><img class="icon" src="../en/images/ic_import_contacts.png"> ic_import_contacts.</p>
         <p><img class="icon" src="../en/images/ic_important_devices.png"> ic_important_devices.</p>
         <p><img class="icon" src="../en/images/ic_location_off.png"> ic_location_off.</p>
         <p><img class="icon" src="../en/images/ic_more.png"> ic_more.</p>
         <p><img class="icon" src="../en/images/ic_question_answer.png"> ic_question_answer.</p>
+        <p><img class="icon" src="../en/images/ic_refresh.png"> ic_refresh.</p>
         <p><img class="icon" src="../en/images/ic_search.png"> ic_search.</p>
         <p><img class="icon" src="../en/images/ic_select_all.png"> ic_select_all.</p>
         <p><img class="icon" src="../en/images/ic_settings.png"> ic_settings.</p>
+        <p><img class="icon" src="../en/images/ic_smartphone.png"> ic_smartphone.</p>
         <p><img class="icon" src="../en/images/ic_subtitles.png"> ic_subtitles.</p>
         <p><img class="icon" src="../en/images/ic_text_fields.png"> ic_text_fields.</p>
         <p><img class="icon" src="../en/images/ic_vertical_align_bottom.png"> ic_vertical_align_bottom.</p>
         <p>The licenses for most software and other practical works are designed
             to take away your freedom to share and change the works.  By contrast,
             the GNU General Public License is intended to guarantee your freedom to
-            share and change all versions of a program--to make sure it remains free
+            share and change all versions of a programto make sure it remains free
             software for all its users.  We, the Free Software Foundation, use the
             GNU General Public License for most of our software; it applies also to
             any other work released this way by its authors.  You can apply it to
             (1) assert copyright on the software, and (2) offer you this License
             giving you legal permission to copy, distribute and/or modify it.</p>
 
-        <p>For the developers' and authors' protection, the GPL clearly explains
-            that there is no warranty for this free software.  For both users' and
-            authors' sake, the GPL requires that modified versions be marked as
+        <p>For the developers’ and authors’ protection, the GPL clearly explains
+            that there is no warranty for this free software.  For both users and
+            authors sake, the GPL requires that modified versions be marked as
             changed, so that their problems will not be attributed erroneously to
             authors of previous versions.</p>
 
         <p>Some devices are designed to deny users access to install or run
             modified versions of the software inside them, although the manufacturer
             can do so.  This is fundamentally incompatible with the aim of
-            protecting users' freedom to change the software.  The systematic
+            protecting users freedom to change the software.  The systematic
             pattern of such abuse occurs in the area of products for individuals to
             use, which is precisely where it is most unacceptable.  Therefore, we
             have designed this version of the GPL to prohibit the practice for those
         <p>The “Corresponding Source” for a work in object code form means all
             the source code needed to generate, install, and (for an executable
             work) run the object code and to modify the work, including scripts to
-            control those activities.  However, it does not include the work's
+            control those activities.  However, it does not include the works
             System Libraries, or general-purpose tools or generally available free
             programs which are used unmodified in performing those activities but
             which are not part of the work.  For example, Corresponding Source
             the conditions stated below.  Sublicensing is not allowed; section 10
             makes it unnecessary.</p>
 
-        <h4>3. Protecting Users' Legal Rights From Anti-Circumvention Law.</h4>
+        <h4>3. Protecting Users Legal Rights From Anti-Circumvention Law.</h4>
 
         <p>No covered work shall be deemed part of an effective technological
             measure under any applicable law fulfilling obligations under article
             circumvention of technological measures to the extent such circumvention
             is effected by exercising rights under this License with respect to
             the covered work, and you disclaim any intention to limit operation or
-            modification of the work as a means of enforcing, against the work's
-            users, your or third parties' legal rights to forbid circumvention of
+            modification of the work as a means of enforcing, against the works
+            users, your or third parties legal rights to forbid circumvention of
             technological measures.</p>
 
         <h4>4. Conveying Verbatim Copies.</h4>
 
-        <p>You may convey verbatim copies of the Program's source code as you
+        <p>You may convey verbatim copies of the Programs source code as you
             receive it, in any medium, provided that you conspicuously and
             appropriately publish on each copy an appropriate copyright notice;
             keep intact all notices stating that this License and any
             and which are not combined with it such as to form a larger program,
             in or on a volume of a storage or distribution medium, is called an
             “aggregate” if the compilation and its resulting copyright are not
-            used to limit the access or legal rights of the compilation's users
+            used to limit the access or legal rights of the compilations users
             beyond what the individual works permit.  Inclusion of a covered work
             in an aggregate does not cause this License to apply to the other
             parts of the aggregate.</p>
             organization, or merging organizations.  If propagation of a covered
             work results from an entity transaction, each party to that
             transaction who receives a copy of the work also receives whatever
-            licenses to the work the party's predecessor in interest had or could
+            licenses to the work the partys predecessor in interest had or could
             give under the previous paragraph, plus a right to possession of the
             Corresponding Source of the work from the predecessor in interest, if
             the predecessor has it or can get it with reasonable efforts.</p>
 
         <p>A “contributor” is a copyright holder who authorizes use under this
             License of the Program or a work on which the Program is based.  The
-            work thus licensed is called the contributor's “contributor version”.</p>
+            work thus licensed is called the contributors “contributor version”.</p>
 
-        <p>A contributor's “essential patent claims” are all patent claims
+        <p>A contributors “essential patent claims” are all patent claims
             owned or controlled by the contributor, whether already acquired or
             hereafter acquired, that would be infringed by some manner, permitted
             by this License, of making, using, or selling its contributor version,
             this License.</p>
 
         <p>Each contributor grants you a non-exclusive, worldwide, royalty-free
-            patent license under the contributor's essential patent claims, to
+            patent license under the contributors essential patent claims, to
             make, use, sell, offer for sale, import and otherwise run, modify and
             propagate the contents of its contributor version.</p>
 
             consistent with the requirements of this License, to extend the patent
             license to downstream recipients.  “Knowingly relying” means you have
             actual knowledge that, but for the patent license, your conveying the
-            covered work in a country, or your recipient's use of the covered work
+            covered work in a country, or your recipients use of the covered work
             in a country, would infringe one or more identifiable patents in that
             country that you have reason to believe are valid.</p>
 
             any implied license or other defenses to infringement that may
             otherwise be available to you under applicable patent law.</p>
 
-        <h4>12. No Surrender of Others' Freedom.</h4>
+        <h4>12. No Surrender of Others Freedom.</h4>
 
         <p>If conditions are imposed on you (whether by court order, agreement or
             otherwise) that contradict the conditions of this License, they do not
             by the Free Software Foundation.</p>
 
         <p>If the Program specifies that a proxy can decide which future
-            versions of the GNU General Public License can be used, that proxy's
+            versions of the GNU General Public License can be used, that proxys
             public statement of acceptance of a version permanently authorizes you
             to choose that version for the Program.</p>
 
@@ -790,7 +794,7 @@ certain conditions; type `show c'
 for details.</pre>
 
         <p>The hypothetical commands `show w' and `show c' should show the appropriate
-            parts of the General Public License.  Of course, your program's commands
+            parts of the General Public License.  Of course, your programs commands
             might be different; for a GUI interface, you would use an “about box”.</p>
 
         <p>You should also get your employer (if you work as a programmer) or school,
index ed4aa4d584aa51ecac51030302097f81550df61b..c433ce37508429c86ef235fb2f7532680ae85728 100644 (file)
@@ -55,8 +55,8 @@
             are derived from ic_security and ic_language, which are part of the <a href="https://material.io/icons/">Android Material icon set</a> and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
             The full text of the license is below. Modifications copyright © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="images/orbot.png"> orbot is a modified version of <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">the status icon from the Orbot project</a>, which is copyright
-            2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
-            The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+            2009-2010 Nathan Freitas, The Guardian Project. It is released under the <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">3-clause BSD license</a>.
+            The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="images/cookie.png"> cookie was created by Google. It is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>
             and can be downloaded from <a href="https://materialdesignicons.com/icon/cookie">Material Design Icons</a>. It is unchanged except for layout information like color and size.</p>
         <p>The following icons come from the <a href="https://material.io/icons/">Android Material icon set</a>, which is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. They are unchanged except for layout
@@ -66,6 +66,7 @@
         <p><img class="icon" src="images/ic_arrow_forward.png"> ic_arrow_forward.</p>
         <p><img class="icon" src="images/ic_bookmark_border.png"> ic_bookmark_border.</p>
         <p><img class="icon" src="images/ic_bug_report.png"> ic_bug_report.</p>
+        <p><img class="icon" src="images/ic_call_to_action.png"> ic_call_to_action.</p>
         <p><img class="icon" src="images/ic_chrome_reader_mode.png"> ic_chrome_reader_mode.</p>
         <p><img class="icon" src="images/ic_close.png"> ic_close.</p>
         <p><img class="icon" src="images/ic_create_new_folder.png"> ic_create_new_folder.</p>
@@ -80,6 +81,7 @@
         <p><img class="icon" src="images/ic_find_in_page.png"> ic_find_in_page.</p>
         <p><img class="icon" src="images/ic_folder.png"> ic_folder.</p>
         <p><img class="icon" src="images/ic_folder_special.png"> ic_folder_special.</p>
+        <p><img class="icon" src="images/ic_fullscreen.png"> ic_fullscreen.</p>
         <p><img class="icon" src="images/ic_home.png"> ic_home.</p>
         <p><img class="icon" src="images/ic_import_contacts.png"> ic_import_contacts.</p>
         <p><img class="icon" src="images/ic_important_devices.png"> ic_important_devices.</p>
         <p><img class="icon" src="images/ic_location_off.png"> ic_location_off.</p>
         <p><img class="icon" src="images/ic_more.png"> ic_more.</p>
         <p><img class="icon" src="images/ic_question_answer.png"> ic_question_answer.</p>
+        <p><img class="icon" src="images/ic_refresh.png"> ic_refresh.</p>
         <p><img class="icon" src="images/ic_search.png"> ic_search.</p>
         <p><img class="icon" src="images/ic_select_all.png"> ic_select_all.</p>
         <p><img class="icon" src="images/ic_settings.png"> ic_settings.</p>
+        <p><img class="icon" src="images/ic_smartphone.png"> ic_smartphone.</p>
         <p><img class="icon" src="images/ic_subtitles.png"> ic_subtitles.</p>
         <p><img class="icon" src="images/ic_text_fields.png"> ic_text_fields.</p>
         <p><img class="icon" src="images/ic_vertical_align_bottom.png"> ic_vertical_align_bottom.</p>
         <p>The licenses for most software and other practical works are designed
             to take away your freedom to share and change the works.  By contrast,
             the GNU General Public License is intended to guarantee your freedom to
-            share and change all versions of a program--to make sure it remains free
+            share and change all versions of a programto make sure it remains free
             software for all its users.  We, the Free Software Foundation, use the
             GNU General Public License for most of our software; it applies also to
             any other work released this way by its authors.  You can apply it to
             (1) assert copyright on the software, and (2) offer you this License
             giving you legal permission to copy, distribute and/or modify it.</p>
 
-        <p>For the developers' and authors' protection, the GPL clearly explains
-            that there is no warranty for this free software.  For both users' and
-            authors' sake, the GPL requires that modified versions be marked as
+        <p>For the developers’ and authors’ protection, the GPL clearly explains
+            that there is no warranty for this free software.  For both users and
+            authors sake, the GPL requires that modified versions be marked as
             changed, so that their problems will not be attributed erroneously to
             authors of previous versions.</p>
 
         <p>Some devices are designed to deny users access to install or run
             modified versions of the software inside them, although the manufacturer
             can do so.  This is fundamentally incompatible with the aim of
-            protecting users' freedom to change the software.  The systematic
+            protecting users freedom to change the software.  The systematic
             pattern of such abuse occurs in the area of products for individuals to
             use, which is precisely where it is most unacceptable.  Therefore, we
             have designed this version of the GPL to prohibit the practice for those
         <p>The “Corresponding Source” for a work in object code form means all
             the source code needed to generate, install, and (for an executable
             work) run the object code and to modify the work, including scripts to
-            control those activities.  However, it does not include the work's
+            control those activities.  However, it does not include the works
             System Libraries, or general-purpose tools or generally available free
             programs which are used unmodified in performing those activities but
             which are not part of the work.  For example, Corresponding Source
             the conditions stated below.  Sublicensing is not allowed; section 10
             makes it unnecessary.</p>
 
-        <h4>3. Protecting Users' Legal Rights From Anti-Circumvention Law.</h4>
+        <h4>3. Protecting Users Legal Rights From Anti-Circumvention Law.</h4>
 
         <p>No covered work shall be deemed part of an effective technological
             measure under any applicable law fulfilling obligations under article
             circumvention of technological measures to the extent such circumvention
             is effected by exercising rights under this License with respect to
             the covered work, and you disclaim any intention to limit operation or
-            modification of the work as a means of enforcing, against the work's
-            users, your or third parties' legal rights to forbid circumvention of
+            modification of the work as a means of enforcing, against the works
+            users, your or third parties legal rights to forbid circumvention of
             technological measures.</p>
 
         <h4>4. Conveying Verbatim Copies.</h4>
 
-        <p>You may convey verbatim copies of the Program's source code as you
+        <p>You may convey verbatim copies of the Programs source code as you
             receive it, in any medium, provided that you conspicuously and
             appropriately publish on each copy an appropriate copyright notice;
             keep intact all notices stating that this License and any
             and which are not combined with it such as to form a larger program,
             in or on a volume of a storage or distribution medium, is called an
             “aggregate” if the compilation and its resulting copyright are not
-            used to limit the access or legal rights of the compilation's users
+            used to limit the access or legal rights of the compilations users
             beyond what the individual works permit.  Inclusion of a covered work
             in an aggregate does not cause this License to apply to the other
             parts of the aggregate.</p>
             organization, or merging organizations.  If propagation of a covered
             work results from an entity transaction, each party to that
             transaction who receives a copy of the work also receives whatever
-            licenses to the work the party's predecessor in interest had or could
+            licenses to the work the partys predecessor in interest had or could
             give under the previous paragraph, plus a right to possession of the
             Corresponding Source of the work from the predecessor in interest, if
             the predecessor has it or can get it with reasonable efforts.</p>
 
         <p>A “contributor” is a copyright holder who authorizes use under this
             License of the Program or a work on which the Program is based.  The
-            work thus licensed is called the contributor's “contributor version”.</p>
+            work thus licensed is called the contributors “contributor version”.</p>
 
-        <p>A contributor's “essential patent claims” are all patent claims
+        <p>A contributors “essential patent claims” are all patent claims
             owned or controlled by the contributor, whether already acquired or
             hereafter acquired, that would be infringed by some manner, permitted
             by this License, of making, using, or selling its contributor version,
             this License.</p>
 
         <p>Each contributor grants you a non-exclusive, worldwide, royalty-free
-            patent license under the contributor's essential patent claims, to
+            patent license under the contributors essential patent claims, to
             make, use, sell, offer for sale, import and otherwise run, modify and
             propagate the contents of its contributor version.</p>
 
             consistent with the requirements of this License, to extend the patent
             license to downstream recipients.  “Knowingly relying” means you have
             actual knowledge that, but for the patent license, your conveying the
-            covered work in a country, or your recipient's use of the covered work
+            covered work in a country, or your recipients use of the covered work
             in a country, would infringe one or more identifiable patents in that
             country that you have reason to believe are valid.</p>
 
             any implied license or other defenses to infringement that may
             otherwise be available to you under applicable patent law.</p>
 
-        <h4>12. No Surrender of Others' Freedom.</h4>
+        <h4>12. No Surrender of Others Freedom.</h4>
 
         <p>If conditions are imposed on you (whether by court order, agreement or
             otherwise) that contradict the conditions of this License, they do not
             by the Free Software Foundation.</p>
 
         <p>If the Program specifies that a proxy can decide which future
-            versions of the GNU General Public License can be used, that proxy's
+            versions of the GNU General Public License can be used, that proxys
             public statement of acceptance of a version permanently authorizes you
             to choose that version for the Program.</p>
 
@@ -782,7 +786,7 @@ certain conditions; type `show c'
 for details.</pre>
 
         <p>The hypothetical commands `show w' and `show c' should show the appropriate
-            parts of the General Public License.  Of course, your program's commands
+            parts of the General Public License.  Of course, your programs commands
             might be different; for a GUI interface, you would use an “about box”.</p>
 
         <p>You should also get your employer (if you work as a programmer) or school,
diff --git a/app/src/main/assets/en/images/ic_call_to_action.png b/app/src/main/assets/en/images/ic_call_to_action.png
new file mode 100644 (file)
index 0000000..84c2e37
Binary files /dev/null and b/app/src/main/assets/en/images/ic_call_to_action.png differ
diff --git a/app/src/main/assets/en/images/ic_fullscreen.png b/app/src/main/assets/en/images/ic_fullscreen.png
new file mode 100644 (file)
index 0000000..ae9d4c3
Binary files /dev/null and b/app/src/main/assets/en/images/ic_fullscreen.png differ
diff --git a/app/src/main/assets/en/images/ic_refresh.png b/app/src/main/assets/en/images/ic_refresh.png
new file mode 100644 (file)
index 0000000..a37fd60
Binary files /dev/null and b/app/src/main/assets/en/images/ic_refresh.png differ
diff --git a/app/src/main/assets/en/images/ic_smartphone.png b/app/src/main/assets/en/images/ic_smartphone.png
new file mode 100644 (file)
index 0000000..9704acc
Binary files /dev/null and b/app/src/main/assets/en/images/ic_smartphone.png differ
index 3eff919040c44c68994932b0eb05fe1d9336557f..15727c8d5ab9366e60b90556bbc1f965932730f2 100644 (file)
             <img class="left" src="../en/images/privacy_browser_free.png">
             <img class="left" src="../en/images/warning.png">
             <img class="left" src="../en/images/javascript_enabled.png">
-            derivan de ic_security y de ic_language, which are part of the <a href="https://material.io/icons/">Android Material icon set</a> and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
-            The full text of the license is below. Modifications copyright © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
-        <p><img class="left" src="../en/images/orbot.png"> orbot is a modified version of <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">the status icon from the Orbot project</a>, which is copyright
-            2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
-            The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+            derivan de ic_security y de ic_language, que son parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a> y son liberados bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>.
+            El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. Las imágenes resultantes se liberan bajo la
+            <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
+        <p><img class="left" src="../en/images/orbot.png"> orbot es una versión modificada del <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">icono de estado del proyecto Orbot</a>,
+            que tiene copyright 2009-2010 por Nathan Freitas, The Guardian Project. Es liberado bajo la <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">licencia BSD modificada (de 3 cláusulas)</a>.
+            El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            La imagen resultante se libera bajo la <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
         <p><img class="left" src="../en/images/cookie.png"> cookie fue creado por Google. Es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">licencia Apache 2.0</a> y puede ser descargado desde
             <a href="https://materialdesignicons.com/icon/cookie">Material Design Icons</a>. Está sin cambios, excepto por la información de diseño como el color y el tamaño.</p>
         <p>Los siguientes iconos proceden de <a href="https://material.io/icons/">Android Material icon set</a>, el cual es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">licencia Apache 2.0</a>.
-            Están sin cambios, excepto por la información de diseño como el color y el tamaño. Algunos de ellos se han renombrado para que coincida con su uso en el código. Los iconos originales y los nombres se muestran a continuación.</p>
+            Están sin cambios, excepto por la información de diseño como el color y el tamaño. Algunos de ellos se han renombrado para que coincida con su uso en el código. Los iconos y los nombres originales se muestran a continuación.</p>
         <p><img class="icon" src="../en/images/ic_add.png"> ic_add.</p>
         <p><img class="icon" src="../en/images/ic_arrow_back.png"> ic_arrow_back.</p>
         <p><img class="icon" src="../en/images/ic_arrow_forward.png"> ic_arrow_forward.</p>
         <p><img class="icon" src="../en/images/ic_bookmark_border.png"> ic_bookmark_border.</p>
         <p><img class="icon" src="../en/images/ic_bug_report.png"> ic_bug_report.</p>
+        <p><img class="icon" src="../en/images/ic_call_to_action.png"> ic_call_to_action.</p>
         <p><img class="icon" src="../en/images/ic_chrome_reader_mode.png"> ic_chrome_reader_mode.</p>
         <p><img class="icon" src="../en/images/ic_close.png"> ic_close.</p>
         <p><img class="icon" src="../en/images/ic_create_new_folder.png"> ic_create_new_folder.</p>
@@ -82,6 +85,7 @@
         <p><img class="icon" src="../en/images/ic_find_in_page.png"> ic_find_in_page.</p>
         <p><img class="icon" src="../en/images/ic_folder.png"> ic_folder.</p>
         <p><img class="icon" src="../en/images/ic_folder_special.png"> ic_folder_special.</p>
+        <p><img class="icon" src="../en/images/ic_fullscreen.png"> ic_fullscreen.</p>
         <p><img class="icon" src="../en/images/ic_home.png"> ic_home.</p>
         <p><img class="icon" src="../en/images/ic_import_contacts.png"> ic_import_contacts.</p>
         <p><img class="icon" src="../en/images/ic_important_devices.png"> ic_important_devices.</p>
         <p><img class="icon" src="../en/images/ic_location_off.png"> ic_location_off.</p>
         <p><img class="icon" src="../en/images/ic_more.png"> ic_more.</p>
         <p><img class="icon" src="../en/images/ic_question_answer.png"> ic_question_answer.</p>
+        <p><img class="icon" src="../en/images/ic_refresh.png"> ic_refresh.</p>
         <p><img class="icon" src="../en/images/ic_search.png"> ic_search.</p>
         <p><img class="icon" src="../en/images/ic_select_all.png"> ic_select_all.</p>
         <p><img class="icon" src="../en/images/ic_settings.png"> ic_settings.</p>
+        <p><img class="icon" src="../en/images/ic_smartphone.png"> ic_smartphone.</p>
         <p><img class="icon" src="../en/images/ic_subtitles.png"> ic_subtitles.</p>
         <p><img class="icon" src="../en/images/ic_text_fields.png"> ic_text_fields.</p>
         <p><img class="icon" src="../en/images/ic_vertical_align_bottom.png"> ic_vertical_align_bottom.</p>
@@ -1015,36 +1021,34 @@ limitations under the License.</pre>
 
         <hr/>
 
-        <h3>3-Clause BSD License</h3>
+        <h3>Licencia BSD modificada (de 3 cláusulas)</h3>
 
-        <p>Redistribution and use in source and binary forms, with or without
-            modification, are permitted provided that the following conditions are
-            met:</p>
+        <p>La redistribución y el uso en las formas de código fuente y binario, con o sin
+            modificaciones, están permitidos siempre que se cumplan las siguientes condiciones:</p>
 
         <ul>
-            <li>Redistributions of source code must retain the above copyright
-                notice, this list of conditions and the following disclaimer.</li>
+            <li>Las redistribuciones del código fuente deben conservar el aviso de copyright
+                anterior, esta lista de condiciones y el siguiente descargo de responsabilidad.</li>
 
-            <li>Redistributions in binary form must reproduce the above
-                copyright notice, this list of conditions and the following disclaimer
-                in the documentation and/or other materials provided with the
-                distribution.</li>
+            <li>Las redistribuciones en formato binario deben reproducir el aviso de copyright
+                anterior, esta lista de condiciones y el siguiente descargo de responsabilidad
+                en la documentación y/u otros materiales suministrados con la distribución.</li>
 
-            <li>Neither the names of the copyright owners nor the names of its
-                contributors may be used to endorse or promote products derived from
-                this software without specific prior written permission.</li>
+            <li>Ni el nombre de los titulares de derechos de autor ni los nombres de sus
+                colaboradores pueden usarse para apoyar o promocionar productos derivados de
+                este software sin permiso específico previo y por escrito.</li>
         </ul>
 
-        <p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-            “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-            LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-            A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-            OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-            SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-            LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-            DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-            THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-            (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-            OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
+        <p>ESTE SOFTWARE SE SUMINISTRA POR LOS PROPIETARIOS DEL COPYRIGHT Y COLABORADORES
+            “COMO ESTÁ” Y CUALQUIER GARANTÍAS EXPRESA O IMPLÍCITA, INCLUYENDO, PERO NO
+            LIMITADO A, LAS GARANTÍAS IMPLÍCITAS DE COMERCIALIZACIÓN Y APTITUD PARA UN
+            PROPÓSITO PARTICULAR SON RECHAZADAS. EN NINGÚN CASO LOS PROPIETARIOS DEL COPYRIGHT
+            Y COLABORADORES SERÁN RESPONSABLES POR NINGÚN DAÑO DIRECTO, INDIRECTO, INCIDENTAL,
+            ESPECIAL, EJEMPLAR O COSECUENCIAL (INCLUYENDO, PERO NO LIMITADO A, LA ADQUISICIÓN
+            O SUSTITUCIÓN DE BIENES O SERVICIOS; LA PÉRDIDA DE USO, DE DATOS O DE BENEFICIOS;
+            O INTERRUPCIÓN DE LA ACTIVIDAD EMPRESARIAL) O POR CUALQUIER TEORÍA DE
+            RESPONSABILIDAD, YA SEA POR CONTRATO, RESPONSABILIDAD ESTRICTA O AGRAVIO
+            (INCLUYENDO NEGLIGENCIA O CUALQUIER OTRA CAUSA) QUE SURJA DE CUALQUIER MANERA DEL
+            USO DE ESTE SOFTWARE, INCLUSO SI SE HA ADVERTIDO DE LA POSIBILIDAD DE TALES DAÑOS.</p>
     </body>
 </html>
\ No newline at end of file
index 2c5c24c8fe7834c84a25c865fa298ec4224b465f..e960817c2e14dc8579348995e8765d11b795452d 100644 (file)
@@ -61,9 +61,9 @@
             are derived from ic_security and ic_language, which are part of the <a href="https://material.io/icons/">Android Material icon set</a> and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
             The full text of the license is below. Modifications copyright © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="../en/images/orbot.png"> orbot is a modified version of <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">the status icon from the Orbot project</a>, which is copyright
-            2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
-            The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
-        <p><img class="left" src="images/cookie.png"> cookie was created by Google. It is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>
+            2009-2010 Nathan Freitas, The Guardian Project. It is released under the <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">3-clause BSD license</a>.
+            The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="../en/images/cookie.png"> cookie was created by Google. It is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>
             and can be downloaded from <a href="https://materialdesignicons.com/icon/cookie">Material Design Icons</a>. It is unchanged except for layout information like color and size.</p>
         <p>The following icons come from the <a href="https://material.io/icons/">Android Material icon set</a>, which is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. They are unchanged except for layout
             information like color and size. Some of them have been renamed to match their use in the code. The original icons and names are shown below.</p>
@@ -72,6 +72,7 @@
         <p><img class="icon" src="../en/images/ic_arrow_forward.png"> ic_arrow_forward.</p>
         <p><img class="icon" src="../en/images/ic_bookmark_border.png"> ic_bookmark_border.</p>
         <p><img class="icon" src="../en/images/ic_bug_report.png"> ic_bug_report.</p>
+        <p><img class="icon" src="../en/images/ic_call_to_action.png"> ic_call_to_action.</p>
         <p><img class="icon" src="../en/images/ic_chrome_reader_mode.png"> ic_chrome_reader_mode.</p>
         <p><img class="icon" src="../en/images/ic_close.png"> ic_close.</p>
         <p><img class="icon" src="../en/images/ic_create_new_folder.png"> ic_create_new_folder.</p>
@@ -86,6 +87,7 @@
         <p><img class="icon" src="../en/images/ic_find_in_page.png"> ic_find_in_page.</p>
         <p><img class="icon" src="../en/images/ic_folder.png"> ic_folder.</p>
         <p><img class="icon" src="../en/images/ic_folder_special.png"> ic_folder_special.</p>
+        <p><img class="icon" src="../en/images/ic_fullscreen.png"> ic_fullscreen.</p>
         <p><img class="icon" src="../en/images/ic_home.png"> ic_home.</p>
         <p><img class="icon" src="../en/images/ic_import_contacts.png"> ic_import_contacts.</p>
         <p><img class="icon" src="../en/images/ic_important_devices.png"> ic_important_devices.</p>
         <p><img class="icon" src="../en/images/ic_location_off.png"> ic_location_off.</p>
         <p><img class="icon" src="../en/images/ic_more.png"> ic_more.</p>
         <p><img class="icon" src="../en/images/ic_question_answer.png"> ic_question_answer.</p>
+        <p><img class="icon" src="../en/images/ic_refresh.png"> ic_refresh.</p>
         <p><img class="icon" src="../en/images/ic_search.png"> ic_search.</p>
         <p><img class="icon" src="../en/images/ic_select_all.png"> ic_select_all.</p>
         <p><img class="icon" src="../en/images/ic_settings.png"> ic_settings.</p>
+        <p><img class="icon" src="../en/images/ic_smartphone.png"> ic_smartphone.</p>
         <p><img class="icon" src="../en/images/ic_subtitles.png"> ic_subtitles.</p>
         <p><img class="icon" src="../en/images/ic_text_fields.png"> ic_text_fields.</p>
         <p><img class="icon" src="../en/images/ic_vertical_align_bottom.png"> ic_vertical_align_bottom.</p>
index d3fb878cc3b766f058dfed55669f772d5171911d..c206459dfc4fb4a9b157a7b9398c0df03dd84f7e 100644 (file)
@@ -55,8 +55,8 @@
             are derived from ic_security and ic_language, which are part of the <a href="https://material.io/icons/">Android Material icon set</a> and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
             The full text of the license is below. Modifications copyright © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="../en/images/orbot.png"> orbot is a modified version of <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">the status icon from the Orbot project</a>, which is copyright
-            2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
-            The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+            2009-2010 Nathan Freitas, The Guardian Project. It is released under the <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">3-clause BSD license</a>.
+            The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="../en/images/cookie.png"> cookie was created by Google. It is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>
             and can be downloaded from <a href="https://materialdesignicons.com/icon/cookie">Material Design Icons</a>. It is unchanged except for layout information like color and size.</p>
         <p>The following icons come from the <a href="https://material.io/icons/">Android Material icon set</a>, which is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. They are unchanged except for layout
@@ -66,6 +66,7 @@
         <p><img class="icon" src="../en/images/ic_arrow_forward.png"> ic_arrow_forward.</p>
         <p><img class="icon" src="../en/images/ic_bookmark_border.png"> ic_bookmark_border.</p>
         <p><img class="icon" src="../en/images/ic_bug_report.png"> ic_bug_report.</p>
+        <p><img class="icon" src="../en/images/ic_call_to_action.png"> ic_call_to_action.</p>
         <p><img class="icon" src="../en/images/ic_chrome_reader_mode.png"> ic_chrome_reader_mode.</p>
         <p><img class="icon" src="../en/images/ic_close.png"> ic_close.</p>
         <p><img class="icon" src="../en/images/ic_create_new_folder.png"> ic_create_new_folder.</p>
@@ -80,6 +81,7 @@
         <p><img class="icon" src="../en/images/ic_find_in_page.png"> ic_find_in_page.</p>
         <p><img class="icon" src="../en/images/ic_folder.png"> ic_folder.</p>
         <p><img class="icon" src="../en/images/ic_folder_special.png"> ic_folder_special.</p>
+        <p><img class="icon" src="../en/images/ic_fullscreen.png"> ic_fullscreen.</p>
         <p><img class="icon" src="../en/images/ic_home.png"> ic_home.</p>
         <p><img class="icon" src="../en/images/ic_import_contacts.png"> ic_import_contacts.</p>
         <p><img class="icon" src="../en/images/ic_important_devices.png"> ic_important_devices.</p>
         <p><img class="icon" src="../en/images/ic_location_off.png"> ic_location_off.</p>
         <p><img class="icon" src="../en/images/ic_more.png"> ic_more.</p>
         <p><img class="icon" src="../en/images/ic_question_answer.png"> ic_question_answer.</p>
+        <p><img class="icon" src="../en/images/ic_refresh.png"> ic_refresh.</p>
         <p><img class="icon" src="../en/images/ic_search.png"> ic_search.</p>
         <p><img class="icon" src="../en/images/ic_select_all.png"> ic_select_all.</p>
         <p><img class="icon" src="../en/images/ic_settings.png"> ic_settings.</p>
+        <p><img class="icon" src="../en/images/ic_smartphone.png"> ic_smartphone.</p>
         <p><img class="icon" src="../en/images/ic_subtitles.png"> ic_subtitles.</p>
         <p><img class="icon" src="../en/images/ic_text_fields.png"> ic_text_fields.</p>
         <p><img class="icon" src="../en/images/ic_vertical_align_bottom.png"> ic_vertical_align_bottom.</p>
         <p>The licenses for most software and other practical works are designed
             to take away your freedom to share and change the works.  By contrast,
             the GNU General Public License is intended to guarantee your freedom to
-            share and change all versions of a program--to make sure it remains free
+            share and change all versions of a programto make sure it remains free
             software for all its users.  We, the Free Software Foundation, use the
             GNU General Public License for most of our software; it applies also to
             any other work released this way by its authors.  You can apply it to
             (1) assert copyright on the software, and (2) offer you this License
             giving you legal permission to copy, distribute and/or modify it.</p>
 
-        <p>For the developers' and authors' protection, the GPL clearly explains
-            that there is no warranty for this free software.  For both users' and
-            authors' sake, the GPL requires that modified versions be marked as
+        <p>For the developers’ and authors’ protection, the GPL clearly explains
+            that there is no warranty for this free software.  For both users and
+            authors sake, the GPL requires that modified versions be marked as
             changed, so that their problems will not be attributed erroneously to
             authors of previous versions.</p>
 
         <p>Some devices are designed to deny users access to install or run
             modified versions of the software inside them, although the manufacturer
             can do so.  This is fundamentally incompatible with the aim of
-            protecting users' freedom to change the software.  The systematic
+            protecting users freedom to change the software.  The systematic
             pattern of such abuse occurs in the area of products for individuals to
             use, which is precisely where it is most unacceptable.  Therefore, we
             have designed this version of the GPL to prohibit the practice for those
         <p>The “Corresponding Source” for a work in object code form means all
             the source code needed to generate, install, and (for an executable
             work) run the object code and to modify the work, including scripts to
-            control those activities.  However, it does not include the work's
+            control those activities.  However, it does not include the works
             System Libraries, or general-purpose tools or generally available free
             programs which are used unmodified in performing those activities but
             which are not part of the work.  For example, Corresponding Source
             the conditions stated below.  Sublicensing is not allowed; section 10
             makes it unnecessary.</p>
 
-        <h4>3. Protecting Users' Legal Rights From Anti-Circumvention Law.</h4>
+        <h4>3. Protecting Users Legal Rights From Anti-Circumvention Law.</h4>
 
         <p>No covered work shall be deemed part of an effective technological
             measure under any applicable law fulfilling obligations under article
             circumvention of technological measures to the extent such circumvention
             is effected by exercising rights under this License with respect to
             the covered work, and you disclaim any intention to limit operation or
-            modification of the work as a means of enforcing, against the work's
-            users, your or third parties' legal rights to forbid circumvention of
+            modification of the work as a means of enforcing, against the works
+            users, your or third parties legal rights to forbid circumvention of
             technological measures.</p>
 
         <h4>4. Conveying Verbatim Copies.</h4>
 
-        <p>You may convey verbatim copies of the Program's source code as you
+        <p>You may convey verbatim copies of the Programs source code as you
             receive it, in any medium, provided that you conspicuously and
             appropriately publish on each copy an appropriate copyright notice;
             keep intact all notices stating that this License and any
             and which are not combined with it such as to form a larger program,
             in or on a volume of a storage or distribution medium, is called an
             “aggregate” if the compilation and its resulting copyright are not
-            used to limit the access or legal rights of the compilation's users
+            used to limit the access or legal rights of the compilations users
             beyond what the individual works permit.  Inclusion of a covered work
             in an aggregate does not cause this License to apply to the other
             parts of the aggregate.</p>
             organization, or merging organizations.  If propagation of a covered
             work results from an entity transaction, each party to that
             transaction who receives a copy of the work also receives whatever
-            licenses to the work the party's predecessor in interest had or could
+            licenses to the work the partys predecessor in interest had or could
             give under the previous paragraph, plus a right to possession of the
             Corresponding Source of the work from the predecessor in interest, if
             the predecessor has it or can get it with reasonable efforts.</p>
 
         <p>A “contributor” is a copyright holder who authorizes use under this
             License of the Program or a work on which the Program is based.  The
-            work thus licensed is called the contributor's “contributor version”.</p>
+            work thus licensed is called the contributors “contributor version”.</p>
 
-        <p>A contributor's “essential patent claims” are all patent claims
+        <p>A contributors “essential patent claims” are all patent claims
             owned or controlled by the contributor, whether already acquired or
             hereafter acquired, that would be infringed by some manner, permitted
             by this License, of making, using, or selling its contributor version,
             this License.</p>
 
         <p>Each contributor grants you a non-exclusive, worldwide, royalty-free
-            patent license under the contributor's essential patent claims, to
+            patent license under the contributors essential patent claims, to
             make, use, sell, offer for sale, import and otherwise run, modify and
             propagate the contents of its contributor version.</p>
 
             consistent with the requirements of this License, to extend the patent
             license to downstream recipients.  “Knowingly relying” means you have
             actual knowledge that, but for the patent license, your conveying the
-            covered work in a country, or your recipient's use of the covered work
+            covered work in a country, or your recipients use of the covered work
             in a country, would infringe one or more identifiable patents in that
             country that you have reason to believe are valid.</p>
 
             any implied license or other defenses to infringement that may
             otherwise be available to you under applicable patent law.</p>
 
-        <h4>12. No Surrender of Others' Freedom.</h4>
+        <h4>12. No Surrender of Others Freedom.</h4>
 
         <p>If conditions are imposed on you (whether by court order, agreement or
             otherwise) that contradict the conditions of this License, they do not
             by the Free Software Foundation.</p>
 
         <p>If the Program specifies that a proxy can decide which future
-            versions of the GNU General Public License can be used, that proxy's
+            versions of the GNU General Public License can be used, that proxys
             public statement of acceptance of a version permanently authorizes you
             to choose that version for the Program.</p>
 
@@ -782,7 +786,7 @@ certain conditions; type `show c'
 for details.</pre>
 
         <p>The hypothetical commands `show w' and `show c' should show the appropriate
-            parts of the General Public License.  Of course, your program's commands
+            parts of the General Public License.  Of course, your programs commands
             might be different; for a GUI interface, you would use an “about box”.</p>
 
         <p>You should also get your employer (if you work as a programmer) or school,
index 353a8d16407ddb6f182921d15dc22916b250e951..05625983417be7983b39ef89b3f39244c618d588 100644 (file)
@@ -2154,7 +2154,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
         incognitoModeEnabled = sharedPreferences.getBoolean("incognito_mode", false);
         boolean doNotTrackEnabled = sharedPreferences.getBoolean("do_not_track", false);
         boolean proxyThroughOrbot = sharedPreferences.getBoolean("proxy_through_orbot", false);
-        fullScreenBrowsingModeEnabled = sharedPreferences.getBoolean("enable_full_screen_browsing_mode", false);
+        fullScreenBrowsingModeEnabled = sharedPreferences.getBoolean("full_screen_browsing_mode", false);
         hideSystemBarsOnFullscreen = sharedPreferences.getBoolean("hide_system_bars", false);
         translucentNavigationBarOnFullscreen = sharedPreferences.getBoolean("translucent_navigation_bar", true);
         swipeToRefreshEnabled = sharedPreferences.getBoolean("swipe_to_refresh", false);
index f64a9b5d071a0e6e39f86efc1ec2fc14e890b254..dcc548939e58c356020cf3a0baba24b67161950a 100644 (file)
@@ -60,16 +60,19 @@ public class SettingsFragment extends PreferenceFragment {
         final Preference torSearchCustomURLPreference = findPreference("tor_search_custom_url");
         final Preference searchPreference = findPreference("search");
         final Preference searchCustomURLPreference = findPreference("search_custom_url");
+        final Preference fullScreenBrowsingModePreference = findPreference("full_screen_browsing_mode");
         final Preference hideSystemBarsPreference = findPreference("hide_system_bars");
         final Preference translucentNavigationBarPreference = findPreference("translucent_navigation_bar");
         final Preference homepagePreference = findPreference("homepage");
         final Preference defaultFontSizePreference = findPreference("default_font_size");
+        final Preference swipeToRefreshPreference = findPreference("swipe_to_refresh");
+        final Preference displayAdditionalAppBarIconsPreference = findPreference("display_additional_app_bar_icons");
 
         // Set dependencies.
         domStoragePreference.setDependency("javascript_enabled");
         torHomepagePreference.setDependency("proxy_through_orbot");
         torSearchPreference.setDependency("proxy_through_orbot");
-        hideSystemBarsPreference.setDependency("enable_full_screen_browsing_mode");
+        hideSystemBarsPreference.setDependency("full_screen_browsing_mode");
 
         // Get strings from the preferences.
         String torSearchString = savedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q=");
@@ -80,6 +83,8 @@ public class SettingsFragment extends PreferenceFragment {
         boolean firstPartyCookiesEnabledBoolean = savedPreferences.getBoolean("first_party_cookies_enabled", false);
         boolean thirdPartyCookiesEnabledBoolean = savedPreferences.getBoolean("third_party_cookies_enabled", false);
         boolean proxyThroughOrbotBoolean = savedPreferences.getBoolean("proxy_through_orbot", false);
+        boolean fullScreenBrowsingModeBoolean = savedPreferences.getBoolean("full_screen_browsing_mode", false);
+        boolean hideSystemBarsBoolean = savedPreferences.getBoolean("hide_system_bars", false);
 
         // Only enable `thirdPartyCookiesPreference` if `firstPartyCookiesEnabledBoolean` is `true` and API >= 21.
         thirdPartyCookiesPreference.setEnabled(firstPartyCookiesEnabledBoolean && (Build.VERSION.SDK_INT >= 21));
@@ -147,8 +152,8 @@ public class SettingsFragment extends PreferenceFragment {
         searchCustomURLPreference.setEnabled(searchString.equals("Custom URL"));
 
 
-        // Enable `transparent_navigation_bar` only if full screen browsing mode is enabled and `hide_system_bars` is disabled.
-        translucentNavigationBarPreference.setEnabled(savedPreferences.getBoolean("enable_full_screen_browsing_mode", false) && !savedPreferences.getBoolean("hide_system_bars", false));
+        // Enable `translucentNavigationBarPreference` only if full screen browsing mode is enabled and `hide_system_bars` is disabled.
+        translucentNavigationBarPreference.setEnabled(fullScreenBrowsingModeBoolean && !hideSystemBarsBoolean);
 
 
         // Set the homepage URL as the summary text for the `Homepage` preference when the preference screen is loaded.  The default is `https://duckduckgo.com`.
@@ -236,6 +241,24 @@ public class SettingsFragment extends PreferenceFragment {
             proxyThroughOrbotPreference.setIcon(R.drawable.orbot_disabled);
         }
 
+        // Set the `torSearchPreference` and `torSearchCustomURLPreference` icons.
+        if (proxyThroughOrbotBoolean) {
+            // Set the `torHomepagePreference` and `torSearchPreference` icons.
+            torHomepagePreference.setIcon(R.drawable.home_enabled);
+            torSearchPreference.setIcon(R.drawable.search_enabled);
+
+            // Set the `torSearchCustomURLPreference` icon.
+            if (torSearchCustomURLPreference.isEnabled()) {
+                torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled);
+            } else {
+                torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_disabled);
+            }
+        } else {  // Proxy through Orbot is disabled.
+            torHomepagePreference.setIcon(R.drawable.home_ghosted);
+            torSearchPreference.setIcon(R.drawable.search_ghosted);
+            torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted);
+        }
+
         // Set the `searchCustomURLPreference` icon.
         if (searchCustomURLPreference.isEnabled()) {
             searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled);
@@ -243,6 +266,47 @@ public class SettingsFragment extends PreferenceFragment {
             searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted);
         }
 
+        // Set the full screen browsing mode icons.
+        if (fullScreenBrowsingModeBoolean) {
+            // Set the `fullScreenBrowsingModePreference` icon.
+            fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled);
+
+            if (hideSystemBarsBoolean) {
+                // Set `hideSystemBarsPreference` to use the enabled icon.
+                hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled);
+
+                // Set `translucentNavigationBarPreference` to use the ghosted icon.
+                translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted);
+            } else {  // `hideSystemBarsBoolean` is false.
+                // Set `hideSystemBarsPreference` to use the disabled icon.
+                hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled);
+
+                // Set the correct icon for `translucentNavigationBarPreference`.
+                if (savedPreferences.getBoolean("translucent_navigation_bar", true)) {
+                    translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled);
+                } else {
+                    translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled);
+                }
+            }
+        } else {  // `fullScreenBrwosingModeBoolean` is false.
+            fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled);
+            hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_ghosted);
+            translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted);
+        }
+
+        // Set the `swipeToRefreshPreference` icon.
+        if (savedPreferences.getBoolean("swipe_to_refresh", false)) {
+            swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled);
+        } else {
+            swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled);
+        }
+
+        // Set the `displayAdditionalAppBarIconsPreference` icon.
+        if (savedPreferences.getBoolean("display_additional_app_bar_icons", false)) {
+            displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled);
+        } else {
+            displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled);
+        }
 
         // Listen for preference changes.
         preferencesListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
@@ -401,11 +465,24 @@ public class SettingsFragment extends PreferenceFragment {
                         // Enable the Tor custom URL search option only if `currentProxyThroughOrbot` is true and the search is set to `Custom URL`.
                         torSearchCustomURLPreference.setEnabled(currentProxyThroughOrbot && currentTorSearchString.equals("Custom URL"));
 
-                        // Update the icon.
+                        // Update the icons.
                         if (currentProxyThroughOrbot) {
+                            // Set the `proxyThroughOrbotPreference`, `torHomepagePreference`, and `torSearchPreference` icons.
                             proxyThroughOrbotPreference.setIcon(R.drawable.orbot_enabled);
-                        } else {
+                            torHomepagePreference.setIcon(R.drawable.home_enabled);
+                            torSearchPreference.setIcon(R.drawable.search_enabled);
+
+                            // Set the `torSearchCustomURLPreference` icon.
+                            if (torSearchCustomURLPreference.isEnabled()) {
+                                torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled);
+                            } else {
+                                torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_disabled);
+                            }
+                        } else {  // Proxy through Orbot is disabled.
                             proxyThroughOrbotPreference.setIcon(R.drawable.orbot_disabled);
+                            torHomepagePreference.setIcon(R.drawable.home_ghosted);
+                            torSearchPreference.setIcon(R.drawable.search_ghosted);
+                            torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted);
                         }
                         break;
 
@@ -418,17 +495,22 @@ public class SettingsFragment extends PreferenceFragment {
                         // Get the present search string.
                         String presentTorSearchString = sharedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q=");
 
-                        // Set the summary text for `tor_search`.
+                        // Update the preferences.
                         if (presentTorSearchString.equals("Custom URL")) {
-                            // Use R.string.custom_url, which is translated, instead of the array value, which isn't.
+                            // Use `R.string.custom_url`, which is translated, as the summary instead of the array value, which isn't.
                             torSearchPreference.setSummary(R.string.custom_url);
+
+                            // Update `torSearchCustomURLPreference`.
+                            torSearchCustomURLPreference.setEnabled(true);
+                            torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled);
                         } else {
                             // Set the array value as the summary text.
                             torSearchPreference.setSummary(presentTorSearchString);
-                        }
 
-                        // Set the status of `torJavaScriptDisabledSearchCustomURLPreference`.
-                        torSearchCustomURLPreference.setEnabled(presentTorSearchString.equals("Custom URL"));
+                            // Update `torSearchCustomURLPreference`.
+                            torSearchCustomURLPreference.setEnabled(false);
+                            torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_disabled);
+                        }
                         break;
 
                     case "tor_search_custom_url":
@@ -463,14 +545,70 @@ public class SettingsFragment extends PreferenceFragment {
                         searchCustomURLPreference.setSummary(sharedPreferences.getString("search_custom_url", ""));
                         break;
 
-                    case "enable_full_screen_browsing_mode":
-                        // Enable `transparent_navigation_bar` only if full screen browsing mode is enabled and `hide_system_bars` is disabled.
-                        translucentNavigationBarPreference.setEnabled(sharedPreferences.getBoolean("enable_full_screen_browsing_mode", false) && !sharedPreferences.getBoolean("hide_system_bars", false));
+                    case "full_screen_browsing_mode":
+                        if (sharedPreferences.getBoolean("full_screen_browsing_mode", false)) {
+                            // Set `fullScreenBrowsingModePreference` to use the enabled icon.
+                            fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled);
+
+                            if (sharedPreferences.getBoolean("hide_system_bars", false)) {
+                                // Set `hideSystemBarsPreference` to use the enabled icon.
+                                hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled);
+
+                                // Update `translucentNavigationBarPreference`.
+                                translucentNavigationBarPreference.setEnabled(false);
+                                translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted);
+                            } else {  // `hide_system_bars` is false.
+                                // Set `hideSystemBarsPreference` to use the disabled icon.
+                                hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled);
+
+                                // Update `translucentNavigationBarPreference`.
+                                translucentNavigationBarPreference.setEnabled(true);
+                                if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) {
+                                    translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled);
+                                } else {
+                                    translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled);
+                                }
+                            }
+                        } else {  // `full_screen_browsing_mode` is false.
+                            // Disable `translucentNavigationBarPreference`.
+                            translucentNavigationBarPreference.setEnabled(false);
+
+                            // Update the icons.
+                            fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled);
+                            hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_ghosted);
+                            translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted);
+                        }
                         break;
 
                     case "hide_system_bars":
-                        // Enable `translucentNavigationBarPreference` if `hide_system_bars` is disabled.
-                        translucentNavigationBarPreference.setEnabled(!sharedPreferences.getBoolean("hide_system_bars", false));
+                        if (sharedPreferences.getBoolean("hide_system_bars", false)) {
+                            // Set `hideSystemBarsPreference` to use the enabled icon.
+                            hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled);
+
+                            // Update `translucentNavigationBarPreference`.
+                            translucentNavigationBarPreference.setEnabled(false);
+                            translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted);
+                        } else {  // `hide_system_bars` is false.
+                            // Set `hideSystemBarsPreference` to use the disabled icon.
+                            hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled);
+
+                            // Update `translucentNavigationBarPreference`.
+                            translucentNavigationBarPreference.setEnabled(true);
+                            if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) {
+                                translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled);
+                            } else {
+                                translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled);
+                            }
+                        }
+                        break;
+
+                    case "translucent_navigation_bar":
+                        // Update the icon.
+                        if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) {
+                            translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled);
+                        } else {
+                            translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled);
+                        }
                         break;
 
                     case "homepage":
@@ -483,6 +621,24 @@ public class SettingsFragment extends PreferenceFragment {
                         defaultFontSizePreference.setSummary(sharedPreferences.getString("default_font_size", "100") + "%%");
                         break;
 
+                    case "swipe_to_refresh":
+                        // Update the icon.
+                        if (sharedPreferences.getBoolean("swipe_to_refresh", false)) {
+                            swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled);
+                        } else {
+                            swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled);
+                        }
+                        break;
+
+                    case "display_additional_app_bar_icons":
+                        // Update the icon.
+                        if (sharedPreferences.getBoolean("display_additional_app_bar_icons", false)) {
+                            displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled);
+                        } else {
+                            displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled);
+                        }
+                        break;
+
                     default:
                         // If no match, do nothing.
                         break;
diff --git a/app/src/main/res/drawable/full_screen_disabled.xml b/app/src/main/res/drawable/full_screen_disabled.xml
new file mode 100644 (file)
index 0000000..d7d02a3
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `full_screen_disabled.xml` comes from the Android Material icon set, where it is called `ic_smartphone`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#88000000"
+        android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19H7V5h10v14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/full_screen_enabled.xml b/app/src/main/res/drawable/full_screen_enabled.xml
new file mode 100644 (file)
index 0000000..533a5eb
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `full_screen_enabled.xml` comes from the Android Material icon set, where it is called `ic_smartphone`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19H7V5h10v14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/hide_system_bars_disabled.xml b/app/src/main/res/drawable/hide_system_bars_disabled.xml
new file mode 100644 (file)
index 0000000..82f5ba1
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `hide_system_bars_disabled.xml` comes from the Android Material icon set, where it is called `ic_fullscreen`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#88000000"
+        android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/hide_system_bars_enabled.xml b/app/src/main/res/drawable/hide_system_bars_enabled.xml
new file mode 100644 (file)
index 0000000..36fb7a6
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `hide_system_bars_enabled.xml` comes from the Android Material icon set, where it is called `ic_fullscreen`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/hide_system_bars_ghosted.xml b/app/src/main/res/drawable/hide_system_bars_ghosted.xml
new file mode 100644 (file)
index 0000000..59a673b
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `hide_system_bars_ghosted.xml` comes from the Android Material icon set, where it is called `ic_fullscreen`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#44000000"
+        android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/home.xml b/app/src/main/res/drawable/home.xml
deleted file mode 100644 (file)
index a87c3b7..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- `home.xml` comes from the Android Material icon set, where it is called `ic_home`.  It is released under the Apache License 2.0. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
-
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/home_enabled.xml b/app/src/main/res/drawable/home_enabled.xml
new file mode 100644 (file)
index 0000000..349e609
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `home_enabled.xml` comes from the Android Material icon set, where it is called `ic_home`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/home_ghosted.xml b/app/src/main/res/drawable/home_ghosted.xml
new file mode 100644 (file)
index 0000000..44c366c
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `home_ghosted.xml` comes from the Android Material icon set, where it is called `ic_home`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#44000000"
+        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/more_disabled.xml b/app/src/main/res/drawable/more_disabled.xml
new file mode 100644 (file)
index 0000000..2484a22
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `more_disabled.xml` comes from the Android Material icon set, where it is called `ic_more`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:width="24dp"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#88000000"
+        android:pathData="M22,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.97,0.89 1.66,0.89L22,21c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM9,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM14,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM19,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/more_enabled.xml b/app/src/main/res/drawable/more_enabled.xml
new file mode 100644 (file)
index 0000000..458c8d2
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `more_enabled.xml` comes from the Android Material icon set, where it is called `ic_more`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:width="24dp"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M22,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.97,0.89 1.66,0.89L22,21c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM9,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM14,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM19,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/refresh_disabled.xml b/app/src/main/res/drawable/refresh_disabled.xml
new file mode 100644 (file)
index 0000000..b0a3e7b
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `refresh_disabled.xml` comes from the Android Material icon set, where it is called `ic_refresh`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#88000000"
+        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+</vector>
diff --git a/app/src/main/res/drawable/refresh_enabled.xml b/app/src/main/res/drawable/refresh_enabled.xml
new file mode 100644 (file)
index 0000000..9d1b023
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `refresh_enabled.xml` comes from the Android Material icon set, where it is called `ic_refresh`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+</vector>
diff --git a/app/src/main/res/drawable/search_custom_url_disabled.xml b/app/src/main/res/drawable/search_custom_url_disabled.xml
new file mode 100644 (file)
index 0000000..ff0969b
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `search_custom_url_ghosted.xml` comes from the Android Material icon set, where it is called `ic_find_in_page`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#88000000"
+        android:pathData="M20,19.59V8l-6,-6H6c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2H18c0.45,0 0.85,-0.15 1.19,-0.4l-4.43,-4.43c-0.8,0.52 -1.74,0.83 -2.76,0.83 -2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5c0,1.02 -0.31,1.96 -0.83,2.75L20,19.59zM9,13c0,1.66 1.34,3 3,3s3,-1.34 3,-3 -1.34,-3 -3,-3 -3,1.34 -3,3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/search_ghosted.xml b/app/src/main/res/drawable/search_ghosted.xml
new file mode 100644 (file)
index 0000000..e078033
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `search_ghosted.xml` comes from the Android Material icon set, where it is called `ic_search`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#44000000"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/translucent_bar_disabled.xml b/app/src/main/res/drawable/translucent_bar_disabled.xml
new file mode 100644 (file)
index 0000000..395dea0
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `translucent_bar_disabled.xml` comes from the Android Material icon set, where it is called `ic_call_to_action`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#88000000"
+        android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19v-3h18v3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/translucent_bar_enabled.xml b/app/src/main/res/drawable/translucent_bar_enabled.xml
new file mode 100644 (file)
index 0000000..d7b10ef
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `translucent_bar_enabled.xml` comes from the Android Material icon set, where it is called `ic_call_to_action`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19v-3h18v3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/translucent_bar_ghosted.xml b/app/src/main/res/drawable/translucent_bar_ghosted.xml
new file mode 100644 (file)
index 0000000..efa1137
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `translucent_bar_ghosted.xml` comes from the Android Material icon set, where it is called `ic_call_to_action`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#44000000"
+        android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19v-3h18v3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/user_agent_enabled.xml b/app/src/main/res/drawable/user_agent_enabled.xml
deleted file mode 100644 (file)
index 35fba81..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `user_agent_enabled.xml` comes from the Android Material icon set, where it is called `ic_devices_other`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:autoMirrored="true"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF1565C0"
-        android:pathData="M3,6h18L21,4L3,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h4v-2L3,18L3,6zM13,12L9,12v1.78c-0.61,0.55 -1,1.33 -1,2.22s0.39,1.67 1,2.22L9,20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22L13,12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1L23,9c0,-0.5 -0.5,-1 -1,-1zM21,18h-4v-8h4v8z"/>
-</vector>
index 8cac40c33e54410a099486189b85719615d422d1..06599268298c435f05ac3ad535484b3eb6e78c16 100644 (file)
@@ -23,7 +23,7 @@
     <item
         android:id="@+id/home"
         android:title="@string/home"
-        android:icon="@drawable/home"
+        android:icon="@drawable/home_enabled"
         android:orderInCategory="10" />
 
     <item
index f948e1daed2ae306e400ac2c829fefa1fa2dd232..3d19033bfe1cb9593b57dbf204ad03ad90e3d0a2 100644 (file)
         <string name="search_custom_url">URL personalizado de búsqueda</string>
         <string name="custom_url">URL personalizado</string>
     <string name="full_screen">Pantalla Completa</string>
-        <string name="enable_full_screen_browsing_mode">Habilitar pantalla completa</string>
-        <string name="enable_full_screen_browsing_mode_summary">Doble toque para alternar a modo de navegación de pantalla completa.</string>
+        <string name="full_screen_browsing_mode">Navegación de pantalla completa</string>
+        <string name="full_screen_browsing_mode_summary">Doble toque para alternar a modo de navegación de pantalla completa.</string>
         <string name="hide_system_bars">Esconder barras del systema</string>
         <string name="hide_system_bars_summary">Esconder las barras de estado y de navegación en el modo de navegación a pantalla completa.  Esto no funciona bien si el teclado es mostrado durante el modo de navegación a pantalla completa.</string>
         <string name="translucent_navigation_bar">Barra de navegación translúcida</string>
index 3d6e76fcbb3552f3eed76d66c642db592b607dd8..2a8110713c1a49873a84d5a170958695c0f396fa 100644 (file)
         <string name="search_custom_url">Ricerca personalizzata</string>
         <string name="custom_url">URL Personalizzata</string>
     <string name="full_screen">Schermo intero</string>
-        <string name="enable_full_screen_browsing_mode">Abilita la navigazione a schermo intero</string>
-        <string name="enable_full_screen_browsing_mode_summary">Toccare due volte per avviare la navigazione a schermo intero.</string>
+        <string name="full_screen_browsing_mode">Navigazione a schermo intero</string>
+        <string name="full_screen_browsing_mode_summary">Toccare due volte per avviare la navigazione a schermo intero.</string>
         <string name="hide_system_bars">Nascondi le barre di sistema</string>
         <string name="hide_system_bars_summary">Nasconde la barra di stato e la barra di navigazione durante la navigazione a schermo intero. Questa opzione non funziona perfettamente se si visualizza la tastiera durante la navigazione a schermo intero.</string>
         <string name="translucent_navigation_bar">Barra di navigazione trasparente</string>
index 02f96f0d4425eb4c35e99b7735e039952037777d..aed97ad520737c4bd0b1e39e4482171451cd0c6a 100644 (file)
         <string name="search_custom_url">Search custom URL</string>
         <string name="custom_url">Custom URL</string>
     <string name="full_screen">Full Screen</string>
-        <string name="enable_full_screen_browsing_mode">Enable full screen browsing mode</string>
-        <string name="enable_full_screen_browsing_mode_summary">Double-tap to toggle full screen browsing mode.</string>
+        <string name="full_screen_browsing_mode">Full screen browsing mode</string>
+        <string name="full_screen_browsing_mode_summary">Double-tap to toggle full screen browsing mode.</string>
         <string name="hide_system_bars">Hide system bars</string>
         <string name="hide_system_bars_summary">Hide the status and navigation bars in full screen browsing mode. This doesn\'t work well if the keyboard is displayed during full screen browsing mode.</string>
         <string name="translucent_navigation_bar">Translucent navigation bar</string>
index 3552849b8af0be3ad1c8ca6ee4342b00f0083e7d..dfff1a27641aaa217df5aea052e613bd34cae8d5 100644 (file)
         <string name="search_custom_url">Search custom URL</string>
         <string name="custom_url">Custom URL</string>
     <string name="full_screen">Full Screen</string>
-        <string name="enable_full_screen_browsing_mode">Enable full screen browsing mode</string>
-        <string name="enable_full_screen_browsing_mode_summary">Double-tap to toggle full screen browsing mode.</string>
+        <string name="full_screen_browsing_mode">Full screen browsing mode</string>
+        <string name="full_screen_browsing_mode_summary">Double-tap to toggle full screen browsing mode.</string>
         <string name="hide_system_bars">Hide system bars</string>
-        <string name="hide_system_bars_summary">Hide the status and navigation bars in full screen browsing mode. This doesn\'t work well if the keyboard is displayed during full screen browsing mode.</string>
+        <string name="hide_system_bars_summary">Hide the status and navigation bars in full screen browsing mode. This doesnt work well if the keyboard is displayed during full screen browsing mode.</string>
         <string name="translucent_navigation_bar">Translucent navigation bar</string>
         <string name="translucent_navigation_bar_summary">Make the navigation bar translucent in full screen browsing mode.</string>
     <string name="general">General</string>
             <item>200</item>
         </string-array>
         <string name="swipe_to_refresh_enabled">Swipe to refresh</string>
-        <string name="swipe_to_refresh_enabled_summary">Some websites don\'t work well if swipe to refresh is enabled.</string>
+        <string name="swipe_to_refresh_enabled_summary">Some websites dont work well if swipe to refresh is enabled.</string>
         <string name="display_additional_app_bar_icons">Display additional app bar icons</string>
         <string name="display_additional_app_bar_icons_summary">Display icons for toggling cookies, DOM storage, and form data in the app bar if there is room.</string>
 
index 2263b0c4780551667884785b01ace6e9d02fdbf0..194aa4d3dd3307b9fdd8f3925eedb489e3cdd7cf 100644 (file)
         android:title="@string/full_screen">
 
         <SwitchPreference
-            android:key="enable_full_screen_browsing_mode"
-            android:title="@string/enable_full_screen_browsing_mode"
-            android:summary="@string/enable_full_screen_browsing_mode_summary"
+            android:key="full_screen_browsing_mode"
+            android:title="@string/full_screen_browsing_mode"
+            android:summary="@string/full_screen_browsing_mode_summary"
             android:defaultValue="false" />
 
         <SwitchPreference
             android:key="homepage"
             android:title="@string/homepage"
             android:defaultValue="https://duckduckgo.com"
-            android:inputType="textUri" />
+            android:inputType="textUri"
+            android:icon="@drawable/home_enabled" />
 
         <ListPreference
             android:key="default_font_size"