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

Commit 3e5fbca0 authored by Paul Duffin's avatar Paul Duffin
Browse files

Replace com.android.internal.util.Predicate with java.util.function.Predicate 

Bug: 35089332
Bug: 30188076
Test: make checkbuild
Merged-In: I0a5b4bf520fc39b59d8d790b01e9cff0d54e6d21
Change-Id: I58e4e35e7b7315033d893748f7c79e1ba6732f39
parent 97fca8c0

cmds/uiautomator/library/core-src/com/android/uiautomator/core/InteractionController.java

+1 −3
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ import android.view.MotionEvent.PointerCoords; 
import android.view.MotionEvent.PointerProperties;

import android.view.accessibility.AccessibilityEvent;



import com.android.internal.util.Predicate;



import java.util.ArrayList;

import java.util.List;

import java.util.concurrent.TimeoutException;
@@ -261,7 +259,7 @@ class InteractionController { 
    }



    /**

     * Returns a Runnable for use in {@link #runAndWaitForEvents(Runnable, Predicate, long) to

     * Returns a Runnable for use in {@link #runAndWaitForEvents(Runnable, AccessibilityEventFilter, long) to

     * perform a click.

     *

     * @param x coordinate

core/java/android/view/AccessibilityInteractionController.java

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.view.accessibility.AccessibilityNodeProvider; 
import android.view.accessibility.IAccessibilityInteractionConnectionCallback;



import com.android.internal.os.SomeArgs;

import com.android.internal.util.Predicate;



import java.util.ArrayList;

import java.util.HashMap;
@@ -43,6 +42,7 @@ import java.util.LinkedList; 
import java.util.List;

import java.util.Map;

import java.util.Queue;

import java.util.function.Predicate;



/**

 * Class for managing accessibility interactions initiated from the system
@@ -1233,7 +1233,7 @@ final class AccessibilityInteractionController { 
        }



        @Override

        public boolean apply(View view) {

        public boolean test(View view) {

            if (view.getId() == mViewId && isShown(view)) {

                mInfos.add(view.createAccessibilityNodeInfo());

            }

core/java/android/view/View.java

+7 −7
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ import static android.os.Build.VERSION_CODES.*; 
import static java.lang.Math.max;















import com.android.internal.R;













import com.android.internal.util.Predicate;















import com.android.internal.view.menu.MenuBuilder;















import com.android.internal.widget.ScrollBarUtils;















import com.google.android.collect.Lists;









@@ -126,6 +125,7 @@ import java.util.Locale;













import java.util.Map;















import java.util.concurrent.CopyOnWriteArrayList;















import java.util.concurrent.atomic.AtomicInteger;













import java.util.function.Predicate;





























/**















 * <p>










@@ -8778,7 +8778,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













                final int id = mID;















                return root.findViewByPredicateInsideOut(this, new Predicate<View>() {















                    @Override













                    public boolean apply(View t) {













                    public boolean test(View t) {















                        return t.mNextFocusForwardId == id;















                    }















                });










@@ -19349,7 +19349,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     * @return The first view that matches the predicate or null.















     */















    protected View findViewByPredicateTraversal(Predicate<View> predicate, View childToSkip) {













        if (predicate.apply(this)) {













        if (predicate.test(this)) {















            return this;















        }















        return null;










@@ -23639,20 +23639,20 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













        }















    }



























    private class MatchIdPredicate implements Predicate<View> {













    private static class MatchIdPredicate implements Predicate<View> {















        public int mId;





























        @Override













        public boolean apply(View view) {













        public boolean test(View view) {















            return (view.mID == mId);















        }















    }



























    private class MatchLabelForPredicate implements Predicate<View> {













    private static class MatchLabelForPredicate implements Predicate<View> {















        private int mLabeledId;





























        @Override













        public boolean apply(View view) {













        public boolean test(View view) {















            return (view.mLabelForId == mLabeledId);















        }















    }

























core/java/android/view/ViewGroup.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -52,13 +52,13 @@ import android.view.animation.LayoutAnimationController;













import android.view.animation.Transformation;































import com.android.internal.R;













import com.android.internal.util.Predicate;































import java.util.ArrayList;















import java.util.Collections;















import java.util.HashSet;















import java.util.List;















import java.util.Map;













import java.util.function.Predicate;































import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR1;


























@@ -3994,7 +3994,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager













     */















    @Override















    protected View findViewByPredicateTraversal(Predicate<View> predicate, View childToSkip) {













        if (predicate.apply(this)) {













        if (predicate.test(this)) {















            return this;















        }

















































core/java/android/widget/DayPickerViewPager.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -25,11 +25,11 @@ import android.view.View;













import android.view.ViewGroup;















import android.view.ViewGroup.LayoutParams;





























import com.android.internal.util.Predicate;















import com.android.internal.widget.PagerAdapter;















import com.android.internal.widget.ViewPager;































import java.util.ArrayList;













import java.util.function.Predicate;































/**















 * This displays a list of months in a calendar format with selectable days.










@@ -143,7 +143,7 @@ class DayPickerViewPager extends ViewPager {





























    @Override















    protected View findViewByPredicateTraversal(Predicate<View> predicate, View childToSkip) {













        if (predicate.apply(this)) {













        if (predicate.test(this)) {















            return this;















        }