Commit 4cc6ae5f authored by Romain Hunault's avatar Romain Hunault

Merge branch 'cm-14.1' into v1-nougat

parents b4f09b06 0c2ac4a8
......@@ -2,7 +2,7 @@
<!--
Copyright (c) 2014 Google Inc.
Copyright (C) 2017 The LineageOS Project
Copyright (C) 2017,2019 The LineageOS Project
Copyright (C) 2018 e.foundation
Licensed under the Apache License, Version 2.0 (the "License");
......@@ -52,22 +52,10 @@
<result wizard:action="flow_choice" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.FLOW_CHOICE;end" id="flow_choice">
<result wizard:resultCode="-1" wizard:action="restore_choice" wizard:name="ok" />
<result wizard:resultCode="1" wizard:action="setup_as_new_flow" wizard:name="skip" />
<result wizard:action="restore_with_account_flow" />
<result wizard:action="restore_flow" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.RESTORE_CHOICE;end" id="restore_choice">
<result wizard:resultCode="101" wizard:action="restore_with_device_flow" wizard:name="d2d" />
<result wizard:resultCode="102" wizard:action="restore_with_ios_flow" wizard:name="ios_restore" />
<result wizard:action="restore_with_account_flow" />
</WizardAction>
<WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_restore_with_account_flow" id="restore_with_account_flow">
<result wizard:action="oem_post_setup" />
</WizardAction>
<WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_restore_with_device_flow" id="restore_with_device_flow">
<result wizard:action="oem_post_setup" />
</WizardAction>
<WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_restore_with_ios_flow" id="restore_with_ios_flow">
<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_setup_as_new_flow" id="setup_as_new_flow">
......
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2013-2015 The CyanogenMod Project
Copyright (C) 2017 The LineageOS Project
Copyright (C) 2017,2019 The LineageOS Project
Copyright (C) 2018 e.foundation
Licensed under the Apache License, Version 2.0 (the "License");
......@@ -26,7 +26,6 @@
<string name="cm_wizard_script_user_uri" translatable="false">android.resource://com.cyanogenmod.setupwizard/raw/cm_wizard_script_user</string>
<!-- Partner SUW Strings -->
<string name="theme_type" translatable="false">material_light</string>
<string name="wizard_script_uri" translatable="false">android.resource://com.cyanogenmod.setupwizard/raw/wizard_script</string>
<string name="wizard_script_user_uri" translatable="false">android.resource://com.cyanogenmod.setupwizard/raw/wizard_script_user</string>
<string name="activity_label_empty" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment