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

Commit 7beadfc7 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Fix accessibility actions for navigation bar 

Because we handle touch events with custom code, we also need to
handle accessibiltiy correctly.

Bug: 15938266
Change-Id: I186807b7349881a5f0804d7452974cc3c3a8a160
parent 03861d07

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java

+34 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Context; 
import android.content.res.TypedArray;

import android.graphics.drawable.Drawable;

import android.hardware.input.InputManager;

import android.os.Bundle;

import android.os.SystemClock;

import android.util.AttributeSet;

import android.util.Log;
@@ -33,10 +34,14 @@ import android.view.MotionEvent; 
import android.view.SoundEffectConstants;

import android.view.ViewConfiguration;

import android.view.accessibility.AccessibilityEvent;

import android.view.accessibility.AccessibilityNodeInfo;

import android.widget.ImageView;



import com.android.systemui.R;



import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLICK;

import static android.view.accessibility.AccessibilityNodeInfo.ACTION_LONG_CLICK;



public class KeyButtonView extends ImageView {

    private static final String TAG = "StatusBar.KeyButtonView";

    private static final boolean DEBUG = false;
@@ -95,6 +100,35 @@ public class KeyButtonView extends ImageView { 
        mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();

    }



    @Override

    public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {

        super.onInitializeAccessibilityNodeInfo(info);

        if (mCode != 0) {

            info.addAction(new AccessibilityNodeInfo.AccessibilityAction(ACTION_CLICK, null));

            if (mSupportsLongpress) {

                info.addAction(

                        new AccessibilityNodeInfo.AccessibilityAction(ACTION_LONG_CLICK, null));

            }

        }

    }



    @Override

    public boolean performAccessibilityAction(int action, Bundle arguments) {

        if (action == ACTION_CLICK && mCode != 0) {

            sendEvent(KeyEvent.ACTION_DOWN, 0, SystemClock.uptimeMillis());

            sendEvent(KeyEvent.ACTION_UP, 0);

            sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_CLICKED);

            playSoundEffect(SoundEffectConstants.CLICK);

            return true;

        } else if (action == ACTION_LONG_CLICK && mCode != 0 && mSupportsLongpress) {

            sendEvent(KeyEvent.ACTION_DOWN, KeyEvent.FLAG_LONG_PRESS);

            sendEvent(KeyEvent.ACTION_UP, 0);

            sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_LONG_CLICKED);

            return true;

        }

        return super.performAccessibilityAction(action, arguments);

    }



    public void setQuiescentAlpha(float alpha, boolean animate) {

        mAnimateToQuiescent.cancel();

        alpha = Math.min(Math.max(alpha, 0), 1);