PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove MainSwitchPreference.updateStatus

Browse Source 
NO_IFTTT=Update API

Bug: 391092187
Flag: EXEMPT library
Test: atest&manual
Change-Id: I6e31857d8ca7084c737fd69f63b33f6a58cf3022
This commit is contained in:
Jacky Wang
2025-01-20 21:19:46 +08:00
parent 1d28b612fe
commit 041bc113eb
14 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/accounts/WorkModePreferenceController.java
View File

@@ -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

3
src/com/android/settings/display/NightDisplayActivationPreferenceController.java
View File

@@ -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

2
src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java
View File

@@ -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

2
src/com/android/settings/emergency/EmergencyGesturePreferenceController.java
View File

@@ -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

2
src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
View File

@@ -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

2
src/com/android/settings/gestures/PreventRingingSwitchPreferenceController.java
View File

@@ -76,7 +76,7 @@ public class PreventRingingSwitchPreferenceController extends AbstractPreference
public void setChecked(boolean isChecked) {
if (mSwitch != null) {
mSwitch.updateStatus(isChecked);
mSwitch.setChecked(isChecked);
}
}

2
src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java
View File

@@ -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

2
src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java
View File

@@ -49,7 +49,7 @@ public class WifiScanningMainSwitchPreferenceController extends TogglePreference
MainSwitchPreference pref = screen.findPreference(getPreferenceKey());
pref.addOnSwitchChangeListener(this);
pref.updateStatus(isChecked());
pref.setChecked(isChecked());
}
@Override

8
src/com/android/settings/nfc/NfcEnabler.java
View File

@@ -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;
}

2
src/com/android/settings/notification/zen/ZenAutomaticRuleSwitchPreferenceController.java
View File

@@ -81,7 +81,7 @@ public class ZenAutomaticRuleSwitchPreferenceController extends
public void updateState(Preference preference) {
if (mRule != null) {
mSwitchBar.updateStatus(mRule.isEnabled());
mSwitchBar.setChecked(mRule.isEnabled());
}
}

9
tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java
View File

@@ -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();
}

6
tests/robotests/src/com/android/settings/gestures/PreventRingingSwitchPreferenceControllerTest.java
View File

@@ -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

4
tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java
View File

@@ -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);
}
}

2
tests/robotests/src/com/android/settings/notification/BubbleNotificationPreferenceControllerTest.java
View File

@@ -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();
}