From: Soren Stoutner Date: Thu, 6 Jul 2017 00:05:38 +0000 (-0700) Subject: Update the Clear and Exit icon. Implements https://redmine.stoutner.com/issues/146. X-Git-Tag: v2.5~19 X-Git-Url: https://gitweb.stoutner.com/?a=commitdiff_plain;h=a6a0e78b9442a402a40430cbd489c9dd60a389fe;p=PrivacyBrowserAndroid.git Update the Clear and Exit icon. Implements https://redmine.stoutner.com/issues/146. --- diff --git a/app/src/main/assets/de/about_licenses.html b/app/src/main/assets/de/about_licenses.html index 3a742ca2..32692288 100644 --- a/app/src/main/assets/de/about_licenses.html +++ b/app/src/main/assets/de/about_licenses.html @@ -60,6 +60,9 @@ are derived from ic_security and ic_language, which are part of the Android Material icon set and are released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2016 Soren Stoutner. The resulting images are released under the GPLv3+ license.

+

+ is derived from ic_exit_to_app, which is part of the Android Material icon set and is released under the Apache License 2.0. + The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.

orbot is a modified version of the status icon from the Orbot project, 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 Soren Stoutner. The resulting image is released under the GPLv3+ license.

@@ -83,7 +86,6 @@

ic_dns.

ic_donut_small.

ic_edit.

-

ic_exit_to_app.

ic_expand_less.

ic_expand_more.

ic_file_download.

diff --git a/app/src/main/assets/en/about_licenses.html b/app/src/main/assets/en/about_licenses.html index 4d742f15..18a7edb0 100644 --- a/app/src/main/assets/en/about_licenses.html +++ b/app/src/main/assets/en/about_licenses.html @@ -55,6 +55,9 @@ are derived from ic_security and ic_language, which are part of the Android Material icon set and are released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2016 Soren Stoutner. The resulting images are released under the GPLv3+ license.

+

+ is derived from ic_exit_to_app, which is part of the Android Material icon set and is released under the Apache License 2.0. + The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.

orbot is a modified version of the status icon from the Orbot project, 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 Soren Stoutner. The resulting image is released under the GPLv3+ license.

@@ -77,7 +80,6 @@

ic_dns.

ic_donut_small.

ic_edit.

-

ic_exit_to_app.

ic_expand_less.

ic_expand_more.

ic_file_download.

diff --git a/app/src/main/assets/en/images/clear_and_exit.png b/app/src/main/assets/en/images/clear_and_exit.png new file mode 100644 index 00000000..b9fdd999 Binary files /dev/null and b/app/src/main/assets/en/images/clear_and_exit.png differ diff --git a/app/src/main/assets/en/images/ic_exit_to_app.png b/app/src/main/assets/en/images/ic_exit_to_app.png deleted file mode 100644 index fae891f4..00000000 Binary files a/app/src/main/assets/en/images/ic_exit_to_app.png and /dev/null differ diff --git a/app/src/main/assets/es/about_licenses.html b/app/src/main/assets/es/about_licenses.html index 47836aa3..9460f564 100644 --- a/app/src/main/assets/es/about_licenses.html +++ b/app/src/main/assets/es/about_licenses.html @@ -58,13 +58,17 @@ derivan de ic_security y de ic_language, que son parte del conjunto de iconos Android Material y son liberados bajo la Licencia Apache 2.0. El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2016 Soren Stoutner. Las imágenes resultantes se liberan bajo la licencia GPLv3+.

+

+ deriva de ic_exit_to_app, que es parte del conjunto de iconos Android Material y es liberado bajo la Licencia Apache 2.0. + El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 Soren Stoutner. El imagen resultante se libera bajo la + licencia GPLv3+.

orbot es una versión modificada del icono de estado del proyecto Orbot, que tiene copyright 2009-2010 por Nathan Freitas, The Guardian Project. Es liberado bajo la licencia BSD modificada (de 3 cláusulas). El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 Soren Stoutner. La imagen resultante se libera bajo la licencia GPLv3+.

cookie fue creado por Google. Es liberado bajo la licencia Apache 2.0 y puede ser descargado desde Material Design Icons. Está sin cambios, excepto por la información de diseño como el color y el tamaño.

-

Los siguientes iconos proceden de Android Material icon set, el cual es liberado bajo la licencia Apache 2.0. +

Los siguientes iconos proceden de conjunto de iconos Android Material, el cual es liberado bajo la licencia Apache 2.0. 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.

ic_add.

ic_arrow_back.

@@ -81,7 +85,6 @@

ic_dns.

ic_donut_small.

ic_edit.

-

ic_exit_to_app.

ic_expand_less.

ic_expand_more.

ic_file_download.

diff --git a/app/src/main/assets/it/about_licenses.html b/app/src/main/assets/it/about_licenses.html index 44374ba5..899cd65e 100644 --- a/app/src/main/assets/it/about_licenses.html +++ b/app/src/main/assets/it/about_licenses.html @@ -62,6 +62,9 @@ sono state derivate da ic_security e ic_language, che fanno parte dell'Android Material icon set e sono state rilasciate sotto Licenza Apache 2.0. Il testo completo della Licenza è riportato di seguito. Copyright delle modifiche © 2016 Soren Stoutner. Le immagini risultanti sono rilasciate sotto Licenza GPLv3+.

+

+ is derived from ic_exit_to_app, which is part of the Android Material icon set and is released under the Apache License 2.0. + The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.

orbot è una versione modificata della icona di stato del progetto Orbot, il cui copyright è 2009-2010 Nathan Freitas, The Guardian Project. E' rilasciata sotto 3-clause BSD license. Il testo completo della Licenza è riportato di seguito. Copyright delle modifiche © 2017Soren Stoutner. L'immagine risultante è rilasciata sotto Licenza GPLv3+.

@@ -84,7 +87,6 @@

ic_dns.

ic_donut_small.

ic_edit.

-

ic_exit_to_app.

ic_expand_less.

ic_expand_more.

ic_file_download.

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java index f826f6d1..36650cd7 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java @@ -362,9 +362,6 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation } else { // The user has stopped editing `urlTextBox`. // Reapply the highlighting. highlightUrlText(); - - // Scroll to the beginning of the text. - urlTextBox.setScrollX(0); } } }); diff --git a/app/src/main/res/drawable/clear_and_exit.xml b/app/src/main/res/drawable/clear_and_exit.xml new file mode 100644 index 00000000..24a6a545 --- /dev/null +++ b/app/src/main/res/drawable/clear_and_exit.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/exit.xml b/app/src/main/res/drawable/exit.xml deleted file mode 100644 index 49b5841c..00000000 --- a/app/src/main/res/drawable/exit.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/menu/webview_navigation_menu.xml b/app/src/main/res/menu/webview_navigation_menu.xml index 59d086dd..16bdf8f6 100644 --- a/app/src/main/res/menu/webview_navigation_menu.xml +++ b/app/src/main/res/menu/webview_navigation_menu.xml @@ -98,7 +98,7 @@ \ No newline at end of file