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

Commit 5e5ebd8c authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '1111-t-find-my-device' into 'v3.0-t' 

Fix validation failed for A13

See merge request !75
parents 2b89d571 39253461

res/raw/lineage_wizard_script.xml

+6 −6
Original line number Diff line number Diff line
@@ -70,6 +70,12 @@ 
-->



    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.NAVIGATION_SETTINGS;end" id="navigation_settings">

        <result wizard:action="e_find_my_device_settings" />

    </WizardAction>



    <WizardAction

        wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.E_FIND_MY_DEVICE_SETTINGS;end"

        id="e_find_my_device_settings">

        <result wizard:action="biometric_settings" />

    </WizardAction>
@@ -81,12 +87,6 @@ 
        <result wizard:action="e_account_manager_settings" />

    </WizardAction>



    <WizardAction

        wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.E_FIND_MY_DEVICE_SETTINGS;end"

        id="e_find_my_device_settings">

        <result wizard:action="theme_settings" />

    </WizardAction>

	

    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.E_ACCOUNT_MANAGER_SETTINGS;end" id="e_account_manager_settings">

        <result wizard:action="finish" />

    </WizardAction>

src/org/lineageos/setupwizard/FindMyDeviceActivity.java

+0 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ public class FindMyDeviceActivity extends SubBaseActivity { 
    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        if (!SetupWizardUtils.hasTelephony(this)) {

            Log.v(TAG, "Has no telephony support");

            hasTelephonySupport = false;
@@ -51,7 +50,6 @@ public class FindMyDeviceActivity extends SubBaseActivity { 
    @Override

    public void onRestart() {

        super.onRestart();

        

        if (!hasTelephonySupport) {

            onNavigateNext();

            return;