Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove onClickableListener on MainSwitchBar's switch since it has been set to not focusable and not clickable. am: 08eeec366e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18344583

Change-Id: I4bb89aaec89aca4196f87ecb8a368643999eb22a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jacqueline Huang
2022-05-27 04:07:38 +00:00
committed by Automerger Merge Worker
parent c3e50ddbdf 08eeec366e
commit 33ce2b02d1
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,6 @@ import android.widget.Switch;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.ColorInt; import androidx.annotation.ColorInt;
import androidx.annotation.Nullable;
import com.android.settingslib.utils.BuildCompatUtils; import com.android.settingslib.utils.BuildCompatUtils;
@@ -122,15 +121,10 @@ public class MainSwitchBar extends LinearLayout implements CompoundButton.OnChec
propagateChecked(isChecked); propagateChecked(isChecked);
} }
@Override
public void setOnClickListener(@Nullable OnClickListener l) {
super.setOnClickListener(l);
mSwitch.setOnClickListener(l);
}
@Override @Override
public boolean performClick() { public boolean performClick() {
return mSwitch.performClick(); mSwitch.performClick();
return super.performClick();
} }
/** /**