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

Commit 5722331e authored by Evan Rosky's avatar Evan Rosky
Browse files

Add focusdirection annotations to cluster methods 

Bug: 34361917
Test: Still compiles
Change-Id: I47b5e9472524708544d567444b3fbcc93bc45119
parent d133b00e

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);