From 6dc96584812968456a860ebbe801ab14bb6843ae Mon Sep 17 00:00:00 2001 From: Bo Zhao Date: Thu, 3 Aug 2023 04:06:34 +0000 Subject: [PATCH] Revert "Fix clicking MainSwitchPreference, there will be two touch sounds" This reverts commit cffc4354ee58cb05369203df7e375c126c5c27a0. Reason for revert: I am investigating the presubmit failure https://android-build.corp.google.com/test_investigate/?invocationId=I93100010183816709&testResultId=TR21628833881709462 It started failing on 12:59 AM Aug 2, 2023, Pacific time, which is the same as this CL's submit time, and it is related to MainSwitchBar. I am suspecting this CL is the culprit of the test failure b/294186307 Change-Id: I1277c01348abfe4372de9c47c852e6ce7df6a1cf --- .../src/com/android/settingslib/widget/MainSwitchBar.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 c8df7602800f9..864a8bb17058e 100644 --- a/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java +++ b/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java @@ -123,7 +123,8 @@ public class MainSwitchBar extends LinearLayout implements CompoundButton.OnChec @Override public boolean performClick() { - return mSwitch.performClick(); + mSwitch.performClick(); + return super.performClick(); } /**