From 08eeec366efa0db6c524055bc8ffca5f1eb47afb Mon Sep 17 00:00:00 2001 From: Jacqueline Huang Date: Thu, 12 May 2022 19:08:43 +0800 Subject: Remove onClickableListener on MainSwitchBar's switch since it has been set to not focusable and not clickable. Fix: 230266556 Test: manually verified Change-Id: Iee3649a37727e3f845e4c17576cf577270befd95 --- .../src/com/android/settingslib/widget/MainSwitchBar.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java b/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java index 383bf8eaf2e7..86fec50d7c21 100644 --- a/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java +++ b/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java @@ -30,7 +30,6 @@ import android.widget.Switch; import android.widget.TextView; import androidx.annotation.ColorInt; -import androidx.annotation.Nullable; import com.android.settingslib.utils.BuildCompatUtils; @@ -122,15 +121,10 @@ public class MainSwitchBar extends LinearLayout implements CompoundButton.OnChec propagateChecked(isChecked); } - @Override - public void setOnClickListener(@Nullable OnClickListener l) { - super.setOnClickListener(l); - mSwitch.setOnClickListener(l); - } - @Override public boolean performClick() { - return mSwitch.performClick(); + mSwitch.performClick(); + return super.performClick(); } /** -- cgit v1.2.3-59-g8ed1b