From: Soren Stoutner Date: Tue, 23 May 2017 23:28:15 +0000 (-0700) Subject: Move `Refresh` to the bottom of the main options menu. https://redmine.stoutner... X-Git-Tag: v2.3~4 X-Git-Url: https://gitweb.stoutner.com/?a=commitdiff_plain;h=038527fc881cb548e212d3904c878cceaaf050ab;p=PrivacyBrowserAndroid.git Move `Refresh` to the bottom of the main options menu. https://redmine.stoutner.com/issues/89. --- diff --git a/app/src/main/assets/de/about_licenses.html b/app/src/main/assets/de/about_licenses.html index ddd730db..6b479aea 100644 --- a/app/src/main/assets/de/about_licenses.html +++ b/app/src/main/assets/de/about_licenses.html @@ -48,7 +48,8 @@

Privacy Browser ist copyright © 2015-2017 von Soren Stoutner.

Lizenz

-

Privacy Browser ist veröffentlicht unter der GPLv3+ Lizenz. The full text of the license is below.

+

Privacy Browser ist veröffentlicht unter der GPLv3+ Lizenz. The full text of the license is below. + The source code is available from git.stoutner.com.

Attribute

The list of ad servers used by the ad blocker comes from pgl.yoyo.org. @@ -77,7 +78,7 @@

ic_close.

ic_create_new_folder.

ic_devices_other.

-

ic_download.

+

ic_delete.

ic_dns.

ic_edit.

ic_exit_to_app.

diff --git a/app/src/main/assets/en/about_licenses.html b/app/src/main/assets/en/about_licenses.html index c433ce37..4e9f8f66 100644 --- a/app/src/main/assets/en/about_licenses.html +++ b/app/src/main/assets/en/about_licenses.html @@ -43,7 +43,8 @@

Privacy Browser copyright © 2015-2017 Soren Stoutner.

License

-

Privacy Browser is released under the GPLv3+ license. The full text of the license is below.

+

Privacy Browser is released under the GPLv3+ license. The full text of the license is below. + The source code is available from git.stoutner.com.

Attributions

The list of ad servers used by the ad blocker comes from pgl.yoyo.org. @@ -71,7 +72,7 @@

ic_close.

ic_create_new_folder.

ic_devices_other.

-

ic_download.

+

ic_delete.

ic_dns.

ic_edit.

ic_exit_to_app.

diff --git a/app/src/main/assets/es/about_licenses.html b/app/src/main/assets/es/about_licenses.html index 15727c8d..b34a68f3 100644 --- a/app/src/main/assets/es/about_licenses.html +++ b/app/src/main/assets/es/about_licenses.html @@ -45,7 +45,8 @@

Navegador Privado tiene derechos de autor © 2015-2017 por Soren Stoutner.

Licencia

-

Navegador Privado está liberado bajo la licencia GPLv3+. El texto completo de la licencia se encuentra en la parte inferior de este documento (se deja en el idioma original).

+

Navegador Privado está liberado bajo la licencia GPLv3+. El texto completo de la licencia se encuentra en la parte inferior de este documento (se deja en el idioma original). + The source code is available from git.stoutner.com.

Atribuciones

La lista de servidores publicitarios usados por el bloqueador de anuncios procede de pgl.yoyo.org. @@ -75,7 +76,7 @@

ic_close.

ic_create_new_folder.

ic_devices_other.

-

ic_download.

+

ic_delete.

ic_dns.

ic_edit.

ic_exit_to_app.

diff --git a/app/src/main/assets/it/about_licenses.html b/app/src/main/assets/it/about_licenses.html index e960817c..eeae2d53 100644 --- a/app/src/main/assets/it/about_licenses.html +++ b/app/src/main/assets/it/about_licenses.html @@ -49,7 +49,8 @@ che usa la GNU GPL. Soltanto la versione originale in inglese della GNU GPL fa ciò. Lo scopo di questa traduzione è unicamente quello di aiutare gli utenti di lingua italiana a comprendere la GNU GPL, e pertanto in caso di eventuali discrepanze tra traduzione e versione originale in inglese, prevarrà e sarà unicamente la versione originale ad avere valore legale. - E' inoltre ammessa la modifica e la pubblicazione di questa traduzione, ma solamente in accordo ai termini qui riportati.

+ E' inoltre ammessa la modifica e la pubblicazione di questa traduzione, ma solamente in accordo ai termini qui riportati. + The source code is available from git.stoutner.com.

Attribuzioni

La lista dei server utilizzata dalla funzionalità di blocco degli annunci è tratta da pgl.yoyo.org. @@ -77,7 +78,7 @@

ic_close.

ic_create_new_folder.

ic_devices_other.

-

ic_download.

+

ic_delete.

ic_dns.

ic_edit.

ic_exit_to_app.

diff --git a/app/src/main/assets/zh-rTW/about_licenses.html b/app/src/main/assets/zh-rTW/about_licenses.html index c206459d..0af91d73 100644 --- a/app/src/main/assets/zh-rTW/about_licenses.html +++ b/app/src/main/assets/zh-rTW/about_licenses.html @@ -43,7 +43,8 @@

Privacy Browser copyright © 2015-2017 Soren Stoutner.

License

-

Privacy Browser is released under the GPLv3+ license. The full text of the license is below.

+

Privacy Browser is released under the GPLv3+ license. The full text of the license is below. + The source code is available from git.stoutner.com.

Attributions

The list of ad servers used by the ad blocker comes from pgl.yoyo.org. @@ -71,7 +72,7 @@

ic_close.

ic_create_new_folder.

ic_devices_other.

-

ic_download.

+

ic_delete.

ic_dns.

ic_edit.

ic_exit_to_app.

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 05625983..01978f46 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java @@ -1277,10 +1277,6 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation }, 200); return true; - case R.id.refresh: - mainWebView.reload(); - return true; - case R.id.print: // Get a `PrintManager` instance. PrintManager printManager = (PrintManager) getSystemService(Context.PRINT_SERVICE); @@ -1300,6 +1296,10 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation //Everything else will be handled by `CreateHomeScreenShortcutDialog` and the associated listener below. return true; + case R.id.refresh: + mainWebView.reload(); + return true; + default: // Don't consume the event. return super.onOptionsItemSelected(menuItem); diff --git a/app/src/main/res/menu/webview_options_menu.xml b/app/src/main/res/menu/webview_options_menu.xml index c1fc680a..d2d57432 100644 --- a/app/src/main/res/menu/webview_options_menu.xml +++ b/app/src/main/res/menu/webview_options_menu.xml @@ -146,22 +146,22 @@ android:title="@string/find_on_page" android:orderInCategory="110" app:showAsAction="never|collapseActionView" /> - +