Merge "No code changes, added missing param to docs." into androidx-main

ggfan · Feb 23, 2021 · db16c52 · db16c52
2 parents 25ac255 + dbdba1b
commit db16c52
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/recyclerview/recyclerview/src/main/java/androidx/recyclerview/widget/ConcatAdapter.java b/recyclerview/recyclerview/src/main/java/androidx/recyclerview/widget/ConcatAdapter.java
@@ -288,6 +288,8 @@ public List<? extends Adapter<? extends ViewHolder>> getAdapters() {
      *
      * @param adapter    The adapter which is a sub adapter of this ConcatAdapter or itself.
      * @param viewHolder The view holder whose local position in the given adapter will be returned.
+     * @param localPosition The position of the given {@link ViewHolder} in this {@link Adapter}.
+     *
      * @return The local position of the given {@link ViewHolder} in the given {@link Adapter} or
      * {@link RecyclerView#NO_POSITION} if the {@link ViewHolder} is not bound to an item or the
      * given {@link Adapter} is not part of this ConcatAdapter.
@@ -296,8 +298,8 @@ public List<? extends Adapter<? extends ViewHolder>> getAdapters() {
     public int findRelativeAdapterPositionIn(
             @NonNull Adapter<? extends ViewHolder> adapter,
             @NonNull ViewHolder viewHolder,
-            int globalPosition) {
-        return mController.getLocalAdapterPosition(adapter, viewHolder, globalPosition);
+            int localPosition) {
+        return mController.getLocalAdapterPosition(adapter, viewHolder, localPosition);
     }
 
     /**

diff --git a/recyclerview/recyclerview/src/main/java/androidx/recyclerview/widget/RecyclerView.java b/recyclerview/recyclerview/src/main/java/androidx/recyclerview/widget/RecyclerView.java
@@ -7263,6 +7263,9 @@ public void onBindViewHolder(@NonNull VH holder, int position,
          * @param adapter    The adapter which is a sub adapter of this adapter or itself.
          * @param viewHolder The ViewHolder whose local position in the given adapter will be
          *                   returned.
+         * @param localPosition The position of the given {@link ViewHolder} in this
+         * {@link Adapter}.
+         *
          * @return The local position of the given {@link ViewHolder} in this {@link Adapter}
          * or {@link RecyclerView#NO_POSITION} if the {@link ViewHolder} is not bound to an item
          * or the given {@link Adapter} is not part of this Adapter (if this Adapter merges other