diff options
| -rw-r--r-- | core/java/android/view/FocusFinder.java | 4 | ||||
| -rw-r--r-- | core/java/android/view/View.java | 3 | ||||
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/core/java/android/view/FocusFinder.java b/core/java/android/view/FocusFinder.java index 7fde8a652001..61c92018a406 100644 --- a/core/java/android/view/FocusFinder.java +++ b/core/java/android/view/FocusFinder.java @@ -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) { diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 66c394f15d6a..a88084272d80 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -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; } diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 595e7a1e2da6..b79f22fb2d7d 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -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); |