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

Commit 15ca95a3 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Migrate to TwoStatePreference 

SwitchPreference and SwitchPreferenceCompat are both TwoStatePreference.

Using TwoStatePreference in Java will helps migration in the future.

Bug: 306771414
Test: manual - check Settings pages
Change-Id: I84e1d7b09451106797c2b23d127855c6976678ca
parent 7976f1e7

src/com/android/settings/IccLockSettings.java

+3 −3
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ import android.widget.TextView; 
import android.widget.Toast;



import androidx.preference.Preference;

import androidx.preference.SwitchPreference;

import androidx.preference.TwoStatePreference;



import com.android.settings.network.ProxySubscriptionManager;

import com.android.settings.network.SubscriptionUtil;
@@ -122,7 +122,7 @@ public class IccLockSettings extends SettingsPreferenceFragment 
    private ProxySubscriptionManager mProxySubscriptionMgr;



    private EditPinPreference mPinDialog;

    private SwitchPreference mPinToggle;

    private TwoStatePreference mPinToggle;



    private Resources mRes;
@@ -193,7 +193,7 @@ public class IccLockSettings extends SettingsPreferenceFragment 
        addPreferencesFromResource(R.xml.sim_lock_settings);



        mPinDialog = (EditPinPreference) findPreference(PIN_DIALOG);

        mPinToggle = (SwitchPreference) findPreference(PIN_TOGGLE);

        mPinToggle = (TwoStatePreference) findPreference(PIN_TOGGLE);

        if (savedInstanceState != null) {

            if (savedInstanceState.containsKey(DIALOG_STATE)

                    && restoreDialogStates(savedInstanceState)) {

src/com/android/settings/accessibility/ColorAndMotionFragment.java

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import android.provider.Settings; 


import androidx.preference.Preference;

import androidx.preference.PreferenceCategory;

import androidx.preference.SwitchPreference;

import androidx.preference.TwoStatePreference;



import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;
@@ -49,8 +49,8 @@ public class ColorAndMotionFragment extends DashboardFragment { 
    private static final String TOGGLE_LARGE_POINTER_ICON = "toggle_large_pointer_icon";



    private Preference mDisplayDaltonizerPreferenceScreen;

    private SwitchPreference mToggleDisableAnimationsPreference;

    private SwitchPreference mToggleLargePointerIconPreference;

    private TwoStatePreference mToggleDisableAnimationsPreference;

    private TwoStatePreference mToggleLargePointerIconPreference;

    private AccessibilitySettingsContentObserver mSettingsContentObserver;



    private final List<String> mShortcutFeatureKeys = new ArrayList<>();

src/com/android/settings/accessibility/DisableAnimationsPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import android.provider.Settings; 


import androidx.annotation.VisibleForTesting;

import androidx.preference.PreferenceScreen;

import androidx.preference.SwitchPreference;

import androidx.preference.TwoStatePreference;



import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;
@@ -62,7 +62,7 @@ public class DisableAnimationsPreferenceController extends TogglePreferenceContr 
    };



    private final ContentResolver mContentResolver;

    private SwitchPreference mPreference;

    private TwoStatePreference mPreference;



    public DisableAnimationsPreferenceController(Context context, String preferenceKey) {

        super(context, preferenceKey);

src/com/android/settings/accessibility/FloatingMenuFadePreferenceController.java

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import android.provider.Settings; 
import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;

import androidx.preference.SwitchPreference;

import androidx.preference.TwoStatePreference;



import com.android.settings.core.BasePreferenceController;

import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -45,7 +45,7 @@ public class FloatingMenuFadePreferenceController extends BasePreferenceControll 
    final ContentObserver mContentObserver;



    @VisibleForTesting

    SwitchPreference mPreference;

    TwoStatePreference mPreference;



    public FloatingMenuFadePreferenceController(Context context, String preferenceKey) {

        super(context, preferenceKey);
@@ -81,7 +81,7 @@ public class FloatingMenuFadePreferenceController extends BasePreferenceControll 
    @Override

    public void updateState(Preference preference) {

        super.updateState(preference);

        final SwitchPreference switchPreference = (SwitchPreference) preference;

        final TwoStatePreference switchPreference = (TwoStatePreference) preference;



        switchPreference.setChecked(getFloatingMenuFadeValue() == ON);

    }

src/com/android/settings/accessibility/HighTextContrastPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.content.Context; 
import android.provider.Settings;



import androidx.preference.PreferenceScreen;

import androidx.preference.SwitchPreference;

import androidx.preference.TwoStatePreference;



import com.android.settings.R;

import com.android.settings.accessibility.TextReadingPreferenceFragment.EntryPoint;
@@ -32,7 +32,7 @@ import com.android.settings.core.instrumentation.SettingsStatsLog; 
 */

public class HighTextContrastPreferenceController extends TogglePreferenceController implements

        TextReadingResetController.ResetStateListener {

    private SwitchPreference mSwitchPreference;

    private TwoStatePreference mSwitchPreference;



    @EntryPoint

    private int mEntryPoint;