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

Commit b2048d42 authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Add focusdirection annotations to cluster methods"

parents da047073 5722331e

core/java/android/view/FocusFinder.java

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ public class FocusFinder { 
    public View findNextKeyboardNavigationCluster(

            @NonNull View root,

            @Nullable View currentCluster,

            int direction) {

            @View.FocusDirection int direction) {

        View next = null;



        final ArrayList<View> clusters = mTempList;
@@ -206,7 +206,7 @@ public class FocusFinder { 
            View root,

            View currentCluster,

            List<View> clusters,

            int direction) {

            @View.FocusDirection int direction) {

        final int count = clusters.size();



        switch (direction) {

core/java/android/view/View.java

+2 −1
Original line number Diff line number Diff line
@@ -9433,7 +9433,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * @return The nearest keyboard navigation cluster in the specified direction, or null if none

     *         can be found

     */

    public View keyboardNavigationClusterSearch(View currentCluster, int direction) {

    public View keyboardNavigationClusterSearch(View currentCluster,

            @FocusDirection int direction) {

        if (isKeyboardNavigationCluster()) {

            currentCluster = this;

        }

core/java/android/view/ViewRootImpl.java

+3 −1
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ import android.util.TimeUtils; 
import android.util.TypedValue;

import android.view.Surface.OutOfResourcesException;

import android.view.View.AttachInfo;

import android.view.View.FocusDirection;

import android.view.View.MeasureSpec;

import android.view.WindowManager.LayoutParams.SoftInputModeFlags;

import android.view.accessibility.AccessibilityEvent;
@@ -5975,7 +5976,8 @@ public final class ViewRootImpl implements ViewParent, 
     * {@inheritDoc}

     */

    @Override

    public View keyboardNavigationClusterSearch(View currentCluster, int direction) {

    public View keyboardNavigationClusterSearch(View currentCluster,

            @FocusDirection int direction) {

        checkThread();

        return FocusFinder.getInstance().findNextKeyboardNavigationCluster(

                mView, currentCluster, direction);