commit 08eeec366efa0db6c524055bc8ffca5f1eb47afb
author Jacqueline Huang <jacquelinehu@google.com> Thu May 12 19:08:43 2022 +0800
committer Jacqueline Huang <jacquelinehu@google.com> Fri May 27 03:47:21 2022 +0000
tree fb3c2b316609b3f53693803f778bddb9c04c1e97
parent 59ebb04c7877c6e77f2fa007a72bcc1df0f73053

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

packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java

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 383bf8e..86fec50 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.TextView;
 
 import androidx.annotation.ColorInt;
-import androidx.annotation.Nullable;
 
 import com.android.settingslib.utils.BuildCompatUtils;
 
@@ -123,14 +122,9 @@
     }
 
     @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();
     }
 
     /**