diff options
| author | lalottacontinua <loddatio@posteo.de> | 2018-07-21 03:01:44 -0700 |
|---|---|---|
| committer | lalottacontinua <loddatio@posteo.de> | 2018-07-21 03:01:44 -0700 |
| commit | 7434a53d0c2545375ff9844a510c9fc8b09948f0 (patch) | |
| tree | bdf7b4a2ee6043c3c63cce265fa7c52e5eb92273 /app/src/main/res/values | |
| parent | ce6f1c9c9b402bc2e92462353bb56cadfb9b2f35 (diff) | |
| parent | 9b50dcae236f9f93d24f7991df4d7acf64219b73 (diff) | |
Merge branch '#8886_add_provider' into 'master'
#8886 add provider
See merge request leap/bitmask_android!79
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/dimens.xml | 8 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index f160487b..10c32471 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -6,6 +6,7 @@ <resources> <dimen name="paddingItemsSidebarLog">20dp</dimen> <dimen name="stdpadding">8dp</dimen> + <dimen name="compact_padding">3dp</dimen> <dimen name="standard_margin">8dp</dimen> <dimen name="mainbutton_padding">20dp</dimen> <bool name="logSildersAlwaysVisible">false</bool> @@ -32,5 +33,10 @@ <dimen name="loading_screen_icon_vertical_margin">16dp</dimen> <dimen name="bitmask_logo">56dp</dimen> - <dimen name="bitmask_logo_tablet">72dp</dimen> + <dimen name="bitmask_logo_compact">42dp</dimen> + + <dimen name="constraint_top_std">0.15</dimen> + <dimen name="constraint_bottom_std">0.85</dimen> + <dimen name="constraint_top_compact">0.1</dimen> + <dimen name="constraint_bottom_compact">0.9</dimen> </resources>
\ 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 3aa00124..968ac2e0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -113,6 +113,7 @@ <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> + <string name="title_activity_provider_add">ProviderAddActivity</string> <string name="donate_title">Donate</string> <string name="donate_default_message">Please donate today if you value secure communication that is easy for both the end-user and the service provider.</string> <string name="donate_message">LEAP depends on donations and grants. Please donate today if you value secure communication that is easy for both the end-user and the service provider.</string> |