diff options
| author | cyberta <cyberta@riseup.net> | 2020-03-08 05:05:01 -0700 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2020-03-08 05:05:01 -0700 |
| commit | 20843f531af829088d736f37cc5c2a6f733244a5 (patch) | |
| tree | c8772adf74a4c44ccaf0a3d95b84df247e433693 /app/src/main/res | |
| parent | c5d5494e0e0d3cb8bb9c97583af3205143f5dea1 (diff) | |
| parent | 432a9885451dafb47e0feafb6070b415d93aac03 (diff) | |
Merge branch 'tethering_improvements' into 'master'
Tethering improvements
See merge request leap/bitmask_android!101
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout-xlarge/v_switch_list_item.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/f_drawer_main.xml | 1 | ||||
| -rw-r--r-- | app/src/main/res/layout/v_switch_list_item.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/app/src/main/res/layout-xlarge/v_switch_list_item.xml b/app/src/main/res/layout-xlarge/v_switch_list_item.xml index c393a0f8..8ad83650 100644 --- a/app/src/main/res/layout-xlarge/v_switch_list_item.xml +++ b/app/src/main/res/layout-xlarge/v_switch_list_item.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" > - <ImageView + <android.support.v7.widget.AppCompatImageView android:id="@+id/material_icon" android:layout_width="?android:attr/listPreferredItemHeight" android:layout_height="?android:attr/listPreferredItemHeight" diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml index 191d547f..7e6291b7 100644 --- a/app/src/main/res/layout/f_drawer_main.xml +++ b/app/src/main/res/layout/f_drawer_main.xml @@ -65,6 +65,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" app:text="@string/save_battery" + app:subtitle="@string/subtitle_save_battery" app:icon="@drawable/ic_battery_36" /> diff --git a/app/src/main/res/layout/v_switch_list_item.xml b/app/src/main/res/layout/v_switch_list_item.xml index a92e78b1..6a2e4a8d 100644 --- a/app/src/main/res/layout/v_switch_list_item.xml +++ b/app/src/main/res/layout/v_switch_list_item.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" > - <ImageView + <android.support.v7.widget.AppCompatImageView android:id="@+id/material_icon" android:layout_width="?android:attr/listPreferredItemHeightSmall" android:layout_height="?android:attr/listPreferredItemHeightSmall" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b5fc2fa2..abab24df 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -102,6 +102,7 @@ <string name="vpn_certificate_is_invalid">VPN certificate is invalid. Try to download a new one.</string> <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="subtitle_save_battery">Disabled while VPN Hotspot on</string> <string name="save_battery_message">Background data connections will hibernate when your phone is inactive.</string> <string name="always_on_vpn">Always-on VPN</string> <string name="subtitle_always_on_vpn">Open Android System Settings</string> @@ -139,4 +140,5 @@ <string name="warning_option_try_pt">Try obfuscated connection</string> <string name="warning_option_try_ovpn">Try standard connection</string> <string name="vpn_error_establish">Android failed to establish the VPN service.</string> + <string name="root_permission_error">%s cannot execute features like VPN Hotspot or IPv6 firewall without root permissions.</string> </resources> |