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

Commit 6f684c73 authored by Jacky Wang's avatar Jacky Wang
Browse files

[MainSwitchPreference] Remove SettingsMainSwitchPreferenceController 

NO_IFTTT=Update base class

Bug: 401406987
Flag: EXEMPT refactor
Test: manual
Change-Id: I68093366f63fa5b4184aa7b3dde8bc2609f17dfb
parent 7867f297

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

+17 −3
Original line number Diff line number Diff line
@@ -28,8 +28,13 @@ import android.os.VibrationAttributes; 
import android.os.Vibrator;

import android.provider.Settings;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.widget.SettingsMainSwitchPreferenceController;

import com.android.settings.core.TogglePreferenceController;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnStart;

import com.android.settingslib.core.lifecycle.events.OnStop;
@@ -42,11 +47,12 @@ import com.android.settingslib.core.lifecycle.events.OnStop; 
 * be disabled by this setting, except the flagged alerts and accessibility touch feedback.

 */

// LINT.IfChange

public class VibrationMainSwitchPreferenceController extends SettingsMainSwitchPreferenceController

public class VibrationMainSwitchPreferenceController extends TogglePreferenceController

        implements LifecycleObserver, OnStart, OnStop {



    private final ContentObserver mSettingObserver;

    private final Vibrator mVibrator;

    private @Nullable Preference mPreference;



    public VibrationMainSwitchPreferenceController(Context context, String preferenceKey) {

        super(context, preferenceKey);
@@ -55,7 +61,9 @@ public class VibrationMainSwitchPreferenceController extends SettingsMainSwitchP 
        mSettingObserver = new ContentObserver(handler) {

            @Override

            public void onChange(boolean selfChange, Uri uri) {

                updateState(mSwitchPreference);

                if (mPreference != null) {

                    updateState(mPreference);

                }

            }

        };

    }
@@ -65,6 +73,12 @@ public class VibrationMainSwitchPreferenceController extends SettingsMainSwitchP 
        return AVAILABLE;

    }



    @Override

    public void displayPreference(@NonNull PreferenceScreen screen) {

        super.displayPreference(screen);

        mPreference = screen.findPreference(getPreferenceKey());

    }



    @Override

    public void onStart() {

        mContext.getContentResolver().registerContentObserver(

src/com/android/settings/gestures/DoubleTapPowerMainSwitchPreferenceController.java

+14 −4
Original line number Diff line number Diff line
@@ -27,34 +27,44 @@ import android.os.Looper; 


import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.widget.SettingsMainSwitchPreferenceController;

import com.android.settings.core.TogglePreferenceController;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnStart;

import com.android.settingslib.core.lifecycle.events.OnStop;



/** The controller to handle double tap power button main switch enable or disable state. */

public class DoubleTapPowerMainSwitchPreferenceController

        extends SettingsMainSwitchPreferenceController

        extends TogglePreferenceController

        implements LifecycleObserver, OnStart, OnStop {



    private final ContentObserver mSettingsObserver =

            new ContentObserver(new Handler(Looper.getMainLooper())) {

                @Override

                public void onChange(boolean selfChange, @Nullable Uri uri) {

                    if (mSwitchPreference == null || uri == null) {

                    if (mPreference == null || uri == null) {

                        return;

                    }

                    updateState(mSwitchPreference);

                    updateState(mPreference);

                }

            };



    private @Nullable Preference mPreference;



    public DoubleTapPowerMainSwitchPreferenceController(

            @NonNull Context context, @NonNull String preferenceKey) {

        super(context, preferenceKey);

    }



    @Override

    public void displayPreference(@NonNull PreferenceScreen screen) {

        super.displayPreference(screen);

        mPreference = screen.findPreference(getPreferenceKey());

    }



    @Override

    public int getAvailabilityStatus() {

        return DoubleTapPowerSettingsUtils

src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java

+3 −4
Original line number Diff line number Diff line
@@ -23,15 +23,14 @@ import android.provider.Settings; 
import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.widget.SettingsMainSwitchPreferenceController;

import com.android.settings.core.TogglePreferenceController;



/**

 * {@link SettingsMainSwitchPreferenceController}

 * {@link TogglePreferenceController}

 * that controls whether Adaptive connectivity option is enabled.

 */

// LINT.IfChange

public class AdaptiveConnectivityTogglePreferenceController extends

        SettingsMainSwitchPreferenceController {

public class AdaptiveConnectivityTogglePreferenceController extends TogglePreferenceController {



    private final WifiManager mWifiManager;

src/com/android/settings/notification/BubbleNotificationPreferenceController.java

+9 −5
Original line number Diff line number Diff line
@@ -25,10 +25,12 @@ import android.net.Uri; 
import android.os.Handler;

import android.provider.Settings;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;



import com.android.settings.widget.SettingsMainSwitchPreferenceController;

import com.android.settings.core.TogglePreferenceController;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnPause;

import com.android.settingslib.core.lifecycle.events.OnResume;
@@ -38,10 +40,11 @@ import com.android.settingslib.core.lifecycle.events.OnResume; 
 * Allows user to turn bubbles on or off for the device.

 */

public class BubbleNotificationPreferenceController extends

        SettingsMainSwitchPreferenceController implements LifecycleObserver, OnResume, OnPause {

        TogglePreferenceController implements LifecycleObserver, OnResume, OnPause {



    private static final String TAG = "BubbleNotifPrefContr";



    private @Nullable Preference mPreference;

    private SettingObserver mSettingObserver;



    public BubbleNotificationPreferenceController(Context context, String preferenceKey) {
@@ -49,10 +52,11 @@ public class BubbleNotificationPreferenceController extends 
    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

    public void displayPreference(@NonNull PreferenceScreen screen) {

        super.displayPreference(screen);

        if (mSwitchPreference != null) {

            mSettingObserver = new SettingObserver(mSwitchPreference);

        mPreference = screen.findPreference(getPreferenceKey());

        if (mPreference != null) {

            mSettingObserver = new SettingObserver(mPreference);

        }

    }

src/com/android/settings/notification/BundleGlobalPreferenceController.java

+2 −3
Original line number Diff line number Diff line
@@ -21,10 +21,9 @@ import android.content.Context; 


import androidx.annotation.NonNull;



import com.android.settings.widget.SettingsMainSwitchPreferenceController;

import com.android.settings.core.TogglePreferenceController;



public class BundleGlobalPreferenceController extends

        SettingsMainSwitchPreferenceController {

public class BundleGlobalPreferenceController extends TogglePreferenceController {



    NotificationBackend mBackend;