From 36ee8033ed5938e7307f10e4f5cdc2270e7f3ede Mon Sep 17 00:00:00 2001
From: Josia Pietsch <git@jrpie.de>
Date: Sat, 21 Dec 2024 15:05:24 +0100
Subject: [PATCH] make device admin the preferred method for locking the screen

---
 .../main/res/layout/dialog_select_lock_method.xml  | 14 ++++++++------
 app/src/main/res/values-de/strings.xml             | 10 ++++++----
 app/src/main/res/values-it/strings.xml             | 11 +++++++----
 app/src/main/res/values-pt-rBR/strings.xml         | 11 +++++++----
 app/src/main/res/values-tr/strings.xml             | 11 +++++++----
 app/src/main/res/values/strings.xml                | 10 ++++++----
 6 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/app/src/main/res/layout/dialog_select_lock_method.xml b/app/src/main/res/layout/dialog_select_lock_method.xml
index ead6172..7d25e02 100644
--- a/app/src/main/res/layout/dialog_select_lock_method.xml
+++ b/app/src/main/res/layout/dialog_select_lock_method.xml
@@ -15,18 +15,20 @@
         android:text="@string/screen_lock_method_dialog_text"
         android:textColor="@android:color/black" />
 
-        <Button
-            android:id="@+id/dialog_select_lock_method_button_accessibility"
-            android:text="@string/screen_lock_method_use_accessibility"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
         <Button
             android:id="@+id/dialog_select_lock_method_button_device_admin"
             android:text="@string/screen_lock_method_use_device_admin"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             />
+
+        <Button
+            android:id="@+id/dialog_select_lock_method_button_accessibility"
+            android:text="@string/screen_lock_method_use_accessibility"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+
     </LinearLayout>
 
 </ScrollView>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e0dca2e..36d4057 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -218,16 +218,18 @@
         Es gibt zwei Möglichkeiten, wie µLauncher den Bildschirm sperren kann.
         Leider haben beide Nachteile:<br/><br/>
 
+
+        <h3>Geräteadministrator</h3>
+        Ein Entsperren mittels Fingerabdruck oder Gesichtserkennung ist nicht möglich.
+        <br/>
+        <br/>
+
         <h3>Bedienungshilfe</h3>
         Dies erfordert sehr weitgehende Berechtigungen.
         µLauncher wird diese ausschließlich zum Sperren des Bildschirms verwenden.
         <br/>
         (Irgeneiner gerade heruntergeladenen App sollte man eine solche Behauptung natürlich nicht einfach glauben.
         Du kannst jedoch den <a href=\"https://github.com/jrpie/Launcher\">Source Code</a> selbst prüfen.)
-        <br/>
-        <br/>
-        <h3>Geräteadministrator</h3>
-        Ein Entsperren mittels Fingerabdruck oder Gesichtserkennung ist nicht möglich.
 
 
         <br/><br/><br/><br/>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0904af4..afc92da 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -18,15 +18,18 @@
         Esistono due modi di bloccare lo schermo.
         Sfortunatamente entrambi presentano svantaggi:<br/><br/>
 
+        <h3>Amministratore Dispositivo</h3>
+        Non funziona con impronta e riconoscimento facciale.
+
+        <br/>
+        <br/>
+
         <h3>Servizio Accessibilità</h3>
         Richiede privilegi eccessivi.
         µLauncher userà quei privilegi esclusivamente per bloccare lo schermo.
         <br/>
         (Non ci si dovrebbe mai fidare di un\'applicazione qualsiasi appena scaricata su queste cose, ma puoi verificare il <a href=\"https://github.com/jrpie/Launcher\">codice sorgente</a>.)
-        <br/>
-        <br/>
-        <h3>Amministratore Dispositivo</h3>
-        Non funziona con impronta e riconoscimento facciale.
+
 
         <br/><br/><br/><br/>
         Puoi cambiare le tue scelte in seguito nelle impostazioni.
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index d9dd6cf..55f8238 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -174,15 +174,18 @@
         Há dois métodos para bloquear a tela.
         Infelizmente, ambos têm desvantagens:<br/><br/>
 
+        <h3>Administrador do dispositivo</h3>
+        Não funciona para desbloqueio por impressão digital ou reconhecimento facial.
+
+        <br/>
+        <br/>
+
         <h3>Serviço de acessibilidade</h3>
         Exige permissões elevadas.
         O µLauncher usará essas permissões apenas para bloquear a tela.
         <br/>
         (Você realmente não deveria confiar num app aleatório que você baixou que tá pedindo estas permissões, mas pode verificar o <a href=\"https://github.com/jrpie/Launcher\">código-fonte</a>.)
-        <br/>
-        <br/>
-        <h3>Administrador do dispositivo</h3>
-        Não funciona para desbloqueio por impressão digital ou reconhecimento facial.
+
 
         <br/><br/><br/><br/>
         Você pode alterar sua escolha em configurações à qualquer momento.
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 197f77e..bfd0cfe 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -19,15 +19,18 @@
         Ekranı kitlemenin iki tane metodu vardır.
         Ne yazık ki ikisinin de eksikleri vardır:<br/><br/>
 
+        <h3>Cihaz Yöneticisi</h3>
+        Yüz ve parmak taramasıyla açılan ekran kilidiyle çalışmaz.
+
+        <br/>
+        <br/>
+
         <h3>Erişilebilirlik Servisi</h3>
         Aşırı yetkiler ister.
         µLauncher bu yetkileri sadece ekranı kilitlemek için kullanacaktır.
         <br/>
         (Böyle bir iddiayla indirdiğiniz rastgele bir uygulamaya gerçekten güvenmemelisiniz ama <a href=\"https://github.com/jrpie/Launcher\">kaynak kodunu</a>.) istediğiniz zaman göz atabilirsiniz.
-        <br/>
-        <br/>
-        <h3>Cihaz Yöneticisi</h3>
-        Yüz ve parmak taramasıyla açılan ekran kilidiyle çalışmaz.
+
 
         <br/><br/><br/><br/>
         Seçimlerinizi sonra da değiştirebilirsiniz.
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c7c7a14..e71203a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -270,15 +270,17 @@
         There are two methods to lock the screen.
         Unfortunately both have downsides:<br/><br/>
 
+        <h3>Device Admin</h3>
+        Doesn\'t work with unlocking by fingerprint or face recognition.
+
+        <br/>
+        <br/>
+
         <h3>Accessibility Service</h3>
         Requires excessive privileges.
         µLauncher will use those privileges only for locking the screen.
         <br/>
         (You really should not trust a random app you just downloaded with such a claim, but you can check the <a href=\"https://github.com/jrpie/Launcher\">source code</a>.)
-        <br/>
-        <br/>
-        <h3>Device Admin</h3>
-        Doesn\'t work with unlocking by fingerprint or face recognition.
 
         <br/><br/><br/><br/>
         You can change your selection later in settings.