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

Commit 2236d291 authored by Michael W's avatar Michael W
Browse files

SUW: (Not-really-)Spring Cleanup 

* Remove unused imports
* Fix a few line length issues
* Convert a few anonymous classes to lambda expressions
* Convert a few global vars to locals
* Remove unused methods
* Add a small local method in MobileDataActivity to shorten repeated calls

Change-Id: Ia10be8b8c98ef3956949f913ddb6bddc185cf1a5
parent e5741b0e

src/org/lineageos/setupwizard/ChooseDataSimActivity.java

+15 −19
Original line number Diff line number Diff line
@@ -67,25 +67,19 @@ public class ChooseDataSimActivity extends BaseSetupWizardActivity { 


    private final Handler mHandler = new Handler();



    private final Runnable mRadioReadyRunnable = new Runnable() {

        @Override

        public void run() {

    private final Runnable mRadioReadyRunnable = () -> {

        // If we timeout out waiting for the radio, Oh well.

        if (!mRadioReady) {

            mRadioReady = true;

            checkForRadioReady();

        }

        }

    };



    private View.OnClickListener mSetDataSimClickListener = new View.OnClickListener() {

        @Override

        public void onClick(View view) {

    private View.OnClickListener mSetDataSimClickListener = view -> {

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

        if (subInfoRecord != null) {

            changeDataSub(subInfoRecord);

        }

        }

    };



    private PhoneMonitor.SubscriptionStateListener mSubscriptionStateListener =
@@ -455,10 +449,12 @@ public class ChooseDataSimActivity extends BaseSetupWizardActivity { 
        if (serviceState != null) {

            if (LOGV) {

                Log.v(TAG, "hasService{" +

                        "serviceState.getVoiceRegState()='" + serviceState.getVoiceRegState() + '\'' +

                        "serviceState.getVoiceRegState()='" + serviceState.getVoiceRegState() + '\'' +

                        ", subInfoRecord.getSimSlotIndex() =" + subInfoRecord.getSimSlotIndex()  +

                        '}');

                        "serviceState.getVoiceRegState()='" + serviceState.getVoiceRegState()

                        + '\''

                        + "serviceState.getVoiceRegState()='" + serviceState.getVoiceRegState()

                        + '\''

                        + ", subInfoRecord.getSimSlotIndex() =" + subInfoRecord.getSimSlotIndex()

                        + '}');

            }

            // Consider the device to be in service if either voice or data service is available.

            // Some SIM cards are marketed as data-only and do not support voice service, and on

src/org/lineageos/setupwizard/DateTimeActivity.java

+41 −58
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.util.Log; 
import android.view.View;

import android.widget.AdapterView;

import android.widget.DatePicker;

import android.widget.ImageView;

import android.widget.SimpleAdapter;

import android.widget.Spinner;

import android.widget.TextView;
@@ -67,8 +66,6 @@ public class DateTimeActivity extends BaseSetupWizardActivity implements 
    private static final int HOURS_1 = 60 * 60000;



    private TimeZone mCurrentTimeZone;

    private View mDateView;

    private View mTimeView;

    private TextView mDateTextView;

    private TextView mTimeTextView;
@@ -90,26 +87,14 @@ public class DateTimeActivity extends BaseSetupWizardActivity implements 
        final Spinner spinner = (Spinner) findViewById(R.id.timezone_list);

        final SimpleAdapter adapter = constructTimezoneAdapter(this, false);

        mCurrentTimeZone = TimeZone.getDefault();

        mDateView = findViewById(R.id.date_item);

        mDateView.setOnClickListener(new View.OnClickListener() {

            @Override

            public void onClick(View view) {

                showDatePicker();

            }

        });

        mTimeView = findViewById(R.id.time_item);

        mTimeView.setOnClickListener(new View.OnClickListener() {

            @Override

            public void onClick(View view) {

                showTimePicker();

            }

        });

        View dateView = findViewById(R.id.date_item);

        dateView.setOnClickListener((view) -> showDatePicker());

        View timeView = findViewById(R.id.time_item);

        timeView.setOnClickListener((view) -> showTimePicker());

        mDateTextView = (TextView)findViewById(R.id.date_text);

        mTimeTextView = (TextView)findViewById(R.id.time_text);

        // Pre-select current/default timezone

        mHandler.post(new Runnable() {

            @Override

            public void run() {

        mHandler.post(() -> {

            int tzIndex = getTimeZoneIndex(adapter, mCurrentTimeZone);

            spinner.setAdapter(adapter);

            if (tzIndex != -1) {
@@ -117,12 +102,14 @@ public class DateTimeActivity extends BaseSetupWizardActivity implements 
            }

            spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {

                @Override

                    public void onItemSelected(AdapterView<?> adapterView, View view, int position, long id) {

                public void onItemSelected(AdapterView<?> adapterView, View view, int position,

                                           long id) {

                    final Map<?, ?> map = (Map<?, ?>) adapterView.getItemAtPosition(position);

                    final String tzId = (String) map.get(KEY_ID);

                    if (mCurrentTimeZone != null && !mCurrentTimeZone.getID().equals(tzId)) {

                        // Update the system timezone value

                            final AlarmManager alarm = (AlarmManager) getSystemService(Context.ALARM_SERVICE);

                        final AlarmManager alarm =

                                (AlarmManager) getSystemService(Context.ALARM_SERVICE);

                        alarm.setTimeZone(tzId);

                        mCurrentTimeZone = TimeZone.getTimeZone(tzId);

                    }
@@ -133,12 +120,9 @@ public class DateTimeActivity extends BaseSetupWizardActivity implements 
                public void onNothingSelected(AdapterView<?> adapterView) {

                }

            });

            }

        });

        // Pre-select current/default date if epoch

        mHandler.post(new Runnable() {

            @Override

            public void run() {

        mHandler.post(() -> {

            final Calendar calendar = Calendar.getInstance();

            final boolean isEpoch = calendar.get(Calendar.YEAR) == 1970;

            if (isEpoch) {
@@ -153,7 +137,6 @@ public class DateTimeActivity extends BaseSetupWizardActivity implements 
                    setDate(DateTimeActivity.this, 2017, Calendar.JANUARY, 1);

                }

            }

            }

        });

    }

src/org/lineageos/setupwizard/FingerprintActivity.java

+1 −6
Original line number Diff line number Diff line
@@ -38,12 +38,7 @@ public class FingerprintActivity extends SubBaseActivity { 
    @Override

    protected void onStartSubactivity() {

        setNextAllowed(true);

        findViewById(R.id.setup_fingerprint).setOnClickListener(new View.OnClickListener() {

            @Override

            public void onClick(View v) {

                launchFingerprintSetup();

            }

        });

        findViewById(R.id.setup_fingerprint).setOnClickListener(view -> launchFingerprintSetup());

    }



    @Override

src/org/lineageos/setupwizard/FinishActivity.java

+0 −3
Original line number Diff line number Diff line
@@ -37,10 +37,7 @@ import android.os.Handler; 
import android.preference.PreferenceManager;

import android.view.View;

import android.view.ViewAnimationUtils;

import android.view.animation.Animation;

import android.view.animation.AnimationUtils;

import android.widget.ImageView;

import android.widget.ProgressBar;



import com.android.setupwizardlib.util.WizardManagerHelper;

src/org/lineageos/setupwizard/LineageSettingsActivity.java

+19 −32
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import android.view.IWindowManager; 
import android.view.View;

import android.view.WindowManagerGlobal;

import android.widget.CheckBox;

import android.widget.ImageView;

import android.widget.TextView;



import com.android.setupwizardlib.util.WizardManagerHelper;
@@ -56,40 +55,28 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity { 


    private SetupWizardApp mSetupWizardApp;



    private View mMetricsRow;

    private View mNavKeysRow;

    private View mPrivacyGuardRow;

    private CheckBox mMetrics;

    private CheckBox mNavKeys;

    private CheckBox mPrivacyGuard;



    private boolean mHideNavKeysRow = false;



    private View.OnClickListener mMetricsClickListener = new View.OnClickListener() {

        @Override

        public void onClick(View view) {

    private View.OnClickListener mMetricsClickListener = view -> {

        boolean checked = !mMetrics.isChecked();

        mMetrics.setChecked(checked);

        mSetupWizardApp.getSettingsBundle().putBoolean(KEY_SEND_METRICS, checked);

        }

    };



    private View.OnClickListener mNavKeysClickListener = new View.OnClickListener() {

        @Override

        public void onClick(View view) {

    private View.OnClickListener mNavKeysClickListener = view -> {

        boolean checked = !mNavKeys.isChecked();

        mNavKeys.setChecked(checked);

        mSetupWizardApp.getSettingsBundle().putBoolean(DISABLE_NAV_KEYS, checked);

        }

    };



    private View.OnClickListener mPrivacyGuardClickListener = new View.OnClickListener() {

        @Override

        public void onClick(View view) {

    private View.OnClickListener mPrivacyGuardClickListener = view -> {

        boolean checked = !mPrivacyGuard.isChecked();

        mPrivacyGuard.setChecked(checked);

        mSetupWizardApp.getSettingsBundle().putBoolean(KEY_PRIVACY_GUARD, checked);

        }

    };



    @Override
@@ -121,8 +108,8 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity { 
        privacyPolicy.setMovementMethod(LinkMovementMethod.getInstance());

        privacyPolicy.setText(ss);



        mMetricsRow = findViewById(R.id.metrics);

        mMetricsRow.setOnClickListener(mMetricsClickListener);

        View metricsRow = findViewById(R.id.metrics);

        metricsRow.setOnClickListener(mMetricsClickListener);

        String metricsHelpImproveLineage =

                getString(R.string.services_help_improve_cm, getString(R.string.os_name));

        String metricsSummary = getString(R.string.services_metrics_label,
@@ -134,8 +121,8 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity { 
        metrics.setText(metricsSpan);

        mMetrics = (CheckBox) findViewById(R.id.enable_metrics_checkbox);



        mNavKeysRow = findViewById(R.id.nav_keys);

        mNavKeysRow.setOnClickListener(mNavKeysClickListener);

        View navKeysRow = findViewById(R.id.nav_keys);

        navKeysRow.setOnClickListener(mNavKeysClickListener);

        mNavKeys = (CheckBox) findViewById(R.id.nav_keys_checkbox);

        boolean needsNavBar = true;

        try {
@@ -145,14 +132,14 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity { 
        }

        mHideNavKeysRow = hideKeyDisabler(this);

        if (mHideNavKeysRow || needsNavBar) {

            mNavKeysRow.setVisibility(View.GONE);

            navKeysRow.setVisibility(View.GONE);

        } else {

            boolean navKeysDisabled = isKeyDisablerActive(this);

            mNavKeys.setChecked(navKeysDisabled);

        }



        mPrivacyGuardRow = findViewById(R.id.privacy_guard);

        mPrivacyGuardRow.setOnClickListener(mPrivacyGuardClickListener);

        View privacyGuardRow = findViewById(R.id.privacy_guard);

        privacyGuardRow.setOnClickListener(mPrivacyGuardClickListener);

        mPrivacyGuard = (CheckBox) findViewById(R.id.privacy_guard_checkbox);

        mPrivacyGuard.setChecked(LineageSettings.Secure.getInt(getContentResolver(),

                LineageSettings.Secure.PRIVACY_GUARD_DEFAULT, 0) == 1);