Consider renaming MergeAdapter to clarify behavior [158019211]

Fixed

Bug

Status Update

No update yet.

Description

cc...@google.com

created issue #1

Jun 2, 2020 08:07PM

Comment on Florina's blogpost (https://medium.com/p/294d2942127a) mentioned that the name made it sound like it could interleave items, and I recently saw someone else make the same wrong assumption elsewhere.

Something like SequenceAdapter or ConcatAdapter or similar may be clearer.

Comments

yb...@google.com <yb...@google.com> #2Jun 3, 2020 12:10AM

Reassigned to yb...@google.com.

since these are in public API (:/) we need to do this in 1.2

sh...@google.com <sh...@google.com> #3Jun 3, 2020 09:33PM

since it is already marked as deprecated, we can probably do it by now.

cc...@google.com <cc...@google.com> #4Jun 3, 2020 09:36PM

Opening diff shortly

ku...@gmail.com <ku...@gmail.com> #5Jun 5, 2020 09:13PM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit d576cbdc911cba16638a44fd8223391a90a07ef7
Author: Mike Nakhimovich <digitalbuddha@users.noreply.github.com>
Date: Tue Aug 11 09:30:34 2020

[GH] Hide deprecated internal API.

## Proposed Changes

* `RoomDatabase.java` has protected `mCallbacks` field which is leaking in the API docs, we should @Hide it.

## Testing

Test: Ran unit tests locally

## Issues Fixed

Fixes: 76109329

This is an imported pull request from

https://github.com/androidx/androidx/pull/61.

Resolves #61
Github-Pr-Head-Sha: 6440daa3a63752c7f9d5ba2a390248cd85bc634f
GitOrigin-RevId: fe92d8466a59b44b218b6ca3cbd57dcda17992f7

Change-Id: Id599cdf5b02b32bdae0166266fb7da967598fe92

A room/runtime/api/current.ignore
M room/runtime/api/current.txt
M room/runtime/api/public_plus_experimental_current.txt
M room/runtime/api/restricted_current.txt
M room/runtime/src/main/java/androidx/room/RoomDatabase.java

https://android-review.googlesource.com/1396827

ap...@google.com <ap...@google.com> #6Jun 12, 2020 03:49PM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit a678d10f76e2c1da8f6857538474fbf87f919ed0
Author: Yigit Boyar <yboyar@google.com>
Date: Tue Jun 02 18:09:39 2020

Rename merge adapter to concat adapter

Bug: 158019211
Test: existing tests
Change-Id: I71dbfc22d4c757cdc2c94ec25fc9a9b780431c2c

M paging/runtime/api/3.0.0-alpha02.txt
M paging/runtime/api/current.txt
M paging/runtime/api/public_plus_experimental_3.0.0-alpha02.txt
M paging/runtime/api/public_plus_experimental_current.txt
M paging/runtime/api/restricted_3.0.0-alpha02.txt
M paging/runtime/api/restricted_current.txt
M paging/runtime/build.gradle
M paging/runtime/src/main/java/androidx/paging/LoadStateAdapter.kt
M paging/runtime/src/main/java/androidx/paging/PagedListAdapter.kt
M paging/runtime/src/main/java/androidx/paging/PagingDataAdapter.kt
M recyclerview/recyclerview/api/1.2.0-alpha04.txt
M recyclerview/recyclerview/api/current.txt
M recyclerview/recyclerview/api/public_plus_experimental_1.2.0-alpha04.txt
M recyclerview/recyclerview/api/public_plus_experimental_current.txt
M recyclerview/recyclerview/api/restricted_1.2.0-alpha04.txt
M recyclerview/recyclerview/api/restricted_current.txt
M recyclerview/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ConcatAdapterSubject.kt
M recyclerview/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ConcatAdapterTest.kt
M recyclerview/recyclerview/src/main/java/androidx/recyclerview/widget/ConcatAdapter.java
M recyclerview/recyclerview/src/main/java/androidx/recyclerview/widget/ConcatAdapterController.java
M recyclerview/recyclerview/src/main/java/androidx/recyclerview/widget/NestedAdapterWrapper.java
M recyclerview/recyclerview/src/main/java/androidx/recyclerview/widget/RecyclerView.java
M recyclerview/recyclerview/src/main/java/androidx/recyclerview/widget/StableIdStorage.java
M recyclerview/recyclerview/src/main/java/androidx/recyclerview/widget/ViewTypeStorage.java

https://android-review.googlesource.com/1321891

yb...@google.com <yb...@google.com> Jun 12, 2020 03:50PM

Marked as fixed.

ad...@google.com <ad...@google.com> #7Jun 12, 2020 03:55PM

Years ago the term MergeAdapter was common for ListViews, but that was before other APIs like RxJava and Flow entered the common Android development lexicon and brought along much more precise definitions of these terms. These APIs build very strong distinctions between interleave (merge) and strict ordered sequence of groups (concat) and we benefit from consistency with the more contemporary usage here, especially when these APIs are often used in close proximity to one another.

Normally we try to encourage spelling out terms in API rather than abbreviating, but concat is a special case here. String, Rx and others standardized on concat so long ago that many people aren't even familiar with the fully expanded term; better to be consistent with the ecosystem here.

ap...@google.com <ap...@google.com> #8Jun 12, 2020 04:57PM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit c0540c10cc7ea5027d3fc3b22024de7e66c41a9d
Author: Yigit Boyar <yboyar@google.com>
Date: Tue Jun 02 18:38:41 2020

ConcatAdapter API improvements

Accept extends bound in constructor arguments
Make Config & Config.Builder final

Bug: 158019211
Test: existing tests
Change-Id: I60bc0da651935b35a4dd64a0117aae532a278452

M recyclerview/recyclerview/api/1.2.0-alpha04.txt
M recyclerview/recyclerview/api/current.txt
M recyclerview/recyclerview/api/public_plus_experimental_1.2.0-alpha04.txt
M recyclerview/recyclerview/api/public_plus_experimental_current.txt
M recyclerview/recyclerview/api/restricted_1.2.0-alpha04.txt
M recyclerview/recyclerview/api/restricted_current.txt
M recyclerview/recyclerview/src/main/java/androidx/recyclerview/widget/ConcatAdapter.java

https://android-review.googlesource.com/1321893