Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a34d12d7 authored by vince-bourgmayer's avatar vince-bourgmayer
Browse files

end of port for commit 62f81106 from eelo-0.1...

end of port for commit 62f81106 from eelo-0.1 branch to branch eelo-0.2
parent ff9e0bc9
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@
<!--
     Copyright (C) 2016 The CyanogenMod Project
     Copyright (C) 2017 The LineageOS Project
     Copyright (C) 2018 e.foundation

    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -54,12 +55,15 @@
    </WizardAction>

    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end" id="location_settings">
        <result wizard:action="lineage_settings" />
        <!-- <result wizard:action="lineage_settings" /> -->
        <result wizard:action="fingerprint_settings" />        
    </WizardAction>

    <!--
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end" id="lineage_settings">
        <result wizard:action="fingerprint_settings" />
    </WizardAction>
    -->

    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_FINGERPRINT_SETTINGS;end" id="fingerprint_settings">
        <result wizard:action="lockscreen_settings" />
+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@

<!--
     Copyright (C) 2016 The CyanogenMod Project

     Copyright (C) 2018 e.foundation
    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
@@ -16,6 +16,7 @@
    limitations under the License.
-->

<!-- K1ZFP /e/ Check this -->
<WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
              wizard:firstAction="finish">

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@
    Copyright (c) 2014 Google Inc.
    Copyright (C) 2017 The LineageOS Project
    Copyright (C) 2018 e.foundation

    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
@@ -25,6 +26,7 @@
    adb shell am to-intent-uri -a com.android.setupwizard.WELCOME -f 0x10000000 \-\-ez firstRun true
-->

<!-- K1ZFP : /e/ unused -->
<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" />
+3 −1
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@

    adb shell am to-intent-uri -a com.android.setupwizard.WELCOME -f 0x10000000 \-\-ez firstRun true
-->

<!-- K1ZFP : /e/ unused -->
<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" />