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

Commit 841512bf authored by Alessandro Astone's avatar Alessandro Astone
Browse files

SUW: Move re-enabling of status bar to FinishActivity 

This is always run both in the GMS and non-GMS flows

Change-Id: If70aa4cec640bacaf7b03da505b90d6c3c5aaf8e
parent 367f3214

src/org/lineageos/setupwizard/FinishActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import com.google.android.setupcompat.util.SystemBarHelper; 
import com.google.android.setupcompat.util.WizardManagerHelper;



import org.lineageos.setupwizard.util.EnableAccessibilityController;

import org.lineageos.setupwizard.util.SetupWizardUtils;



import lineageos.providers.LineageSettings;
@@ -183,6 +184,7 @@ public class FinishActivity extends BaseSetupWizardActivity { 
                WallpaperManager.getInstance(mSetupWizardApp);

        wallpaperManager.forgetLoadedWallpaper();

        finishAllAppTasks();

        SetupWizardUtils.enableStatusBar(this);

        Intent intent = WizardManagerHelper.getNextIntent(getIntent(),

                Activity.RESULT_OK);

        startActivityForResult(intent, NEXT_REQUEST);

src/org/lineageos/setupwizard/SetupWizardExitActivity.java

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ public class SetupWizardExitActivity extends BaseSetupWizardActivity { 
        if (LOGV) {

            Log.v(TAG, "onCreate savedInstanceState=" + savedInstanceState);

        }

        SetupWizardUtils.enableStatusBar(this);

        SetupWizardUtils.enableCaptivePortalDetection(this);

        PhoneMonitor.onSetupFinished();

        launchHome();