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

Commit 70acef7d authored by Svet Ganov's avatar Svet Ganov Committed by Android Git Automerger
Browse files

am aad2ffe6: am 7f980d75: am 381a4236: Merge "When accessibility on cannot... 

am aad2ffe6: am 7f980d75: am 381a4236: Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev

* commit 'aad2ffe6':
  When accessibility on cannot click on a view covered by a HorizontalScrollView
parents 0213ac7c aad2ffe6

core/java/android/view/View.java

+5 −2
Original line number Diff line number Diff line
@@ -5938,9 +5938,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * layer.

     *

     * @param outRects List to which to add clickable areas.

     *

     * @hide

     */

    void addClickableRectsForAccessibility(List<RectF> outRects) {

        if (isClickable() || isLongClickable()) {

    public void addClickableRectsForAccessibility(List<RectF> outRects) {

        if (isClickable() || isLongClickable()

                || (mListenerInfo != null && mListenerInfo.mOnTouchListener != null)) {

            RectF bounds = new RectF();

            bounds.set(0, 0, getWidth(), getHeight());

            outRects.add(bounds);

core/java/android/view/ViewGroup.java

+4 −1
Original line number Diff line number Diff line
@@ -883,8 +883,11 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        return true;

    }



    /**

     * @hide

     */

    @Override

    void addClickableRectsForAccessibility(List<RectF> outRects) {

    public void addClickableRectsForAccessibility(List<RectF> outRects) {

        int sizeBefore = outRects.size();



        super.addClickableRectsForAccessibility(outRects);

core/java/android/widget/HorizontalScrollView.java

+14 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.Context; 
import android.content.res.TypedArray;

import android.graphics.Canvas;

import android.graphics.Rect;

import android.graphics.RectF;

import android.os.Build;

import android.os.Bundle;

import android.os.Parcel;
@@ -761,6 +762,18 @@ public class HorizontalScrollView extends FrameLayout { 
        awakenScrollBars();

    }



    /**

     * @hide

     */

    @Override

    public void addClickableRectsForAccessibility(List<RectF> outRects) {

        // This class always consumes touch events, therefore if it

        // covers a view we do not want to send a click over it.

        RectF bounds = new RectF();

        bounds.set(0, 0, getWidth(), getHeight());

        outRects.add(bounds);

    }



    @Override

    public boolean performAccessibilityAction(int action, Bundle arguments) {

        if (super.performAccessibilityAction(action, arguments)) {