diff options
| author | fupduck <fupduck@riseup.net> | 2018-03-05 05:45:08 -0800 |
|---|---|---|
| committer | fupduck <fupduck@riseup.net> | 2018-03-05 05:45:08 -0800 |
| commit | d2a68f7f72de06b26aa6ab0a139512455ba0fe76 (patch) | |
| tree | b364d18a5934736c24a1667b4728fa1032b8d327 /app/src/main/res | |
| parent | 69d7e4bc6d77e40407a404606b55630c35a4050b (diff) | |
| parent | ac207c23d1a282b3f9cf58eee8ac24380581b77f (diff) | |
Merge branch '#8808_add_hint_to_enable_always-on' into 'master'
#8808 add hint to enable always on
See merge request leap/bitmask_android!62
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 | 24 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 3 |
6 files changed, 27 insertions, 0 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 new file mode 100644 index 00000000..6dd22417 --- /dev/null +++ b/app/src/main/res/layout/checkbox_confirm_dialog.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <se.leap.bitmaskclient.views.IconTextView + android:id="@+id/user_message" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/activity_horizontal_margin" + android:layout_marginBottom="0dp" + android:autoLink="web" + /> + + + <CheckBox + android:id="@+id/do_not_show_again" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/stdpadding" + android:text="@string/do_not_show_again" /> + +</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 71b6d437..a308b5e7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -110,4 +110,7 @@ <string name="vpn_certificate_user_message">The VPN certificate is invalid. Please log in to download a new one.</string> <string name="save_battery">Save battery</string> <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 [img src] and turn the switch on."</string> </resources> |
