Automatic translation import

Change-Id: I66da73c79bb494d63cc007ac8ac3d8cd09b5d4f9
2024-02-08 04:29:07 +02:00 · 2022-02-13 02:57:41 +02:00 · 2022-01-12 20:47:44 +01:00 · 2022-01-08 13:54:40 +01:00 · 2021-05-16 12:19:49 +00:00 · 2021-04-19 15:22:33 +02:00
302 changed files with 11789 additions and 11715 deletions
--- a/Android.mk
+++ b/Android.mk
@@ -5,29 +5,40 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := CyanogenSetupWizard
+LOCAL_PACKAGE_NAME := LineageSetupWizard
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_OVERRIDES_PACKAGES := Provision
 LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 LOCAL_STATIC_ANDROID_LIBRARIES := \
    androidx.core_core \
    setupcompat \
    setupdesign
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    android-support-v4 \
+    org.lineageos.platform.internal
    android-support-v13 \
    play \
    libphonenumber \
    org.cyanogenmod.platform.sdk
-LOCAL_JAVA_LIBRARIES := telephony-common
+LOCAL_JAVA_LIBRARIES := \
    telephony-common
-# Include res dir from chips
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 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_USE_AAPT2 := true
 LOCAL_AAPT_FLAGS := --auto-add-overlay
 LOCAL_AAPT_FLAGS += --extra-packages com.google.android.gms
-include frameworks/opt/setupwizard/library/common.mk
+LOCAL_REQUIRED_MODULES := privapp_whitelist_org.lineageos.setupwizard.xml
 include $(BUILD_PACKAGE)
 include $(CLEAR_VARS)
 LOCAL_MODULE := privapp_whitelist_org.lineageos.setupwizard.xml
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
 include $(BUILD_PREBUILT)
 include $(call all-makefiles-under,$(LOCAL_PATH))
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2013 The CyanogenMod Project
     Copyright (C) 2017,2019 The LineageOS Project
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -16,8 +17,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
-          package="com.cyanogenmod.setupwizard"
+          package="org.lineageos.setupwizard"
-          android:versionCode="4"
+          android:versionCode="5"
          android:sharedUserId="android.uid.system">
    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
@@ -37,64 +38,282 @@
    <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="cyanogenmod.permission.ACCESS_THEME_MANAGER"/>
    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
-    <uses-permission android:name="cyanogenmod.permission.HARDWARE_ABSTRACTION_ACCESS" />
+    <uses-permission android:name="lineageos.permission.HARDWARE_ABSTRACTION_ACCESS" />
    <uses-permission android:name="android.permission.BACKUP" />
-    <uses-permission android:name="cyanogenmod.permission.FINISH_SETUP" />
+    <uses-permission android:name="android.permission.LOCAL_MAC_ADDRESS" />
-    <uses-permission android:name="cyanogenmod.permission.LEGALESE" />
+    <uses-permission android:name="lineageos.permission.FINISH_SETUP" />
-    <uses-permission android:name="com.cyngn.stats.SEND_ANALYTICS" />
+    <uses-permission android:name="lineageos.permission.WRITE_SETTINGS" />
-    <uses-permission android:name="com.cyanogen.permission.REQUEST_KILL_SWITCH_OP" />
+    <uses-permission android:name="lineageos.permission.WRITE_SECURE_SETTINGS" />
    <uses-permission android:name="cyanogenmod.permission.WRITE_SETTINGS"/>
    <uses-permission android:name="cyanogenmod.permission.WRITE_SECURE_SETTINGS"/>
    <permission
-        android:name="cyanogenmod.permission.PROTECTED_APP"
+        android:name="lineageos.permission.FINISH_SETUP"
        android:protectionLevel="signatureOrSystem" />
-    <permission
+    <protected-broadcast android:name="org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE"
-        android:name="cyanogenmod.permission.FINISH_SETUP"
+                         android:permission="lineageos.permission.FINISH_SETUP"/>
        android:protectionLevel="signatureOrSystem"
        androidprv:allowViaWhitelist="true" />
-    <protected-broadcast android:name="com.cyanogenmod.setupwizard.SETUP_FINISHED"
+    <protected-broadcast android:name="org.lineageos.setupwizard.SETUP_FINISHED"
-                         android:permission="cyanogenmod.permission.FINISH_SETUP"/>
+                         android:permission="lineageos.permission.FINISH_SETUP"/>
    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="23" />
    <application android:label="@string/app_name"
-                 android:icon="@drawable/icon"
+                 android:icon="@mipmap/ic_launcher"
                 android:theme="@style/Theme.Setup"
                 android:uiOptions="none"
                 android:taskAffinity="com.android.wizard"
                 android:name=".SetupWizardApp">
        <meta-data android:name="com.google.android.gms.version"
                   android:value="@integer/google_play_services_version" />
-        <activity android:name=".ui.SetupWizardActivity"
+        <activity android:theme="@style/NoDisplay"
-                  android:label="@string/product_name"
+                  android:label="@string/activity_label_empty"
-                  android:launchMode="singleInstance"
+                  android:name=".wizardmanager.WizardManager"
                  android:enabled="false"
                  android:exported="false"
                  android:excludeFromRecents="true"
-                  android:configChanges="mcc|mnc|themeChange"
+                  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>
        <activity android:name=".SetupWizardActivity"
                  android:label="@string/activity_label_empty"
                  android:lockTaskMode="normal"
                  android:launchMode="singleTask"
                  android:excludeFromRecents="true"
                  android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
                  android:immersive="true"
-                  android:windowSoftInputMode="stateAlwaysHidden">
+                  android:windowSoftInputMode="stateAlwaysHidden"
                  android:theme="@style/NoDisplay">
            <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>
-        <receiver android:name=".setup.FinishSetupReceiver"
+        <activity android:name=".BluetoothSetupActivity"
-                  android:exported="true">
+                  android:label="@string/activity_label_empty"
                  android:excludeFromRecents="true"
                  android:configChanges="mcc|mnc"
                  android:immersive="true"
                  android:windowSoftInputMode="stateAlwaysHidden">
            <intent-filter>
-                <action android:name="com.cyanogenmod.setupwizard.ACTION_FINISH_SETUPWIZARD" />
+                <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:excludeFromRecents="true"
                  android:configChanges="mcc|mnc"
                  android:immersive="true"
                  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:excludeFromRecents="true"
                  android:configChanges="mcc|mnc"
                  android:immersive="true"
                  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:excludeFromRecents="true"
                  android:configChanges="mcc|mnc"
                  android:immersive="true"
                  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=".WifiSetupActivity"
                  android:label="@string/activity_label_empty"
                  android:excludeFromRecents="true"
                  android:configChanges="mcc|mnc"
                  android:immersive="true"
                  android:exported="false"
                  android:windowSoftInputMode="stateAlwaysHidden">
            <intent-filter>
                <action android:name="org.lineageos.setupwizard.LINEAGE_WIFI_SETUP" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </activity>
        <activity android:name=".CaptivePortalSetupActivity"
                  android:label="@string/activity_label_empty"
                  android:excludeFromRecents="true"
                  android:configChanges="mcc|mnc"
                  android:immersive="true"
                  android:exported="false"
                  android:windowSoftInputMode="stateAlwaysHidden">
            <intent-filter>
                <action android:name="org.lineageos.setupwizard.LINEAGE_CAPTIVE_PORTAL_SETUP" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </activity>
        <activity android:name=".SimMissingActivity"
                  android:label="@string/activity_label_empty"
                  android:excludeFromRecents="true"
                  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=".ChooseDataSimActivity"
                  android:label="@string/activity_label_empty"
                  android:excludeFromRecents="true"
                  android:configChanges="mcc|mnc"
                  android:immersive="true"
                  android:exported="false"
                  android:windowSoftInputMode="stateAlwaysHidden">
            <intent-filter>
                <action android:name="org.lineageos.setupwizard.LINEAGE_CHOOSE_DATA_SIM" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </activity>
        <activity android:name=".MobileDataActivity"
                  android:label="@string/activity_label_empty"
                  android:excludeFromRecents="true"
                  android:configChanges="mcc|mnc"
                  android:immersive="true"
                  android:exported="false"
                  android:windowSoftInputMode="stateAlwaysHidden">
            <intent-filter>
                <action android:name="org.lineageos.setupwizard.LINEAGE_ENABLE_MOBILE_DATA" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </activity>
        <activity android:name=".LocationSettingsActivity"
                  android:label="@string/activity_label_empty"
                  android:excludeFromRecents="true"
                  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=".LineageSettingsActivity"
                  android:label="@string/activity_label_empty"
                  android:excludeFromRecents="true"
                  android:configChanges="mcc|mnc"
                  android:immersive="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=".BiometricActivity"
                  android:label="@string/activity_label_empty"
                  android:excludeFromRecents="true"
                  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:excludeFromRecents="true"
                  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:excludeFromRecents="true"
                  android:configChanges="mcc|mnc"
                  android:immersive="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=".FinishActivity"
                  android:label="@string/activity_label_empty"
                  android:excludeFromRecents="true"
                  android:configChanges="mcc|mnc"
                  android:immersive="true"
                  android:windowSoftInputMode="stateAlwaysHidden">
            <intent-filter>
                <action android:name="org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </activity>
        <activity android:name=".SetupWizardExitActivity"
                  android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
                  android:excludeFromRecents="true"
                  android:immersive="true"
                  android:label="@@string/activity_label_empty"
                  android:theme="@style/NoDisplay">
            <intent-filter>
                <action android:name="org.lineageos.setupwizard.EXIT"/>
                <category android:name="android.intent.category.DEFAULT"/>
            </intent-filter>
        </activity>
        <activity android:name=".SetupWizardTestActivity"
                  android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
                  android:exported="false"
                  android:immersive="true"
                  android:label="@string/activity_label_empty"
                  android:launchMode="singleInstance"
                  android:theme="@style/NoDisplay"/>
        <receiver android:name=".PartnerReceiver">
            <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" />
            </intent-filter>
        </receiver>
        <service android:name=".SetupWizardExitService"
                 android:exported="false"/>
    </application>
 </manifest>
--- a/exit_wizard.sh
+++ b/exit_wizard.sh
@@ -0,0 +1,13 @@
 #!/bin/bash
 adb root
 wait ${!}
 adb shell pm enable org.lineageos.setupwizard/org.lineageos.setupwizard.SetupWizardExitActivity || true
 wait ${!}
 adb shell pm enable com.google.android.setupwizard/com.google.android.setupwizard.SetupWizardExitActivity || true
 wait ${!}
 sleep 1
 adb shell am start org.lineageos.setupwizard/org.lineageos.setupwizard.SetupWizardExitActivity || true
 wait ${!}
 sleep 1
 adb shell am start com.google.android.setupwizard/com.google.android.setupwizard.SetupWizardExitActivity
--- a/privapp_whitelist_org.lineageos.setupwizard.xml
+++ b/privapp_whitelist_org.lineageos.setupwizard.xml
@@ -0,0 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2017-2020 The LineageOS 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.
 -->
 <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.LOCAL_MAC_ADDRESS"/>
        <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
@@ -2,18 +2,6 @@
    protected Object[][] getContents();
 }
 # Keep SafeParcelable value, needed for reflection. This is required to support backwards
 # compatibility of some classes.
 -keep public class com.google.android.gms.common.internal.safeparcel.SafeParcelable {
    public static final *** NULL;
 }
 # Keep the names of classes/members we need for client functionality.
 -keepnames @com.google.android.gms.common.annotation.KeepName class *
 -keepclassmembernames class * {
    @com.google.android.gms.common.annotation.KeepName *;
 }
 # Needed for Parcelable/SafeParcelable Creators to not get stripped
 -keepnames class * implements android.os.Parcelable {
    public static final ** CREATOR;
@@ -21,5 +9,4 @@
 # Needed when building against the Marshmallow SDK
 -dontwarn org.apache.http.**
-dontwarn android.support.**
+-dontwarn androidx.**
 -dontwarn com.google.android.gms.**
--- a/res/anim/slide_left.xml
+++ b/res/anim/slide_left.xml
@@ -1,9 +0,0 @@
 <?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
@@ -1,9 +0,0 @@
 <?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/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/btn_mod_oobe.9.png
+++ b/res/drawable-hdpi/btn_mod_oobe.9.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/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/btn_mod_oobe.9.png
+++ b/res/drawable-mdpi/btn_mod_oobe.9.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/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/btn_mod_oobe.9.png
+++ b/res/drawable-xhdpi/btn_mod_oobe.9.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/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/btn_mod_oobe.9.png
+++ b/res/drawable-xxhdpi/btn_mod_oobe.9.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/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/btn_mod_oobe.9.png
+++ b/res/drawable-xxxhdpi/btn_mod_oobe.9.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/tick.png
+++ b/res/drawable-xxxhdpi/tick.png
--- a/res/drawable-xxxhdpi/timer.png
+++ b/res/drawable-xxxhdpi/timer.png
--- a/res/drawable/cross.xml
+++ b/res/drawable/cross.xml
@@ -0,0 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    Copyright (c) 2017 The LineageOS 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="@color/black"
        android:pathData="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59
 19 19 17.59 13.41 12z" />
    <path
        android:pathData="M0 0h24v24H0z" />
 </vector>
--- a/res/drawable/ic_check_mark.xml
+++ b/res/drawable/ic_check_mark.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    Copyright (c) 2015 The CyanogenMod Project
    Copyright (c) 2017 The LineageOS Project
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -21,6 +22,6 @@
    android:viewportHeight="24">
    <path
-        android:fillColor="#7ED321"
+        android:fillColor="@color/accent"
        android:pathData="M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z" />
-</vector>
+</vector>
--- a/res/drawable/ic_chevron_left_wht.xml
+++ b/res/drawable/ic_chevron_left_wht.xml
@@ -1,11 +0,0 @@
 <?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_wht.xml
+++ b/res/drawable/ic_chevron_right_wht.xml
@@ -1,11 +0,0 @@
 <?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
@@ -0,0 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    Copyright (c) 2017 The LineageOS 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:pathData="M0 0h24v24H0z" />
    <path
        android:fillColor="@color/black"
        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_face.xml
+++ b/res/drawable/ic_face.xml
@@ -0,0 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
  ~ Copyright (C) 2019 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:width="24dp"
        android:height="24dp"
        android:viewportWidth="24"
        android:viewportHeight="24">
    <path
        android:fillColor="@color/black"
        android:pathData="M10.25,13c0,0.69-0.56,1.25-1.25,1.25S7.75,13.69,7.75,13S8.31,11.75,9,11.75S10.25,12.31,10.25,13z M15,11.75 c-0.69,0-1.25,0.56-1.25,1.25s0.56,1.25,1.25,1.25s1.25-0.56,1.25-1.25S15.69,11.75,15,11.75z M22,12c0,5.52-4.48,10-10,10 S2,17.52,2,12S6.48,2,12,2S22,6.48,22,12z M20,12c0-0.78-0.12-1.53-0.33-2.24C18.97,9.91,18.25,10,17.5,10 c-3.13,0-5.92-1.44-7.76-3.69c-1.05,2.56-3.14,4.57-5.74,5.55C4.01,11.9,4,11.95,4,12c0,4.41,3.59,8,8,8S20,16.41,20,12z" />
    <path
        android:pathData="M0,0h24v24H0V0z" />
 </vector>
--- a/res/drawable/ic_features.xml
+++ b/res/drawable/ic_features.xml
@@ -0,0 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    Copyright (c) 2017 The LineageOS 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:pathData="M0 0h24v24H0V0z" />
    <path
        android:fillColor="@color/black"
        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_fingerprint.xml
+++ b/res/drawable/ic_fingerprint.xml
@@ -0,0 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    Copyright (c) 2017 The LineageOS 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="@color/black"
        android:pathData="M17.81 4.47c-.08 0-.16-.02-.23-.06C15.66 3.42 14 3 12.01 3c-1.98 0-3.86 .47
 -5.57 1.41-.24 .13 -.54 .04 -.68-.2-.13-.24-.04-.55 .2 -.68C7.82 2.52 9.86 2
 12.01 2c2.13 0 3.99 .47 6.03 1.52 .25 .13 .34 .43 .21 .67-.09 .18 -.26 .28 -.44
 .28 zM3.5 9.72c-.1 0-.2-.03-.29-.09-.23-.16-.28-.47-.12-.7 .99 -1.4 2.25-2.5
 3.75-3.27C9.98 4.04 14 4.03 17.15 5.65c1.5 .77 2.76 1.86 3.75 3.25 .16 .22 .11
 .54-.12 .7 -.23 .16 -.54 .11
 -.7-.12-.9-1.26-2.04-2.25-3.39-2.94-2.87-1.47-6.54-1.47-9.4 .01 -1.36 .7 -2.5
 1.7-3.4 2.96-.08 .14 -.23 .21 -.39 .21 zm6.25 12.07c-.13
 0-.26-.05-.35-.15-.87-.87-1.34-1.43-2.01-2.64-.69-1.23-1.05-2.73-1.05-4.34
 0-2.97 2.54-5.39 5.66-5.39s5.66 2.42 5.66 5.39c0 .28-.22 .5 -.5 .5
 s-.5-.22-.5-.5c0-2.42-2.09-4.39-4.66-4.39-2.57 0-4.66 1.97-4.66 4.39 0 1.44 .32
 2.77 .93 3.85 .64 1.15 1.08 1.64 1.85 2.42 .19 .2 .19 .51 0 .71-.11 .1 -.24 .15
 -.37 .15 zm7.17-1.85c-1.19 0-2.24-.3-3.1-.89-1.49-1.01-2.38-2.65-2.38-4.39 0-.28
 .22 -.5 .5 -.5s.5 .22 .5 .5 c0 1.41 .72 2.74 1.94 3.56 .71 .48 1.54 .71 2.54 .71
 .24 0 .64-.03 1.04-.1 .27 -.05 .53 .13 .58 .41 .05 .27-.13 .53 -.41 .58 -.57 .11
 -1.07 .12 -1.21 .12 zM14.91 22c-.04
 0-.09-.01-.13-.02-1.59-.44-2.63-1.03-3.72-2.1-1.4-1.39-2.17-3.24-2.17-5.22
 0-1.62 1.38-2.94 3.08-2.94 1.7 0 3.08 1.32 3.08 2.94 0 1.07 .93 1.94 2.08
 1.94s2.08-.87 2.08-1.94c0-3.77-3.25-6.83-7.25-6.83-2.84 0-5.44 1.58-6.61
 4.03-.39 .81 -.59 1.76-.59 2.8 0 .78 .07 2.01 .67 3.61 .1 .26-.03 .55 -.29 .64
 -.26 .1 -.55-.04-.64-.29-.49-1.31-.73-2.61-.73-3.96 0-1.2 .23 -2.29 .68 -3.24
 1.33-2.79 4.28-4.6 7.51-4.6 4.55 0 8.25 3.51 8.25 7.83 0 1.62-1.38 2.94-3.08
 2.94s-3.08-1.32-3.08-2.94c0-1.07-.93-1.94-2.08-1.94s-2.08 .87 -2.08 1.94c0 1.71
 .66 3.31 1.87 4.51 .95 .94 1.86 1.46 3.27 1.85 .27 .07 .42 .35 .35 .61-.05 .23
 -.26 .38 -.47 .38 z" />
    <path
        android:pathData="M0 0h24v24H0z" />
 </vector>
--- a/res/drawable/ic_locale.xml
+++ b/res/drawable/ic_locale.xml
@@ -0,0 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    Copyright (c) 2017 The LineageOS 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:pathData="M0 0h24v24H0z" />
    <path
        android:fillColor="@color/black"
        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
@@ -0,0 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    Copyright (c) 2017 The LineageOS 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="@color/black"
        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_lock_screen.xml
+++ b/res/drawable/ic_lock_screen.xml
@@ -0,0 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    Copyright (c) 2017 The LineageOS 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:pathData="M0 0h24v24H0z" />
    <path
        android:fillColor="@color/black"
        android:pathData="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1 .9 2 2
 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9
 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z" />
 </vector>
--- a/res/drawable/ic_logo_mod_title.xml
+++ b/res/drawable/ic_logo_mod_title.xml
@@ -1,50 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    Copyright (c) 2016 Cyanogen, Inc.
    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="72dp"
    android:height="16dp"
    android:viewportWidth="72"
    android:viewportHeight="16">
    <path
        android:name="ic_logo_mod_title"
        android:fillColor="#000000"
        android:pathData="M19.9097139,5.66053833 C19.9097139,2.54013671 17.3930434,4.53810596e-05
 14.2986968,4.53810596e-05 L0,4.53810596e-05 L0,15.9999319 L2.53412329,15.9999319
 L2.53412329,2.5567008 L8.68814203,2.5567008 L8.68814203,15.9999319
 L11.221803,15.9999319 L11.221803,2.5567008 L14.2986968,2.5567008
 C15.9954325,2.5567008 17.3755906,3.94933205 17.3755906,5.66053833
 L17.3755906,15.9999319 L19.9097139,15.9999319 L19.9097139,5.66053833 Z
 M44.8456489,7.26108291 L44.8456489,6.32158153 L44.8456489,5.66049295
 C44.8456489,2.54020478 42.3287472,0 39.2346318,0 L31.9464123,0 C28.853106,0
 26.3363199,2.54020478 26.3363199,5.66049295 L26.3363199,6.93388547
 L26.3363199,7.26108291 L26.3363199,8.73891709 L26.3363199,9.19476983
 L26.3363199,10.3393936 C26.3363199,13.4595683 28.853106,16 31.9464123,16
 L39.2346318,16 C42.3287472,16 44.8456489,13.4595683 44.8456489,10.3393936
 L44.8456489,9.71290807 L44.8456489,8.73891709 L44.8456489,7.26108291 Z
 M42.3111788,10.3393936 C42.3111788,12.0508268 40.9310208,13.4432311
 39.2346318,13.4432311 L31.9464123,13.4432311 C30.2502545,13.4432311
 28.8700964,12.0508268 28.8700964,10.3393936 L28.8700964,5.66049295
 C28.8700964,3.94928667 30.2502545,2.55676887 31.9464123,2.55676887
 L39.2346318,2.55676887 C40.9315987,2.55676887 42.3111788,3.94928667
 42.3111788,5.66049295 L42.3111788,10.3393936 Z M64.1708327,0 L51.2719428,0
 L51.2719428,16 L64.1708327,16 C67.2652948,16 69.7817342,13.4595683
 69.7817342,10.3393936 L69.7817342,5.66049295 C69.7817342,2.54020478 67.2652948,0
 64.1708327,0 Z M67.2477265,10.3393936 C67.2477265,12.0508268
 65.8674528,13.4432311 64.1708327,13.4432311 L53.8064129,13.4432311
 L53.8064129,2.55676887 L64.1708327,2.55676887 C65.8674528,2.55676887
 67.2477265,3.94928667 67.2477265,5.66049295 L67.2477265,10.3393936 Z" />
 </vector>
--- a/res/drawable/ic_mobile_data.xml
+++ b/res/drawable/ic_mobile_data.xml
@@ -0,0 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    Copyright (c) 2017 The LineageOS 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="@color/black"
        android:fillAlpha=".3"
        android:pathData="M2 22h20V2z" />
    <path
        android:fillColor="@color/black"
        android:pathData="M17 7L2 22h15z" />
 </vector>
--- a/res/drawable/ic_restore.xml
+++ b/res/drawable/ic_restore.xml
@@ -0,0 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:height="24dp"
        android:width="24dp"
        android:viewportWidth="24"
        android:viewportHeight="24">
    <path android:fillColor="#000"
          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
@@ -1,5 +1,6 @@
 <!--
-Copyright (C) 2014 The Android Open Source Project
+    Copyright (C) 2014 The Android Open Source Project
    Copyright (c) 2017 The LineageOS Project
   Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -20,6 +21,6 @@ Copyright (C) 2014 The Android Open Source Project
        android:viewportWidth="24.0"
        android:viewportHeight="24.0">
    <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="#e0e0e0"
        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
@@ -1,5 +1,6 @@
 <!--
-Copyright (C) 2014 The Android Open Source Project
+    Copyright (C) 2014 The Android Open Source Project
    Copyright (c) 2017 The LineageOS Project
   Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -20,7 +21,7 @@ Copyright (C) 2014 The Android Open Source Project
        android:viewportWidth="24.0"
        android:viewportHeight="24.0">
    <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="#e0e0e0"
        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
    <path
        android:fillColor="@color/accent"
--- a/res/drawable/ic_signal_2.xml
+++ b/res/drawable/ic_signal_2.xml
@@ -1,5 +1,6 @@
 <!--
-Copyright (C) 2014 The Android Open Source Project
+    Copyright (C) 2014 The Android Open Source Project
    Copyright (c) 2017 The LineageOS Project
   Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -20,7 +21,7 @@ Copyright (C) 2014 The Android Open Source Project
        android:viewportWidth="24.0"
        android:viewportHeight="24.0">
    <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="#e0e0e0"
        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
    <path
        android:fillColor="@color/accent"
--- a/res/drawable/ic_signal_3.xml
+++ b/res/drawable/ic_signal_3.xml
@@ -1,5 +1,6 @@
 <!--
-Copyright (C) 2014 The Android Open Source Project
+    Copyright (C) 2014 The Android Open Source Project
    Copyright (c) 2017 The LineageOS Project
   Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -20,7 +21,7 @@ Copyright (C) 2014 The Android Open Source Project
        android:viewportWidth="24.0"
        android:viewportHeight="24.0">
    <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="#e0e0e0"
        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
    <path
        android:fillColor="@color/accent"
--- a/res/drawable/ic_signal_4.xml
+++ b/res/drawable/ic_signal_4.xml
@@ -1,5 +1,6 @@
 <!--
-Copyright (C) 2014 The Android Open Source Project
+    Copyright (C) 2014 The Android Open Source Project
    Copyright (c) 2017 The LineageOS Project
   Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
--- a/res/drawable/ic_signal_no_signal.xml
+++ b/res/drawable/ic_signal_no_signal.xml
@@ -1,5 +1,6 @@
 <!--
-Copyright (C) 2014 The Android Open Source Project
+    Copyright (C) 2014 The Android Open Source Project
    Copyright (c) 2017 The LineageOS Project
   Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -20,6 +21,6 @@ Copyright (C) 2014 The Android Open Source Project
        android:viewportWidth="24.0"
        android:viewportHeight="24.0">
    <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="#e0e0e0"
        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
@@ -0,0 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    Copyright (c) 2017 The LineageOS 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="@color/black"
        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/img_oobe_hero.jpg
+++ b/res/drawable/img_oobe_hero.jpg
--- a/res/drawable/logo.xml
+++ b/res/drawable/logo.xml
@@ -0,0 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    Copyright (c) 2017 The LineageOS 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="512dp"
    android:height="320dp"
    android:viewportWidth="512"
    android:viewportHeight="320">
    <path
        android:fillColor="@color/accent"
        android:pathData="M157.89,271.64a1.83,1.83,0,0,1-1.89-1.89V248.42h4.65v19.32H171v3.9Z" />
    <path
        android:fillColor="@color/accent"
        android:pathData="M185,271.64V248.42h4.68v23.22Z" />
    <path
        android:fillColor="@color/accent"
        android:pathData="M221.17,248.42h4.26v22a1.23,1.23,0,0,1-.67,1.09,3.17,3.17,0,0,1-1.67 .41
 ,4,4,0,0,1-1.71-.29,3.11,3.11,0,0,1-1.12-1L210,256v15.61h-4.32v-21.5a1.56,1.56,0,0,1,.68-1.4,3.18,3.18,0,0,1,1.79-.46,3.59,3.59,0,0,1,1.9
 .39 ,5.91,5.91,0,0,1,1.41,1.56l9.72,13.59Z" />
    <path
        android:fillColor="@color/accent"
        android:pathData="M256.9,252.36H246.2v5.5h9.63v3.93H246.2v5.89H256.6v4H241.51V250.31a1.74,1.74,0,0,1,.59-1.37,2,2,0,0,1,1.4-.52h13.4Z" />
    <path
        android:fillColor="@color/accent"
        android:pathData="M286.38,271.64l-2-5.76h-8.49l-2,5.76h-4.85l7.87-21.5q.68-1.85,3.15-1.85t3.19,1.89l7.87,21.46ZM277.27,262h5.82l-2.93-8.62Z" />
    <path
        android:fillColor="@color/accent"
        android:pathData="M314.33,272a11,11,0,0,1-8.36-3.19,11.93,11.93,0,0,1-3.06-8.62,12.12,12.12,0,0,1,3.25-8.89,11.56,11.56,0,0,1,8.62-3.3,11.44,11.44,0,0,1,6,1.5,9,9,0,0,1,3.63,3.93l-3.74,2q-1.69-3.41-6-3.41a6.53,6.53,0,0,0-5.14,2.16,8.58,8.58,0,0,0-1.92,5.9,8.67,8.67,0,0,0,1.79,5.8,6.11,6.11,0,0,0,4.91,2.1,6.74,6.74,0,0,0,4.6-1.58,5.26,5.26,0,0,0,1.87-4h-5.89v-3.67h10.5v2.57a10.19,10.19,0,0,1-3.12,7.72A11.12,11.12,0,0,1,314.33,272Z" />
    <path
        android:fillColor="@color/accent"
        android:pathData="M356,252.36H345.3v5.5h9.63v3.93H345.3v5.89h10.41v4H340.62V250.31a1.74,1.74,0,0,1,.59-1.37,2,2,0,0,1,1.4-.52H356Z" />
    <path
        android:fillColor="@color/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/mod_ready.xml
+++ b/res/drawable/mod_ready.xml
@@ -1,42 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    Copyright (c) 2016 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="256dp"
        android:height="114dp"
        android:viewportWidth="256"
        android:viewportHeight="114">
    <path android:fillColor="@color/white"
          android:pathData="M40,113.7V77.1h14.3c7.5,0,12.3,4,12.3,11.1c0,6.2-3,9.4-8.6,10.6l8,14.9h-5.8l-7.7-14.5h-7.4v14.5H40z
            M45.2,94.6h8.7 c4.6,0,7.5-1.9,7.5-6.3c0-4.2-2.5-6.4-7.5-6.4h-8.6v12.7H45.2z
            M78.7,113.7V77.1h22.4V82H84v10.6h15.7v4.7H84V109h17.2v4.8
            L78.7,113.7L78.7,113.7z
            M136.5,113.7L134,107h-15.7l-2.4,6.7h-5.4l13.2-36.6h5l13.2,36.6H136.5z
            M126.1,84.7l-6.2,17.8h12.6 l-6.2-17.8H126.1z
            M152.7,113.7V77.1h11.7c8.1,0,15.9,5.6,15.9,18.3c0,13.6-7.6,18.4-16.2,18.4L152.7,113.7L152.7,113.7z
            M158,108.9 h5.9c6.9,0,10.8-3.8,10.8-13.6c0-8.8-4-13.4-10.5-13.4H158V108.9z
            M198.8,113.7V98.3l-12-21.2h5.7l8.8,16.4h0.1l8.9-16.4h5.7
            l-12,21.2v15.4C204,113.7,198.8,113.7,198.8,113.7z
            M73.1,20.8c0-11.3-9.2-20.5-20.6-20.5H0.2v58.1h9.3V9.5H32v48.8h9.3V9.5h11.3
            c6.2,0,11.3,5.1,11.3,11.3v37.5h9.3L73.1,20.8L73.1,20.8z
            M164.5,26.6v-3.4v-2.4c0-11.3-9.2-20.5-20.6-20.5h-26.7
            c-11.3,0-20.5,9.2-20.5,20.5v4.6v1.2V32v1.7v4.2c0,11.3,9.2,20.5,20.5,20.5h26.7c11.3,0,20.6-9.2,20.6-20.5v-2.3V32V26.6z
            M155.2,37.8c0,6.2-5.1,11.3-11.3,11.3h-26.7c-6.2,0-11.3-5.1-11.3-11.3v-17c0-6.2,5.1-11.3,11.3-11.3h26.7
            c6.2,0,11.3,5.1,11.3,11.3V37.8z
            M235.2,0.3H188v58.1h47.2c11.3,0,20.6-9.2,20.6-20.5v-17C255.8,9.5,246.6,0.3,235.2,0.3z
            M246.5,37.8c0,6.2-5.1,11.3-11.3,11.3h-38V9.5h38c6.2,0,11.3,5.1,11.3,11.3V37.8z" />
 </vector>
--- a/res/drawable/tick.xml
+++ b/res/drawable/tick.xml
@@ -0,0 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    Copyright (c) 2017 The LineageOS 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:pathData="M0 0h24v24H0z" />
    <path
        android:fillColor="@color/black"
        android:pathData="M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z" />
 </vector>
--- a/res/drawable/timelapse.xml
+++ b/res/drawable/timelapse.xml
@@ -0,0 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    Copyright (c) 2017 The LineageOS 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="@color/black"
        android:pathData="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59
 19 19 17.59 13.41 12z" />
    <path
        android:pathData="M0 0h24v24H0z" />
 </vector>
--- a/res/layout-land/logo_header.xml
+++ b/res/layout-land/logo_header.xml
@@ -1,50 +0,0 @@
 <?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
@@ -1,44 +0,0 @@
 <?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
@@ -19,7 +19,7 @@
              android:layout_width="match_parent"
              android:layout_height="match_parent">
-    <include layout="@layout/header" />
+    <include layout="@layout/header_condensed" />
    <FrameLayout android:id="@+id/page"
                 android:layout_width="match_parent"
@@ -55,7 +55,3 @@
        </LinearLayout>
    </FrameLayout>
 </LinearLayout>
--- a/res/layout/button_bar.xml
+++ b/res/layout/button_bar.xml
@@ -1,36 +0,0 @@
 <?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
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2015 The CyanogenMod Project
     Copyright (C) 2017 The LineageOS Project
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,9 +18,10 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:orientation="vertical"
              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+              android:layout_height="match_parent"
              android:background="@color/primary">
-    <include layout="@layout/header" />
+    <include layout="@layout/header_condensed" />
    <FrameLayout android:id="@+id/page"
                 android:layout_width="match_parent"
@@ -62,6 +64,11 @@
            android:layout_gravity="top"
            android:visibility="gone"/>
    </FrameLayout>
    <com.google.android.setupdesign.view.NavigationBar
        android:id="@+id/navigation_bar"
        style="@style/SudNavBarTheme"
        android:layout_width="match_parent"
        android:layout_height="@dimen/sud_navbar_height" />
 </LinearLayout>
--- a/res/layout/finish_activity.xml
+++ b/res/layout/finish_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2013 The CyanogenMod Project
+     Copyright (C) 2016 The CyanogenMod Project
     Copyright (C) 2017 The LineageOS Project
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,28 +15,38 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<com.cyanogenmod.setupwizard.ui.widget.ScrimInsetsFrameLayout
+<org.lineageos.setupwizard.widget.ScrimInsetsFrameLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/root"
    android:orientation="vertical"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:clickable="true"
    android:fitsSystemWindows="true"
    app:insetForeground="@android:color/transparent">
-    <LinearLayout android:orientation="vertical"
+    <LinearLayout
-                  android:layout_width="match_parent"
+        android:layout_width="match_parent"
-                  android:layout_height="match_parent">
+        android:layout_height="match_parent"
        android:orientation="vertical"
        android:background="@color/primary">
-        <FrameLayout android:id="@+id/content"
+        <ImageView
-                     android:layout_width="match_parent"
+            android:id="@+id/brand_logo"
-                     android:layout_height="0dp"
+            android:layout_width="match_parent"
-                     android:layout_weight="1"
+            android:layout_height="0px"
-                     style="@style/PageContainer"/>
+            android:layout_weight="1"
            android:src="@drawable/logo"
            android:adjustViewBounds="true"
            android:scaleType="fitCenter"
            android:gravity="center"
            android:padding="@dimen/content_margin_left"/>
-        <include layout="@layout/button_bar"/>
+        <com.google.android.setupdesign.view.NavigationBar
            android:id="@+id/navigation_bar"
            style="@style/SudNavBarTheme"
            android:layout_width="match_parent"
            android:layout_height="@dimen/sud_navbar_height" />
    </LinearLayout>
@@ -45,13 +56,4 @@
               android:background="@drawable/reveal"
               android:visibility="invisible"/>
-    <ProgressBar
+</org.lineageos.setupwizard.widget.ScrimInsetsFrameLayout>
        android:id="@+id/finishing_bar"
        style="?android:attr/progressBarStyleHorizontal"
        android:layout_width="match_parent"
        android:layout_height="8dp"
        android:layout_gravity="bottom"
        android:visibility="gone"/>
 </com.cyanogenmod.setupwizard.ui.widget.ScrimInsetsFrameLayout>
--- a/res/layout/header.xml
+++ b/res/layout/header.xml
@@ -1,29 +0,0 @@
 <?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="match_parent"
                android:layout_height="@dimen/header_height"
                android:background="@color/header_bg"
                style="@style/Header">
    <TextView
        android:layout_width="match_parent"
        android:layout_height="@dimen/page_title_height"
        style="@style/PageTitle" />
 </RelativeLayout>
--- a/res/layout/header_condensed.xml
+++ b/res/layout/header_condensed.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2015 The CyanogenMod Project
     Copyright (C) 2017 The LineageOS Project
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,15 +16,32 @@
     limitations under the License.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/header"
+    android:id="@+id/header"
-                android:layout_width="match_parent"
+    android:layout_width="match_parent"
-                android:layout_height="@dimen/header_condensed_height"
+    android:layout_height="@dimen/header_condensed_height"
-                android:background="@color/header_condensed_bg"
+    android:paddingTop="48dp"
-                style="@style/Header">
+    android:orientation="vertical">
    <ImageView
        android:id="@+id/header_icon"
        android:layout_width="64dp"
        android:layout_height="wrap_content"
        android:paddingStart="8dp"
        android:paddingEnd="8dp"
        android:adjustViewBounds="true"
        android:scaleType="centerInside"
        android:visibility="gone"
        android:contentDescription="@null" />
    <TextView
        android:layout_width="match_parent"
-        android:layout_height="@dimen/page_title_height"
+        android:layout_height="64dp"
        android:layout_toEndOf="@id/header_icon"
        android:paddingEnd="8dp"
        android:typeface="monospace"
        android:gravity="center_vertical"
        android:maxLines="1"
        android:ellipsize="end"
        style="@style/PageTitle" />
-</RelativeLayout>
+</RelativeLayout>
--- a/res/layout/intro_restore_activity.xml
+++ b/res/layout/intro_restore_activity.xml
@@ -0,0 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2015 The CyanogenMod Project
     Copyright (C) 2017 The LineageOS 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"
    android:background="@color/primary">
    <include layout="@layout/header_condensed" />
    <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:orientation="vertical"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:paddingStart="@dimen/content_margin_left"
                android:paddingEnd="@dimen/content_margin_left"
                style="@style/PageContent">
                <TextView
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    style="@style/PageSummaryText"
                    android:textSize="16sp"
                    android:layout_marginBottom="@dimen/summary_margin_bottom"
                    android:paddingRight="@dimen/location_text_margin_right"
                    android:text="@string/intro_restore_subtitle" />
                <Button
                    android:id="@+id/intro_restore_button"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:paddingLeft="@dimen/content_margin_left"
                    android:paddingRight="@dimen/location_text_margin_right"
                    android:gravity="center"
                    android:textSize="16sp"
                    android:textAllCaps="true"
                    android:textColor="@color/white"
                    android:background="@color/accent"
                    android:maxLines="1"
                    android:ellipsize="end"
                    android:text="@string/intro_restore_button"/>
            </LinearLayout>
        </ScrollView>
    </FrameLayout>
    <com.google.android.setupdesign.view.NavigationBar
        android:id="@+id/navigation_bar"
        style="@style/SudNavBarTheme"
        android:layout_width="match_parent"
        android:layout_height="@dimen/sud_navbar_height" />
 </LinearLayout>
--- a/res/layout/locale_picker.xml
+++ b/res/layout/locale_picker.xml
@@ -25,7 +25,7 @@
                 android:paddingTop="22dip"
                 android:paddingBottom="22dip"/>
-    <view class="com.cyanogenmod.setupwizard.ui.LocalePicker$CustomEditText"
+    <view class="org.lineageos.setupwizard.widget.LocalePicker$CustomEditText"
          android:textAppearance="?android:attr/textAppearanceMedium"
          android:textColor="?android:attr/textColorPrimary"
          android:id="@+id/localepicker_input"
--- a/res/layout/location_settings.xml
+++ b/res/layout/location_settings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2013 The CyanogenMod Project
     Copyright (C) 2017-2020 The LineageOS Project
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,7 +18,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:orientation="vertical"
              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+              android:layout_height="match_parent"
              android:background="@color/primary">
    <include layout="@layout/header_condensed" />
@@ -81,77 +83,14 @@
                </LinearLayout>
                <LinearLayout
                    android:id="@+id/battery_saving"
                    android:orientation="horizontal"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:paddingLeft="@dimen/location_margin_left"
                    android:paddingRight="@dimen/content_margin_right"
                    android:background="?android:attr/selectableItemBackground"
                    android:clickable="true">
                    <CheckBox
                        android:id="@+id/battery_saving_checkbox"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_gravity="top"
                        android:layout_marginTop="5dp"
                        android:duplicateParentState="true"
                        android:clickable="false" />
                    <TextView
                        android:id="@+id/battery_saving_summary"
                        android:layout_width="0px"
                        android:layout_height="wrap_content"
                        android:layout_weight="1"
                        android:textSize="15sp"
                        android:lineSpacingExtra="@dimen/setup_line_spacing"
                        android:gravity="top"
                        android:layout_marginLeft="@dimen/location_text_margin_left"
                        android:layout_marginRight="@dimen/location_text_margin_right"
                        android:paddingBottom="@dimen/content_margin_bottom"
                        android:text="@string/location_battery_saving"
                        android:maxLines="5" />
                </LinearLayout>
                <LinearLayout
                    android:id="@+id/network"
                    android:orientation="horizontal"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:paddingLeft="@dimen/location_margin_left"
                    android:paddingRight="@dimen/content_margin_right"
                    android:background="?android:attr/selectableItemBackground"
                    android:clickable="true">
                    <CheckBox
                        android:id="@+id/network_checkbox"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_gravity="top"
                        android:layout_marginTop="5dp"
                        android:duplicateParentState="true"
                        android:clickable="false" />
                    <TextView
                        android:id="@+id/network_summary"
                        android:layout_width="0px"
                        android:layout_height="wrap_content"
                        android:layout_weight="1"
                        android:textSize="15sp"
                        android:lineSpacingExtra="@dimen/setup_line_spacing"
                        android:gravity="top"
                        android:layout_marginLeft="@dimen/location_text_margin_left"
                        android:layout_marginRight="@dimen/location_text_margin_right"
                        android:paddingBottom="@dimen/content_margin_bottom"
                        android:text="@string/location_network"
                        android:maxLines="5" />
                </LinearLayout>
            </LinearLayout>
        </ScrollView>
    </FrameLayout>
    <com.google.android.setupdesign.view.NavigationBar
        android:id="@+id/navigation_bar"
        style="@style/SudNavBarTheme"
        android:layout_width="match_parent"
        android:layout_height="@dimen/sud_navbar_height" />
 </LinearLayout>
--- a/res/layout/logo_header.xml
+++ b/res/layout/logo_header.xml
@@ -1,48 +0,0 @@
 <?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="match_parent"
                android:layout_height="@dimen/logo_header_height"
                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_above="@+id/powered_by_logo"/>
    <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_above="@android:id/title"/>
    <TextView
        android:layout_width="match_parent"
        android:layout_height="@dimen/page_title_height"
        style="@style/PageTitle" />
 </RelativeLayout>
--- a/res/layout/mobile_data_settings.xml
+++ b/res/layout/mobile_data_settings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2013 The CyanogenMod Project
     Copyright (C) 2017 The LineageOS Project
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,16 +18,18 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:orientation="vertical"
              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+              android:layout_height="match_parent"
              android:background="@color/primary">
-    <include layout="@layout/header" />
+    <include layout="@layout/header_condensed" />
    <ProgressBar
        android:id="@+id/progress"
        style="?android:attr/progressBarStyleHorizontal"
        android:indeterminateOnly="true"
        android:layout_width="match_parent"
-        android:layout_height="8dp" />
+        android:layout_height="8dp"
        android:visibility="gone"/>
    <FrameLayout android:id="@+id/page"
                 android:layout_width="match_parent"
@@ -42,8 +45,7 @@
                android:orientation="vertical"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                style="@style/PageContent"
+                style="@style/PageContent">
                android:visibility="gone">
                <TextView
                    android:id="@+id/mobile_data_summary"
@@ -101,5 +103,11 @@
            </LinearLayout>
        </ScrollView>
    </FrameLayout>
 </LinearLayout>
    <com.google.android.setupdesign.view.NavigationBar
        android:id="@+id/navigation_bar"
        style="@style/SudNavBarTheme"
        android:layout_width="match_parent"
        android:layout_height="@dimen/sud_navbar_height" />
 </LinearLayout>
--- a/res/layout/setup_fingerprint.xml
+++ b/res/layout/setup_fingerprint.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2015 The CyanogenMod Project
     Copyright (C) 2017 The LineageOS Project
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,9 +18,10 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
    android:background="@color/primary">
-    <include layout="@layout/header" />
+    <include layout="@layout/header_condensed" />
    <FrameLayout android:id="@+id/page"
        android:layout_width="match_parent"
@@ -37,14 +39,14 @@
                style="@style/PageContent">
                <TextView
                    android:id="@+id/setup_biometric_summary"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    style="@style/PageSummaryText"
                    android:textSize="16sp"
                    android:paddingLeft="@dimen/content_margin_left"
                    android:layout_marginBottom="@dimen/summary_margin_bottom"
-                    android:paddingRight="@dimen/location_text_margin_right"
+                    android:paddingRight="@dimen/location_text_margin_right"/>
                    android:text="@string/fingerprint_setup_summary" />
                <TextView
                    android:layout_width="match_parent"
@@ -57,9 +59,10 @@
                    android:gravity="center_vertical"
                    android:textSize="16sp"
                    android:textStyle="bold"
-                    android:text="@string/fingerprint_setup_backup_lock_method"/>
+                    android:text="@string/biometric_setup_backup_lock_method"/>
                <TextView
                    android:id="@+id/setup_add_biometric"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginBottom="24dp"
@@ -69,11 +72,10 @@
                    android:drawablePadding="24dp"
                    android:gravity="center_vertical"
                    android:textSize="16sp"
-                    android:textStyle="bold"
+                    android:textStyle="bold"/>
                    android:text="@string/fingerprint_setup_add_fingerprint"/>
                <TextView
-                    android:id="@+id/setup_fingerprint"
+                    android:id="@+id/setup_biometric"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:paddingLeft="@dimen/content_margin_left"
@@ -81,10 +83,17 @@
                    android:gravity="center_vertical"
                    android:textSize="16sp"
                    android:textAllCaps="true"
-                    android:textColor="@color/fingerprint_setup_text_color"
+                    android:textColor="@color/biometric_setup_text_color"
-                    android:text="@string/fingerprint_setup_screen_lock_setup"/>
+                    android:text="@string/biometric_setup_screen_lock_setup"/>
            </LinearLayout>
        </ScrollView>
    </FrameLayout>
-</LinearLayout>
+
    <com.google.android.setupdesign.view.NavigationBar
        android:id="@+id/navigation_bar"
        style="@style/SudNavBarTheme"
        android:layout_width="match_parent"
        android:layout_height="@dimen/sud_navbar_height" />
 </LinearLayout>
--- a/res/layout/setup_datetime_page.xml
+++ b/res/layout/setup_datetime_page.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2013 The CyanogenMod Project
     Copyright (C) 2017 The LineageOS Project
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,9 +18,10 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:orientation="vertical"
              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+              android:layout_height="match_parent"
              android:background="@color/primary">
-    <include layout="@layout/header" />
+    <include layout="@layout/header_condensed" />
    <FrameLayout android:id="@+id/page"
                 android:layout_width="match_parent"
@@ -109,4 +111,11 @@
            </LinearLayout>
        </ScrollView>
    </FrameLayout>
-</LinearLayout>
+
    <com.google.android.setupdesign.view.NavigationBar
        android:id="@+id/navigation_bar"
        style="@style/SudNavBarTheme"
        android:layout_width="match_parent"
        android:layout_height="@dimen/sud_navbar_height" />
 </LinearLayout>
--- a/res/layout/setup_finished_page.xml
+++ b/res/layout/setup_finished_page.xml
@@ -1,65 +0,0 @@
 <?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="vertical"
              android:layout_width="match_parent"
              android:layout_height="match_parent"
              android:background="@color/primary">
    <Space android:layout_width="match_parent"
           android:layout_height="0px"
           android:layout_weight="1"/>
    <ImageView
        android:id="@+id/brand_logo"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:src="@drawable/brand_finish"
        android:scaleType="centerInside"
        android:padding="@dimen/content_margin_left"/>
    <TextView android:id="@+id/mod_welcome"
              android:layout_width="match_parent"
              android:layout_height="wrap_content"
              android:textSize="20sp"
              android:layout_marginTop="105dp"
              android:paddingLeft="@dimen/content_margin_left"
              android:paddingRight="@dimen/content_margin_right"
              android:text="@string/mod_welcome"
              android:fontFamily="sans-serif-medium"
              android:textColor="@color/white"
              android:visibility="gone"/>
    <TextView android:id="@+id/mod_desc"
              android:layout_width="match_parent"
              android:layout_height="wrap_content"
              android:textSize="16sp"
              android:layout_marginTop="16dp"
              android:paddingLeft="@dimen/content_margin_left"
              android:paddingRight="@dimen/content_margin_right"
              android:text="@string/mod_description"
              android:textColor="@color/white"
              android:visibility="gone"/>
    <Space android:layout_width="match_parent"
           android:layout_height="0px"
           android:layout_weight="1"/>
 </LinearLayout>
--- a/res/layout/setup_cyanogen_services.xml
+++ b/res/layout/setup_cyanogen_services.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2015 The CyanogenMod Project
     Copyright (C) 2017,2019 The LineageOS Project
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,7 +18,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:orientation="vertical"
              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+              android:layout_height="match_parent"
              android:background="@color/primary">
    <include layout="@layout/header_condensed" />
@@ -34,8 +36,7 @@
            <LinearLayout
                android:orientation="vertical"
                android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="match_parent">
                style="@style/PageContent">
                <!-- The caption about privacy policy -->
                <TextView
@@ -50,58 +51,6 @@
                    android:text="@string/services_explanation"
                    android:clickable="true"/>
                <LinearLayout
                    android:id="@+id/killswitch"
                    android:orientation="horizontal"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:paddingLeft="@dimen/location_margin_left"
                    android:paddingRight="@dimen/content_margin_right"
                    android:background="?android:attr/selectableItemBackground">
                    <ImageView
                        android:id="@+id/killswitch_check"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginTop="5dp"
                        android:paddingLeft="8dp"
                        android:paddingRight="@dimen/location_text_margin_left"
                        android:layout_gravity="center|top"
                        android:src="@drawable/tick"/>
                    <RelativeLayout
                        android:layout_width="0px"
                        android:layout_height="wrap_content"
                        android:layout_weight="1"
                        android:gravity="top"
                        android:layout_marginLeft="@dimen/location_text_margin_left"
                        android:layout_marginRight="@dimen/location_text_margin_right"
                        android:paddingBottom="@dimen/content_margin_bottom">
                        <TextView
                            android:id="@+id/killswitch_title"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:textSize="15sp"
                            android:lineSpacingExtra="@dimen/setup_line_spacing"
                            android:fadingEdge="horizontal"
                            android:text="@string/setup_require_cyanogen_label"/>
                        <TextView
                            android:id="@+id/killswitch_summary"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_below="@+id/killswitch_title"
                            android:layout_alignStart="@+id/killswitch_title"
                            android:textSize="15sp"
                            android:lineSpacingExtra="@dimen/setup_line_spacing"
                            android:textColor="?android:attr/textColorSecondary"
                            android:text="@string/setup_device_locked_instructions"/>
                    </RelativeLayout>
                </LinearLayout>
                <!-- Whether or not to enable metrics -->
                <LinearLayout
                    android:id="@+id/metrics"
@@ -138,42 +87,6 @@
                </LinearLayout>
                <!-- Whether or not to enable default theme -->
                <LinearLayout
                    android:id="@+id/theme"
                    android:orientation="horizontal"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:paddingLeft="@dimen/location_margin_left"
                    android:paddingRight="@dimen/content_margin_right"
                    android:background="?android:attr/selectableItemBackground"
                    android:clickable="true">
                    <CheckBox
                        android:id="@+id/enable_theme_checkbox"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_gravity="top"
                        android:layout_marginTop="5dp"
                        android:duplicateParentState="true"
                        android:clickable="false"/>
                    <TextView
                        android:id="@+id/enable_theme_summary"
                        android:layout_width="0px"
                        android:layout_height="wrap_content"
                        android:layout_weight="1"
                        android:textSize="15sp"
                        android:lineSpacingExtra="@dimen/setup_line_spacing"
                        android:gravity="top"
                        android:layout_marginLeft="@dimen/location_text_margin_left"
                        android:layout_marginRight="@dimen/location_text_margin_right"
                        android:paddingBottom="@dimen/content_margin_bottom"
                        android:text="@string/services_metrics_label"/>
                </LinearLayout>
                <!-- Checkbox for using on-screen nav keys -->
                <LinearLayout
                    android:id="@+id/nav_keys"
@@ -209,7 +122,15 @@
                        android:text="@string/services_os_nav_keys_label"/>
                </LinearLayout>
            </LinearLayout>
        </ScrollView>
    </FrameLayout>
-</LinearLayout>
+
    <com.google.android.setupdesign.view.NavigationBar
        android:id="@+id/navigation_bar"
        style="@style/SudNavBarTheme"
        android:layout_width="match_parent"
        android:layout_height="@dimen/sud_navbar_height" />
 </LinearLayout>
--- a/res/layout/setup_loading_page.xml
+++ b/res/layout/setup_loading_page.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2015 The CyanogenMod Project
     Copyright (C) 2017 The LineageOS Project
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,24 +18,30 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:orientation="vertical"
              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+              android:layout_height="match_parent"
              android:background="@color/primary">
-    <include layout="@layout/header" />
+    <include layout="@layout/header_condensed" />
    <ProgressBar
        android:id="@+id/progressBar1"
        style="?android:attr/progressBarStyleHorizontal"
        android:indeterminateOnly="true"
        android:layout_width="match_parent"
-        android:layout_height="8dp" />
+        android:layout_height="8dp"
        android:paddingStart="0dp"
        android:paddingEnd="0dp" />
    <FrameLayout android:id="@+id/page"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1"
                 style="@style/PageContent"/>
    <com.google.android.setupdesign.view.NavigationBar
        android:id="@+id/navigation_bar"
        style="@style/SudNavBarTheme"
        android:layout_width="match_parent"
        android:layout_height="@dimen/sud_navbar_height" />
 </LinearLayout>
--- a/res/layout/setup_locale.xml
+++ b/res/layout/setup_locale.xml
@@ -0,0 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2013 The CyanogenMod Project
     Copyright (C) 2017 The LineageOS 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:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical"
    android:background="@color/primary">
    <include layout="@layout/header_condensed" />
    <RelativeLayout android:layout_width="match_parent"
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:gravity="center"
                    android:paddingLeft="@dimen/content_margin_left"
                    android:paddingRight="@dimen/content_margin_left">
        <org.lineageos.setupwizard.widget.LocalePicker
            android:id="@+id/locale_list"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:focusable="true"
            android:focusableInTouchMode="true"
            android:layout_alignParentBottom="true"
            android:layout_centerHorizontal="true"/>
    </RelativeLayout>
    <com.google.android.setupdesign.view.NavigationBar
        android:id="@+id/navigation_bar"
        style="@style/SudNavBarTheme"
        android:layout_width="match_parent"
        android:layout_height="@dimen/sud_navbar_height" />
 </LinearLayout>
--- a/res/layout/setup_lockscreen.xml
+++ b/res/layout/setup_lockscreen.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2015 The CyanogenMod Project
     Copyright (C) 2017 The LineageOS Project
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,9 +18,10 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
    android:background="@color/primary">
-    <include layout="@layout/header" />
+    <include layout="@layout/header_condensed" />
    <FrameLayout android:id="@+id/page"
        android:layout_width="match_parent"
@@ -34,6 +36,8 @@
                android:orientation="vertical"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:paddingStart="@dimen/content_margin_left"
                android:paddingEnd="@dimen/content_margin_left"
                style="@style/PageContent">
                <TextView
@@ -41,24 +45,33 @@
                    android:layout_height="wrap_content"
                    style="@style/PageSummaryText"
                    android:textSize="16sp"
                    android:paddingLeft="@dimen/content_margin_left"
                    android:layout_marginBottom="@dimen/summary_margin_bottom"
                    android:paddingRight="@dimen/location_text_margin_right"
                    android:text="@string/lockscreen_setup_summary" />
-                <TextView
+                <Button
                    android:id="@+id/setup_lockscreen"
-                    android:layout_width="match_parent"
+                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:paddingLeft="@dimen/content_margin_left"
                    android:paddingRight="@dimen/location_text_margin_right"
-                    android:gravity="center_vertical"
+                    android:gravity="center"
                    android:textSize="16sp"
                    android:textAllCaps="true"
-                    android:textColor="@color/accent"
+                    android:textColor="@color/white"
                    android:background="@color/accent"
                    android:maxLines="1"
                    android:ellipsize="end"
                    android:text="@string/lockscreen_setup_screen_lock_setup"/>
            </LinearLayout>
        </ScrollView>
    </FrameLayout>
    <com.google.android.setupdesign.view.NavigationBar
        android:id="@+id/navigation_bar"
        style="@style/SudNavBarTheme"
        android:layout_width="match_parent"
        android:layout_height="@dimen/sud_navbar_height" />
 </LinearLayout>
--- a/res/layout/setup_modguide_page.xml
+++ b/res/layout/setup_modguide_page.xml
@@ -1,102 +0,0 @@
 <?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"
        xmlns:tools="http://schemas.android.com/tools"
        android:orientation="vertical"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:background="@color/mod_yellow">
    <FrameLayout
            android:layout_width="match_parent"
            android:layout_height="296dp">
        <ImageView
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:scaleType="centerCrop"
                android:src="@drawable/img_oobe_hero"
                tools:ignore="ContentDescription"/>
        <ImageView
                android:layout_width="140dp"
                android:layout_height="32dp"
                android:src="@drawable/ic_logo_mod_title"
                android:tint="@color/white"
                android:layout_marginTop="72dp"
                android:layout_marginStart="24dp"
                tools:ignore="ContentDescription"/>
    </FrameLayout>
    <TextView android:id="@+id/mod_welcome"
              android:layout_width="match_parent"
              android:layout_height="wrap_content"
              android:minHeight="20sp"
              android:textSize="16sp"
              android:fontFamily="sans-serif"
              android:layout_marginTop="32dp"
              android:paddingStart="24dp"
              android:paddingEnd="24dp"
              android:text="@string/mod_welcome"
              android:textColor="@color/mod_title"/>
    <TextView android:id="@+id/mod_desc"
              android:layout_width="match_parent"
              android:layout_height="wrap_content"
              android:fontFamily="sans-serif"
              android:textSize="14sp"
              android:lineSpacingExtra="6sp"
              android:layout_marginTop="3dp"
              android:paddingStart="24dp"
              android:paddingEnd="24dp"
              android:text="@string/mod_description"
              android:textColor="@color/mod_description"/>
    <FrameLayout
            android:layout_width="wrap_content"
            android:layout_height="72dp"
            android:minWidth="208dp"
            android:layout_marginTop="25dp"
            android:layout_marginStart="24dp"
            android:background="@drawable/btn_mod_oobe">
        <LinearLayout
                android:id="@+id/explore_mod_guide"
                android:layout_width="wrap_content"
                android:layout_height="40dp"
                android:minWidth="176dp"
                android:orientation="horizontal">
            <ImageView
                    android:layout_width="24dp"
                    android:layout_height="24dp"
                    android:src="@mipmap/ic_modguide"
                    android:layout_margin="8dp"
                    tools:ignore="ContentDescription"/>
            <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:layout_marginStart="16dp"
                    android:layout_marginEnd="16dp"
                    android:gravity="center_vertical"
                    android:fontFamily="sans-serif"
                    android:text="@string/mod_explore"
                    android:textAllCaps="false"
                    android:textColor="@color/mod_title"/>
        </LinearLayout>
    </FrameLayout>
 </LinearLayout>
--- a/res/layout/setup_welcome_page.xml
+++ b/res/layout/setup_welcome_page.xml
@@ -1,43 +0,0 @@
 <?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="vertical"
              android:layout_width="match_parent"
              android:layout_height="match_parent">
    <include layout="@layout/logo_header" />
    <RelativeLayout android:id="@+id/page"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 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:focusable="true"
            android:focusableInTouchMode="true"
            android:layout_centerInParent="true"/>
    </RelativeLayout>
 </LinearLayout>
--- a/res/layout/sim_missing_page.xml
+++ b/res/layout/sim_missing_page.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2015 The CyanogenMod Project
     Copyright (C) 2017 The LineageOS Project
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,9 +18,10 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:orientation="vertical"
              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+              android:layout_height="match_parent"
              android:background="@color/primary">
-    <include layout="@layout/header" />
+    <include layout="@layout/header_condensed" />
    <FrameLayout android:id="@+id/page"
                 android:layout_width="match_parent"
@@ -53,8 +55,11 @@
        </LinearLayout>
    </FrameLayout>
    <com.google.android.setupdesign.view.NavigationBar
        android:id="@+id/navigation_bar"
        style="@style/SudNavBarTheme"
        android:layout_width="match_parent"
        android:layout_height="@dimen/sud_navbar_height" />
 </LinearLayout>
--- a/res/layout/terms_webview.xml
+++ b/res/layout/terms_webview.xml
@@ -1,35 +0,0 @@
 <?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.
 -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
        android:layout_width="match_parent"
        android:layout_height="match_parent">
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent">
        <View
            android:layout_height="match_parent"
            android:layout_width="match_parent"
            android:layout_weight="1" />
    </LinearLayout>
    <WebView
        android:id="@+id/webview"
        android:layout_width="match_parent"
        android:layout_height="match_parent" />
 </FrameLayout>
--- a/res/layout/welcome_activity.xml
+++ b/res/layout/welcome_activity.xml
@@ -0,0 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2016 The CyanogenMod Project
     Copyright (C) 2017 The LineageOS 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/root"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical"
    android:background="@color/primary">
    <ImageView
        android:id="@+id/brand_logo"
        android:layout_width="match_parent"
        android:layout_height="0px"
        android:layout_weight="1"
        android:src="@drawable/logo"
        android:adjustViewBounds="true"
        android:scaleType="fitCenter"
        android:gravity="center"
        android:padding="@dimen/content_margin_left"/>
    <com.google.android.setupdesign.view.NavigationBar
        android:id="@+id/navigation_bar"
        style="@style/SudNavBarTheme"
        android:layout_width="match_parent"
        android:layout_height="@dimen/sud_navbar_height" />
 </LinearLayout>
--- a/res/mipmap-hdpi/ic_launcher.png
+++ b/res/mipmap-hdpi/ic_launcher.png
--- a/res/mipmap-hdpi/ic_modguide.png
+++ b/res/mipmap-hdpi/ic_modguide.png
--- a/res/mipmap-mdpi/ic_launcher.png
+++ b/res/mipmap-mdpi/ic_launcher.png
--- a/res/mipmap-mdpi/ic_modguide.png
+++ b/res/mipmap-mdpi/ic_modguide.png
--- a/Show More
+++ b/Show More