Initial unified commit for Android 14, with "light" GSI target
This commit is contained in:
@@ -0,0 +1,163 @@
|
||||
From 7f78c8c7ea3b7aad4c234338263ed88eef8485e7 Mon Sep 17 00:00:00 2001
|
||||
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
|
||||
Date: Thu, 23 Nov 2023 23:21:58 +0800
|
||||
Subject: [PATCH] SetupWizard: Least Action(s) Principle
|
||||
|
||||
Change-Id: I892634b8ffc7beafa5a223de0afdc64276efd2f5
|
||||
---
|
||||
res/raw/lineage_wizard_script.xml | 43 +------------------
|
||||
.../lineage_wizard_script_managed_profile.xml | 15 +------
|
||||
res/raw/lineage_wizard_script_user.xml | 27 +-----------
|
||||
3 files changed, 5 insertions(+), 80 deletions(-)
|
||||
|
||||
diff --git a/res/raw/lineage_wizard_script.xml b/res/raw/lineage_wizard_script.xml
|
||||
index 616f6ed..e7c9b7f 100644
|
||||
--- a/res/raw/lineage_wizard_script.xml
|
||||
+++ b/res/raw/lineage_wizard_script.xml
|
||||
@@ -18,21 +18,13 @@
|
||||
-->
|
||||
|
||||
<WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
|
||||
- wizard:firstAction="bluetooth_setup">
|
||||
-
|
||||
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BLUETOOTH_SETUP;end" id="bluetooth_setup">
|
||||
- <result wizard:action="welcome" />
|
||||
- </WizardAction>
|
||||
+ wizard:firstAction="welcome">
|
||||
|
||||
<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="sim_missing" />
|
||||
- </WizardAction>
|
||||
-
|
||||
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SIM_MISSING;end" id="sim_missing">
|
||||
<result wizard:action="network_setup" />
|
||||
</WizardAction>
|
||||
|
||||
@@ -41,44 +33,13 @@
|
||||
</WizardAction>
|
||||
|
||||
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_DATETIME;end" id="datetime">
|
||||
- <result wizard:action="location_settings" />
|
||||
- </WizardAction>
|
||||
-
|
||||
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end" id="location_settings">
|
||||
- <result wizard:action="device_specific" />
|
||||
- </WizardAction>
|
||||
-
|
||||
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.DEVICE_SPECIFIC;end" id="device_specific">
|
||||
- <result wizard:action="recovery_update" />
|
||||
- </WizardAction>
|
||||
-
|
||||
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RECOVERY_UPDATE;end" id="recovery_update">
|
||||
- <result wizard:action="lineage_settings" />
|
||||
- </WizardAction>
|
||||
-
|
||||
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end" id="lineage_settings">
|
||||
- <result wizard:action="lockscreen_settings" />
|
||||
- </WizardAction>
|
||||
-
|
||||
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end" id="lockscreen_settings">
|
||||
- <result wizard:action="biometric_settings" />
|
||||
- </WizardAction>
|
||||
-
|
||||
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS;end" id="biometric_settings">
|
||||
- <result wizard:action="restore" />
|
||||
- </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>
|
||||
|
||||
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">
|
||||
<result wizard:action="exit" />
|
||||
</WizardAction>
|
||||
+
|
||||
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.EXIT;end" id="exit" />
|
||||
|
||||
</WizardScript>
|
||||
diff --git a/res/raw/lineage_wizard_script_managed_profile.xml b/res/raw/lineage_wizard_script_managed_profile.xml
|
||||
index 00a66e3..4f8b867 100644
|
||||
--- a/res/raw/lineage_wizard_script_managed_profile.xml
|
||||
+++ b/res/raw/lineage_wizard_script_managed_profile.xml
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
<!--
|
||||
Copyright (C) 2016 The CyanogenMod Project
|
||||
- Copyright (C) 2021 The Calyx Institute
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
@@ -18,19 +17,7 @@
|
||||
-->
|
||||
|
||||
<WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
|
||||
- wizard:firstAction="welcome">
|
||||
-
|
||||
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end" id="welcome">
|
||||
- <result wizard:action="location_settings" />
|
||||
- </WizardAction>
|
||||
-
|
||||
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end" id="location_settings">
|
||||
- <result wizard:action="restore" />
|
||||
- </WizardAction>
|
||||
-
|
||||
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end" id="restore">
|
||||
- <result wizard:action="finish" />
|
||||
- </WizardAction>
|
||||
+ wizard:firstAction="finish">
|
||||
|
||||
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">
|
||||
<result wizard:action="exit" />
|
||||
diff --git a/res/raw/lineage_wizard_script_user.xml b/res/raw/lineage_wizard_script_user.xml
|
||||
index d480901..4f8b867 100644
|
||||
--- a/res/raw/lineage_wizard_script_user.xml
|
||||
+++ b/res/raw/lineage_wizard_script_user.xml
|
||||
@@ -17,35 +17,12 @@
|
||||
-->
|
||||
|
||||
<WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
|
||||
- wizard:firstAction="welcome">
|
||||
-
|
||||
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end" id="welcome">
|
||||
- <result wizard:action="location_settings" />
|
||||
- </WizardAction>
|
||||
-
|
||||
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end" id="location_settings">
|
||||
- <result wizard:action="lockscreen_settings" />
|
||||
- </WizardAction>
|
||||
-
|
||||
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end" id="lockscreen_settings">
|
||||
- <result wizard:action="biometric_settings" />
|
||||
- </WizardAction>
|
||||
-
|
||||
- <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS;end" id="biometric_settings">
|
||||
- <result wizard:action="restore" />
|
||||
- </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>
|
||||
+ wizard:firstAction="finish">
|
||||
|
||||
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">
|
||||
<result wizard:action="exit" />
|
||||
</WizardAction>
|
||||
+
|
||||
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.EXIT;end" id="exit" />
|
||||
|
||||
</WizardScript>
|
||||
--
|
||||
2.34.1
|
||||
|
||||
Reference in New Issue
Block a user