From d2f0a34b98d72d5816ee71cd80a863b515a4844c Mon Sep 17 00:00:00 2001
From: frankpreel <frank.preel@espridigital.fr>
Date: Tue, 22 Apr 2025 21:33:19 +0200
Subject: [PATCH 1/4] Fix validation failed

---
 res/raw/lineage_wizard_script.xml | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/res/raw/lineage_wizard_script.xml b/res/raw/lineage_wizard_script.xml
index becca1db..23260f35 100644
--- a/res/raw/lineage_wizard_script.xml
+++ b/res/raw/lineage_wizard_script.xml
@@ -28,8 +28,11 @@
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end" id="welcome">
         <result wizard:action="locale" />
     </WizardAction>
-
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCALE;end" id="locale">
+        <result wizard:action="datetime" />
+    </WizardAction>
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_DATETIME;end" id="datetime">
         <result wizard:action="sim_missing" />
     </WizardAction>
 
@@ -38,10 +41,6 @@
     </WizardAction>
 
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_NETWORK_SETUP;end" id="network_setup">
-        <result wizard:action="datetime" />
-    </WizardAction>
-
-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_DATETIME;end" id="datetime">
         <result wizard:action="e_parental_control_settings" />
     </WizardAction>
 
@@ -78,25 +77,21 @@
     </WizardAction>
 
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end" id="lockscreen_settings">
-        <result wizard:action="e_account_manager_settings" />
+        <result wizard:action="e_find_my_device_settings" />
     </WizardAction>
-
+	
     <WizardAction
         wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.E_FIND_MY_DEVICE_SETTINGS;end"
         id="e_find_my_device_settings">
-        <result wizard:action="theme_settings" />
+        <result wizard:action="e_account_manager_settings" />
     </WizardAction>
-	
+
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.E_ACCOUNT_MANAGER_SETTINGS;end" id="e_account_manager_settings">
         <result wizard:action="finish" />
     </WizardAction>
 
 <!--
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end" id="restore">
-        <result wizard:action="navigation_settings" />
-    </WizardAction>
-
-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.NAVIGATION_SETTINGS;end" id="navigation_settings">
         <result wizard:action="finish" />
     </WizardAction>
 -->
-- 
GitLab


From b663be4f6f278d457dc5a13b8f33c64dd115e38e Mon Sep 17 00:00:00 2001
From: frankpreel <frank.preel@espridigital.fr>
Date: Wed, 23 Apr 2025 21:08:39 +0200
Subject: [PATCH 2/4] Reorder tiles

---
 res/raw/lineage_wizard_script.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/raw/lineage_wizard_script.xml b/res/raw/lineage_wizard_script.xml
index 23260f35..208b6c8b 100644
--- a/res/raw/lineage_wizard_script.xml
+++ b/res/raw/lineage_wizard_script.xml
@@ -69,6 +69,12 @@
 -->
 
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.NAVIGATION_SETTINGS;end" id="navigation_settings">
+        <result wizard:action="e_find_my_device_settings" />
+    </WizardAction>
+
+    <WizardAction
+        wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.E_FIND_MY_DEVICE_SETTINGS;end"
+        id="e_find_my_device_settings">
         <result wizard:action="biometric_settings" />
     </WizardAction>
 
@@ -77,12 +83,6 @@
     </WizardAction>
 
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end" id="lockscreen_settings">
-        <result wizard:action="e_find_my_device_settings" />
-    </WizardAction>
-	
-    <WizardAction
-        wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.E_FIND_MY_DEVICE_SETTINGS;end"
-        id="e_find_my_device_settings">
         <result wizard:action="e_account_manager_settings" />
     </WizardAction>
 
-- 
GitLab


From 35995bc8e54e9b459934b60161b7ba253ae57e83 Mon Sep 17 00:00:00 2001
From: frankpreel <frank.preel@espridigital.fr>
Date: Thu, 24 Apr 2025 10:41:05 +0200
Subject: [PATCH 3/4] Add debug

---
 src/org/lineageos/setupwizard/FindMyDeviceActivity.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/org/lineageos/setupwizard/FindMyDeviceActivity.java b/src/org/lineageos/setupwizard/FindMyDeviceActivity.java
index 8317c3a6..6f257005 100644
--- a/src/org/lineageos/setupwizard/FindMyDeviceActivity.java
+++ b/src/org/lineageos/setupwizard/FindMyDeviceActivity.java
@@ -37,7 +37,7 @@ public class FindMyDeviceActivity extends SubBaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
+        Log.v(TAG, "onCreate called");
         if (!SetupWizardUtils.hasTelephony(this)) {
             Log.v(TAG, "Has no telephony support");
             hasTelephonySupport = false;
@@ -51,8 +51,9 @@ public class FindMyDeviceActivity extends SubBaseActivity {
     @Override
     public void onRestart() {
         super.onRestart();
-        
+        Log.v(TAG, "onRestart");
         if (!hasTelephonySupport) {
+            Log.v(TAG, "Has no telephony support (2)");
             onNavigateNext();
             return;
         }
-- 
GitLab


From c21c9263bda83eab5141ace6a92cfb86f50af0e7 Mon Sep 17 00:00:00 2001
From: frankpreel <frank.preel@espridigital.fr>
Date: Thu, 24 Apr 2025 13:46:35 +0200
Subject: [PATCH 4/4] Fix validation failed

---
 res/raw/lineage_wizard_script.xml                   | 13 +++++++++----
 .../lineageos/setupwizard/FindMyDeviceActivity.java |  3 ---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/res/raw/lineage_wizard_script.xml b/res/raw/lineage_wizard_script.xml
index 208b6c8b..2f37668f 100644
--- a/res/raw/lineage_wizard_script.xml
+++ b/res/raw/lineage_wizard_script.xml
@@ -28,11 +28,8 @@
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end" id="welcome">
         <result wizard:action="locale" />
     </WizardAction>
-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCALE;end" id="locale">
-        <result wizard:action="datetime" />
-    </WizardAction>
 
-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_DATETIME;end" id="datetime">
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCALE;end" id="locale">
         <result wizard:action="sim_missing" />
     </WizardAction>
 
@@ -41,6 +38,10 @@
     </WizardAction>
 
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_NETWORK_SETUP;end" id="network_setup">
+        <result wizard:action="datetime" />
+    </WizardAction>
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_DATETIME;end" id="datetime">
         <result wizard:action="e_parental_control_settings" />
     </WizardAction>
 
@@ -92,6 +93,10 @@
 
 <!--
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end" id="restore">
+        <result wizard:action="navigation_settings" />
+    </WizardAction>
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.NAVIGATION_SETTINGS;end" id="navigation_settings">
         <result wizard:action="finish" />
     </WizardAction>
 -->
diff --git a/src/org/lineageos/setupwizard/FindMyDeviceActivity.java b/src/org/lineageos/setupwizard/FindMyDeviceActivity.java
index 6f257005..bb9a3680 100644
--- a/src/org/lineageos/setupwizard/FindMyDeviceActivity.java
+++ b/src/org/lineageos/setupwizard/FindMyDeviceActivity.java
@@ -37,7 +37,6 @@ public class FindMyDeviceActivity extends SubBaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Log.v(TAG, "onCreate called");
         if (!SetupWizardUtils.hasTelephony(this)) {
             Log.v(TAG, "Has no telephony support");
             hasTelephonySupport = false;
@@ -51,9 +50,7 @@ public class FindMyDeviceActivity extends SubBaseActivity {
     @Override
     public void onRestart() {
         super.onRestart();
-        Log.v(TAG, "onRestart");
         if (!hasTelephonySupport) {
-            Log.v(TAG, "Has no telephony support (2)");
             onNavigateNext();
             return;
         }
-- 
GitLab