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

Commit 93ea1f84 authored by Kevin Chyn's avatar Kevin Chyn Committed by android-build-merger
Browse files

Merge "Do not allow toggle to be clickable/focusable" into qt-r1-dev am: 5ac36909 

am: 0a519b9c

Change-Id: I5e956efb3c15e72180a78887c1709cacc8db61d5
parents a16818f1 0a519b9c

src/com/android/settings/biometrics/face/FaceEnrollAccessibilityToggle.java

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ public class FaceEnrollAccessibilityToggle extends LinearLayout { 
        }

        mSwitch = findViewById(R.id.toggle);

        mSwitch.setChecked(false);

        mSwitch.setClickable(false);

        mSwitch.setFocusable(false);

    }



    public boolean isChecked() {

src/com/android/settings/biometrics/face/FaceEnrollEducation.java

+3 −4
Original line number Diff line number Diff line
@@ -159,13 +159,12 @@ public class FaceEnrollEducation extends BiometricEnrollBase { 


        mSwitchDiversity = findViewById(R.id.toggle_diversity);

        mSwitchDiversity.setListener(mSwitchDiversityListener);



        if (accessibilityEnabled) {

            accessibilityButton.callOnClick();

            mSwitchDiversity.setClickable(true);

        mSwitchDiversity.setOnClickListener(v -> {

            mSwitchDiversity.getSwitch().toggle();

        });



        if (accessibilityEnabled) {

            accessibilityButton.callOnClick();

        }

    }