Automatic translation import

Change-Id: Ic2b7786bf3d0940d5334cc858e72dec0d0d5ad72 Ticket: RM-154
SetupWizard: Fix translatability
2016-06-17 15:49:31 -07:00 · 2016-06-17 11:30:03 -07:00 · 2016-06-13 23:18:35 +02:00 · 2016-04-25 09:02:23 -07:00 · 2016-02-01 15:55:13 -08:00 · 2016-01-12 16:28:53 -08:00
291 changed files with 10785 additions and 11975 deletions
--- a/Android.mk
+++ b/Android.mk
@@ -5,40 +5,24 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := LineageSetupWizard
+LOCAL_PACKAGE_NAME := CyanogenSetupWizard
 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 := \
-    org.lineageos.platform.internal
+    android-support-v4 \
    android-support-v13 \
    play \
    libphonenumber
-LOCAL_JAVA_LIBRARIES := \
+# Include res dir from chips
-    telephony-common
+google_play_dir := ../../../external/google/google_play_services/libproject/google-play-services_lib/res
 res_dir := $(google_play_dir) res
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir))
-
+LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_USE_AAPT2 := true
+LOCAL_AAPT_FLAGS += --extra-packages com.google.android.gms
 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,7 +1,6 @@
 <?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.
@@ -17,8 +16,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
-          package="org.lineageos.setupwizard"
+          package="com.cyanogenmod.setupwizard"
-          android:versionCode="5"
+          android:versionCode="3"
          android:sharedUserId="android.uid.system">
    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
@@ -31,289 +30,71 @@
    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.GET_ACCOUNTS_PRIVILEGED" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
    <uses-permission android:name="android.permission.MANAGE_USERS" />
    <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
    <uses-permission android:name="android.permission.ACCESS_THEME_MANAGER"/>
    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
-    <uses-permission android:name="lineageos.permission.HARDWARE_ABSTRACTION_ACCESS" />
+    <uses-permission android:name="android.permission.HARDWARE_ABSTRACTION_ACCESS" />
    <uses-permission android:name="android.permission.BACKUP" />
-    <uses-permission android:name="android.permission.LOCAL_MAC_ADDRESS" />
+    <uses-permission android:name="cyanogenmod.permission.FINISH_SETUP" />
-    <uses-permission android:name="lineageos.permission.FINISH_SETUP" />
+    <uses-permission android:name="cyanogenmod.permission.LEGALESE" />
-    <uses-permission android:name="lineageos.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="com.cyngn.stats.SEND_ANALYTICS" />
-    <uses-permission android:name="lineageos.permission.WRITE_SECURE_SETTINGS" />
+    <uses-permission android:name="com.cyanogen.permission.REQUEST_KILL_SWITCH_OP" />
    <permission
-        android:name="lineageos.permission.FINISH_SETUP"
+        android:name="cyanogenmod.permission.PROTECTED_APP"
        android:protectionLevel="signatureOrSystem" />
-    <protected-broadcast android:name="org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE"
+    <permission
-                         android:permission="lineageos.permission.FINISH_SETUP"/>
+        android:name="cyanogenmod.permission.FINISH_SETUP"
        android:protectionLevel="signatureOrSystem"
        androidprv:allowViaWhitelist="true" />
-    <protected-broadcast android:name="org.lineageos.setupwizard.SETUP_FINISHED"
+    <protected-broadcast android:name="com.cyanogenmod.setupwizard.SETUP_FINISHED"
-                         android:permission="lineageos.permission.FINISH_SETUP"/>
+                         android:permission="cyanogenmod.permission.FINISH_SETUP"/>
    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />
    <application android:label="@string/app_name"
-                 android:icon="@mipmap/ic_launcher"
+                 android:icon="@drawable/icon"
                 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:theme="@style/NoDisplay"
+        <activity android:name=".ui.SetupWizardActivity"
-                  android:label="@string/activity_label_empty"
+                  android:label="@string/product_name"
-                  android:name=".wizardmanager.WizardManager"
+                  android:launchMode="singleInstance"
                  android:enabled="false"
                  android:exported="false"
                  android:excludeFromRecents="true"
-                  android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
+                  android:configChanges="themeChange|mcc|mnc"
                  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>
-        <activity android:name=".BluetoothSetupActivity"
+        <receiver android:name=".setup.FinishSetupReceiver"
-                  android:label="@string/activity_label_empty"
+                  android:exported="true">
                  android:excludeFromRecents="true"
                  android:configChanges="mcc|mnc"
                  android:immersive="true"
                  android:windowSoftInputMode="stateAlwaysHidden">
            <intent-filter>
-                <action android:name="org.lineageos.setupwizard.LINEAGE_BLUETOOTH_SETUP" />
+                <action android:name="com.cyanogenmod.setupwizard.ACTION_FINISH_SETUPWIZARD" />
                <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
@@ -1,13 +0,0 @@
 #!/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
@@ -1,32 +0,0 @@
 <?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
@@ -1,12 +1,3 @@
 -keep class * extends java.util.ListResourceBundle {
    protected Object[][] getContents();
-}
+}
 # Needed for Parcelable/SafeParcelable Creators to not get stripped
 -keepnames class * implements android.os.Parcelable {
    public static final ** CREATOR;
 }
 # Needed when building against the Marshmallow SDK
 -dontwarn org.apache.http.**
 -dontwarn androidx.**
--- a/res/anim/slide_left.xml
+++ b/res/anim/slide_left.xml
@@ -0,0 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
    <objectAnimator android:duration="@android:integer/config_mediumAnimTime"
                    android:interpolator="@android:anim/accelerate_interpolator"
                    android:propertyName="x"
                    android:valueFrom="1280"
                    android:valueTo="0"
                    android:valueType="floatType"/>
 </set>
--- a/res/anim/slide_right.xml
+++ b/res/anim/slide_right.xml
@@ -0,0 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
    <objectAnimator android:duration="@android:integer/config_mediumAnimTime"
                    android:interpolator="@android:anim/accelerate_interpolator"
                    android:propertyName="x"
                    android:valueFrom="0"
                    android:valueTo="-1280"
                    android:valueType="floatType"/>
 </set>
--- a/res/drawable-hdpi/brand.png
+++ b/res/drawable-hdpi/brand.png
--- a/res/drawable-hdpi/brand_finish.png
+++ b/res/drawable-hdpi/brand_finish.png
--- a/res/drawable-hdpi/cross.png
+++ b/res/drawable-hdpi/cross.png
--- a/res/drawable-hdpi/icon.png
+++ b/res/drawable-hdpi/icon.png
--- a/res/drawable-hdpi/powered_by.png
+++ b/res/drawable-hdpi/powered_by.png
--- a/res/drawable-hdpi/tick.png
+++ b/res/drawable-hdpi/tick.png
--- a/res/drawable-hdpi/timer.png
+++ b/res/drawable-hdpi/timer.png
--- a/res/drawable-mdpi/brand.png
+++ b/res/drawable-mdpi/brand.png
--- a/res/drawable-mdpi/brand_finish.png
+++ b/res/drawable-mdpi/brand_finish.png
--- a/res/drawable-mdpi/cross.png
+++ b/res/drawable-mdpi/cross.png
--- a/res/drawable-mdpi/icon.png
+++ b/res/drawable-mdpi/icon.png
--- a/res/drawable-mdpi/powered_by.png
+++ b/res/drawable-mdpi/powered_by.png
--- a/res/drawable-mdpi/tick.png
+++ b/res/drawable-mdpi/tick.png
--- a/res/drawable-mdpi/timer.png
+++ b/res/drawable-mdpi/timer.png
--- a/res/drawable-xhdpi/brand.png
+++ b/res/drawable-xhdpi/brand.png
--- a/res/drawable-xhdpi/brand_finish.png
+++ b/res/drawable-xhdpi/brand_finish.png
--- a/res/drawable-xhdpi/cross.png
+++ b/res/drawable-xhdpi/cross.png
--- a/res/drawable-xhdpi/icon.png
+++ b/res/drawable-xhdpi/icon.png
--- a/res/drawable-xhdpi/powered_by.png
+++ b/res/drawable-xhdpi/powered_by.png
--- a/res/drawable-xhdpi/tick.png
+++ b/res/drawable-xhdpi/tick.png
--- a/res/drawable-xhdpi/timer.png
+++ b/res/drawable-xhdpi/timer.png
--- a/res/drawable-xxhdpi/brand.png
+++ b/res/drawable-xxhdpi/brand.png
--- a/res/drawable-xxhdpi/brand_finish.png
+++ b/res/drawable-xxhdpi/brand_finish.png
--- a/res/drawable-xxhdpi/cross.png
+++ b/res/drawable-xxhdpi/cross.png
--- a/res/drawable-xxhdpi/powered_by.png
+++ b/res/drawable-xxhdpi/powered_by.png
--- a/res/drawable-xxhdpi/tick.png
+++ b/res/drawable-xxhdpi/tick.png
--- a/res/drawable-xxhdpi/timer.png
+++ b/res/drawable-xxhdpi/timer.png
--- a/res/drawable-xxxhdpi/brand.png
+++ b/res/drawable-xxxhdpi/brand.png
--- a/res/drawable-xxxhdpi/brand_finish.png
+++ b/res/drawable-xxxhdpi/brand_finish.png
--- a/res/drawable-xxxhdpi/cross.png
+++ b/res/drawable-xxxhdpi/cross.png
--- a/res/drawable-xxxhdpi/powered_by.png
+++ b/res/drawable-xxxhdpi/powered_by.png
--- a/res/drawable-xxxhdpi/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
@@ -1,29 +0,0 @@
 <?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,7 +1,6 @@
 <?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.
@@ -22,6 +21,6 @@
    android:viewportHeight="24">
    <path
-        android:fillColor="@color/accent"
+        android:fillColor="#7ED321"
        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
@@ -0,0 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
        android:fillColor="@color/white"
        android:pathData="M15.41,7.41L14,6l-6,6l6,6l1.41-1.41L10.83,12L15.41,7.41Z" />
 </vector>
--- a/res/drawable/ic_chevron_right_wht.xml
+++ b/res/drawable/ic_chevron_right_wht.xml
@@ -0,0 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
        android:fillColor="@color/white"
        android:pathData="M10,6L8.59,7.41L13.17,12l-4.58,4.59L10,18l6-6L10,6Z" />
 </vector>
--- a/res/drawable/ic_datetime.xml
+++ b/res/drawable/ic_datetime.xml
@@ -1,29 +0,0 @@
 <?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
@@ -1,29 +0,0 @@
 <?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
@@ -1,35 +0,0 @@
 <?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
@@ -1,52 +0,0 @@
 <?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
@@ -1,32 +0,0 @@
 <?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
@@ -1,29 +0,0 @@
 <?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
@@ -1,30 +0,0 @@
 <?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_mobile_data.xml
+++ b/res/drawable/ic_mobile_data.xml
@@ -1,30 +0,0 @@
 <?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
@@ -1,8 +0,0 @@
 <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,6 +1,5 @@
 <!--
-    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.
@@ -21,6 +20,6 @@
        android:viewportWidth="24.0"
        android:viewportHeight="24.0">
    <path
-        android:fillColor="#e0e0e0"
+        android:fillColor="#FFFFFF"
        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
 </vector>
--- a/res/drawable/ic_signal_1.xml
+++ b/res/drawable/ic_signal_1.xml
@@ -1,6 +1,5 @@
 <!--
-    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.
@@ -21,7 +20,7 @@
        android:viewportWidth="24.0"
        android:viewportHeight="24.0">
    <path
-        android:fillColor="#e0e0e0"
+        android:fillColor="#FFFFFF"
        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,6 +1,5 @@
 <!--
-    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.
@@ -21,7 +20,7 @@
        android:viewportWidth="24.0"
        android:viewportHeight="24.0">
    <path
-        android:fillColor="#e0e0e0"
+        android:fillColor="#FFFFFF"
        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,6 +1,5 @@
 <!--
-    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.
@@ -21,7 +20,7 @@
        android:viewportWidth="24.0"
        android:viewportHeight="24.0">
    <path
-        android:fillColor="#e0e0e0"
+        android:fillColor="#FFFFFF"
        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,6 +1,5 @@
 <!--
-    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,6 +1,5 @@
 <!--
-    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.
@@ -21,6 +20,6 @@
        android:viewportWidth="24.0"
        android:viewportHeight="24.0">
    <path
-        android:fillColor="#e0e0e0"
+        android:fillColor="#FFFFFF"
        android:pathData="M2.000000,22.000000l20.000000,0.000000L22.000000,2.000000L2.000000,22.000000zM20.000000,20.000000L6.800000,20.000000L20.000000,6.800000L20.000000,20.000000z"/>
 </vector>
--- a/res/drawable/ic_sim.xml
+++ b/res/drawable/ic_sim.xml
@@ -1,28 +0,0 @@
 <?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/logo.xml
+++ b/res/drawable/logo.xml
@@ -1,51 +0,0 @@
 <?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/tick.xml
+++ b/res/drawable/tick.xml
@@ -1,28 +0,0 @@
 <?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
@@ -1,29 +0,0 @@
 <?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
@@ -0,0 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2015 The CyanogenMod Project
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
          http://www.apache.org/licenses/LICENSE-2.0
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                android:id="@+id/header"
                android:layout_width="0px"
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:paddingTop="@dimen/header_logo_margin_top"
                android:background="@color/primary"
                style="@style/Header">
    <ImageView
        android:id="@+id/brand_logo"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:src="@drawable/brand"
        android:paddingLeft="@dimen/header_logo_margin_left"
        android:paddingBottom="@dimen/header_logo_margin_bottom"
        android:layout_alignParentTop="true"/>
    <ImageView
        android:id="@+id/powered_by_logo"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:src="@drawable/powered_by"
        android:visibility="gone"
        android:paddingLeft="@dimen/header_logo_margin_left"
        android:paddingBottom="@dimen/header_logo_margin_bottom"
        android:layout_below="@+id/brand_logo"/>
    <TextView
        android:layout_width="match_parent"
        android:layout_height="@dimen/page_title_height"
        style="@style/PageTitle" />
 </RelativeLayout>
--- a/res/layout-land/setup_welcome_page.xml
+++ b/res/layout-land/setup_welcome_page.xml
@@ -0,0 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2013 The CyanogenMod Project
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
          http://www.apache.org/licenses/LICENSE-2.0
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:orientation="horizontal"
              android:layout_width="match_parent"
              android:layout_height="match_parent">
    <include layout="@layout/logo_header" />
    <RelativeLayout android:id="@+id/page"
                 android:layout_width="0px"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
                 android:paddingLeft="@dimen/content_margin_left"
                 android:paddingRight="@dimen/content_margin_left"
                 style="@style/PageContent">
        <com.cyanogenmod.setupwizard.ui.LocalePicker
            android:id="@+id/locale_list"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:minHeight="@dimen/min_locale_picker_height"
            android:focusable="true"
            android:focusableInTouchMode="true"
            android:layout_centerInParent="true"/>
    </RelativeLayout>
 </LinearLayout>
--- a/res/layout-land/sim_missing_page.xml
+++ b/res/layout-land/sim_missing_page.xml
@@ -19,7 +19,7 @@
              android:layout_width="match_parent"
              android:layout_height="match_parent">
-    <include layout="@layout/header_condensed" />
+    <include layout="@layout/header" />
    <FrameLayout android:id="@+id/page"
                 android:layout_width="match_parent"
@@ -55,3 +55,7 @@
        </LinearLayout>
    </FrameLayout>
 </LinearLayout>
--- a/res/layout/button_bar.xml
+++ b/res/layout/button_bar.xml
@@ -0,0 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2015 The CyanogenMod Project
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
          http://www.apache.org/licenses/LICENSE-2.0
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:id="@+id/button_bar"
              android:layout_width="match_parent"
              android:layout_height="wrap_content"
              android:orientation="horizontal"
              android:background="@color/button_bar_background">
    <Button
        style="@style/ButtonBar.Left"
        android:id="@+id/prev_button"
        android:layout_width="wrap_content"
        android:layout_weight="1"/>
    <Button
        style="@style/ButtonBar.Right"
        android:id="@+id/next_button"
        android:layout_width="wrap_content"
        android:text="@string/next" />
 </LinearLayout>
--- a/res/layout/choose_data_sim_page.xml
+++ b/res/layout/choose_data_sim_page.xml
@@ -1,7 +1,6 @@
 <?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.
@@ -18,10 +17,9 @@
 <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" />
+    <include layout="@layout/header" />
    <FrameLayout android:id="@+id/page"
                 android:layout_width="match_parent"
@@ -64,11 +62,6 @@
            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/header.xml
+++ b/res/layout/header.xml
@@ -0,0 +1,29 @@
 <?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,7 +1,6 @@
 <?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.
@@ -16,32 +15,15 @@
     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:paddingTop="48dp"
+                android:background="@color/header_condensed_bg"
-    android:orientation="vertical">
+                style="@style/Header">
    <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="64dp"
+        android:layout_height="@dimen/page_title_height"
        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
@@ -1,76 +0,0 @@
 <?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
@@ -19,26 +19,24 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageButton android:id="@+id/lp__increment"
+    <ImageButton android:id="@+id/increment"
-                 android:layout_width="fill_parent"
+        android:layout_width="fill_parent"
-                 android:layout_height="wrap_content"
+        android:layout_height="wrap_content"
-                 android:paddingTop="22dip"
+        android:paddingTop="22dip"
-                 android:paddingBottom="22dip"/>
+        android:paddingBottom="22dip"/>
-    <view class="org.lineageos.setupwizard.widget.LocalePicker$CustomEditText"
+    <EditText
-          android:textAppearance="?android:attr/textAppearanceMedium"
+        android:id="@+id/numberpicker_input"
-          android:textColor="?android:attr/textColorPrimary"
+        android:layout_width="fill_parent"
-          android:id="@+id/localepicker_input"
+        android:layout_height="wrap_content"
-          android:layout_width="fill_parent"
+        android:textAppearance="?android:attr/textAppearanceMediumInverse"
-          android:layout_height="wrap_content"
+        android:gravity="center"
-          android:gravity="center"
+        android:singleLine="true" />
          android:singleLine="true"
          android:background="@null" />
-    <ImageButton android:id="@+id/lp__decrement"
+    <ImageButton android:id="@+id/decrement"
-                 android:layout_width="fill_parent"
+        android:layout_width="fill_parent"
-                 android:layout_height="wrap_content"
+        android:layout_height="wrap_content"
-                 android:paddingTop="22dip"
+        android:paddingTop="22dip"
-                 android:paddingBottom="22dip"/>
+        android:paddingBottom="22dip"/>
 </merge>
--- a/res/layout/location_settings.xml
+++ b/res/layout/location_settings.xml
@@ -1,7 +1,6 @@
 <?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.
@@ -18,8 +17,7 @@
 <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" />
@@ -47,6 +45,42 @@
                    android:paddingRight="@dimen/content_margin_right"
                    style="@style/PageSummaryText" />
                <LinearLayout
                    android:id="@+id/backup"
                    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/backup_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/backup_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/backup_data_summary"
                        android:maxLines="5" />
                </LinearLayout>
                <LinearLayout
                    android:id="@+id/location"
                    android:orientation="horizontal"
@@ -83,14 +117,77 @@
                </LinearLayout>
                <LinearLayout
                    android:id="@+id/gps"
                    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/gps_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/gps_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_gps"
                        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
@@ -0,0 +1,48 @@
 <?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,7 +1,6 @@
 <?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.
@@ -18,18 +17,16 @@
 <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" />
+    <include layout="@layout/header" />
    <ProgressBar
        android:id="@+id/progress"
        style="?android:attr/progressBarStyleHorizontal"
        android:indeterminateOnly="true"
        android:layout_width="match_parent"
-        android:layout_height="8dp"
+        android:layout_height="8dp" />
        android:visibility="gone"/>
    <FrameLayout android:id="@+id/page"
                 android:layout_width="match_parent"
@@ -45,7 +42,8 @@
                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"
@@ -103,11 +101,5 @@
            </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_cyanogen_services.xml
+++ b/res/layout/setup_cyanogen_services.xml
@@ -1,7 +1,6 @@
 <?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.
@@ -18,8 +17,7 @@
 <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" />
@@ -36,7 +34,8 @@
            <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
@@ -51,6 +50,58 @@
                    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"
@@ -87,6 +138,42 @@
                </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"
@@ -122,15 +209,7 @@
                        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_datetime_page.xml
+++ b/res/layout/setup_datetime_page.xml
@@ -1,7 +1,6 @@
 <?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.
@@ -18,10 +17,9 @@
 <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" />
+    <include layout="@layout/header" />
    <FrameLayout android:id="@+id/page"
                 android:layout_width="match_parent"
@@ -111,11 +109,4 @@
            </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,7 +1,6 @@
 <?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.
@@ -18,10 +17,9 @@
 <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" />
+    <include layout="@layout/header" />
    <FrameLayout android:id="@+id/page"
        android:layout_width="match_parent"
@@ -39,14 +37,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"
@@ -59,10 +57,9 @@
                    android:gravity="center_vertical"
                    android:textSize="16sp"
                    android:textStyle="bold"
-                    android:text="@string/biometric_setup_backup_lock_method"/>
+                    android:text="@string/fingerprint_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"
@@ -72,10 +69,11 @@
                    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_biometric"
+                    android:id="@+id/setup_fingerprint"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:paddingLeft="@dimen/content_margin_left"
@@ -83,17 +81,10 @@
                    android:gravity="center_vertical"
                    android:textSize="16sp"
                    android:textAllCaps="true"
-                    android:textColor="@color/biometric_setup_text_color"
+                    android:textColor="@color/fingerprint_setup_text_color"
-                    android:text="@string/biometric_setup_screen_lock_setup"/>
+                    android:text="@string/fingerprint_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_finished_page.xml
+++ b/res/layout/setup_finished_page.xml
@@ -0,0 +1,31 @@
 <?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">
    <ImageView
        android:id="@+id/brand_logo"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:src="@drawable/brand_finish"
        android:scaleType="centerInside"
        android:padding="@dimen/content_margin_left"/>
 </LinearLayout>
--- a/res/layout/setup_loading_page.xml
+++ b/res/layout/setup_loading_page.xml
@@ -1,7 +1,6 @@
 <?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.
@@ -18,30 +17,24 @@
 <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" />
+    <include layout="@layout/header" />
    <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
@@ -1,51 +0,0 @@
 <?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,77 +0,0 @@
 <?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/lockscreen_setup_summary" />
                <Button
                    android:id="@+id/setup_lockscreen"
                    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/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/finish_activity.xml
+++ b/res/layout/finish_activity.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2016 The CyanogenMod Project
+     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.
@@ -15,38 +14,28 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<org.lineageos.setupwizard.widget.ScrimInsetsFrameLayout
+<com.cyanogenmod.setupwizard.ui.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
+    <LinearLayout android:orientation="vertical"
-        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">
-        <ImageView
+        <FrameLayout android:id="@+id/content"
-            android:id="@+id/brand_logo"
+                     android:layout_width="match_parent"
-            android:layout_width="match_parent"
+                     android:layout_height="0dp"
-            android:layout_height="0px"
+                     android:layout_weight="1"
-            android:layout_weight="1"
+                     style="@style/PageContainer"/>
            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
+        <include layout="@layout/button_bar"/>
            android:id="@+id/navigation_bar"
            style="@style/SudNavBarTheme"
            android:layout_width="match_parent"
            android:layout_height="@dimen/sud_navbar_height" />
    </LinearLayout>
@@ -56,4 +45,13 @@
               android:background="@drawable/reveal"
               android:visibility="invisible"/>
-</org.lineageos.setupwizard.widget.ScrimInsetsFrameLayout>
+    <ProgressBar
        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/setup_welcome_page.xml
+++ b/res/layout/setup_welcome_page.xml
@@ -0,0 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2013 The CyanogenMod Project
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
          http://www.apache.org/licenses/LICENSE-2.0
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:orientation="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:minHeight="@dimen/min_locale_picker_height"
            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,7 +1,6 @@
 <?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.
@@ -18,10 +17,9 @@
 <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" />
+    <include layout="@layout/header" />
    <FrameLayout android:id="@+id/page"
                 android:layout_width="match_parent"
@@ -55,11 +53,8 @@
        </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
@@ -0,0 +1,35 @@
 <?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
@@ -1,44 +0,0 @@
 <?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-mdpi/ic_launcher.png
+++ b/res/mipmap-mdpi/ic_launcher.png
--- a/res/mipmap-xhdpi/ic_launcher.png
+++ b/res/mipmap-xhdpi/ic_launcher.png
--- a/res/mipmap-xxhdpi/ic_launcher.png
+++ b/res/mipmap-xxhdpi/ic_launcher.png
--- a/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/res/mipmap-xxxhdpi/ic_launcher.png
--- a/res/raw/lineage_wizard_script.xml
+++ b/res/raw/lineage_wizard_script.xml
@@ -1,81 +0,0 @@
 <?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.
 -->
 <WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
    wizard:firstAction="bluetooth_setup">
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BLUETOOTH_SETUP;end" id="bluetooth_setup">
        <result wizard:action="welcome" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end" id="welcome">
        <result wizard:action="locale" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCALE;end" id="locale">
        <result wizard:action="datetime" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_DATETIME;end" id="datetime">
        <result wizard:action="wifi_setup" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WIFI_SETUP;end" id="wifi_setup">
        <result wizard:resultCode="1" wizard:action="sim_missing" wizard:name="no_sim" />
        <result wizard:action="choose_data_sim" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SIM_MISSING;end" id="sim_missing">
        <result wizard:resultCode="1" wizard:action="location_settings" wizard:name="skip_sim" />
        <result wizard:action="choose_data_sim" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_CHOOSE_DATA_SIM;end" id="choose_data_sim">
        <result wizard:action="enable_mobile_data" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_ENABLE_MOBILE_DATA;end" id="enable_mobile_data">
        <result wizard:action="location_settings" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end" id="location_settings">
        <result wizard:action="lineage_settings" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end" id="lineage_settings">
        <result wizard:action="biometric_settings" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS;end" id="biometric_settings">
        <result wizard:action="lockscreen_settings" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end" id="lockscreen_settings">
        <result wizard:action="restore" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end" id="restore">
        <result wizard:action="finish" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">
        <result wizard:action="exit" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.EXIT;end" id="exit" />
 </WizardScript>
--- a/res/raw/lineage_wizard_script_user.xml
+++ b/res/raw/lineage_wizard_script_user.xml
@@ -1,27 +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.
 -->
 <WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
              wizard:firstAction="finish">
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">
        <result wizard:action="exit" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.EXIT;end" id="exit" />
 </WizardScript>
--- a/res/raw/wizard_script.xml
+++ b/res/raw/wizard_script.xml
@@ -1,93 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    Copyright (c) 2014 Google Inc.
    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.
    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.
 -->
 <!--
    The wizard:uris recorded here have the inconvenience of being generated by hand, but they allow
    for the full spread of launch flags (we need FLAG_ACTIVITY_NEW_TASK [0x10000000]), where the
    <intent> tag processed by Intent.parseIntent() does not.
    adb shell am to-intent-uri -a com.android.setupwizard.WELCOME -f 0x10000000 \-\-ez firstRun true
 -->
 <WizardScript wizard:version="2"
  xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard">
    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.OEM_PRE_SETUP;end" id="oem_pre_setup" />
    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.WELCOME;end" id="welcome">
        <result wizard:action="check_user_unlock_qr" wizard:name="start_qr_provision" wizard:resultCode="101" />
        <result wizard:action="check_user_unlock_dpm_user_complete" wizard:name="dpm_user_complete" wizard:resultCode="111" />
        <result wizard:action="check_user_unlock" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.CHECK_USER_UNLOCK;end" id="check_user_unlock_qr">
        <result wizard:action="qr_provision_flow" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.CHECK_USER_UNLOCK;end" id="check_user_unlock_dpm_user_complete">
        <result wizard:action="oem_post_setup" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.CHECK_USER_UNLOCK;end" id="check_user_unlock" />
    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.SIM_MISSING;end" id="sim_missing">
        <result wizard:action="esim_intro" wizard:name="esim" wizard:resultCode="101" />
        <result wizard:action="carrier_setup" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.ESIM_INTRO;end" id="esim_intro" />
    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.CARRIER_SETUP;end" id="carrier_setup" />
    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.SIM_SETUP;end" id="sim_setup" />
    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.DEVICE_OWNER_WARNING;end" id="device_owner_warning">
        <result wizard:action="check_frp" wizard:name="skip" wizard:resultCode="1" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.FACTORY_RESET;end" id="factory_reset" />
    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.CHECK_FRP;end" id="check_frp" />
    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_connect_and_update_flow" id="connect_and_update">
        <result wizard:action="no_network_flow" wizard:name="no_connection" wizard:resultCode="1" />
    </WizardAction>
    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_zero_touch_flow" id="zero_touch">
        <result wizard:action="post_dpm_user_flow" wizard:name="dpm_user_complete" wizard:resultCode="111" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.FLOW_CHOICE;end" id="flow_choice">
        <result wizard:action="setup_as_new_flow" wizard:name="skip" wizard:resultCode="1" />
        <result wizard:action="exit" wizard:name="demo_mode_flow" wizard:resultCode="101" />
        <result wizard:action="unified_restore_flow" wizard:name="unified_restore_flow" wizard:resultCode="102" />
    </WizardAction>
    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_restore_flow" id="restore_flow">
        <result wizard:action="oem_post_setup" />
    </WizardAction>
    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_unified_restore_flow" id="unified_restore_flow">
        <result wizard:action="oem_post_setup" />
    </WizardAction>
    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_setup_as_new_flow" id="setup_as_new_flow">
        <result wizard:action="oem_post_setup" />
    </WizardAction>
    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_no_network_flow" id="no_network_flow">
        <result wizard:action="oem_post_setup" />
    </WizardAction>
    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_post_dpm_user_flow" id="post_dpm_user_flow">
        <result wizard:action="oem_post_setup" />
    </WizardAction>
    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_qr_provision_flow" id="qr_provision_flow" />
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end" id="oem_post_setup">
        <result wizard:action="restore" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end" id="restore">
        <result wizard:action="finish" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">
        <result wizard:action="exit" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.KID_POST_SETUP;end" id="kid_post_setup" />
    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.EXIT;end" id="exit" />
 </WizardScript>
--- a/res/raw/wizard_script_user.xml
+++ b/res/raw/wizard_script_user.xml
@@ -1,74 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
    Copyright (c) 2014 Google Inc.
    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.
    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.
 -->
 <!--
    The wizard:uris recorded here have the inconvenience of being generated by hand, but they allow
    for the full spread of launch flags (we need FLAG_ACTIVITY_NEW_TASK [0x10000000]), where the
    <intent> tag processed by Intent.parseIntent() does not.
    adb shell am to-intent-uri -a com.android.setupwizard.WELCOME -f 0x10000000 \-\-ez firstRun true
 -->
 <WizardScript wizard:version="2"
  xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard">
    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.OEM_PRE_SETUP;end" id="oem_pre_setup" />
    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.USER_WARNING;end" id="secondary_user_warning">
        <result wizard:action="check_user_unlock_dpm_user_complete" wizard:name="dpm_user_complete" wizard:resultCode="111" />
        <result wizard:action="check_user_unlock" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.CHECK_USER_UNLOCK;end" id="check_user_unlock_dpm_user_complete">
        <result wizard:action="oem_post_setup" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.CHECK_USER_UNLOCK;end" id="check_user_unlock" />
    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.NETWORK_SETTINGS;end" id="network_settings">
        <result wizard:action="wifi_settings" wizard:name="see_all_wifi" wizard:resultCode="102" />
        <result wizard:action="network_check" wizard:name="skip" wizard:resultCode="1" />
        <result wizard:action="captive_portal" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.WIFI_SETTINGS;end" id="wifi_settings">
        <result wizard:action="network_check" wizard:name="skip" wizard:resultCode="1" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.CAPTIVE_PORTAL;end" id="captive_portal" />
    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.GMS_CHECKIN;end" id="gms_checkin" />
    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.EARLY_UPDATE;end" id="early_update" />
    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.NETWORK_CHECK;end" id="network_check">
        <result wizard:action="no_account_flow" wizard:name="skip" wizard:resultCode="1" />
    </WizardAction>
    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_rollback_auth_early_update_flow" id="rollback_auth_early_update" />
    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.LOAD_ADD_ACCOUNT_INTENT;end" id="load_account_intent" />
    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.ACCOUNT_SETUP;end" id="account_setup">
        <result wizard:action="no_account_flow" wizard:name="skip" wizard:resultCode="1" />
        <result wizard:action="oem_post_setup" wizard:name="dpm_user_complete" wizard:resultCode="111" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.GMS_ACCOUNT_CHECKIN;end" id="gms_account_checkin">
        <result wizard:action="mfm_check" wizard:name="skip" wizard:resultCode="1" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.ACCOUNT_CHECK;end" id="mfm_check">
        <result wizard:action="no_account_flow" wizard:name="skip" wizard:resultCode="1" />
    </WizardAction>
    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_user_account_flow" id="account_flow">
        <result wizard:action="oem_post_setup" />
    </WizardAction>
    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_user_no_account_flow" id="no_account_flow">
        <result wizard:action="oem_post_setup" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="oem_post_setup" />
    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.KID_POST_SETUP;end" id="kid_post_setup" />
    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.EXIT;end" id="exit" />
    <WizardAction id="END_OF_SCRIPT" />
 </WizardScript>
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
     Copyright (C) 2013-2015 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.
@@ -16,60 +16,66 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name">Opstel Ghoeroe</string>
+  <string name="app_name">Opstel Ghoeroe</string>
-    <string name="next">Volgende</string>
+  <string name="next">Volgende</string>
-    <string name="skip">Slaan oor</string>
+  <string name="skip">Slaan oor</string>
-    <string name="start">Begin</string>
+  <string name="start">Begin</string>
-    <string name="done">Gedoen</string>
+  <string name="ok">OK</string>
-    <string name="ok">OK</string>
+  <string name="loading">Net \'n sekonde\u2026</string>
-    <string name="loading">Net \'n sekonde\u2026</string>
+  <string name="setup_complete">Opstelling is voltooi</string>
-    <string name="setup_complete">Opstelling is voltooi</string>
+  <string name="setup_welcome">Welkom</string>
-    <string name="setup_welcome">Welkom</string>
+  <string name="setup_wifi">Kies Wi\u2011Fi</string>
-    <string name="setup_locale">Taal</string>
+  <string name="setup_sim_missing">SIM-kaart ontbreek</string>
-    <string name="setup_wifi">Kies Wi\u2011Fi</string>
+  <string name="setup_choose_data_sim">Kies \'n SIM vir data</string>
-    <string name="setup_sim_missing">SIM-kaart ontbreek</string>
+  <string name="setup_location">Ligging dienste</string>
-    <string name="setup_choose_data_sim">Kies \'n SIM vir data</string>
+  <string name="setup_other">Ander dienste</string>
-    <string name="setup_location">Ligging dienste</string>
+  <string name="setup_datetime">Datum &amp; tyd</string>
-    <string name="setup_other">Ander dienste</string>
+  <string name="setup_current_date">Huidige datum</string>
-    <string name="setup_datetime">Datum &amp; tyd</string>
+  <string name="setup_current_time">Huidige tyd</string>
-    <string name="setup_current_date">Huidige datum</string>
+  <string name="sim_missing_summary" product="tablet">\'n SIM-kaart is nie bespeur in jou tablet. Om \'n SIM-kaart by te voeg, lees die instruksies wat saam gekom het met jou tablet.</string>
-    <string name="setup_current_time">Huidige tyd</string>
+  <string name="sim_missing_summary" product="default">\'n SIM-kaart is nie bespeur in jou foon. Om \'n SIM-kaart by te voeg, lees die instruksies wat saam gekom het met jou foon.</string>
-    <string name="sim_missing_summary" product="tablet">\'n SIM-kaart is nie bespeur in jou tablet. Om \'n SIM-kaart by te voeg, lees die instruksies wat saam gekom het met jou tablet.</string>
+  <string name="choose_data_sim_summary" product="tablet">Watter SIM wil jy gebruik vir data? Die gekose SIM kan netwerk koste aangaan, dit sal gebruik word met die opstel van jou tablet.</string>
-    <string name="sim_missing_summary" product="default">\'n SIM-kaart is nie bespeur in jou foon. Om \'n SIM-kaart by te voeg, lees die instruksies wat saam gekom het met jou foon.</string>
+  <string name="choose_data_sim_summary" product="default">Watter SIM wil jy gebruik vir data? Die gekose SIM kan netwerk koste aangaan, dit sal gebruik word met die opstel van jou foon.</string>
-    <string name="choose_data_sim_summary" product="tablet">Watter SIM wil jy gebruik vir data? Die gekose SIM kan netwerk koste aangaan, dit sal gebruik word met die opstel van jou tablet.</string>
+  <string name="date_time_summary">Stel jou tydsone en pas huidige datum en tyd toe, indien nodig</string>
-    <string name="choose_data_sim_summary" product="default">Watter SIM wil jy gebruik vir data? Die gekose SIM kan netwerk koste aangaan, dit sal gebruik word met die opstel van jou foon.</string>
+  <string name="backup_data_summary"><b>Rugsteun</b> program data, Wi-Fi wagwoorde en ander instellings na Google-bedieners</string>
-    <string name="date_time_summary">Stel jou tydsone en pas huidige datum en tyd toe, indien nodig</string>
+  <string name="other_services_summary">Hierdie dienste word deur Google verskaf en jy kan dit aktiveer of deaktiveer op enige tyd. Data sal in ooreenstemming met Google se <xliff:g id="name" example="Privacy Policy">%s</xliff:g> gebruik word.</string>
-    <string name="backup_data_summary"><b>Rugsteun</b> program data, Wi-Fi wagwoorde en ander instellings na Google-bedieners</string>
+  <string name="location_services_summary">Ligging dienste laat stelsel en ander 3rde party programme toe om data te gebruik soos jou benaderde ligging. Bv \'n program kan jou benaderde ligging gebruik om nabygeleë koffiewinkels op te spoor.</string>
-    <string name="other_services_summary">Hierdie dienste word deur Google verskaf en jy kan dit aktiveer of deaktiveer op enige tyd. Data sal in ooreenstemming met Google se <xliff:g id="name" example="Privacy Policy">%s</xliff:g> gebruik word.</string>
+  <string name="location_access_summary"><b>Laat programme toe wat jou toestemming gevra het</b> om jou ligging inligting te gebruik. Dit kan jou huidige ligging en plekke asook liggings en plekke uit die verlede insluit.</string>
-    <string name="location_services_summary">Ligging dienste laat stelsel en ander 3rde party programme toe om data te gebruik soos jou benaderde ligging. Bv \'n program kan jou benaderde ligging gebruik om nabygeleë koffiewinkels op te spoor.</string>
+  <string name="location_gps" product="tablet"><b>Verbeter ligging akkuraatheid</b> deur programme toe te laat om jou GPS te kan gebruik op jou tablet.</string>
-    <string name="location_access_summary"><b>Laat programme toe wat jou toestemming gevra het</b> om jou ligging inligting te gebruik. Dit kan jou huidige ligging en plekke asook liggings en plekke uit die verlede insluit.</string>
+  <string name="location_gps" product="default"><b>Verbeter ligging akkuraatheid</b> deur programme toe te laat om jou GPS te kan gebruik op jou foon.</string>
-    <string name="setup_mobile_data">Skakel mobiele data aan</string>
+  <string name="location_network"><b>Gebruik Wi-Fi</b> om programme te help om jou ligging te bepaal.</string>
-    <string name="setup_mobile_data_no_service">Geen diens</string>
+  <string name="location_network_telephony"><b>Gebruik Wi-Fi en mobiele netwerke</b> om programme te help om jou ligging te bepaal.</string>
-    <string name="setup_mobile_data_emergency_only">Net Noodoproepe</string>
+  <string name="location_network_gms"><b>Gebruik Google se ligging diens</b> om programme te help om jou ligging te bepaal. Dit beteken dit stuur anonieme ligging data na Google, selfs wanneer daar geen programme aktief is nie.</string>
-    <string name="enable_mobile_data_summary">Wil jy sellulêre data aanskakel gedurende opstelling? Wanneer aangeskakel kan dit tot data kostes lui.</string>
+  <string name="setup_mobile_data">Skakel mobiele data aan</string>
-    <string name="no">Nee</string>
+  <string name="setup_mobile_data_no_service">Geen diens</string>
-    <string name="yes">Ja</string>
+  <string name="setup_mobile_data_emergency_only">Net Noodoproepe</string>
-    <string name="emergency_call">Noodoproep</string>
+  <string name="enable_mobile_data_summary">Wil jy mobiele data gebruik tydens die opstelling? Aan skakeling van mobiele data kan onderworpe aan data koste wees.</string>
-    <string name="setup_services">LineageOS kenmerke</string>
+  <string name="no">Nee</string>
-    <string name="services_explanation" product="tablet">Hierdie dienste werk vir jou om die vermoëns van jou tablet uit te brei. Data sal in ooreenkomstig met LineageOS se <xliff:g id="name" example="Privaatheidspolitiek">%s</xliff:g> gebruik word.</string>
+  <string name="yes">Ja</string>
-    <string name="services_explanation" product="default">Hierdie dienste werk vir jou om die vermoëns van jou foon uit te brei. Data sal in ooreenkomstig met LineageOS se <xliff:g id="name" example="Privaatheidspolitiek">%s</xliff:g> gebruik word.</string>
+  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
-    <string name="services_privacy_policy">Privaatheid beleid</string>
+  <string name="emergency_call">Noodoproep</string>
-    <string name="services_os_nav_keys_label"><b>Gebruik skerm navigasie sleutels</b> in plaas van hardeware sleutels.</string>
+  <string name="setup_services">Cyanogen funksies</string>
-    <string name="setup_unlock">Ontsluit</string>
+  <string name="services_explanation" product="tablet">Hierdie dienste werk vir jou om die vermoëns van jou tablet uit te brei. Data sal in ooreenkomstig gebruik word met Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="setup_device_locked">Die toestel is gesluit deur die gebruiker.</string>
+  <string name="services_explanation" product="default">Hierdie dienste werk vir jou om die vermoëns van jou foon uit te brei. Data sal in ooreenkomstig gebruik word met Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="setup_require_cyanogen_label"><b>Jou rekening wagwoord sal vereis word</b> om jou toestel te gebruik, selfs na \'n fabriek herstel.</string>
+  <string name="services_privacy_policy">Privaatheid beleid</string>
-    <string name="setup_device_locked_instructions"><i>Om hierdie funksie te aan/af te skakel, gaan asseblief na Instellings &gt; Sekuriteit</i></string>
+  <string name="services_help_improve_cm">Help verbeter <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
-    <string name="settings_biometric_setup_title">Kies nog \'n skerm sluit tipe</string>
+  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> deur outomaties diagnostiese en gebruikers data te stuur na Cyanogen. Hierdie inligting kan nie gebruik word om jou te identifiseer nie en help spanne werk op dinge soos battery lewe, program werkverrigting en nuwe <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> funksies.</string>
-    <string name="settings_biometric_setup_details">Hoe wil jy jou skerm sluit?</string>
+  <string name="services_apply_theme">Pas <xliff:g id="name" example="Material">%s</xliff:g> tema toe</string>
-    <string name="fingerprint_setup_title">Vingerafdruk opstelling</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> aktiveer unieke ikone, agtergronde en lettertipe.</string>
-    <string name="fingerprint_setup_summary">Om jou vingerafdruk sensor te gebruik om jou skerm te ontsluit, benodig jy:</string>
+  <string name="services_os_nav_keys_label"><b>Gebruik skerm navigasie sleutels</b> in plaas van hardeware sleutels.</string>
-    <string name="fingerprint_setup_add_fingerprint">Voeg jou vingerafdruk by</string>
+  <string name="services_use_secure_sms">Maak gebruik van veilige SMS</string>
-    <string name="biometric_setup_backup_lock_method">Stel \'n tweede ontsluit metode op</string>
+  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> om SMS gesprekke met ander gebruikers te enkripteer met behulp van veilige SMS op \'n <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> toestel.</string>
-    <string name="biometric_setup_screen_lock_setup">Stel skerm sluit op</string>
+  <string name="setup_unlock">Ontsluit</string>
-    <string name="sim_locale_changed">%1$s SIM opgespoor</string>
+  <string name="setup_device_locked">Die toestel is gesluit deur die gebruiker.</string>
-    <string name="settings_lockscreen_setup_title">Kies skerm sluit tipe</string>
+  <string name="setup_require_cyanogen_label"><b>Benodig  jou Cyanogen wagwoord</b> om jou toestel te gebruik, selfs nadat \'n fabriek herstel gedoen is.</string>
-    <string name="settings_lockscreen_setup_details">Hoe wil jy jou skerm sluit?</string>
+  <string name="setup_device_locked_instructions"><i>Om hierdie funksie te aan/af te skakel, gaan asseblief na Instellings &gt; Sekuriteit</i></string>
-    <string name="lockscreen_setup_title" product="default">Beskerm jou foon</string>
+  <string name="setup_warning_skip_anyway">Sonder \'n Cyanogen bedryfstelsel rekening, sal jy nie in staat wees om:\n\nOm jou toestel met nuwe ikone, agtergronde en meer in die Temas program te verpersoonlik nie\n\nJou toestel te vind of op te spoor indien dit verlore gaan nie</string>
-    <string name="lockscreen_setup_summary"><b>Beskerm die toestel</b>\" en vereis \'n PIN, patroon of wagwoord om skerm te ontsluit\"</string>
+  <!-- Fingerprint setup -->
-    <string name="lockscreen_setup_screen_lock_setup">Stel op</string>
+  <string name="settings_fingerprint_setup_title">Kies nog \'n skerm sluit tipe</string>
  <string name="settings_fingerprint_setup_details">Hoe wil jy jou skerm sluit?</string>
  <string name="fingerprint_setup_title">Vingerafdruk opstelling</string>
  <string name="fingerprint_setup_summary">Om jou vingerafdruk sensor te gebruik om jou skerm te ontsluit, benodig jy:</string>
  <string name="fingerprint_setup_backup_lock_method">Stel \'n tweede ontsluit metode op</string>
  <string name="fingerprint_setup_add_fingerprint">Voeg jou vingerafdruk by</string>
  <string name="fingerprint_setup_screen_lock_setup">Stel skerm sluit op</string>
 </resources>
--- a/res/values-sc-rIT/strings.xml
+++ b/res/values-sc-rIT/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
     Copyright (C) 2013-2015 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.
@@ -16,12 +16,5 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="skip">Brinca</string>
+  <!-- Fingerprint setup -->
    <string name="start">Incumintza</string>
    <string name="done">Fatu</string>
    <string name="ok">AB</string>
    <string name="setup_locale">Limba</string>
    <string name="no">Nono</string>
    <string name="yes">Eja</string>
    <string name="services_privacy_policy">Polìtica de riservadesa</string>
 </resources>
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
     Copyright (C) 2013-2015 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.
@@ -16,71 +16,66 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name">معالج الإعداد</string>
+  <string name="app_name">معالج الإعداد</string>
-    <string name="next">التالي</string>
+  <string name="next">التالي</string>
-    <string name="skip">تخطي</string>
+  <string name="skip">تخطي</string>
-    <string name="start">البداية</string>
+  <string name="start">البداية</string>
-    <string name="done">تم</string>
+  <string name="ok">موافق</string>
-    <string name="ok">موافق</string>
+  <string name="loading">ثانية واحدة</string>
-    <string name="loading">ثانية واحدة</string>
+  <string name="setup_complete">الإعداد تم</string>
-    <string name="setup_complete">الإعداد تم</string>
+  <string name="setup_welcome">مرحبا</string>
-    <string name="setup_welcome">مرحبا</string>
+  <string name="setup_wifi">تحديد الواي فاي</string>
-    <string name="setup_locale">اللغة</string>
+  <string name="setup_sim_missing">شريحة SIM مفقودة</string>
-    <string name="setup_wifi">تحديد الواي فاي</string>
+  <string name="setup_choose_data_sim">اختر شريحة SIM للبيانات</string>
-    <string name="setup_sim_missing">شريحة SIM مفقودة</string>
+  <string name="setup_location">خدمات الموقع</string>
-    <string name="setup_choose_data_sim">اختر شريحة SIM للبيانات</string>
+  <string name="setup_other">خدمات أخرى</string>
-    <string name="setup_location">خدمات الموقع</string>
+  <string name="setup_datetime">التاريخ والوقت</string>
-    <string name="setup_other">خدمات أخرى</string>
+  <string name="setup_current_date">التاريخ الحالي</string>
-    <string name="setup_datetime">التاريخ والوقت</string>
+  <string name="setup_current_time">الوقت الحالي</string>
-    <string name="setup_current_date">التاريخ الحالي</string>
+  <string name="sim_missing_summary" product="tablet">لم يتم العثور على شريحة SIM في الكمبيوتر اللوحي الخاص بك. لإدخال شريحة SIM، عليك قراءة الإرشادات المرفقة بجهازك.</string>
-    <string name="setup_current_time">الوقت الحالي</string>
+  <string name="sim_missing_summary" product="default">لم يتم العثور على شريحة SIM في هاتفك. لإدخال شريحة SIM، عليك قراءة الإرشادات المرفقة بجهازك.</string>
-    <string name="sim_missing_summary" product="tablet">لم يتم العثور على شريحة SIM في الكمبيوتر اللوحي الخاص بك. لإدخال شريحة SIM، عليك قراءة الإرشادات المرفقة بجهازك.</string>
+  <string name="choose_data_sim_summary" product="tablet">أي شريحة SIM تريد استخدامها للبيانات؟ شريحة SIM المحددة قد يترتب عليها رسوماً للشبكة لأنها ستُستخدم لإعداد الكمبيوتر اللوحي الخاص بك.</string>
-    <string name="sim_missing_summary" product="default">لم يتم العثور على شريحة SIM في هاتفك. لإدخال شريحة SIM، عليك قراءة الإرشادات المرفقة بجهازك.</string>
+  <string name="choose_data_sim_summary" product="default">أي شريحة SIM تريد استخدامها للبيانات؟ شريحة SIM المحددة قد يترتب عليها رسوماً للشبكة لأنها ستُستخدم لإعداد هاتفك.</string>
-    <string name="choose_data_sim_summary" product="tablet">أي شريحة SIM تريد استخدامها للبيانات؟ شريحة SIM المحددة قد يترتب عليها رسوماً للشبكة لأنها ستُستخدم لإعداد الكمبيوتر اللوحي الخاص بك.</string>
+  <string name="date_time_summary">تعيين منطقتك الزمنية وضبط الوقت والتاريخ الحالي إذا لزم الأمر</string>
-    <string name="choose_data_sim_summary" product="default">أي شريحة SIM تريد استخدامها للبيانات؟ شريحة SIM المحددة قد يترتب عليها رسوماً للشبكة لأنها ستُستخدم لإعداد هاتفك.</string>
+  <string name="backup_data_summary"><b>إجراء نسخ احتياطي</b> لبيانات التطبيقات وكلمات مرور شبكات الواي فاي والإعدادات الأخرى على خوادم جوجل</string>
-    <string name="date_time_summary">تعيين منطقتك الزمنية وضبط الوقت والتاريخ الحالي إذا لزم الأمر</string>
+  <string name="other_services_summary">هذه الخدمات  تجعل جوجل في خدمتك، ويمكنك تشغيلها أو إيقاف تشغيلها في أي وقت. ستُستخدم البيانات بحسب <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="backup_data_summary"><b>إجراء نسخ احتياطي</b> لبيانات التطبيقات وكلمات مرور شبكات الواي فاي والإعدادات الأخرى على خوادم جوجل</string>
+  <string name="location_services_summary">تسمح خدمات الموقع لتطبيقات النظام والتطبيقات الخارجية بجمع واستخدام البيانات مثل موقعك التقريبي. على سبيل المثال، قد يستخدم تطبيق ما موقعك التقريبي لتحديد موقع  المقاهي القريبة.</string>
-    <string name="other_services_summary">هذه الخدمات  تجعل جوجل في خدمتك، ويمكنك تشغيلها أو إيقاف تشغيلها في أي وقت. ستُستخدم البيانات بحسب <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+  <string name="location_access_summary"><b>يسمح للتطبيقات التي طلبت إذنك</b> باستخدام معلومات موقعك. وقد يشمل ذلك موقعك الحالي ومواقعك السابقة.</string>
-    <string name="location_services_summary">تسمح خدمات الموقع لتطبيقات النظام والتطبيقات الخارجية بجمع واستخدام البيانات مثل موقعك التقريبي. على سبيل المثال، قد يستخدم تطبيق ما موقعك التقريبي لتحديد موقع  المقاهي القريبة.</string>
+  <string name="location_gps" product="tablet"><b>تحسين دقة الموقع</b> بالسماح للتطبيقات باستخدام نظام تحديد المواقع على الكمبيوتر اللوحي الخاص بك.</string>
-    <string name="location_access_summary"><b>يسمح للتطبيقات التي طلبت إذنك</b> باستخدام معلومات موقعك. وقد يشمل ذلك موقعك الحالي ومواقعك السابقة.</string>
+  <string name="location_gps" product="default"><b>تحسين دقة الموقع</b> بالسماح للتطبيقات باستخدام نظام تحديد المواقع على هاتفك.</string>
-    <string name="setup_mobile_data">تشغيل البيانات الخلوية</string>
+  <string name="location_network"><b>استخدام الواي فاي</b> لمساعدة التطبيقات على تحديد موقعك.</string>
-    <string name="setup_mobile_data_no_service">لا توجد خدمة</string>
+  <string name="location_network_telephony"><b>استخدام الواي فاي وشبكات الجوال</b> لمساعدة التطبيقات على تحديد موقعك.</string>
-    <string name="setup_mobile_data_emergency_only">مكالمات الطوارئ فقط</string>
+  <string name="location_network_gms"><b>استخدام خدمة الموقع من جوجل</b> لمساعدة التطبيقات على تحديد موقعك. وهذا يعني إرسال بيانات مجهولة عن الموقع إلى جوجل، حتى في حالة عدم تشغيل أي تطبيقات.</string>
-    <string name="enable_mobile_data_summary">هل تريد استخدام البيانات الخلوية أثناء عملية الإعداد؟ قد يخضع تشغيل البيانات الخلوية إلى تطبيق رسوم بيانات.</string>
+  <string name="setup_mobile_data">تشغيل بيانات الجوال</string>
-    <string name="no">لا</string>
+  <string name="setup_mobile_data_no_service">لا توجد خدمة</string>
-    <string name="yes">نعم</string>
+  <string name="setup_mobile_data_emergency_only">مكالمات الطوارئ فقط</string>
-    <string name="data_sim_name">شريحة <xliff:g id="sub">%1$d</xliff:g> - <xliff:g id="name">%2$s</xliff:g></string>
+  <string name="enable_mobile_data_summary">هل تريد تشغيل بيانات الجوال أثناء عملية الإعداد؟ تشغيل بيانات الجوال قد تترتب عليه رسوم البيانات.</string>
-    <string name="emergency_call">مكالمة طوارئ</string>
+  <string name="no">لا</string>
-    <string name="setup_services">ميزات LineageOS</string>
+  <string name="yes">نعم</string>
-    <string name="services_explanation" product="tablet">تعمل هذه الخدمات على توسيع نطاق إمكانيات كمبيوترك اللوحي. ستُستخدم البيانات بحسب <xliff:g id="name" example="Privacy Policy">%s</xliff:g> LineageOS.</string>
+  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g> شريحة</string>
-    <string name="services_explanation" product="default">تعمل هذه الخدمات على توسيع نطاق إمكانيات كمبيوترك اللوحي. ستُستخدم البيانات بحسب <xliff:g id="name" example="Privacy Policy">%s</xliff:g> LineageOS.</string>
+  <string name="emergency_call">مكالمة طوارئ</string>
-    <string name="services_privacy_policy">سياسة الخصوصية</string>
+  <string name="setup_services">ميزات Cyanogen</string>
-    <string name="services_help_improve_cm">ساهم في تحسين <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
+  <string name="services_explanation" product="tablet">تعمل هذه الخدمات  على توسيع نطاق إمكانيات الكمبيوتر اللوحي الخاص بك. ستُستخدم البيانات بحسب <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> بإرسال بيانات التشخيص و الاستعمال تلقائيا إلى LineageOS. لا يمكن استعمال هذه المعلومات لتحديد هويتك، لكنها تساعد الفرق المكلفة بـ: عمر البطارية، أداء التطبيقات، و مزايا <xliff:g id="name" example="LineageOS">%2$s</xliff:g> الجديدة.</string>
+  <string name="services_explanation" product="default">تعمل هذه الخدمات  على توسيع نطاق إمكانيات هاتفك. ستُستخدم البيانات بحسب <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="services_os_nav_keys_label"><b>استخدام مفاتيح التنقل على الشاشة</b> بدلاً من مفاتيح الأجهزة.</string>
+  <string name="services_privacy_policy">سياسة الخصوصية</string>
-    <string name="setup_unlock">فتح القفل</string>
+  <string name="services_help_improve_cm">ساهم في تحسين <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
-    <string name="setup_device_locked">هذا الجهاز تم قفله من قبل المستخدم.</string>
+  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s </xliff:g> بإرسال بيانات تشخيص المشكلات وبيانات الاستخدام تلقائياً إلى Cyanogen. هذه المعلومات لا يمكن استخدامها للتعرف عليك، لكنها تقدم المساعدة للفرق العاملة على جوانب مثل عمر البطارية وأداء التطبيقات، وميزات  <xliff:g id="name" example="CyanogenMod"> %2$s </xliff:g> الجديدة.</string>
-    <string name="setup_require_cyanogen_label"><b>يتطلب كلمة مرور حسابك</b> حتى تتمكن من استخدام الجهاز حتى بعد إعادة تعيين المصنع.</string>
+  <string name="services_apply_theme">تطبيق السمة <xliff:g id="name" example="Material">%s </xliff:g></string>
-    <string name="setup_device_locked_instructions"><i>من أجل تشغيل/تعطيل هذه الميزة، الرجاء إذهب إلى إعدادات &gt; الأمان</i></string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s </xliff:g> تمكين الرموز الفريدة والخلفيات والخطوط.</string>
-    <string name="settings_biometric_setup_title">حدد نوعاً احتياطياً لشاشة القفل</string>
+  <string name="services_os_nav_keys_label"><b>استخدام مفاتيح التنقل على الشاشة</b> بدلاً من مفاتيح الأجهزة.</string>
-    <string name="settings_biometric_setup_details">كيف تريد إقفال الشاشة؟</string>
+  <string name="services_use_secure_sms">استخدام شريحة SIM آمنة</string>
-    <string name="fingerprint_setup_title">إنشاء بصمة الإصبع</string>
+  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s </xliff:g> لتشفير المحادثات عبر الرسائل القصيرة مع المستخدمين الآخرين باستخدام شريحة SMS آمنة على جهاز <xliff:g id="name" example="CyanogenMod"> %2$s </xliff:g>.</string>
-    <string name="fingerprint_setup_summary">لاستخدام مستشعر بصمات الأصابع لفتح شاشتك، سيكون عليك:</string>
+  <string name="setup_unlock">فتح القفل</string>
-    <string name="fingerprint_setup_add_fingerprint">أضف بصمتك</string>
+  <string name="setup_device_locked">هذا الجهاز تم قفله من قبل المستخدم.</string>
-    <string name="face_setup_title">إعداد الوجه</string>
+  <string name="setup_require_cyanogen_label"><b>يتطلب كلمة مرور حساب Cyanogen OS </b>كي تتمكن من استخدام الجهاز حتى بعد إعادة تعيين المصنع.</string>
-    <string name="face_setup_summary">لاستخدام وجهك في فتح شاشتك، سيكون عليك:</string>
+  <string name="setup_device_locked_instructions"><i>من أجل تشغيل/تعطيل هذه الميزة، الرجاء إذهب إلى إعدادات &gt; الأمان</i></string>
-    <string name="face_setup_add_face">إضافة وجهك</string>
+  <string name="setup_warning_skip_anyway">بدون حساب Cyanogen OS لن تستطيع أن:\n\nتخصص هاتفك بأيقونات وخلفيات جديدة والمزيد في تطبيق السمات\n\nأو تحديد مكان هاتفك أو مسح ذاكرته عن بعد إذا فُقد</string>
-    <string name="biometric_setup_backup_lock_method">إنشاء طريقة احتياطية لإلغاء إقفال الشاشة</string>
+  <!-- Fingerprint setup -->
-    <string name="biometric_setup_screen_lock_setup">إنشاء إقفال الشاشة</string>
+  <string name="settings_fingerprint_setup_title">حدد نوعاً احتياطياً لشاشة القفل</string>
-    <string name="sim_locale_changed">تم اكتشاف %1$s SIM</string>
+  <string name="settings_fingerprint_setup_details">كيف تريد إقفال الشاشة؟</string>
-    <string name="settings_lockscreen_setup_title">حدد نوع شاشة القفل</string>
+  <string name="fingerprint_setup_title">إنشاء بصمة الإصبع</string>
-    <string name="settings_lockscreen_setup_details">كيف تريد إقفال الشاشة؟</string>
+  <string name="fingerprint_setup_summary">لاستخدام مستشعر بصمات الأصابع لفتح شاشتك، سيكون عليك:</string>
-    <string name="lockscreen_setup_title" product="tablet">حماية جهازك اللوحي</string>
+  <string name="fingerprint_setup_backup_lock_method">إنشاء طريقة احتياطية لإلغاء إقفال الشاشة</string>
-    <string name="lockscreen_setup_title" product="default">حماية هاتفك</string>
+  <string name="fingerprint_setup_add_fingerprint">أضف بصمتك</string>
-    <string name="lockscreen_setup_summary"><b>حماية هذا الجهاز</b> وطلب رقم تعريف شخصي أو نمط أو كلمة مرور لإلغاء قفل الشاشة.</string>
+  <string name="fingerprint_setup_screen_lock_setup">إنشاء إقفال الشاشة</string>
    <string name="lockscreen_setup_screen_lock_setup">إعداد</string>
    <string name="intro_restore_title">استعادة التطبيقات والبيانات</string>
    <string name="intro_restore_subtitle" product="tablet">إذا كان لديك نسخة احتياطية من آخر جهاز لوحي بنظام LineageOS، يمكنك استعادتها هنا.</string>
    <string name="intro_restore_subtitle" product="default">إذا كان لديك نسخة احتياطية من آخر هاتف بنظام LineageOS، يمكنك استعادتها هنا.</string>
    <string name="intro_restore_button">استعادة من نسخة احتياطية</string>
 </resources>
--- a/res/values-as-rIN/strings.xml
+++ b/res/values-as-rIN/strings.xml
@@ -0,0 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
     Copyright (C) 2013-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.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="app_name">ছেটআপ ৱিজাৰ্ড</string>
  <string name="next">পৰৱৰ্তী</string>
  <string name="skip">বাদ দিয়া</string>
  <string name="start">আৰম্ভ</string>
  <string name="ok">ঠিক</string>
  <string name="loading">মাত্র একছেকেণ্ড\u2026</string>
  <string name="setup_complete">ছেটআপ সম্পূৰ্ণ হৈছে</string>
  <string name="setup_welcome">স্বাগতম</string>
  <string name="setup_wifi">Wi-Fi চয়ন কৰক</string>
  <string name="setup_sim_missing">SIM কার্ড হেৰাইছে</string>
  <string name="setup_choose_data_sim">ডাটাৰ বাবে এখন SIM কাৰ্ড পচন্দ কৰক</string>
  <string name="setup_location">স্থান সেৱাসমূহ</string>
  <string name="setup_other">অন্যান্য সেৱাবোৰ</string>
  <string name="setup_datetime">তাৰিখ আৰু সময়</string>
  <string name="setup_current_date">চলিত তাৰিখ</string>
  <string name="setup_current_time">চলিত সময়</string>
  <string name="sim_missing_summary" product="tablet">আপোনাৰ টেবলেটত এখন SIM কাৰ্ড চিনাক্ত কৰা হোৱা নাই। এখন SIM কাৰ্ড আন্তঃসংযোগ কৰিবলৈ আপোনাৰ ডিভাইচৰ সৈতে অহা নিৰ্দেশনা পঢ়ক।</string>
  <string name="sim_missing_summary" product="default">আপোনাৰ ফোনত এখন SIM কাৰ্ড চিনাক্ত কৰা হোৱা নাই। এখন SIM কাৰ্ড আন্তঃসংযোগ কৰিবলৈ আপোনাৰ ডিভাইচৰ সৈতে অহা নিৰ্দেশনা পঢ়ক।</string>
  <string name="choose_data_sim_summary" product="tablet">ডাটাৰ বাবে আপুনি কোনখন SIM ব্যৱহাৰ কৰিবলৈ বিচাৰে? নিৰ্বাচিত SIM ৰ বাবে নেটৱৰ্ক মাচুল লাগিব পাৰে যিহেতু আপোনাৰ টেবলেট কম্পিউটাৰ ছেটআপ কৰিবলৈ ইয়াক ব্যৱহাৰ কৰা হ\'ব।</string>
  <string name="choose_data_sim_summary" product="default">ডাটাৰ বাবে আপুনি কোনখন SIM ব্যৱহাৰ কৰিবলৈ বিচাৰে? নিৰ্বাচিত SIM ৰ বাবে নেটৱৰ্ক মাচুল লাগিব পাৰে যিহেতু আপোনাৰ ফোনটো ছেটআপ কৰিবলৈ ইয়াক ব্যৱহাৰ কৰা হ\'ব।</string>
  <string name="date_time_summary">যদি প্ৰয়োজন হয় তেন্তে চলিত তাৰিখ আৰু সময় মিলাওক</string>
  <string name="backup_data_summary">এপ্প ডাটা, Wi-Fi পাছৱৰ্ড আৰু অন্যান্য ছেটিংচ Google ছাৰ্ভাৰলৈ <b>বেক আপ কৰক</b></string>
  <string name="other_services_summary">এই সেৱাবোৰে আপোনাৰ বাবে Google ক কাম কৰায় আৰু আপুনি সেইবোৰ যিকোনো সময়তে অন বা অফ কৰিব পাৰে। ডাটা Google ৰ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> অনুযায়ী ব্যৱহাৰ কৰা হ\'ব।</string>
  <string name="location_services_summary">অৱস্থান সেৱাই ছিষ্টেম আৰু তৃতীয় পক্ষৰ এপ্প্‌বোৰক আপোনাৰ মোটামুটি অৱস্থানৰ দৰে ডাটা সংগ্ৰহ আৰু ব্যৱহাৰ কৰিবলৈ অনুমতি দিয়ে। উদাহৰণ হিচাপে, নিকটতম কফি শ্বপ বিচাৰিবলৈ এটা এপ্পে্‌ আপোনাৰ মোটামুটি অৱস্থান ব্যৱহাৰ কৰিব পাৰে।</string>
  <string name="location_access_summary">আপোনাৰ অৱস্থান তথ্য ব্যৱহাৰ কৰিবলৈ <b>অনুমতি বিচৰা এপ্প্‌বোৰক অনুমতি দিয়ক</b>। ইয়াত আপোনাৰ চলিত আৰু অতীতৰ অৱস্থান অন্তৰ্ভুক্ত থাকিব পাৰে।</string>
  <string name="location_gps" product="tablet">আপোনাৰ টেবলেট কম্পিউটাৰত এপ্প্‌ক GPS ব্যৱহাৰ কৰিবলৈ দি <b>অৱস্থান নিৰ্ভুলতা উন্নত কৰক</b>।</string>
  <string name="location_gps" product="default">আপোনাৰ ফোনত এপ্প্‌ক GPS ব্যৱহাৰ কৰিবলৈ দি <b>অৱস্থান নিৰ্ভুলতা উন্নত কৰক</b>।</string>
  <string name="location_network">আপোনাৰ অৱস্থান নিৰ্ণয় কৰাত এপ্প্‌ক সহায় কৰিবলৈ <b>Wi-Fi ব্যৱহাৰ কৰক</b>।</string>
  <string name="location_network_telephony">আপোনাৰ অৱস্থান নিৰ্ণয় কৰাত এপ্প্‌ক সহায় কৰিবলৈ <b>Wi-Fi আৰু ম\'বাইল নেটৱৰ্ক ব্যৱহাৰ কৰক</b>।</string>
  <string name="location_network_gms">আপোনাৰ অৱস্থান নিৰ্ণয় কৰাত এপ্প্‌ক সহায় কৰিবলৈ <b>Google সেৱা ব্যৱহাৰ কৰক</b>। ইয়াৰ অৰ্থ হৈছে Google-লৈ অজ্ঞাত অৱস্থান প্ৰেৰণ কৰা, আনকি কোনো এপ্প্‌ চলি নথকাৰ সময়তো।</string>
  <string name="setup_mobile_data">ম\'বাইল ডাটা অন কৰক</string>
  <string name="setup_mobile_data_no_service">ছাৰ্ভিচ নাই</string>
  <string name="setup_mobile_data_emergency_only">কেৱলমাত্ৰ জৰুৰীকালীন ফোনসমূহ</string>
  <string name="enable_mobile_data_summary">আপুনি ছেটআপৰ সময়ত ম\'বাইল ডাটা ব্যৱহাৰ কৰিব বিচাৰে নে? ম\'বাইল ডাটা অন কৰাটো ডাটা মাচুল সাপেক্ষ হ\'ব পাৰে।</string>
  <string name="no">নহয়</string>
  <string name="yes">হয়</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
  <string name="emergency_call">জৰুৰীকালীন কল</string>
  <string name="setup_services">Cyanogen বৈশিষ্ট্যবোৰ</string>
  <string name="services_explanation" product="tablet">এই সেৱাবোৰে আপোনাৰ টেবলেট কম্পিউটাৰৰ সক্ষমতা সম্প্ৰসাৰিত কৰিবলৈ কাম কৰে। ডাটা Cyanogen ৰ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> অনুযায়ী ব্যৱহাৰ কৰা হ\'ব।</string>
  <string name="services_explanation" product="default">এই সেৱাবোৰে আপোনাৰ ফোনৰ সক্ষমতা সম্প্ৰসাৰিত কৰিবলৈ কাম কৰে। ডাটা Cyanogen ৰ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> অনুযায়ী ব্যৱহাৰ কৰা হ\'ব।</string>
  <string name="services_privacy_policy">গোপনীয়তা নীতি</string>
  <string name="services_help_improve_cm">স্বয়ংক্ৰিয়ভাবে ডায়গনষ্টিক আৰু ব্যৱহাৰ ডাটা Cyanogen লৈ প্ৰেৰণ কৰি <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> উন্নত কৰাত সহায় কৰক এই তথ্য আপোনাক চিনাক্ত কৰিবলৈ ব্যৱহাৰ কৰিব পৰা নাযায় আৰু বেটাৰীৰ আয়ুস, এপ্প্‌ৰ কাৰ্যকাৰীতা আৰু নতুন <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> বৈশিষ্ট্যবোৰৰ ওপৰত কাম কৰি থকা দলবোৰক সহায় কৰে।</string>
  <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g> বিষয়বস্তুটো প্ৰয়োগ কৰক</string>
  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> এ অনন্য আইকন, ৱালপেপাৰ আৰু ফণ্ট সক্ষম কৰি আছে।</string>
  <string name="services_os_nav_keys_label">হাৰ্ডৱেৰ কীবোৰৰ পৰিৱৰ্তে স্ক্ৰীণ <b>নেভিগেচন কীবোৰ ব্যৱহাৰ কৰক</b>।</string>
  <string name="services_use_secure_sms">এটা</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ডিভাইচত সুৰক্ষিত SMS ব্যৱহাৰ কৰি থকা আন ব্যৱহাৰকৰ্তাৰ সৈতে SMS কথোপকথন এনক্ৰিপ্ট কৰিবলৈ সুৰক্ষিত SMS <xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> ব্যৱহাৰ কৰক।</string>
  <string name="setup_unlock">আনলক</string>
  <string name="setup_device_locked">ডিভাইচটো ব্যৱহাৰকৰ্তাৰ দ্বাৰা লক কৰা হৈছে।</string>
  <string name="setup_require_cyanogen_label">আনকি ফেক্টৰী ৰিছেটৰ পাছতো আপোনাৰ ডিভাইচটো ব্যৱহাৰ কৰিবলৈ <b>আপোনাৰ Cyanogen OS একাউণ্টৰ পাছৱৰ্ড প্ৰয়োজন</b>।</string>
  <string name="setup_device_locked_instructions"><i>এই বৈশিষ্ট্যটো অন/অফ কৰিবলৈ অনুগ্ৰহ কৰি ছেটিংচ &gt; নিৰাপত্তা লৈ যাওক</i></string>
  <string name="setup_warning_skip_anyway">Cyanogen OS একাউণ্ট অবিহনে, আপুনি এইবোৰ কৰিবলৈ সক্ষম নহ\'ব:\n\nআপোনাৰ ফোনটো নতুন আইকন, ৱালপেপাৰ আৰু বিষয়বস্তুচ্‌ এপ্পৰ বহুতৰ সৈতে অনুকূলিত কৰিবলৈ\n\n আপোনাৰ ফোন হেৰালে অৱস্থান নিৰূপণ কৰিব বা দূৰৰ পৰাই আপোনাৰ ফোনটো মচি পেলাব</string>
  <!-- Fingerprint setup -->
  <string name="settings_fingerprint_setup_title">স্ক্ৰীণৰ বেকআপ লকৰ প্ৰকাৰ চয়ন কৰক</string>
  <string name="settings_fingerprint_setup_details">আপুনি আপোনাৰ স্ক্ৰীণ লক কেনেকৈ কৰিবলৈ বিচাৰিব?</string>
  <string name="fingerprint_setup_title">আঙুলিৰছাপ ছেটআপ</string>
  <string name="fingerprint_setup_summary">আপোনাৰ স্ক্ৰীণ আনলক কৰিবলৈ আঙুলিৰছাপ চেনচৰ ব্যৱহাৰ কৰিবলৈ, আপোনাৰ প্ৰয়োজন হ\'ব:</string>
  <string name="fingerprint_setup_backup_lock_method">দ্বিতীয় এটা আনলক পদ্ধতি ছেটআপ কৰক</string>
  <string name="fingerprint_setup_add_fingerprint">আপোনাৰ আঙুলিৰছাপ যোগ কৰক</string>
  <string name="fingerprint_setup_screen_lock_setup">স্ক্ৰীণ লক ছেটআপ কৰক</string>
 </resources>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
blinky@build01	3d7ff01666	Automatic translation import Change-Id: Ic2b7786bf3d0940d5334cc858e72dec0d0d5ad72 Ticket: RM-154	2016-06-17 15:49:31 -07:00
black	6c4bd3b155	SetupWizard: Fix translatability In case that there are 2 or more "%s" strings within a line, the order can't be changed. RM-154 Change-Id: I8f68d0ed6b6e5b9ac07316e7c6295df0fa1c4e74 (cherry picked from commit `1125b8dd34`)	2016-06-17 11:30:03 -07:00
Abhisek Devkota	e544afbfa9	Automatic translation import Change-Id: I5e32548d5ddecd139b7727154db74dbec5110b11 Ticket: RM-154	2016-06-13 23:18:35 +02:00
Roman Birg	9dd652049a	SetupWizard: GMS page controls the next step Ticket: CYNGNOS-2533 Change-Id: Icf7dc1de653d18ac60ddfa52dddbe9412dbc8eda Signed-off-by: Roman Birg <roman@cyngn.com> (cherry picked from commit `8684e9d4bb`)	2016-04-25 09:02:23 -07:00
cretin45	5c06225dae	SetupWizard: RIP Whisperpush WISP-41 Change-Id: I20363cc80dbb1481bd66abb4bd4202212ff37028 (cherry picked from commit `962f9a89d4`) (cherry picked from commit `ae793899df`)	2016-02-01 15:55:13 -08:00
cretin45	0fbf2cb2e7	SetupWizard: Don't disable packages on main thread Issue-id: YAM-69 Change-Id: I81ea039a7444d3db5d97b1d798bffe9a6b8ec498 (cherry picked from commit `15b7c92faa`)	2016-01-12 16:28:53 -08:00
Jessica Wagantall	1a3fc6f18b	res/values: Catch up with mainline on translation values RM-190 Change-Id: Ibfe379b8465a8b0119c17e5c4b8cedd4aab1055f	2015-12-07 15:16:28 -08:00
d34d	91239dd54a	Remove use of mCanceled It is possible for mCanceled to be set to true even though it was canceled without ever playing back the cancelation message. This can end up putting us in an incorrect state where the user must release both fingers so ACTION_UP finally sets mCanceled to false. The cancel() method was still being called and since it does the proper checks for removing/sending messages, the use of mCanceled is unneccessary. Change-Id: I38679d3bf65157a9ba5ca3d898c5c8d55e5df9f5 REF: LETTUCE-293 (cherry picked from commit `a726a3d990`) (cherry picked from commit `8bcb714b05`)	2015-10-06 12:07:09 -07:00
Roman Birg	a391c52dba	SetupWizard: fix stats permission Ref: CYNGNOS-1144 Change-Id: I3c9ed01b883134c2c10b1be64ae7e1d319c3df9e Signed-off-by: Roman Birg <roman@cyngn.com> (cherry picked from commit `5780dade7e`)	2015-09-28 16:58:16 -07:00
cretin45	a30464c17a	SetupWizard: Handle xfinity captival portal Addresses CYNGNOS-691 and CYNGNOS-963 Change-Id: I62ef349da48ffd3e9b148e68e946fe550cea2ff7	2015-09-17 13:09:15 -07:00
Brandon McAnsh	293505a62d	WifiSetup: Pass the correct componentName and data for captivePortal * CaptivePortal expects the networkid, which was not being passed on via the intent * Also use the correct componentName to bring up the sign in page Addresses CYNGNOS-963 Change-Id: I83d80dc3ec026d7a5a5d4b8bf4cf577214a13da4 Signed-off-by: Brandon McAnsh <brandon.mcansh@gmail.com>	2015-09-17 13:05:41 -07:00
Danesh M	162dbbda28	Revert "Bump HOME intent priority" Breaks sim unlock issue-id: CYNGNOS-1015 This reverts commit `e3894884b2`. Change-Id: Iaa9d267521e9e9ecc2d3e18b091680680c0356e0	2015-09-15 09:16:51 -07:00
Raj Yengisetty	e3894884b2	Bump HOME intent priority Other applications have a higher priority causing some poor behavior during OOBE (e.g. CryptKeeper). Bumping this to get rid of some jank during first boot. issue-id: CYNGNOS-983 Change-Id: I272d1541e22933aa3abd86d2e73c7140eaa4df91 (cherry picked from commit `4fb57dc022`)	2015-09-11 12:56:12 -07:00
Tom Powell	576e44a2fe	Automatic translation import Change-Id: Ibdd3f4c2b7fcd45add1d855f72f61f67de93ea6f CYNGNOS-264	2015-08-22 09:55:17 -07:00
Tom Powell	e4a5c6d9a0	Automatic translation import Change-Id: Id4e0ec397f0fb74bc7adf0490ab43be933cd3830 CYNGNOS-264	2015-08-22 09:55:01 -07:00
Michael Bestas	fcabaa355d	Automatic translation import Change-Id: Ia4c3c61a0f9e3d5741319ba5d8451283f7ec0089 CYNGNOS-264	2015-08-22 09:54:47 -07:00
Tom Powell	8ad9f4d205	Automatic translation import Change-Id: I6067047c137f92974969558373e25356ee1e5996 CYNGNOS-264	2015-08-22 09:54:32 -07:00
Tom Powell	905f3c2d28	Automatic translation import Change-Id: Ie68bf98b4eac46b5584b34fd117712d51524f7c8 CYNGNOS-264	2015-08-22 09:54:18 -07:00
Tom Powell	f9b22ada59	Automatic translation import Change-Id: I8d9db21a4c4287b8da9c9d247fa949469c9b52fb CYNGNOS-264	2015-08-22 09:53:45 -07:00
Michael Bestas	a12fdbfdb4	Automatic translation import Change-Id: Ie00039c8ccea2c1aecdcef5f4fb1a9d37ca78b02 CYNGNOS-264	2015-08-22 09:53:21 -07:00
Ricardo Cerqueira	06af11c5e3	SetupWizard: Don't wait for data connection to present the data toggle We can proceed to the data enablement screen as soon as the device confirms the requested slot is active. Waiting for an actual data connection kinda breaks the point of that screen :) Addresses CYNGNOS-660 and CRACKLING-503 Change-Id: I975508852b37c0e4b112612ac10aacb71ded97b3	2015-08-20 09:43:22 -07:00
cretin45	b3e9593465	SetupWizard: Improve wait for data sim change logic Invalid sims and bad connections causes huge delays when switching. This disallows switching to invalid sims. It also fixes a bug were the next button would get enabled while waiting on a switch. CRACKLING-503 Change-Id: I6cf7391910cc23554bb418c3083e736a3f06e037 (cherry picked from commit `4ef509ac48`)	2015-08-19 17:07:53 -07:00
cretin45	67ad7c8d22	SetupWizard: Wait for data sim change When changing the default data sim for msim, disable the next action until the operation completes. This PS also refactors how the wait for radio logic a bit. CRACKLING-503 Change-Id: I38ba3ea00f63d3e42c260e5b0e8558c3bc9d347f (cherry picked from commit `62db452188`)	2015-08-18 16:44:52 -07:00
Brint E. Kriebel	b9d3610779	SetupWizard: remove crash-inducing debug line Introduced in Ia1a81c4443cfd5bc3c3e5fd84758ff0ba2a2a140, this causes an NPE in some situations. Change-Id: I13239eb92b69087fe2c91b46482ff76748ab1c19 Ticket: CYNGNOS-707 (cherry picked from commit `4ea986255f`)	2015-08-10 17:00:52 -07:00
Ricardo Cerqueira	3e84ea8acf	SetupWizard: Adjust FRP-enforcing logic * Always pass ALLOW_SKIP to GMS, it's smart enough to know when it can't be applied. * Don't bring up the authentication screen if no-network and canSkip Still CYNGNOS-707 Change-Id: Ia1a81c4443cfd5bc3c3e5fd84758ff0ba2a2a140 (cherry picked from commit `649a5ec162`)	2015-08-10 05:40:37 -07:00
Roman Birg	12ebb2939b	SetupWizard: don't allow skipping FRP Fixes CYNGNOS-707 Change-Id: I7532c0c68418458b921a98e556ee3172b2cf1af3 Signed-off-by: Roman Birg <roman@cyngn.com> (cherry picked from commit `d587f56e2e`)	2015-08-07 15:59:05 -07:00
Roman Birg	f38055d366	SetupWizard: add Kiev timezone to match Settings Ref: CYNGNOS-453 Change-Id: Ide11d2be1c97806a674035a322cf32b1014fd8ac Signed-off-by: Roman Birg <roman@cyngn.com> (cherry picked from commit `1d26db14eb`)	2015-07-29 17:10:43 -07:00
Michael Bestas	ce34270108	Automatic translation import CYNGNOS-264 Change-Id: I736deda8d6c87196050022ac0e7b6bf8b56dbba2 (cherry picked from commit `c7a58bcc60`)	2015-07-28 23:24:30 -07:00
Michael Bestas	ab39b28a82	Automatic translation import CYNGNOS-264 Change-Id: Id3f47c59d6fa731a38b9459096aedfffc1433091 (cherry picked from commit `c10e45a55c`)	2015-07-28 22:49:01 -07:00
Michael Bestas	215edbfc47	Automatic translation import CYNGNOS-264 Change-Id: I557f278a00d76536615ee4b6fbc0ff006c5be140 (cherry picked from commit `79f63d23c1`)	2015-07-28 22:14:04 -07:00
Michael Bestas	8db048cd96	Automatic translation import CYNGNOS-264 Change-Id: I6ac0b00fea1c482c3f87ae10600a1c913afcc8af (cherry picked from commit `a1c8217e77`)	2015-07-28 21:28:48 -07:00
Michael Bestas	51a04e081c	Automatic translation import CYNGNOS-264 Change-Id: I0b037995358cde955daf940e5f0bfaf9beec5431 (cherry picked from commit `e8ae2d7cdf`)	2015-07-28 12:21:24 -07:00
emancebo	f3316e9912	SetupWizard: check if mobile data is enabled from telephony API System property ro.com.android.mobiledata is no longer used issue-id: JALEBI-135 Change-Id: Iac088d50dc50227e805b58b537c38082b6797291 (cherry picked from commit `c92c4b6a3a`)	2015-07-21 10:12:52 -07:00
d34d	9e2b283e06	Move fingerprint setup to end of OOBE Fingerprint setup should occur after the user has setup any accounts and before the customization page. Change-Id: I1305d89e17da1f8d405c8bd5b8b8b5268a2ba38c (cherry picked from commit `6d93813829`) Ticket: SAMBAR-189	2015-07-14 18:33:55 -07:00
d34d	2b3440aeb5	Reword strings on FingerprintSetupPage Change-Id: Iacfeb3f4c7324df825ab9c3a67d5bfa225fbdf1c (cherry picked from commit `c78801e2e7`) Ticket: SAMBAR-197	2015-07-14 18:26:34 -07:00
d34d	98a5906b20	Merge Squashed Fingerprint Patches Into Stable [4/4] See also frameworks/base libhardware Settings Enroll fingerprint via SetupWizard [2/2] Squashed-Id: Ieabfb0f3b789b02ddd1e17aba1eadfda52b21384 Change-Id: I456b54e4946dba9448757d9fa75e13e9b8fa1270	2015-07-12 19:18:18 -07:00
Matt Garnes	616db63139	Fix incorrect retrieval of SIM Network Operator. We were incorrectly passing the phone ID to TelephonyManager instead of the subscription ID. Pass the correct identifier to retrieve the network operator name. Change-Id: I266d2ce39c72db6e97eff5a36c5fec6242d516cc (cherry picked from commit `b31cb54361`)	2015-06-29 13:05:36 -07:00
Raj Yengisetty	497ddd6b71	SetupWizard: protect against IllegalStateExceptions in telephony Telephony throws this exception in some cases when retrieving SIM state Change-Id: I87e14aaa328d46ebba4990559f6531de4e961d68 (cherry picked from commit `b72e820a96`)	2015-06-19 01:04:59 +00:00