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

Commit b7b34b96 authored by Michael Bestas's avatar Michael Bestas Committed by Timi Rautamäki
Browse files

The big code style cleanup 

* Format using AOSP code style in Android Studio,
  excluding `Rearrange entries` option.
* Rename static variables to use proper naming scheme
* Remove empty lines

Change-Id: I0d193e35f071bc288050e587b1693844d68865e1
parent ade1361e

src/org/lineageos/setupwizard/BaseSetupWizardActivity.java

+4 −5
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
package org.lineageos.setupwizard;



import static android.view.View.INVISIBLE;



import static com.google.android.setupcompat.util.ResultCodes.RESULT_ACTIVITY_NOT_FOUND;

import static com.google.android.setupcompat.util.ResultCodes.RESULT_RETRY;

import static com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP;
@@ -85,7 +86,7 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga 


    protected boolean mIsActivityVisible = false;

    protected boolean mIsExiting = false;

    private boolean mIsFirstRun = true;

    private final boolean mIsFirstRun = true;

    protected boolean mIsGoingBack = false;

    private boolean mIsPrimaryUser;

    protected int mResultCode = 0;
@@ -312,7 +313,6 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga 
        tryEnablingWifi();

    }





    protected void exitIfSetupComplete() {

        if (WizardManagerHelper.isUserSetupComplete(this)) {

            Log.i(TAG, "Starting activity with USER_SETUP_COMPLETE=true");
@@ -511,7 +511,6 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga 
        startActivityForResult(intent, requestCode);

    }





    protected boolean isFirstRun() {

        return mIsFirstRun;

    }

src/org/lineageos/setupwizard/BiometricActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static org.lineageos.setupwizard.SetupWizardApp.REQUEST_CODE_SETUP_BIOMET 


import android.content.Intent;

import android.os.Bundle;

import android.view.View;

import android.widget.TextView;



import com.google.android.setupcompat.util.WizardManagerHelper;
@@ -39,7 +38,8 @@ public class BiometricActivity extends SubBaseActivity { 
    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        final TextView setupBiometricSummary = (TextView) findViewById(R.id.setup_biometric_summary);

        final TextView setupBiometricSummary = (TextView) findViewById(

                R.id.setup_biometric_summary);

        final TextView setupAddBiometric = (TextView) findViewById(R.id.setup_add_biometric);

        if (SetupWizardUtils.hasFace(this)) {

            setupBiometricSummary.setText(getString(R.string.face_setup_summary));

src/org/lineageos/setupwizard/BluetoothSetupActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ public class BluetoothSetupActivity extends WrapperSubBaseActivity { 
    protected void onStartSubactivity() {

        try {

            Intent intent = new Intent();

            intent.setComponent(SetupWizardUtils.mTvAddAccessorySettingsActivity);

            intent.setComponent(SetupWizardUtils.sTvAddAccessorySettingsActivity);

            intent.setAction(ACTION_CONNECT_INPUT);

            intent.putExtra(INTENT_EXTRA_NO_INPUT_MODE, true);

            startActivityForResult(intent, REQUEST_CODE_SETUP_BLUETOOTH);

src/org/lineageos/setupwizard/CaptivePortalSetupActivity.java

+12 −5
Original line number Diff line number Diff line
@@ -68,7 +68,8 @@ public class CaptivePortalSetupActivity extends WrapperSubBaseActivity { 
        }



        public static void checkForCaptivePortal(URL captivePortalUrl,

                CaptivePortalSetupActivity captivePortalSetupActivity, boolean cancelAndRecreateIfRunning) {

                CaptivePortalSetupActivity captivePortalSetupActivity,

                boolean cancelAndRecreateIfRunning) {

            if (sTask == null || sTask.getStatus() == Status.FINISHED) {

                sTask = new CheckForCaptivePortalTask(captivePortalUrl, captivePortalSetupActivity);

                sTask.execute();
@@ -123,11 +124,16 @@ public class CaptivePortalSetupActivity extends WrapperSubBaseActivity { 
                intent.putExtra(ConnectivityManager.EXTRA_CAPTIVE_PORTAL,

                        new CaptivePortal(new ICaptivePortal.Stub() {

                            @Override

                            public void appResponse(int response) {}

                            public void appResponse(int response) {

                            }



                            @Override

                            public void logEvent(int eventId, String packageName) {}

                            public void logEvent(int eventId, String packageName) {

                            }



                            @Override

                            public void appRequest(int request) {}

                            public void appRequest(int request) {

                            }

                        }));

                intent.putExtra("status_bar_color",

                        context.getResources().getColor(R.color.primary_dark));
@@ -135,7 +141,8 @@ public class CaptivePortalSetupActivity extends WrapperSubBaseActivity { 
                        R.color.primary_dark));

                intent.putExtra("progress_bar_color", context.getResources().getColor(

                        R.color.accent));

                captivePortalSetupActivity.startSubactivity(intent, REQUEST_CODE_SETUP_CAPTIVE_PORTAL);

                captivePortalSetupActivity.startSubactivity(intent,

                        REQUEST_CODE_SETUP_CAPTIVE_PORTAL);

            } else {

                captivePortalSetupActivity.finishAction(RESULT_OK);

                captivePortalSetupActivity.finish();

src/org/lineageos/setupwizard/ChooseDataSimActivity.java

+9 −15
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.telephony.ServiceState; 
import android.telephony.SignalStrength;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.Log;

import android.util.SparseArray;
@@ -75,14 +74,14 @@ public class ChooseDataSimActivity extends BaseSetupWizardActivity { 
        }

    };



    private View.OnClickListener mSetDataSimClickListener = view -> {

    private final View.OnClickListener mSetDataSimClickListener = view -> {

        SubscriptionInfo subInfoRecord = (SubscriptionInfo) view.getTag();

        if (subInfoRecord != null) {

            changeDataSub(subInfoRecord);

        }

    };



    private PhoneMonitor.SubscriptionStateListener mSubscriptionStateListener =

    private final PhoneMonitor.SubscriptionStateListener mSubscriptionStateListener =

            new PhoneMonitor.SubscriptionStateListener() {

                @Override

                public void onServiceStateChanged(int subId, ServiceState serviceState) {
@@ -204,7 +203,6 @@ public class ChooseDataSimActivity extends BaseSetupWizardActivity { 
        }

        updateSignalStrengths();

        updateCurrentDataSub();



    }



    @Override
@@ -317,11 +315,7 @@ public class ChooseDataSimActivity extends BaseSetupWizardActivity { 
        if (mIsAttached) {

            for (int i = 0; i < mCheckBoxes.size(); i++) {

                int key = mCheckBoxes.keyAt(i);

                if (subInfoRecord.getSimSlotIndex() == key) {

                    mCheckBoxes.get(key).setChecked(true);

                } else {

                    mCheckBoxes.get(key).setChecked(false);

                }

                mCheckBoxes.get(key).setChecked(subInfoRecord.getSimSlotIndex() == key);

            }

        }

    }