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

Commit a20aea8c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "A11y services can perform click on keyguard notifs" into rvc-dev am:...

Merge "A11y services can perform click on keyguard notifs" into rvc-dev am: 6f7376ea am: ecf7ab3c

Change-Id: I40d8697e971d41fddacafaf3dc0685ef92e74ce1
parents a3125628 ecf7ab3c
Loading
Loading
Loading
Loading
+0 −13
Original line number Diff line number Diff line
@@ -331,19 +331,6 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
                .setDuration(ACTIVATE_ANIMATION_LENGTH);
    }

    @Override
    public boolean performClick() {
        if (!mNeedsDimming || (mAccessibilityManager != null
                && mAccessibilityManager.isTouchExplorationEnabled())) {
            return super.performClick();
        }
        return false;
    }

    boolean superPerformClick() {
        return super.performClick();
    }

    /**
     * Cancels the hotspot and makes the notification inactive.
     */
+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public class ActivatableNotificationViewController {
            } else {
                mView.makeInactive(true /* animate */);
            }
        }, mView::superPerformClick, mView::handleSlideBack,
        }, mView::performClick, mView::handleSlideBack,
                mFalsingManager::onNotificationDoubleTap);
        mView.setOnTouchListener(mTouchHandler);
        mView.setTouchHandler(mTouchHandler);