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

Commit ec34667c authored by Peter Kalauskas's avatar Peter Kalauskas
Browse files

1/2 Rename SecureSetting to SettingObserver 

Only renames the class and adds two javadoc comments to satisfy linter.

Test: com.android.systemui.qs.SettingObserverTest
Bug: 201567807
Change-Id: I65d3cd77ef41fcca0ab7d55e82f598f2d9fff1d4
parent 33f9db92

packages/SystemUI/src/com/android/systemui/ScreenDecorations.java

+3 −3
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ import com.android.systemui.animation.Interpolators; 
import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.qs.SecureSetting;

import com.android.systemui.qs.SettingObserver;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.statusbar.events.PrivacyDotViewController;

import com.android.systemui.tuner.TunerService;
@@ -155,7 +155,7 @@ public class ScreenDecorations extends CoreStartable implements Tunable { 
    private float mDensity;

    private WindowManager mWindowManager;

    private int mRotation;

    private SecureSetting mColorInversionSetting;

    private SettingObserver mColorInversionSetting;

    private DelayableExecutor mExecutor;

    private Handler mHandler;

    private boolean mPendingRotationChange;
@@ -346,7 +346,7 @@ public class ScreenDecorations extends CoreStartable implements Tunable { 


            // Watch color inversion and invert the overlay as needed.

            if (mColorInversionSetting == null) {

                mColorInversionSetting = new SecureSetting(mSecureSettings, mHandler,

                mColorInversionSetting = new SettingObserver(mSecureSettings, mHandler,

                        Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED,

                        mUserTracker.getUserId()) {

                    @Override

packages/SystemUI/src/com/android/systemui/qs/SecureSetting.java→packages/SystemUI/src/com/android/systemui/qs/SettingObserver.java

+12 −4
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import com.android.systemui.statusbar.policy.Listenable; 
import com.android.systemui.util.settings.SecureSettings;



/** Helper for managing a secure setting. **/

public abstract class SecureSetting extends ContentObserver implements Listenable {

public abstract class SettingObserver extends ContentObserver implements Listenable {

    private final SecureSettings mSecureSettings;

    private final String mSettingName;

    private final int mDefaultValue;
@@ -35,16 +35,16 @@ public abstract class SecureSetting extends ContentObserver implements Listenabl 


    protected abstract void handleValueChanged(int value, boolean observedChange);



    public SecureSetting(SecureSettings secureSettings, Handler handler, String settingName,

    public SettingObserver(SecureSettings secureSettings, Handler handler, String settingName,

            int userId) {

        this(secureSettings, handler, settingName, userId, 0);

    }



    public SecureSetting(SecureSettings secureSetting, Handler handler, String settingName) {

    public SettingObserver(SecureSettings secureSetting, Handler handler, String settingName) {

        this(secureSetting, handler, settingName, ActivityManager.getCurrentUser());

    }



    public SecureSetting(SecureSettings secureSettings, Handler handler, String settingName,

    public SettingObserver(SecureSettings secureSettings, Handler handler, String settingName,

            int userId, int defaultValue) {

        super(handler);

        mSecureSettings = secureSettings;
@@ -57,6 +57,11 @@ public abstract class SecureSetting extends ContentObserver implements Listenabl 
        return mListening ? mObservedValue : getValueFromProvider();

    }



    /**

     * Set the value of the observed setting.

     *

     * @param value The new value for the setting.

     */

    public void setValue(int value) {

        mSecureSettings.putIntForUser(mSettingName, value, mUserId);

    }
@@ -87,6 +92,9 @@ public abstract class SecureSetting extends ContentObserver implements Listenabl 
        handleValueChanged(value, changed);

    }



    /**

     * Set user handle for which to observe the setting.

     */

    public void setUserId(int userId) {

        mUserId = userId;

        if (mListening) {

packages/SystemUI/src/com/android/systemui/qs/tiles/BatterySaverTile.java

+3 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import com.android.systemui.plugins.FalsingManager; 
import com.android.systemui.plugins.qs.QSTile.BooleanState;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.qs.QSHost;

import com.android.systemui.qs.SecureSetting;

import com.android.systemui.qs.SettingObserver;

import com.android.systemui.qs.logging.QSLogger;

import com.android.systemui.qs.tileimpl.QSTileImpl;

import com.android.systemui.statusbar.policy.BatteryController;
@@ -49,7 +49,7 @@ public class BatterySaverTile extends QSTileImpl<BooleanState> implements 


    private final BatteryController mBatteryController;

    @VisibleForTesting

    protected final SecureSetting mSetting;

    protected final SettingObserver mSetting;



    private int mLevel;

    private boolean mPowerSave;
@@ -76,7 +76,7 @@ public class BatterySaverTile extends QSTileImpl<BooleanState> implements 
        mBatteryController = batteryController;

        mBatteryController.observe(getLifecycle(), this);

        int currentUser = host.getUserContext().getUserId();

        mSetting = new SecureSetting(

        mSetting = new SettingObserver(

                secureSettings,

                mHandler,

                Secure.LOW_POWER_WARNING_ACKNOWLEDGED,

packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java

+3 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import com.android.systemui.plugins.FalsingManager; 
import com.android.systemui.plugins.qs.QSTile.BooleanState;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.qs.QSHost;

import com.android.systemui.qs.SecureSetting;

import com.android.systemui.qs.SettingObserver;

import com.android.systemui.qs.logging.QSLogger;

import com.android.systemui.qs.tileimpl.QSTileImpl;

import com.android.systemui.settings.UserTracker;
@@ -55,7 +55,7 @@ public class ColorInversionTile extends QSTileImpl<BooleanState> { 
    private static final String COLOR_INVERSION_PREFERENCE_KEY = "toggle_inversion_preference";



    private final Icon mIcon = ResourceIcon.get(drawable.ic_invert_colors);

    private final SecureSetting mSetting;

    private final SettingObserver mSetting;



    private boolean mListening;
@@ -75,7 +75,7 @@ public class ColorInversionTile extends QSTileImpl<BooleanState> { 
        super(host, backgroundLooper, mainHandler, falsingManager, metricsLogger,

                statusBarStateController, activityStarter, qsLogger);



        mSetting = new SecureSetting(secureSettings, mHandler,

        mSetting = new SettingObserver(secureSettings, mHandler,

                Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, userTracker.getUserId()) {

            @Override

            protected void handleValueChanged(int value, boolean observedChange) {

packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java

+3 −3
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ import com.android.systemui.plugins.qs.DetailAdapter; 
import com.android.systemui.plugins.qs.QSTile.BooleanState;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.qs.QSHost;

import com.android.systemui.qs.SecureSetting;

import com.android.systemui.qs.SettingObserver;

import com.android.systemui.qs.logging.QSLogger;

import com.android.systemui.qs.tileimpl.QSTileImpl;

import com.android.systemui.statusbar.phone.SystemUIDialog;
@@ -83,7 +83,7 @@ public class DndTile extends QSTileImpl<BooleanState> { 
    private final ZenModeController mController;

    private final DndDetailAdapter mDetailAdapter;

    private final SharedPreferences mSharedPreferences;

    private final SecureSetting mSettingZenDuration;

    private final SettingObserver mSettingZenDuration;



    private boolean mListening;

    private boolean mShowingDetail;
@@ -108,7 +108,7 @@ public class DndTile extends QSTileImpl<BooleanState> { 
        mSharedPreferences = sharedPreferences;

        mDetailAdapter = new DndDetailAdapter();

        mController.observe(getLifecycle(), mZenCallback);

        mSettingZenDuration = new SecureSetting(secureSettings, mUiHandler,

        mSettingZenDuration = new SettingObserver(secureSettings, mUiHandler,

                Settings.Secure.ZEN_DURATION, getHost().getUserId()) {

            @Override

            protected void handleValueChanged(int value, boolean observedChange) {