Merge branch 'development' into development-stable

# Conflicts: # app/src/main/res/values-it/strings.xml
2022-06-25 02:07:14 +02:00
parent ce9480d188 8201b1d4e4
commit 5856c93fc8
30 changed files with 1205 additions and 246 deletions
--- a/app/src/main/res/layout/activity_manage_trigger_tethering.xml
+++ b/app/src/main/res/layout/activity_manage_trigger_tethering.xml
@ -49,7 +49,7 @@
                        android:text="@string/on" />

                    <RadioButton
-                        android:id="@+id/rTetheringOff"
+                        android:id="@+id/rbTetheringOff"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:text="@string/off" />