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

Revert^2 "Migrate to CompoundButton.OnCheckedChangeListener"

Browse Source 
8979681a8d

Change-Id: I60edd3aabf49afbe4aa016af780baa68d928bddf
This commit is contained in:
Chaohui Wang
2023-11-07 20:41:11 +08:00
parent 8979681a8d
commit 08a1c9876e
49 changed files with 174 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/display/AutoBrightnessDetailPreferenceController.java
View File

@@ -17,18 +17,18 @@
package com.android.settings.display;
import android.content.Context;
import android.widget.Switch;
import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
import androidx.preference.PreferenceScreen;
import com.android.settings.widget.SettingsMainSwitchPreference;
import com.android.settingslib.widget.OnMainSwitchChangeListener;
/**
* Controller that updates the adaptive brightness.
*/
public class AutoBrightnessDetailPreferenceController extends
AutoBrightnessPreferenceController implements OnMainSwitchChangeListener {
AutoBrightnessPreferenceController implements OnCheckedChangeListener {
public AutoBrightnessDetailPreferenceController(Context context, String key) {
super(context, key);
@@ -58,7 +58,7 @@ public class AutoBrightnessDetailPreferenceController extends
}
@Override
public void onSwitchChanged(Switch switchView, boolean isChecked) {
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (isChecked != isChecked()) {
setChecked(isChecked);
}

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

@@ -19,7 +19,8 @@ package com.android.settings.display;
import android.content.Context;
import android.hardware.display.ColorDisplayManager;
import android.text.TextUtils;
import android.widget.Switch;
import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -29,13 +30,12 @@ import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.widget.MainSwitchPreference;
import com.android.settingslib.widget.OnMainSwitchChangeListener;
/**
* Controller that updates the night display.
*/
public class NightDisplayActivationPreferenceController extends
TogglePreferenceController implements OnMainSwitchChangeListener {
TogglePreferenceController implements OnCheckedChangeListener {
private final MetricsFeatureProvider mMetricsFeatureProvider;
private ColorDisplayManager mColorDisplayManager;
@@ -81,7 +81,7 @@ public class NightDisplayActivationPreferenceController extends
}
@Override
public void onSwitchChanged(Switch switchView, boolean isChecked) {
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

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

@@ -18,7 +18,8 @@ package com.android.settings.display.darkmode;
import android.app.UiModeManager;
import android.content.Context;
import android.content.res.Configuration;
import android.widget.Switch;
import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -28,7 +29,6 @@ import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.widget.MainSwitchPreference;
import com.android.settingslib.widget.OnMainSwitchChangeListener;
import java.time.LocalTime;
@@ -36,7 +36,7 @@ import java.time.LocalTime;
* Controller for activate/deactivate night mode button
*/
public class DarkModeActivationPreferenceController extends BasePreferenceController implements
OnMainSwitchChangeListener {
OnCheckedChangeListener {
private final UiModeManager mUiModeManager;
private final MetricsFeatureProvider mMetricsFeatureProvider;
@@ -96,7 +96,7 @@ public class DarkModeActivationPreferenceController extends BasePreferenceContro
}
@Override
public void onSwitchChanged(Switch switchView, boolean isChecked) {
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
mMetricsFeatureProvider.logClickedPreference(mPreference, getMetricsCategory());
final boolean active = (mContext.getResources().getConfiguration().uiMode
& Configuration.UI_MODE_NIGHT_YES) != 0;