diff options
| author | cyBerta <cyberta@riseup.net> | 2018-03-02 23:09:08 +0100 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-03-02 23:09:08 +0100 |
| commit | b14e4b9a7940adb4580c0f3c7a0edcb339c73ae8 (patch) | |
| tree | b364d18a5934736c24a1667b4728fa1032b8d327 /app/src/main/res | |
| parent | 30244cbf5b7eaf6152bcdc2cb5b6848f6e10798d (diff) | |
#8808 adds an optional dialog that shows instruction hints for always-on vpn
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/drawable-hdpi/ic_settings.png | bin | 0 -> 826 bytes | |||
| -rw-r--r-- | app/src/main/res/drawable-ldpi/ic_settings.png | bin | 0 -> 534 bytes | |||
| -rw-r--r-- | app/src/main/res/drawable-mdpi/ic_settings.png | bin | 0 -> 657 bytes | |||
| -rw-r--r-- | app/src/main/res/drawable-xhdpi/ic_settings.png | bin | 0 -> 1009 bytes | |||
| -rw-r--r-- | app/src/main/res/layout/checkbox_confirm_dialog.xml | 9 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
6 files changed, 5 insertions, 6 deletions
diff --git a/app/src/main/res/drawable-hdpi/ic_settings.png b/app/src/main/res/drawable-hdpi/ic_settings.png Binary files differnew file mode 100644 index 00000000..d3322976 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/ic_settings.png diff --git a/app/src/main/res/drawable-ldpi/ic_settings.png b/app/src/main/res/drawable-ldpi/ic_settings.png Binary files differnew file mode 100644 index 00000000..2fe03464 --- /dev/null +++ b/app/src/main/res/drawable-ldpi/ic_settings.png diff --git a/app/src/main/res/drawable-mdpi/ic_settings.png b/app/src/main/res/drawable-mdpi/ic_settings.png Binary files differnew file mode 100644 index 00000000..b5988be9 --- /dev/null +++ b/app/src/main/res/drawable-mdpi/ic_settings.png diff --git a/app/src/main/res/drawable-xhdpi/ic_settings.png b/app/src/main/res/drawable-xhdpi/ic_settings.png Binary files differnew file mode 100644 index 00000000..d5959bd9 --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/ic_settings.png diff --git a/app/src/main/res/layout/checkbox_confirm_dialog.xml b/app/src/main/res/layout/checkbox_confirm_dialog.xml index d8d4a19e..6dd22417 100644 --- a/app/src/main/res/layout/checkbox_confirm_dialog.xml +++ b/app/src/main/res/layout/checkbox_confirm_dialog.xml @@ -2,16 +2,15 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" - xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical"> - <TextView + <se.leap.bitmaskclient.views.IconTextView android:id="@+id/user_message" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/activity_horizontal_margin" - android:layout_margin="4dp" - tools:text="To enable always-on VPN please click on the settings icon [img src=settings/] and turn the switch on. \nFurther information: https://help.bitmask.net/android" + android:layout_margin="@dimen/activity_horizontal_margin" + android:layout_marginBottom="0dp" + android:autoLink="web" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4d19758c..a308b5e7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -112,5 +112,5 @@ <string name="save_battery_message">Background data connections will hibernate when your phone is inactive. This feature is still experimental.</string> <string name="always_on_vpn">Always-on VPN</string> <string name="do_not_show_again">Do not show again.</string> - <string name="always_on_vpn_user_message">To enable always-on VPN in Android VPN Settings click on the configure icon and turn the switch on."</string> + <string name="always_on_vpn_user_message">To enable always-on VPN in Android VPN Settings click on the configure icon [img src] and turn the switch on."</string> </resources> |
