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

Commit cff63865 authored by Christian Oder's avatar Christian Oder Committed by Alessandro Astone
Browse files

LSW: Properly set page transition and cleanup definitions on the way 

Set slide animation by default and use it in all pages.
Fix wrong/missing slide animations on various transitions like WiFi
and the backup subpage.

Change-Id: I78c87f38eb615379d39c89b43a016ed2ffb98695
parent b05350b9

src/org/lineageos/setupwizard/BaseSetupWizardActivity.java

+3 −3
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The CyanogenMod Project

 * Copyright (C) 2017 The LineageOS 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.
@@ -89,7 +89,7 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga 
    private boolean mIsFirstRun = true;

    protected boolean mIsGoingBack = false;

    private boolean mIsPrimaryUser;

    private int mResultCode = 0;

    protected int mResultCode = 0;

    private Intent mResultData;



    @Override
@@ -520,7 +520,7 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga 
    }



    protected int getTransition() {

        return TRANSITION_ID_DEFAULT;

        return TRANSITION_ID_SLIDE;

    }



    protected boolean tryEnablingWifi() {

src/org/lineageos/setupwizard/CaptivePortalSetupActivity.java

+1 −6
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The CyanogenMod Project

 * Copyright (C) 2017 The LineageOS 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.
@@ -54,11 +54,6 @@ public class CaptivePortalSetupActivity extends SubBaseActivity { 
                .checkForCaptivePortal(mCaptivePortalUrl, this, true);

    }



    @Override

    protected int getSubactivityNextTransition() {

        return TRANSITION_ID_FADE;

    }



    private static class CheckForCaptivePortalTask extends AsyncTask<Void, Void, Boolean> {



        private final URL captivePortalUrl;

src/org/lineageos/setupwizard/ChooseDataSimActivity.java

+1 −6
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The CyanogenMod Project

 * Copyright (C) 2017 The LineageOS Project

 * Copyright (C) 2017-2018,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.
@@ -229,11 +229,6 @@ public class ChooseDataSimActivity extends BaseSetupWizardActivity { 
        }

    }



    @Override

    protected int getTransition() {

        return TRANSITION_ID_SLIDE;

    }



    private void checkForRadioReady() {

        if (mRadioReady) {

            mHandler.removeCallbacks(mRadioReadyRunnable);

src/org/lineageos/setupwizard/DateTimeActivity.java

+1 −6
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The CyanogenMod Project

 * Copyright (C) 2017 The LineageOS Project

 * Copyright (C) 2017-2018,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.
@@ -159,11 +159,6 @@ public class DateTimeActivity extends BaseSetupWizardActivity implements 
        unregisterReceiver(mIntentReceiver);

    }



    @Override

    protected int getTransition() {

        return TRANSITION_ID_SLIDE;

    }



    @Override

    protected int getLayoutResId() {

        return R.layout.setup_datetime_page;

src/org/lineageos/setupwizard/FingerprintActivity.java

+1 −7
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The CyanogenMod Project

 * Copyright (C) 2017 The LineageOS Project

 * Copyright (C) 2017-2018,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.
@@ -70,10 +70,4 @@ public class FingerprintActivity extends SubBaseActivity { 
                getString(R.string.settings_fingerprint_setup_details));

        startSubactivity(intent, REQUEST_CODE_SETUP_FINGERPRINT);

    }



    @Override

    protected int getSubactivityNextTransition() {

        return TRANSITION_ID_SLIDE;

    }



}