Enroll fingerprint via SetupWizard [2/2]

Change-Id: Ieabfb0f3b789b02ddd1e17aba1eadfda52b21384
Fix incorrect retrieval of SIM Network Operator.
2015-07-10 22:44:36 -07:00 · 2015-06-29 13:05:36 -07:00 · 2015-06-19 01:04:59 +00:00
301 changed files with 11452 additions and 9220 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+values-v1
--- a/Android.bp
+++ b/Android.bp
@@ -1,42 +0,0 @@
-//
-// SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-android_app {
-    name: "LineageSetupWizard",
-
-    srcs: ["src/**/*.java"],
-
-    certificate: "platform",
-    privileged: true,
-    system_ext_specific: true,
-    platform_apis: true,
-
-    overrides: ["Provision"],
-
-    optimize: {
-        proguard_flags_files: ["proguard.flags"],
-    },
-
-    static_libs: [
-        "androidx.activity_activity",
-        "SettingsLib",
-        "setupcompat",
-        "setupdesign",
-        "SystemUISharedLib",
-        "org.lineageos.platform.internal",
-    ],
-
-    libs: ["telephony-common"],
-
-    required: ["privapp_whitelist_org.lineageos.setupwizard"],
-}
-
-prebuilt_etc {
-    name: "privapp_whitelist_org.lineageos.setupwizard",
-    system_ext_specific: true,
-    src: "privapp_whitelist_org.lineageos.setupwizard.xml",
-    sub_dir: "permissions",
-    filename_from_src: true,
-}
--- a/Android.mk
+++ b/Android.mk
@@ -0,0 +1,28 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_PACKAGE_NAME := CyanogenSetupWizard
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := true
+
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-v4 \
+    android-support-v13 \
+    play \
+    libphonenumber
+
+# Include res dir from chips
+google_play_dir := ../../../external/google/google_play_services/libproject/google-play-services_lib/res
+res_dir := $(google_play_dir) res
+
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir))
+LOCAL_AAPT_FLAGS := --auto-add-overlay
+LOCAL_AAPT_FLAGS += --extra-packages com.google.android.gms
+
+include $(BUILD_PACKAGE)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,13 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2013 The CyanogenMod Project
-     SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
+     Copyright (C) 2013 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.lineageos.setupwizard"
-    android:versionCode="5"
-    android:sharedUserId="android.uid.system">
+          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+          package="com.cyanogenmod.setupwizard"
+          android:versionCode="3"
+          android:sharedUserId="android.uid.system">

    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
    <uses-permission android:name="android.permission.STATUS_BAR" />
@@ -16,293 +27,77 @@
    <uses-permission android:name="android.permission.SET_TIME_ZONE" />
    <uses-permission android:name="android.permission.SET_TIME" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS_PRIVILEGED" />
-    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
    <uses-permission android:name="android.permission.MANAGE_USERS" />
    <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_THEME_MANAGER"/>
    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
-    <uses-permission android:name="lineageos.permission.HARDWARE_ABSTRACTION_ACCESS" />
+    <uses-permission android:name="android.permission.HARDWARE_ABSTRACTION_ACCESS" />
    <uses-permission android:name="android.permission.BACKUP" />
-    <uses-permission android:name="android.permission.NETWORK_SETTINGS" />
-    <uses-permission android:name="lineageos.permission.FINISH_SETUP" />
-    <uses-permission android:name="lineageos.permission.WRITE_SETTINGS" />
-    <uses-permission android:name="lineageos.permission.WRITE_SECURE_SETTINGS" />
+    <uses-permission android:name="org.whispersystems.whisperpush.permissions.REGISTER" />
+    <uses-permission android:name="cyanogenmod.permission.FINISH_SETUP" />
+    <uses-permission android:name="cyanogenmod.permission.LEGALESE" />
+    <uses-permission android:name="com.cyngn.cmstats.SEND_ANALYTICS" />
+    <uses-permission android:name="com.cyanogen.permission.REQUEST_KILL_SWITCH_OP" />

    <permission
-        android:name="lineageos.permission.FINISH_SETUP"
+        android:name="cyanogenmod.permission.PROTECTED_APP"
        android:protectionLevel="signatureOrSystem" />

-    <protected-broadcast
-        android:name="org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE"
-        android:permission="lineageos.permission.FINISH_SETUP" />
+    <permission
+        android:name="cyanogenmod.permission.FINISH_SETUP"
+        android:protectionLevel="signatureOrSystem"
+        androidprv:allowViaWhitelist="true" />

-    <protected-broadcast
-        android:name="org.lineageos.setupwizard.SETUP_FINISHED"
-        android:permission="lineageos.permission.FINISH_SETUP" />
+    <permission android:name="org.whispersystems.whisperpush.permissions.REGISTER"
+                android:protectionLevel="signature" />

-    <application
-        android:label="@string/app_name"
-        android:icon="@mipmap/ic_launcher"
-        android:theme="@style/Theme.Setup"
-        android:uiOptions="none"
-        android:taskAffinity="com.android.wizard"
-        android:name=".SetupWizardApp">
+    <protected-broadcast android:name="com.cyanogenmod.setupwizard.SETUP_FINISHED"
+                         android:permission="cyanogenmod.permission.FINISH_SETUP"/>

-        <activity
-            android:theme="@style/NoDisplay"
-            android:label="@string/activity_label_empty"
-            android:name=".wizardmanager.WizardManager"
-            android:enabled="false"
-            android:exported="false"
-            android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
-            android:immersive="true">
-            <intent-filter>
-                <action android:name="com.android.wizard.LOAD" />
-                <action android:name="com.android.wizard.NEXT" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />

-        <activity
-            android:name=".SetupWizardActivity"
-            android:label="@string/activity_label_empty"
-            android:lockTaskMode="normal"
-            android:launchMode="singleTask"
-            android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
-            android:immersive="true"
-            android:exported="true"
-            android:windowSoftInputMode="stateAlwaysHidden"
-            android:theme="@style/NoDisplay">
+    <application android:label="@string/app_name"
+                 android:icon="@drawable/icon"
+                 android:theme="@style/Theme.Setup"
+                 android:uiOptions="none"
+                 android:name=".SetupWizardApp">
+
+        <meta-data android:name="com.google.android.gms.version"
+                   android:value="@integer/google_play_services_version" />
+
+        <activity android:name=".ui.SetupWizardActivity"
+                  android:label="@string/product_name"
+                  android:launchMode="singleInstance"
+                  android:excludeFromRecents="true"
+                  android:configChanges="themeChange|mcc|mnc"
+                  android:immersive="true"
+                  android:windowSoftInputMode="stateAlwaysHidden">

            <intent-filter android:priority="9">
+
                <action android:name="android.intent.action.MAIN" />
                <action android:name="android.intent.action.DEVICE_INITIALIZATION_WIZARD" />
+
                <category android:name="android.intent.category.HOME" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </activity>

-        <activity
-            android:name=".BluetoothSetupActivity"
-            android:label="@string/activity_label_empty"
-            android:configChanges="mcc|mnc"
-            android:immersive="true"
-            android:exported="false"
-            android:windowSoftInputMode="stateAlwaysHidden">
+        <receiver android:name=".setup.FinishSetupReceiver"
+                  android:exported="true">
            <intent-filter>
-                <action android:name="org.lineageos.setupwizard.LINEAGE_BLUETOOTH_SETUP" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".WelcomeActivity"
-            android:label="@string/activity_label_empty"
-            android:configChanges="mcc|mnc"
-            android:immersive="true"
-            android:exported="false"
-            android:windowSoftInputMode="stateAlwaysHidden">
-            <intent-filter>
-                <action android:name="org.lineageos.setupwizard.LINEAGE_WELCOME" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".LocaleActivity"
-            android:label="@string/activity_label_empty"
-            android:configChanges="mcc|mnc"
-            android:immersive="true"
-            android:exported="false"
-            android:windowSoftInputMode="stateAlwaysHidden">
-            <intent-filter>
-                <action android:name="org.lineageos.setupwizard.LINEAGE_LOCALE" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".DateTimeActivity"
-            android:label="@string/activity_label_empty"
-            android:configChanges="mcc|mnc"
-            android:immersive="true"
-            android:exported="false"
-            android:windowSoftInputMode="stateAlwaysHidden">
-            <intent-filter>
-                <action android:name="org.lineageos.setupwizard.LINEAGE_DATETIME" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".SimMissingActivity"
-            android:label="@string/activity_label_empty"
-            android:configChanges="mcc|mnc"
-            android:immersive="true"
-            android:exported="false"
-            android:windowSoftInputMode="stateAlwaysHidden">
-            <intent-filter>
-                <action android:name="org.lineageos.setupwizard.LINEAGE_SIM_MISSING" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".NetworkSetupActivity"
-            android:label="@string/activity_label_empty"
-            android:configChanges="mcc|mnc"
-            android:immersive="true"
-            android:exported="false"
-            android:windowSoftInputMode="stateAlwaysHidden">
-            <intent-filter>
-                <action android:name="org.lineageos.setupwizard.LINEAGE_NETWORK_SETUP" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".LocationSettingsActivity"
-            android:label="@string/activity_label_empty"
-            android:configChanges="mcc|mnc"
-            android:immersive="true"
-            android:exported="false"
-            android:windowSoftInputMode="stateAlwaysHidden">
-            <intent-filter>
-                <action android:name="org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".UpdateRecoveryActivity"
-            android:label="@string/activity_label_empty"
-            android:configChanges="mcc|mnc"
-            android:immersive="true"
-            android:exported="true"
-            android:windowSoftInputMode="stateAlwaysHidden">
-            <intent-filter>
-                <action android:name="org.lineageos.setupwizard.LINEAGE_RECOVERY_UPDATE" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".DeviceSpecificActivity"
-            android:label="@string/activity_label_empty"
-            android:immersive="true"
-            android:exported="true"
-            android:windowSoftInputMode="stateAlwaysHidden">
-            <intent-filter>
-                <action android:name="org.lineageos.setupwizard.DEVICE_SPECIFIC" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".LineageSettingsActivity"
-            android:label="@string/activity_label_empty"
-            android:configChanges="mcc|mnc"
-            android:immersive="true"
-            android:exported="true"
-            android:windowSoftInputMode="stateAlwaysHidden">
-            <intent-filter>
-                <action android:name="org.lineageos.setupwizard.LINEAGE_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".NavigationSettingsActivity"
-            android:label="@string/activity_label_empty"
-            android:configChanges="mcc|mnc"
-            android:immersive="true"
-            android:exported="true"
-            android:windowSoftInputMode="stateAlwaysHidden">
-            <intent-filter>
-                <action android:name="org.lineageos.setupwizard.NAVIGATION_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".BiometricActivity"
-            android:label="@string/activity_label_empty"
-            android:configChanges="mcc|mnc"
-            android:immersive="true"
-            android:exported="false"
-            android:windowSoftInputMode="stateAlwaysHidden">
-            <intent-filter>
-                <action android:name="org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".ScreenLockActivity"
-            android:label="@string/activity_label_empty"
-            android:configChanges="mcc|mnc"
-            android:immersive="true"
-            android:exported="false"
-            android:windowSoftInputMode="stateAlwaysHidden">
-            <intent-filter>
-                <action android:name="org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".backup.RestoreIntroActivity"
-            android:label="@string/activity_label_empty"
-            android:configChanges="mcc|mnc"
-            android:immersive="true"
-            android:exported="true"
-            android:windowSoftInputMode="stateAlwaysHidden">
-            <intent-filter>
-                <action android:name="org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".ThemeSettingsActivity"
-            android:label="@string/activity_label_empty"
-            android:configChanges="mcc|mnc"
-            android:immersive="true"
-            android:exported="true"
-            android:windowSoftInputMode="stateAlwaysHidden">
-            <intent-filter>
-                <action android:name="org.lineageos.setupwizard.THEME_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".FinishActivity"
-            android:label="@string/activity_label_empty"
-            android:configChanges="mcc|mnc"
-            android:immersive="true"
-            android:exported="true"
-            android:windowSoftInputMode="stateAlwaysHidden">
-            <intent-filter>
-                <action android:name="org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE" />
-                <action android:name="org.lineageos.setupwizard.SETUP_FINISHED" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <receiver
-            android:name=".PartnerReceiver"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="com.android.setupwizard.action.PARTNER_CUSTOMIZATION" />
-                <action android:name="com.google.android.tvsetup.action.PARTNER_CUSTOMIZATION" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="com.cyanogenmod.setupwizard.ACTION_FINISH_SETUPWIZARD" />
            </intent-filter>
        </receiver>
    </application>
--- a/LICENSES/Apache-2.0.txt
+++ b/LICENSES/Apache-2.0.txt
@@ -1,73 +0,0 @@
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-
-     (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
-
-     (b) You must cause any modified files to carry prominent notices stating that You changed the files; and
-
-     (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-
-     (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
-
-     You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!)  The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -1,13 +0,0 @@
-# SPDX-FileCopyrightText: 2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
-
-version = 1
-SPDX-PackageName = "SetupWizard"
-SPDX-PackageSupplier = "The LineageOS Project"
-SPDX-PackageDownloadLocation = "https://github.com/LineageOS/android_packages_apps_SetupWizard"
-
-[[annotations]]
-path = ["res/raw/lottie_system_nav_2_button.json", "res/raw/lottie_system_nav_3_button.json", "res/raw/lottie_system_nav_fully_gestural.json"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2019 The Android Open Source Project"
-SPDX-License-Identifier = "Apache-2.0"
--- a/exit_wizard.sh
+++ b/exit_wizard.sh
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
-
-adb root
-wait ${!}
-has_google_suw=$(adb shell pm list packages com.google.android.setupwizard)
-adb shell pm enable org.lineageos.setupwizard/.FinishActivity || true
-if [[ ! -z "$has_google_suw" ]]
-then
-    wait ${!}
-    adb shell pm enable com.google.android.setupwizard/.SetupWizardExitActivity || true
-    wait ${!}
-fi
-sleep 1
-adb shell am start org.lineageos.setupwizard/.FinishActivity || true
-if [[ ! -z "$has_google_suw" ]]
-then
-    wait ${!}
-    sleep 1
-    adb shell am start com.google.android.setupwizard/.SetupWizardExitActivity
-fi
--- a/privapp_whitelist_org.lineageos.setupwizard.xml
+++ b/privapp_whitelist_org.lineageos.setupwizard.xml
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2017-2020 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
-->
-<permissions>
-    <privapp-permissions package="org.lineageos.setupwizard">
-        <permission name="android.permission.BACKUP" />
-        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
-        <permission name="android.permission.CHANGE_CONFIGURATION" />
-        <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED" />
-        <permission name="android.permission.INTERACT_ACROSS_USERS" />
-        <permission name="android.permission.MANAGE_USERS" />
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
-        <permission name="android.permission.SET_TIME" />
-        <permission name="android.permission.SET_TIME_ZONE" />
-        <permission name="android.permission.STATUS_BAR" />
-        <permission name="android.permission.WRITE_SECURE_SETTINGS" />
-    </privapp-permissions>
-</permissions>
--- a/proguard.flags
+++ b/proguard.flags
@@ -1,16 +1,3 @@
-# SPDX-FileCopyrightText: 2015 The CyanogenMod Project
-# SPDX-FileCopyrightText: 2017-2019 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
-
 -keep class * extends java.util.ListResourceBundle {
    protected Object[][] getContents();
-}
-
-# Needed for Parcelable/SafeParcelable Creators to not get stripped
-keepnames class * implements android.os.Parcelable {
-    public static final ** CREATOR;
-}
-
-# Needed when building against the Marshmallow SDK
-dontwarn org.apache.http.**
-dontwarn androidx.**
+}
--- a/res/anim/slide_left.xml
+++ b/res/anim/slide_left.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <objectAnimator android:duration="@android:integer/config_mediumAnimTime"
+                    android:interpolator="@android:anim/accelerate_interpolator"
+                    android:propertyName="x"
+                    android:valueFrom="1280"
+                    android:valueTo="0"
+                    android:valueType="floatType"/>
+</set>
--- a/res/anim/slide_right.xml
+++ b/res/anim/slide_right.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <objectAnimator android:duration="@android:integer/config_mediumAnimTime"
+                    android:interpolator="@android:anim/accelerate_interpolator"
+                    android:propertyName="x"
+                    android:valueFrom="0"
+                    android:valueTo="-1280"
+                    android:valueType="floatType"/>
+</set>
--- a/res/anim/translucent_enter.xml
+++ b/res/anim/translucent_enter.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2009 The Android Open Source Project
-     SPDX-License-Identifier: Apache-2.0
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
 -->
+
 <set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:interpolator/decelerate_quad">
-    <alpha
-        android:fromAlpha="0.0"
-        android:toAlpha="1.0"
-        android:duration="@android:integer/config_shortAnimTime" />
+     android:interpolator="@android:interpolator/decelerate_quad">
+   <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
+           android:duration="@android:integer/config_shortAnimTime"/>
 </set>
--- a/res/anim/translucent_exit.xml
+++ b/res/anim/translucent_exit.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2009 The Android Open Source Project
-     SPDX-License-Identifier: Apache-2.0
+/*
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
 -->
+
 <set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:interpolator/accelerate_quad">
-    <alpha
-        android:fromAlpha="1.0"
-        android:toAlpha="0"
-        android:duration="@android:integer/config_shortAnimTime" />
+     android:interpolator="@android:interpolator/accelerate_quad">
+    <alpha android:fromAlpha="1.0" android:toAlpha="0"
+           android:duration="@android:integer/config_shortAnimTime"/>
 </set>
--- a/res/color/button_bar_text.xml
+++ b/res/color/button_bar_text.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2015 The CyanogenMod Project
-     SPDX-License-Identifier: Apache-2.0
-->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:color="@color/button_bar_text_disabled" />
-    <item android:color="@color/button_bar_text_enabled" />
-</selector>
--- a/res/drawable-hdpi/brand.png
+++ b/res/drawable-hdpi/brand.png
--- a/res/drawable-hdpi/brand_finish.png
+++ b/res/drawable-hdpi/brand_finish.png
--- a/res/drawable-hdpi/cross.png
+++ b/res/drawable-hdpi/cross.png
--- a/res/drawable-hdpi/icon.png
+++ b/res/drawable-hdpi/icon.png
--- a/res/drawable-hdpi/powered_by.png
+++ b/res/drawable-hdpi/powered_by.png
--- a/res/drawable-hdpi/sim.png
+++ b/res/drawable-hdpi/sim.png
--- a/res/drawable-hdpi/sim_back.png
+++ b/res/drawable-hdpi/sim_back.png
--- a/res/drawable-hdpi/sim_side.png
+++ b/res/drawable-hdpi/sim_side.png
--- a/res/drawable-hdpi/tick.png
+++ b/res/drawable-hdpi/tick.png
--- a/res/drawable-hdpi/timer.png
+++ b/res/drawable-hdpi/timer.png
--- a/res/drawable-mdpi/brand.png
+++ b/res/drawable-mdpi/brand.png
--- a/res/drawable-mdpi/brand_finish.png
+++ b/res/drawable-mdpi/brand_finish.png
--- a/res/drawable-mdpi/cross.png
+++ b/res/drawable-mdpi/cross.png
--- a/res/drawable-mdpi/icon.png
+++ b/res/drawable-mdpi/icon.png
--- a/res/drawable-mdpi/powered_by.png
+++ b/res/drawable-mdpi/powered_by.png
--- a/res/drawable-mdpi/sim.png
+++ b/res/drawable-mdpi/sim.png
--- a/res/drawable-mdpi/sim_back.png
+++ b/res/drawable-mdpi/sim_back.png
--- a/res/drawable-mdpi/sim_side.png
+++ b/res/drawable-mdpi/sim_side.png
--- a/res/drawable-mdpi/tick.png
+++ b/res/drawable-mdpi/tick.png
--- a/res/drawable-mdpi/timer.png
+++ b/res/drawable-mdpi/timer.png
--- a/res/drawable-xhdpi/brand.png
+++ b/res/drawable-xhdpi/brand.png
--- a/res/drawable-xhdpi/brand_finish.png
+++ b/res/drawable-xhdpi/brand_finish.png
--- a/res/drawable-xhdpi/cross.png
+++ b/res/drawable-xhdpi/cross.png
--- a/res/drawable-xhdpi/icon.png
+++ b/res/drawable-xhdpi/icon.png
--- a/res/drawable-xhdpi/powered_by.png
+++ b/res/drawable-xhdpi/powered_by.png
--- a/res/drawable-xhdpi/sim.png
+++ b/res/drawable-xhdpi/sim.png
--- a/res/drawable-xhdpi/sim_back.png
+++ b/res/drawable-xhdpi/sim_back.png
--- a/res/drawable-xhdpi/sim_side.png
+++ b/res/drawable-xhdpi/sim_side.png
--- a/res/drawable-xhdpi/tick.png
+++ b/res/drawable-xhdpi/tick.png
--- a/res/drawable-xhdpi/timer.png
+++ b/res/drawable-xhdpi/timer.png
--- a/res/drawable-xxhdpi/brand.png
+++ b/res/drawable-xxhdpi/brand.png
--- a/res/drawable-xxhdpi/brand_finish.png
+++ b/res/drawable-xxhdpi/brand_finish.png
--- a/res/drawable-xxhdpi/cross.png
+++ b/res/drawable-xxhdpi/cross.png
--- a/res/drawable-xxhdpi/powered_by.png
+++ b/res/drawable-xxhdpi/powered_by.png
--- a/res/drawable-xxhdpi/sim.png
+++ b/res/drawable-xxhdpi/sim.png
--- a/res/drawable-xxhdpi/sim_back.png
+++ b/res/drawable-xxhdpi/sim_back.png
--- a/res/drawable-xxhdpi/sim_side.png
+++ b/res/drawable-xxhdpi/sim_side.png
--- a/res/drawable-xxhdpi/tick.png
+++ b/res/drawable-xxhdpi/tick.png
--- a/res/drawable-xxhdpi/timer.png
+++ b/res/drawable-xxhdpi/timer.png
--- a/res/drawable-xxxhdpi/brand.png
+++ b/res/drawable-xxxhdpi/brand.png
--- a/res/drawable-xxxhdpi/brand_finish.png
+++ b/res/drawable-xxxhdpi/brand_finish.png
--- a/res/drawable-xxxhdpi/cross.png
+++ b/res/drawable-xxxhdpi/cross.png
--- a/res/drawable-xxxhdpi/powered_by.png
+++ b/res/drawable-xxxhdpi/powered_by.png
--- a/res/drawable-xxxhdpi/sim.png
+++ b/res/drawable-xxxhdpi/sim.png
--- a/res/drawable-xxxhdpi/sim_back.png
+++ b/res/drawable-xxxhdpi/sim_back.png
--- a/res/drawable-xxxhdpi/sim_side.png
+++ b/res/drawable-xxxhdpi/sim_side.png
--- a/res/drawable-xxxhdpi/tick.png
+++ b/res/drawable-xxxhdpi/tick.png
--- a/res/drawable-xxxhdpi/timer.png
+++ b/res/drawable-xxxhdpi/timer.png
--- a/res/drawable/background.xml
+++ b/res/drawable/background.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2024 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
-->
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?android:attr/colorBackground" />
-</shape>
--- a/res/drawable/divider.xml
+++ b/res/drawable/divider.xml
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2015 The CyanogenMod Project
-     SPDX-License-Identifier: Apache-2.0
+     Copyright (C) 2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
 -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
    <solid android:color="@color/divider" />
-    <size
-        android:width="316dp"
-        android:height="1px" />
-</shape>
+    <size android:width="316dp" android:height="1px"/>
+</shape>
--- a/res/drawable/ic_check_mark.xml
+++ b/res/drawable/ic_check_mark.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2015 The CyanogenMod Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#7ED321"
+        android:pathData="M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z" />
+</vector>
--- a/res/drawable/ic_chevron_left_dark.xml
+++ b/res/drawable/ic_chevron_left_dark.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/button_bar_text"
+        android:pathData="M15.41,7.41L14,6l-6,6l6,6l1.41-1.41L10.83,12L15.41,7.41Z" />
+</vector>
--- a/res/drawable/ic_chevron_left_wht.xml
+++ b/res/drawable/ic_chevron_left_wht.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M15.41,7.41L14,6l-6,6l6,6l1.41-1.41L10.83,12L15.41,7.41Z" />
+</vector>
--- a/res/drawable/ic_chevron_right_dark.xml
+++ b/res/drawable/ic_chevron_right_dark.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/button_bar_text"
+        android:pathData="M10,6L8.59,7.41L13.17,12l-4.58,4.59L10,18l6-6L10,6Z" />
+</vector>
--- a/res/drawable/ic_chevron_right_wht.xml
+++ b/res/drawable/ic_chevron_right_wht.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M10,6L8.59,7.41L13.17,12l-4.58,4.59L10,18l6-6L10,6Z" />
+</vector>
--- a/res/drawable/ic_datetime.xml
+++ b/res/drawable/ic_datetime.xml
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2017 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path android:pathData="M0 0h24v24H0z" />
-    <path
-        android:fillColor="?android:colorControlNormal"
-        android:pathData="M19 3h-1V1h-2v2H8V1H6v2H5c-1.11 0-1.99 .9 -1.99 2L3 19c0 1.1 .89 2 2 2h14c1.1 0
-2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V8h14v11zM7 10h5v5H7z" />
-</vector>
--- a/res/drawable/ic_dialer.xml
+++ b/res/drawable/ic_dialer.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2021-2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="?android:colorControlNormal"
-        android:pathData="M20,15.5C18.8,15.5 17.5,15.3 16.4,14.9C16.3,14.9 16.2,14.9 16.1,14.9C15.8,14.9 15.6,15 15.4,15.2L13.2,17.4C10.4,15.9 8,13.6 6.6,10.8L8.8,8.6C9.1,8.3 9.2,7.9 9,7.6C8.7,6.5 8.5,5.2 8.5,4C8.5,3.5 8,3 7.5,3H4C3.5,3 3,3.5 3,4C3,13.4 10.6,21 20,21C20.5,21 21,20.5 21,20V16.5C21,16 20.5,15.5 20,15.5M5,5H6.5C6.6,5.9 6.8,6.8 7,7.6L5.8,8.8C5.4,7.6 5.1,6.3 5,5M19,19C17.7,18.9 16.4,18.6 15.2,18.2L16.4,17C17.2,17.2 18.1,17.4 19,17.4V19Z" />
-</vector>
--- a/res/drawable/ic_eye.xml
+++ b/res/drawable/ic_eye.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2021-2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="?android:colorControlNormal"
-        android:pathData="M12,9A3,3 0 0,1 15,12A3,3 0 0,1 12,15A3,3 0 0,1 9,12A3,3 0 0,1 12,9M12,4.5C17,4.5 21.27,7.61 23,12C21.27,16.39 17,19.5 12,19.5C7,19.5 2.73,16.39 1,12C2.73,7.61 7,4.5 12,4.5M3.18,12C4.83,15.36 8.24,17.5 12,17.5C15.76,17.5 19.17,15.36 20.82,12C19.17,8.64 15.76,6.5 12,6.5C8.24,6.5 4.83,8.64 3.18,12Z" />
-</vector>
--- a/res/drawable/ic_features.xml
+++ b/res/drawable/ic_features.xml
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2017 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path android:pathData="M0 0h24v24H0V0z" />
-    <path
-        android:fillColor="?android:colorControlNormal"
-        android:pathData="M11.8 12.5v-1l1.1-.8c.1-.1 .1 -.2 .1 -.3l-1-1.7c-.1-.1-.2-.2-.3-.1l-1.3 .4
-c-.3-.2-.6-.4-.9-.5l-.2-1.3c0-.1-.1-.2-.3-.2H7c-.1 0-.2 .1 -.3 .2 l-.2 1.3c-.3
-.1 -.6 .3 -.9 .5 l-1.3-.5c-.1 0-.2 0-.3 .1 l-1 1.7c-.1 .1 0 .2 .1 .3l1.1 .8
-v1l-1.1 .8 c-.1 .2 -.1 .3 -.1 .4 l1 1.7c.1 .1 .2 .2 .3 .1 l1.4-.4c.3 .2 .6 .4 .9
-.5 l.2 1.3c-.1 .1 .1 .2 .2 .2 h2c.1 0 .2-.1 .3 -.2l.2-1.3c.3-.1 .6 -.3 .9
-.5l1.3 .5 c.1 0 .2 0 .3-.1l1-1.7c.1-.1 0-.2-.1-.3l-1.1-.9zM8 14c-1.1
-0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zM19 1H9c-1.1 0-2 .9-2
-2v3h2V4h10v16H9v-2H7v3c0 1.1 .9 2 2 2h10c1.1 0 2-.9 2-2V3c0-1.1-.9-2-2-2z" />
-</vector>
--- a/res/drawable/ic_launcher_background.xml
+++ b/res/drawable/ic_launcher_background.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-
-    <path
-        android:pathData="M0,0h108v108h-108z"
-        android:fillColor="#ffffff" />
-</vector>
--- a/res/drawable/ic_launcher_foreground.xml
+++ b/res/drawable/ic_launcher_foreground.xml
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-
-    <group>
-        <clip-path android:pathData="M0,0h108v108h-108z" />
-        <path
-            android:pathData="M53.671,54.898C53.707,54.605 53.744,54.312 53.744,54C53.744,53.688 53.707,53.395 53.671,53.102L55.651,51.598C55.834,51.47 55.87,51.213 55.761,51.012L53.872,47.84C53.762,47.638 53.506,47.565 53.304,47.638L50.957,48.555C50.462,48.188 49.931,47.895 49.362,47.657L48.995,45.218C48.995,44.998 48.794,44.833 48.556,44.833H44.797C44.559,44.833 44.357,44.998 44.32,45.218L43.954,47.638C43.386,47.858 42.854,48.188 42.359,48.537L40.012,47.62C39.792,47.528 39.554,47.62 39.444,47.822L37.556,50.993C37.445,51.213 37.5,51.452 37.684,51.598L39.664,53.102C39.627,53.395 39.609,53.707 39.609,54C39.609,54.312 39.646,54.605 39.682,54.898L37.684,56.42C37.5,56.548 37.464,56.805 37.574,57.007L39.462,60.178C39.572,60.38 39.829,60.453 40.03,60.38L42.377,59.463C42.872,59.83 43.404,60.123 43.972,60.362L44.339,62.782C44.357,63.002 44.559,63.167 44.797,63.167H48.574C48.812,63.167 49.014,63.002 49.032,62.782L49.399,60.362C49.967,60.142 50.499,59.812 50.994,59.463L53.34,60.38C53.561,60.472 53.799,60.38 53.909,60.178L55.797,57.007C55.907,56.805 55.87,56.567 55.687,56.42L53.671,54.898ZM46.667,57.208C44.852,57.208 43.367,55.778 43.367,54C43.367,52.222 44.852,50.792 46.667,50.792C48.482,50.792 49.967,52.222 49.967,54C49.967,55.778 48.5,57.208 46.667,57.208ZM66.834,33.852L48.5,33.833C46.484,33.833 44.834,35.483 44.834,37.5V43H48.5V41.167H66.834V66.833H48.5V65H44.834V70.5C44.834,72.517 46.484,74.167 48.5,74.167H66.834C68.851,74.167 70.501,72.517 70.501,70.5V37.5C70.501,35.483 68.851,33.852 66.834,33.852Z"
-            android:fillColor="#167C80" />
-        <path
-            android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
-            android:fillAlpha="0.6">
-            <aapt:attr name="android:fillColor">
-                <gradient
-                    android:gradientRadius="72"
-                    android:centerX="28.54"
-                    android:centerY="28.54"
-                    android:type="radial">
-                    <item
-                        android:offset="0"
-                        android:color="#19FFFFFF" />
-                    <item
-                        android:offset="1"
-                        android:color="#00FFFFFF" />
-                </gradient>
-            </aapt:attr>
-        </path>
-    </group>
-</vector>
--- a/res/drawable/ic_locale.xml
+++ b/res/drawable/ic_locale.xml
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2017 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path android:pathData="M0 0h24v24H0z" />
-    <path
-        android:fillColor="?android:colorControlNormal"
-        android:pathData="M12.87 15.07l-2.54-2.51 .03 -.03c1.74-1.94 2.98-4.17
-3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3
-9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11 .76
-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12
-17h-3.24z" />
-</vector>
--- a/res/drawable/ic_location.xml
+++ b/res/drawable/ic_location.xml
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2017 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="?android:colorControlNormal"
-        android:pathData="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0
-9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z" />
-    <path android:pathData="M0 0h24v24H0z" />
-</vector>
--- a/res/drawable/ic_navigation.xml
+++ b/res/drawable/ic_navigation.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: Material Design Authors / Google LLC
-     SPDX-License-Identifier: Apache-2.0
-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="?android:colorControlNormal"
-        android:pathData="M4.59,6.89C5.29,6.18 6,5.54 6.3,5.67C6.8,5.87 6.3,6.7 6,7.19C5.75,7.61 3.14,11.08 3.14,13.5C3.14,14.78 3.62,15.84 4.5,16.5C5.23,17.04 6.22,17.21 7.12,16.94C8.19,16.63 9.07,15.54 10.18,14.17C11.39,12.68 13,10.73 14.26,10.73C15.89,10.73 15.91,11.74 16,12.5C12.24,13.16 10.64,16.19 10.64,17.89C10.64,19.59 12.08,21 13.85,21C15.5,21 18.14,19.65 18.54,14.88H21V12.38H18.53C18.38,10.73 17.44,8.18 14.5,8.18C12.25,8.18 10.32,10.09 9.56,11C9,11.75 7.5,13.5 7.27,13.74C7,14.04 6.59,14.58 6.16,14.58C5.71,14.58 5.44,13.75 5.8,12.66C6.15,11.57 7.2,9.8 7.65,9.14C8.43,8 8.95,7.22 8.95,5.86C8.95,3.69 7.31,3 6.44,3C5.12,3 3.97,4 3.72,4.25C3.36,4.61 3.06,4.91 2.84,5.18L4.59,6.89M13.88,18.55C13.57,18.55 13.14,18.29 13.14,17.83C13.14,17.23 13.87,15.63 16,15.07C15.71,17.76 14.58,18.55 13.88,18.55Z" />
-</vector>
--- a/res/drawable/ic_restore.xml
+++ b/res/drawable/ic_restore.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: Material Design Authors / Google LLC
-     SPDX-License-Identifier: Apache-2.0
-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="?android:colorControlNormal"
-        android:pathData="M17,13L12,18L7,13H10V9H14V13M19.35,10.03C18.67,6.59 15.64,4 12,4C9.11,4 6.6,5.64 5.35,8.03C2.34,8.36 0,10.9 0,14A6,6 0 0,0 6,20H19A5,5 0 0,0 24,15C24,12.36 21.95,10.22 19.35,10.03Z" />
-</vector>
--- a/res/drawable/ic_signal_0.xml
+++ b/res/drawable/ic_signal_0.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
+</vector>
--- a/res/drawable/ic_signal_1.xml
+++ b/res/drawable/ic_signal_1.xml
@@ -0,0 +1,28 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
+    <path
+        android:fillColor="@color/accent"
+        android:pathData="M11.300000,12.700000l-9.300000,9.300000 9.300000,0.000000z"/>
+</vector>
--- a/res/drawable/ic_signal_2.xml
+++ b/res/drawable/ic_signal_2.xml
@@ -0,0 +1,28 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
+    <path
+        android:fillColor="@color/accent"
+        android:pathData="M14.000000,10.000000l-12.000000,12.000000 12.000000,0.000000z"/>
+</vector>
--- a/res/drawable/ic_signal_3.xml
+++ b/res/drawable/ic_signal_3.xml
@@ -0,0 +1,28 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
+    <path
+        android:fillColor="@color/accent"
+        android:pathData="M16.700001,7.300000l-14.700001,14.700000 14.700001,0.000000z"/>
+</vector>
--- a/res/drawable/ic_signal_4.xml
+++ b/res/drawable/ic_signal_4.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/accent"
+        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
+</vector>
--- a/res/drawable/ic_signal_no_signal.xml
+++ b/res/drawable/ic_signal_no_signal.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M2.000000,22.000000l20.000000,0.000000L22.000000,2.000000L2.000000,22.000000zM20.000000,20.000000L6.800000,20.000000L20.000000,6.800000L20.000000,20.000000z"/>
+</vector>
--- a/res/drawable/ic_sim.xml
+++ b/res/drawable/ic_sim.xml
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2017 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="?android:colorControlNormal"
-        android:pathData="M19.99 4c0-1.1-.89-2-1.99-2h-8L4 8v12c0 1.1 .9 2 2 2h12.01c1.1 0 1.99-.9
-1.99-2l-.01-16zM9 19H7v-2h2v2zm8 0h-2v-2h2v2zm-8-4H7v-4h2v4zm4
-4h-2v-4h2v4zm0-6h-2v-2h2v2zm4 2h-2v-4h2v4z" />
-</vector>
--- a/res/drawable/ic_system_update.xml
+++ b/res/drawable/ic_system_update.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2020 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-
-    <path
-        android:fillColor="?android:colorControlNormal"
-        android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14zM16,13h-3L13,8h-2v5L8,13l4,4 4,-4z" />
-</vector>
--- a/res/drawable/ic_theme.xml
+++ b/res/drawable/ic_theme.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2019 The Android Open Source Project
-     SPDX-License-Identifier: Apache-2.0
-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="?android:colorControlNormal"
-        android:pathData="M4,2v9c0,1.65 1.35,3 3,3h2v6c0,1.1 0.9,2 2,2h2c1.1,0 2,-0.9 2,-2v-6h2c1.65,0 3,-1.35 3,-3V2C20,2 4,2 4,2zM11,20v-6h2v6H11zM18,11c0,0.55 -0.45,1 -1,1h-2H9H7c-0.55,0 -1,-0.45 -1,-1v-0.93h12V11zM18,8.07H6V4h2.81v2.15h2V4h2.38v2.15h2V4H18V8.07z" />
-</vector>
--- a/res/drawable/logo.xml
+++ b/res/drawable/logo.xml
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2017-2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="260dp"
-    android:viewportWidth="512"
-    android:viewportHeight="260">
-
-    <path
-        android:fillColor="@color/lineage_accent"
-        android:pathData="M416,128a39.92,39.92,0,0,0-31.11,14.87l-1.5-.6A294.79,294.79,0,0,0,336,128.14s0-.09,0-.14a80,80,0,1,0-160,0s0,.09,0,.13l-1.72
-.38 a293.48,293.48,0,0,0-45.67,13.76l-1.5 .6
-a40,40,0,1,0,7.39,14.28h0a277.33,277.33,0,0,1,43.1-13,80,80,0,0,0,156.73,0,277.3,277.3,0,0,1,43.11,13h0A40,40,0,1,0,416,128ZM96,192a24,24,0,1,1,24-24A24,24,0,0,1,96,192Zm160,0a64,64,0,1,1,64-64A64.07,64.07,0,0,1,256,192Zm160,0a24,24,0,1,1,24-24A24,24,0,0,1,416,192ZM288,128a32,32,0,1,1-32-32A32,32,0,0,1,288,128Z" />
-</vector>
--- a/res/drawable/reveal.xml
+++ b/res/drawable/reveal.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <solid android:color="@color/page_background" />
+</shape>
--- a/res/layout-land/logo_header.xml
+++ b/res/layout-land/logo_header.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:id="@+id/header"
+                android:layout_width="0px"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:paddingTop="@dimen/header_logo_margin_top"
+                android:background="@color/primary"
+                style="@style/Header">
+
+    <ImageView
+        android:id="@+id/brand_logo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/brand"
+        android:paddingLeft="@dimen/header_logo_margin_left"
+        android:paddingBottom="@dimen/header_logo_margin_bottom"
+        android:layout_alignParentTop="true"/>
+
+    <ImageView
+        android:id="@+id/powered_by_logo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/powered_by"
+        android:visibility="gone"
+        android:paddingLeft="@dimen/header_logo_margin_left"
+        android:paddingBottom="@dimen/header_logo_margin_bottom"
+        android:layout_below="@+id/brand_logo"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/page_title_height"
+        style="@style/PageTitle" />
+
+</RelativeLayout>
--- a/res/layout-land/setup_welcome_page.xml
+++ b/res/layout-land/setup_welcome_page.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <include layout="@layout/logo_header" />
+
+    <RelativeLayout android:id="@+id/page"
+                 android:layout_width="0px"
+                 android:layout_height="match_parent"
+                 android:layout_weight="1"
+                 android:gravity="center"
+                 android:paddingLeft="@dimen/content_margin_left"
+                 android:paddingRight="@dimen/content_margin_left"
+                 style="@style/PageContent">
+
+        <com.cyanogenmod.setupwizard.ui.LocalePicker
+            android:id="@+id/locale_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="@dimen/min_locale_picker_height"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:layout_centerInParent="true"/>
+
+    </RelativeLayout>
+
+</LinearLayout>
--- a/res/layout-land/sim_missing_page.xml
+++ b/res/layout-land/sim_missing_page.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <include layout="@layout/header" />
+
+    <FrameLayout android:id="@+id/page"
+                 android:layout_width="match_parent"
+                 android:layout_height="0dp"
+                 android:layout_weight="1">
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            style="@style/PageContent">
+
+            <TextView
+                android:layout_width="0px"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:id="@+id/sim_missing"
+                style="@style/PageSummaryText"
+                android:textSize="15sp"
+                android:layout_marginBottom="@dimen/summary_margin_bottom"
+                android:paddingLeft="@dimen/content_margin_left"
+                android:paddingRight="@dimen/content_margin_right"
+                android:text="@string/sim_missing_summary" />
+
+            <ImageView
+                android:id="@+id/sim_slot_image"
+                android:layout_width="0px"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:scaleType="fitEnd"
+                android:src="@drawable/sim"/>
+
+        </LinearLayout>
+    </FrameLayout>
+</LinearLayout>
+
+
+
+
--- a/res/layout-sw600dp/welcome_activity.xml
+++ b/res/layout-sw600dp/welcome_activity.xml
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2016 The CyanogenMod Project
-     SPDX-FileCopyrightText: 2017-2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
-->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    style="@style/SudContentFrame">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        android:weightSum="100"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/brand_logo"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_weight="65"
-            android:layout_gravity="center"
-            android:src="@drawable/logo"
-            android:adjustViewBounds="true"
-            android:scaleType="fitCenter"
-            android:gravity="center"
-            android:paddingTop="@dimen/content_margin_top"
-            android:paddingRight="@dimen/content_margin_left"
-            android:paddingLeft="@dimen/content_margin_left"
-            android:paddingBottom="0dp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="35"
-            android:gravity="center_vertical"
-            android:orientation="vertical">
-
-            <TextView
-                style="@style/WelcomeTitle"
-                android:id="@+id/welcome_title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hyphenationFrequency="none"
-                android:gravity="center" />
-
-            <Button
-                android:id="@+id/start"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/start"
-                style="@style/SudGlifButton.Primary" />
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center"
-        android:visibility="gone">
-
-        <Button
-            android:id="@+id/emerg_dialer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawableTop="@drawable/ic_dialer"
-            android:text="@string/emergency_call"
-            style="@style/SudGlifButton.Secondary" />
-
-        <Button
-            android:id="@+id/launch_accessibility"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawableTop="@drawable/ic_eye"
-            android:text="@string/accessibility_settings"
-            style="@style/SudGlifButton.Secondary" />
-
-    </LinearLayout>
-</LinearLayout>
--- a/res/layout-television/welcome_activity.xml
+++ b/res/layout-television/welcome_activity.xml
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2016 The CyanogenMod Project
-     SPDX-FileCopyrightText: 2017-2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
-->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    style="@style/SudContentFrame">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        android:weightSum="100"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/brand_logo"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_weight="65"
-            android:layout_gravity="center"
-            android:src="@drawable/logo"
-            android:adjustViewBounds="true"
-            android:scaleType="fitCenter"
-            android:gravity="center"
-            android:paddingTop="@dimen/content_margin_top"
-            android:paddingRight="@dimen/content_margin_left"
-            android:paddingLeft="@dimen/content_margin_left"
-            android:paddingBottom="0dp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="35"
-            android:gravity="center_vertical"
-            android:orientation="vertical">
-
-            <TextView
-                style="@style/WelcomeTitle"
-                android:id="@+id/welcome_title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hyphenationFrequency="none"
-                android:gravity="center" />
-
-            <Button
-                android:id="@+id/start"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/start"
-                style="@style/SudGlifButton.Primary" />
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center"
-        android:visibility="gone">
-
-        <Button
-            android:id="@+id/emerg_dialer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawableTop="@drawable/ic_dialer"
-            android:text="@string/emergency_call"
-            style="@style/SudGlifButton.Secondary" />
-
-        <Button
-            android:id="@+id/launch_accessibility"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawableTop="@drawable/ic_eye"
-            android:text="@string/accessibility_settings"
-            style="@style/SudGlifButton.Secondary" />
-
-    </LinearLayout>
-</LinearLayout>
--- a/res/layout/button_bar.xml
+++ b/res/layout/button_bar.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/button_bar"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="horizontal"
+              android:background="@color/button_bar_background">
+
+    <Button
+        style="@style/ButtonBar.Left"
+        android:id="@+id/prev_button"
+        android:layout_width="wrap_content"
+        android:layout_weight="1"/>
+
+    <Button
+        style="@style/ButtonBar.Right"
+        android:id="@+id/next_button"
+        android:layout_width="wrap_content"
+        android:text="@string/next" />
+
+</LinearLayout>
--- a/res/layout/choose_data_sim_page.xml
+++ b/res/layout/choose_data_sim_page.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <include layout="@layout/header" />
+
+    <ProgressBar
+        android:id="@+id/progress"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:indeterminateOnly="true"
+        android:layout_width="match_parent"
+        android:layout_height="8dp" />
+
+    <FrameLayout android:id="@+id/page"
+                 android:layout_width="match_parent"
+                 android:layout_height="0dp"
+                 android:layout_weight="1">
+
+        <ScrollView android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:fillViewport="true">
+
+            <LinearLayout
+                android:id="@+id/page_view"
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/PageContent"
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/PageSummaryText"
+                    android:textSize="15sp"
+                    android:paddingLeft="@dimen/content_margin_left"
+                    android:paddingRight="@dimen/content_margin_right"
+                    android:paddingBottom="@dimen/summary_margin_bottom"
+                    android:text="@string/choose_data_sim_summary" />
+
+                <include layout="@layout/divider" />
+
+            </LinearLayout>
+        </ScrollView>
+    </FrameLayout>
+</LinearLayout>
+
+
--- a/res/layout/data_sim_row.xml
+++ b/res/layout/data_sim_row.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/sim_row"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:minHeight="?android:attr/listPreferredItemHeight"
+              android:gravity="center_vertical"
+              android:paddingLeft="@dimen/content_margin_left"
+              android:paddingRight="@dimen/data_switch_margin_right"
+              android:background="?android:attr/selectableItemBackground"
+              android:clickable="true">
+
+    <ImageView
+        android:id="@+id/signal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_signal_0" />
+
+    <TextView
+        android:id="@+id/sim_title"
+        android:layout_width="0px"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:textSize="14sp"
+        android:layout_marginLeft="@dimen/carrier_text_margin_left"
+        android:maxLines="4" />
+
+    <CheckBox
+        android:id="@+id/enable_check"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:duplicateParentState="true"
+        android:clickable="false"/>
+
+</LinearLayout>
--- a/res/layout/date_time_setup_custom_list_item_2.xml
+++ b/res/layout/date_time_setup_custom_list_item_2.xml
@@ -1,15 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2013 The CyanogenMod Project
-     SPDX-License-Identifier: Apache-2.0
+     Copyright (C) 2013 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
 -->
 <!-- Based on simple_list_item_2.xml in framework -->
 <TwoLineListItem xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:mode="twoLine"
-    android:gravity="center_vertical">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:mode="twoLine"
+        android:gravity="center_vertical">

    <TextView
        android:id="@android:id/text1"
--- a/res/layout/divider.xml
+++ b/res/layout/divider.xml
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2015 The CyanogenMod Project
-     SPDX-License-Identifier: Apache-2.0
+     Copyright (C) 2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
 -->
-<ImageView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:scaleType="fitXY"
-    android:src="@drawable/divider" />
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+           android:layout_width="match_parent"
+           android:layout_height="wrap_content"
+           android:scaleType="fitXY"
+           android:src="@drawable/divider" />
--- a/Show More
+++ b/Show More