Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d4943e1 authored by Jacqueline Huang's avatar Jacqueline Huang Committed by Automerger Merge Worker
Browse files

Remove onClickableListener on MainSwitchBar's switch since it has been set to... 

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

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



Change-Id: I582e4077f31367016973aebce9da5a597ca8880f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 14cf2195 d9d8360e

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

+2 −8
Original line number Diff line number Diff line
@@ -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();

    }



    /**