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

Commit b8682f91 authored by Adrian Roos's avatar Adrian Roos Committed by Android Git Automerger
Browse files

am cc9f57df: am 2d9f7f57: am a2145ac0: am 034d1d03: am b98fd933: Merge "Ensure... 

am cc9f57df: am 2d9f7f57: am a2145ac0: am 034d1d03: am b98fd933: Merge "Ensure that force lock works with accessibility enabled" into lmp-dev

* commit 'cc9f57df925a80a22d5cf666851937e75bdc2ffc':
  Ensure that force lock works with accessibility enabled
parents f1af7ff0 3da20154

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java

+9 −0
Original line number Diff line number Diff line
@@ -497,4 +497,13 @@ public class KeyguardAffordanceView extends ImageView { 
    public void setIsLeft(boolean left) {

        mIsLeft = left;

    }



    @Override

    public boolean performClick() {

        if (isClickable()) {

            return super.performClick();

        } else {

            return false;

        }

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java

+7 −4
Original line number Diff line number Diff line
@@ -284,10 +284,13 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
        if (mAccessibilityController == null) {

            return;

        }

        mLockIcon.setClickable(mUnlockMethodCache.isTrustManaged()

                || mAccessibilityController.isTouchExplorationEnabled());

        mLockIcon.setLongClickable(mAccessibilityController.isTouchExplorationEnabled()

                && mUnlockMethodCache.isTrustManaged());

        boolean clickToUnlock = mAccessibilityController.isTouchExplorationEnabled();

        boolean clickToForceLock = mUnlockMethodCache.isTrustManaged()

                && !mAccessibilityController.isAccessibilityEnabled();

        boolean longClickToForceLock = mUnlockMethodCache.isTrustManaged()

                && !clickToForceLock;

        mLockIcon.setClickable(clickToForceLock || clickToUnlock);

        mLockIcon.setLongClickable(longClickToForceLock);

        mLockIcon.setFocusable(mAccessibilityController.isAccessibilityEnabled());

    }