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

Commit 6b7fbd22 authored by Andy Wickham's avatar Andy Wickham Committed by Android (Google) Code Review
Browse files

Merge "Makes all ArrowPopups AccessibilityTargets." into ub-launcher3-master

parents d2c56525 27d3c595

src/com/android/launcher3/popup/ArrowPopup.java

+6 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.graphics.Paint; 
import android.graphics.Rect;

import android.graphics.drawable.ShapeDrawable;

import android.util.AttributeSet;

import android.util.Pair;

import android.view.Gravity;

import android.view.LayoutInflater;

import android.view.View;
@@ -358,6 +359,11 @@ public abstract class ArrowPopup<T extends BaseDraggingActivity> extends Abstrac 
        }

    }



    @Override

    protected Pair<View, String> getAccessibilityTarget() {

        return Pair.create(this, "");

    }



    private void animateOpen() {

        setVisibility(View.VISIBLE);

src/com/android/launcher3/popup/PopupContainerWithArrow.java

+0 −6
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import android.os.Build; 
import android.os.Handler;

import android.os.Looper;

import android.util.AttributeSet;

import android.util.Pair;

import android.view.MotionEvent;

import android.view.View;

import android.view.ViewGroup;
@@ -329,11 +328,6 @@ public class PopupContainerWithArrow<T extends BaseDraggingActivity> extends Arr 
                R.string.shortcuts_menu_with_notifications_description);

    }



    @Override

    protected Pair<View, String> getAccessibilityTarget() {

        return Pair.create(this, "");

    }



    @Override

    protected void getTargetObjectLocation(Rect outPos) {

        getPopupContainer().getDescendantRectRelativeToSelf(mOriginalIcon, outPos);