diff --git a/src/com/android/settings/accounts/WorkModePreferenceController.java b/src/com/android/settings/accounts/WorkModePreferenceController.java index 2aea27da96c..f5be873519f 100644 --- a/src/com/android/settings/accounts/WorkModePreferenceController.java +++ b/src/com/android/settings/accounts/WorkModePreferenceController.java @@ -77,7 +77,7 @@ public class WorkModePreferenceController extends BasePreferenceController @Override public final void updateState(Preference preference) { - mPreference.updateStatus(!mQuietModeEnabler.isQuietModeEnabled()); + mPreference.setChecked(!mQuietModeEnabler.isQuietModeEnabled()); } @Override diff --git a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java index aa963c96a9a..b08458ad532 100644 --- a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java @@ -22,7 +22,6 @@ import android.text.TextUtils; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; -import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; @@ -77,7 +76,7 @@ public class NightDisplayActivationPreferenceController extends mPreference = (MainSwitchPreference) screen.findPreference(getPreferenceKey()); mPreference.addOnSwitchChangeListener(this); - mPreference.updateStatus(mColorDisplayManager.isNightDisplayActivated()); + mPreference.setChecked(mColorDisplayManager.isNightDisplayActivated()); } @Override diff --git a/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java b/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java index b136ed02bb5..fc159cb722d 100644 --- a/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java +++ b/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java @@ -49,7 +49,7 @@ public class DarkModeActivationPreferenceController extends BasePreferenceContro public final void updateState(Preference preference) { final boolean active = (mContext.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_YES) != 0; - mPreference.updateStatus(active); + mPreference.setChecked(active); } @Override diff --git a/src/com/android/settings/emergency/EmergencyGesturePreferenceController.java b/src/com/android/settings/emergency/EmergencyGesturePreferenceController.java index b222cc170c7..1d404aee02e 100644 --- a/src/com/android/settings/emergency/EmergencyGesturePreferenceController.java +++ b/src/com/android/settings/emergency/EmergencyGesturePreferenceController.java @@ -63,7 +63,7 @@ public class EmergencyGesturePreferenceController extends BasePreferenceControll mSwitchBar = (MainSwitchPreference) pref; mSwitchBar.setTitle(mContext.getString(R.string.emergency_gesture_switchbar_title)); mSwitchBar.addOnSwitchChangeListener(this); - mSwitchBar.updateStatus(isChecked()); + mSwitchBar.setChecked(isChecked()); } @VisibleForTesting diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java index d4b29b4e439..a8720e50d2c 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java @@ -92,7 +92,7 @@ public class BatterySaverButtonPreferenceController extends TogglePreferenceCont public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); mPreference = screen.findPreference(getPreferenceKey()); - mPreference.updateStatus(isChecked()); + mPreference.setChecked(isChecked()); } @Override diff --git a/src/com/android/settings/gestures/PreventRingingSwitchPreferenceController.java b/src/com/android/settings/gestures/PreventRingingSwitchPreferenceController.java index 9c0e0bffae7..4e68266f188 100644 --- a/src/com/android/settings/gestures/PreventRingingSwitchPreferenceController.java +++ b/src/com/android/settings/gestures/PreventRingingSwitchPreferenceController.java @@ -76,7 +76,7 @@ public class PreventRingingSwitchPreferenceController extends AbstractPreference public void setChecked(boolean isChecked) { if (mSwitch != null) { - mSwitch.updateStatus(isChecked); + mSwitch.setChecked(isChecked); } } diff --git a/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java b/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java index c975a410be1..b8dc6233a0d 100644 --- a/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java +++ b/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java @@ -46,7 +46,7 @@ public class BluetoothScanningMainSwitchPreferenceController extends TogglePrefe super.displayPreference(screen); MainSwitchPreference pref = screen.findPreference(getPreferenceKey()); pref.addOnSwitchChangeListener(this); - pref.updateStatus(isChecked()); + pref.setChecked(isChecked()); } @Override diff --git a/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java b/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java index 9f19a703e65..f084889f313 100644 --- a/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java +++ b/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java @@ -49,7 +49,7 @@ public class WifiScanningMainSwitchPreferenceController extends TogglePreference MainSwitchPreference pref = screen.findPreference(getPreferenceKey()); pref.addOnSwitchChangeListener(this); - pref.updateStatus(isChecked()); + pref.setChecked(isChecked()); } @Override diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java index fe8762b8a90..a8037ec7e4c 100644 --- a/src/com/android/settings/nfc/NfcEnabler.java +++ b/src/com/android/settings/nfc/NfcEnabler.java @@ -37,19 +37,19 @@ public class NfcEnabler extends BaseNfcEnabler { protected void handleNfcStateChanged(int newState) { switch (newState) { case NfcAdapter.STATE_OFF: - mPreference.updateStatus(false); + mPreference.setChecked(false); mPreference.setEnabled(true); break; case NfcAdapter.STATE_ON: - mPreference.updateStatus(true); + mPreference.setChecked(true); mPreference.setEnabled(true); break; case NfcAdapter.STATE_TURNING_ON: - mPreference.updateStatus(true); + mPreference.setChecked(true); mPreference.setEnabled(false); break; case NfcAdapter.STATE_TURNING_OFF: - mPreference.updateStatus(false); + mPreference.setChecked(false); mPreference.setEnabled(false); break; } diff --git a/src/com/android/settings/notification/zen/ZenAutomaticRuleSwitchPreferenceController.java b/src/com/android/settings/notification/zen/ZenAutomaticRuleSwitchPreferenceController.java index 4d2a6a58d6c..cde4249b576 100644 --- a/src/com/android/settings/notification/zen/ZenAutomaticRuleSwitchPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenAutomaticRuleSwitchPreferenceController.java @@ -81,7 +81,7 @@ public class ZenAutomaticRuleSwitchPreferenceController extends public void updateState(Preference preference) { if (mRule != null) { - mSwitchBar.updateStatus(mRule.isEnabled()); + mSwitchBar.setChecked(mRule.isEnabled()); } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java index 8fe18eb7e1d..d35faae8c89 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java @@ -22,7 +22,6 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import android.content.Context; import android.os.PowerManager; @@ -72,18 +71,14 @@ public class BatterySaverButtonPreferenceControllerTest { @Test public void updateState_lowPowerOn_preferenceIsChecked() { - when(mPowerManager.isPowerSaveMode()).thenReturn(true); - - mPreference.updateStatus(mPowerManager.isPowerSaveMode()); + mPreference.setChecked(true); assertThat(mPreference.isChecked()).isTrue(); } @Test public void testUpdateState_lowPowerOff_preferenceIsUnchecked() { - when(mPowerManager.isPowerSaveMode()).thenReturn(false); - - mPreference.updateStatus(mPowerManager.isPowerSaveMode()); + mPreference.setChecked(false); assertThat(mPreference.isChecked()).isFalse(); } diff --git a/tests/robotests/src/com/android/settings/gestures/PreventRingingSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PreventRingingSwitchPreferenceControllerTest.java index 67618c8ab3b..9a1232bcddb 100644 --- a/tests/robotests/src/com/android/settings/gestures/PreventRingingSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingSwitchPreferenceControllerTest.java @@ -88,7 +88,7 @@ public class PreventRingingSwitchPreferenceControllerTest { mController.updateState(mPreference); - verify(mController.mSwitch, times(1)).updateStatus(false); + verify(mController.mSwitch, times(1)).setChecked(false); } @Test @@ -98,7 +98,7 @@ public class PreventRingingSwitchPreferenceControllerTest { mController.updateState(mPreference); - verify(mController.mSwitch, times(1)).updateStatus(true); + verify(mController.mSwitch, times(1)).setChecked(true); } @Test @@ -108,7 +108,7 @@ public class PreventRingingSwitchPreferenceControllerTest { mController.updateState(mPreference); - verify(mController.mSwitch, times(1)).updateStatus(true); + verify(mController.mSwitch, times(1)).setChecked(true); } @Test diff --git a/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java index 5299bbdb10c..7195b3a1fd5 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java @@ -52,11 +52,11 @@ public class NfcEnablerTest { @Test public void handleNfcStateChanged_stateOff_shouldCheckIfPreferenceEnableState() { mNfcEnabler.handleNfcStateChanged(NfcAdapter.STATE_OFF); - verify(mNfcPreference).updateStatus(false); + verify(mNfcPreference).setChecked(false); verify(mNfcPreference).setEnabled(true); mNfcEnabler.handleNfcStateChanged(NfcAdapter.STATE_ON); - verify(mNfcPreference).updateStatus(true); + verify(mNfcPreference).setChecked(true); verify(mNfcPreference, times(2)).setEnabled(true); } } diff --git a/tests/robotests/src/com/android/settings/notification/BubbleNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BubbleNotificationPreferenceControllerTest.java index ea0b2a06d2f..dd212b47b58 100644 --- a/tests/robotests/src/com/android/settings/notification/BubbleNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BubbleNotificationPreferenceControllerTest.java @@ -104,7 +104,7 @@ public class BubbleNotificationPreferenceControllerTest { assertThat(Settings.Global.getInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, ON)).isEqualTo(OFF); - mPreference.updateStatus(false); + mPreference.setChecked(false); assertThat(mPreference.isChecked()).isFalse(); }