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

[MainSwitchPreference] Remove OnCheckedChangeListener from NightDisplayActivationPreferenceController

Browse Source 
Bug: 400335057
Flag: EXEMPT refactor
Test: manual
Change-Id: I97506685a9a188755297c90d15ead738667c8d5c
This commit is contained in:
Jacky Wang
2025-03-07 12:23:10 +08:00
parent 9eb7cd95b4
commit 0da0270ff7
2 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,27 +19,20 @@ package com.android.settings.display;
import android.content.Context; import android.content.Context;
import android.hardware.display.ColorDisplayManager; import android.hardware.display.ColorDisplayManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController; import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.widget.MainSwitchPreference;
/** /**
* Controller that updates the night display. * Controller that updates the night display.
*/ */
public class NightDisplayActivationPreferenceController extends public class NightDisplayActivationPreferenceController extends TogglePreferenceController {
TogglePreferenceController implements OnCheckedChangeListener {
private final MetricsFeatureProvider mMetricsFeatureProvider; private final MetricsFeatureProvider mMetricsFeatureProvider;
private ColorDisplayManager mColorDisplayManager; private ColorDisplayManager mColorDisplayManager;
private NightDisplayTimeFormatter mTimeFormatter; private NightDisplayTimeFormatter mTimeFormatter;
private MainSwitchPreference mPreference;
public NightDisplayActivationPreferenceController(Context context, String key) { public NightDisplayActivationPreferenceController(Context context, String key) {
super(context, key); super(context, key);
@@ -70,25 +63,6 @@ public class NightDisplayActivationPreferenceController extends
return R.string.menu_key_display; return R.string.menu_key_display;
} }
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = (MainSwitchPreference) screen.findPreference(getPreferenceKey());
mPreference.addOnSwitchChangeListener(this);
mPreference.setChecked(mColorDisplayManager.isNightDisplayActivated());
}
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
final boolean activated = mColorDisplayManager.isNightDisplayActivated();
if (isChecked != activated) {
// TODO(b/179017365): Create a controller which extends TogglePreferenceController to
// control the toggle preference.
setChecked(isChecked);
}
}
/** FOR SLICES */ /** FOR SLICES */
@Override @Override

4
tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java
View File

@@ -104,7 +104,7 @@ public class NightDisplayActivationPreferenceControllerTest {
final NightDisplayActivationPreferenceController controller = final NightDisplayActivationPreferenceController controller =
new NightDisplayActivationPreferenceController(mContext, "night_display_activated"); new NightDisplayActivationPreferenceController(mContext, "night_display_activated");
controller.onCheckedChanged(null, true); controller.setChecked(true);
assertThat(mColorDisplayManager.isNightDisplayActivated()).isEqualTo(true); assertThat(mColorDisplayManager.isNightDisplayActivated()).isEqualTo(true);
} }
@@ -115,7 +115,7 @@ public class NightDisplayActivationPreferenceControllerTest {
final NightDisplayActivationPreferenceController controller = final NightDisplayActivationPreferenceController controller =
new NightDisplayActivationPreferenceController(mContext, "night_display_activated"); new NightDisplayActivationPreferenceController(mContext, "night_display_activated");
controller.onCheckedChanged(null, false); controller.setChecked(false);
assertThat(mColorDisplayManager.isNightDisplayActivated()).isEqualTo(false); assertThat(mColorDisplayManager.isNightDisplayActivated()).isEqualTo(false);
} }