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/notification/app/BlockPreferenceController.java
View File

@@ -23,7 +23,8 @@ import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.content.Context;
import android.widget.Switch;
import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
import androidx.preference.Preference;
@@ -31,10 +32,9 @@ import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.widget.SettingsMainSwitchPreference;
import com.android.settingslib.widget.OnMainSwitchChangeListener;
public class BlockPreferenceController extends NotificationPreferenceController
implements PreferenceControllerMixin, OnMainSwitchChangeListener {
implements PreferenceControllerMixin, OnCheckedChangeListener {
private static final String KEY_BLOCK = "block";
private NotificationSettings.DependentFieldListener mDependentFieldListener;
@@ -104,7 +104,7 @@ public class BlockPreferenceController extends NotificationPreferenceController
}
@Override
public void onSwitchChanged(Switch switchView, boolean isChecked) {
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
boolean blocked = !isChecked;
if (mChannel != null) {
final int originalImportance = mChannel.getImportance();

4
src/com/android/settings/notification/history/NotificationHistoryActivity.java
View File

@@ -47,6 +47,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewOutlineProvider;
import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.ImageView;
import android.widget.TextView;
@@ -64,7 +65,6 @@ import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
import com.android.settingslib.utils.StringUtil;
import com.android.settingslib.utils.ThreadUtils;
import com.android.settingslib.widget.MainSwitchBar;
import com.android.settingslib.widget.OnMainSwitchChangeListener;
import java.util.ArrayList;
import java.util.Arrays;
@@ -355,7 +355,7 @@ public class NotificationHistoryActivity extends CollapsingToolbarBaseActivity {
mHistoryEmpty.setVisibility(View.GONE);
}
private final OnMainSwitchChangeListener mOnSwitchClickListener =
private final OnCheckedChangeListener mOnSwitchClickListener =
(switchView, isChecked) -> {
int oldState = 0;
try {

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

@@ -18,7 +18,8 @@ package com.android.settings.notification.zen;
import android.app.AutomaticZenRule;
import android.content.Context;
import android.widget.Switch;
import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
@@ -27,11 +28,10 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.MainSwitchPreference;
import com.android.settingslib.widget.OnMainSwitchChangeListener;
public class ZenAutomaticRuleSwitchPreferenceController extends
AbstractZenModeAutomaticRulePreferenceController implements
OnMainSwitchChangeListener {
OnCheckedChangeListener {
private static final String KEY = "zen_automatic_rule_switch";
private AutomaticZenRule mRule;
@@ -86,7 +86,7 @@ public class ZenAutomaticRuleSwitchPreferenceController extends
}
@Override
public void onSwitchChanged(Switch switchView, boolean isChecked) {
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
final boolean enabled = isChecked;
if (enabled == mRule.isEnabled()) return;
mRule.setEnabled(enabled);