Merge "Revert "Making adapter child views in RemoteCollectionItemsAdapter size-aware"" into android14-tests-dev am: 679d9285 am: cfe8d7d2 am: fc3b7a73

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2915243



Change-Id: Ib6a7f72946c56f67e0fdce1446fac74b93a56b37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Merge "Revert "Making adapter child views in RemoteCollectionItemsAdapter size-aware"" into android14-tests-dev am: 679d9285 am: cfe8d7d2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2915243



Change-Id: Ib7686829822bc961b60c7024632fe341c5d1e597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Auto-generated-cl: translation import
Change-Id: I557279d85470ef0545986a9b24c5c40796a5a643

Merge "Revert "Making adapter child views in RemoteCollectionItemsAdapter size-aware"" into android14-tests-dev am: 679d9285

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2915243



Change-Id: I916c1a24915128690d3b12de42e6235cceff0934
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Merge "Revert "Making adapter child views in RemoteCollectionItemsAdapter size-aware"" into android14-tests-dev

This reverts commit 28dcae49.

Reason for revert: Revert framework changes on test platform, will follow up with a CL that makes the CTS test permissive

Change-Id: I825b4978270720c3693e718f007040c033ccf58f

[automerger skipped] [RESTRICT AUTOMERGE] Disable failing tests in MediaDataManagerTest. am: 829d6b9c am: 92e2db6d -s ours am: 8aa0fedb -s ours am: 8d61c7ef -s ours am: a1e376be -s ours am: 5fdadd8f -s ours am: 27c0cff2 -s ours am: db1c924b -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25874996



Change-Id: I5e4615100e035a55408f18d625e092e9f2076b3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] [RESTRICT AUTOMERGE] Disable failing tests in MediaDataManagerTest. am: 829d6b9c am: 92e2db6d -s ours am: 8aa0fedb -s ours am: 8d61c7ef -s ours am: 3b807bae -s ours am: 87ae5e5a -s ours am: b0a8eb83 -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25874996



Change-Id: Icab236ac167414f3f151715982799d75b68812fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] [RESTRICT AUTOMERGE] Disable failing tests in MediaDataManagerTest. am: 829d6b9c am: 92e2db6d -s ours am: 8aa0fedb -s ours am: 8d61c7ef -s ours am: a1e376be -s ours am: 5fdadd8f -s ours am: 27c0cff2 -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25874996



Change-Id: I293853f168749a2657cfab5c2646fa1ceff91661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] [RESTRICT AUTOMERGE] Disable failing tests in MediaDataManagerTest. am: 829d6b9c am: 92e2db6d -s ours am: 8aa0fedb -s ours am: 8d61c7ef -s ours am: a1e376be -s ours am: 5fdadd8f -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25874996



Change-Id: Icce72e1bd00da95cc72b860a217840153b048886
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] [RESTRICT AUTOMERGE] Disable failing tests in MediaDataManagerTest. am: 829d6b9c am: 92e2db6d -s ours am: 8aa0fedb -s ours am: 8d61c7ef -s ours am: 3b807bae -s ours am: 87ae5e5a -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25874996



Change-Id: If6476ed19967fe318bbae74f992e85744fb94b36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Merge "Making adapter child views in RemoteCollectionItemsAdapter size-aware" into android14-tests-dev am: 83b74c07 am: d5b7d347 am: b74bf07c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2912083



Change-Id: I49c863619e45743642078908fd4e9a8483c93786
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] [RESTRICT AUTOMERGE] Disable failing tests in MediaDataManagerTest. am: 829d6b9c am: 92e2db6d -s ours am: 8aa0fedb -s ours am: 8d61c7ef -s ours am: 3b807bae -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25874996



Change-Id: I73e0fe32498a3d48d75b54ab474771f751785f40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] [RESTRICT AUTOMERGE] Disable failing tests in MediaDataManagerTest. am: 829d6b9c am: 92e2db6d -s ours am: 8aa0fedb -s ours am: 8d61c7ef -s ours am: a1e376be -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25874996



Change-Id: If2a3b2e159a8dbbbb08919527a9c92014fbef895
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Merge "Making adapter child views in RemoteCollectionItemsAdapter size-aware" into android14-tests-dev am: 83b74c07 am: d5b7d347

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2912083



Change-Id: I490e07b81f6cc780fa27520c75481a4c315e54b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] [RESTRICT AUTOMERGE] Disable failing tests in MediaDataManagerTest. am: 829d6b9c am: 92e2db6d -s ours am: 8aa0fedb -s ours am: 8d61c7ef -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25874996



Change-Id: I5cc54b912ffc8b9798525f521494f9cfece056fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] [RESTRICT AUTOMERGE] Disable failing tests in MediaDataManagerTest. am: 829d6b9c am: 92e2db6d -s ours am: 8aa0fedb -s ours am: 8d61c7ef -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25874996



Change-Id: Ida7392df67a383ddb856f27a94d20abd0c390d0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Merge "Making adapter child views in RemoteCollectionItemsAdapter size-aware" into android14-tests-dev am: 83b74c07

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2912083



Change-Id: I4d222dcfc39d8d84d549009aab4e6f630ea9cfd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] [RESTRICT AUTOMERGE] Disable failing tests in MediaDataManagerTest. am: 829d6b9c am: 92e2db6d -s ours am: 8aa0fedb -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25874996



Change-Id: Ie810625d5f1aad549296858f6dedf36aa84a57bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Merge "Making adapter child views in RemoteCollectionItemsAdapter size-aware" into android14-tests-dev

[automerger skipped] [RESTRICT AUTOMERGE] Disable failing tests in MediaDataManagerTest. am: 829d6b9c am: 92e2db6d -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25874996



Change-Id: I894ec11688462d0ab0ef007d92291ff3b2ecd470
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25874996



Change-Id: Ifa6ca2b73f8eafc54cf7e32b2b3a5868b0081310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

This helps fix issues with improper layouts of
adapter child views in case
RemoteCollecionItemsAdapter is used.

Test: Manual
Bug: 245950570
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dc464d6e522eebec5221a934ec3ff5f52a4fb90e)
Merged-In: I0eedf4574975bfae88801e0153816135fc1c8181
Change-Id: I0eedf4574975bfae88801e0153816135fc1c8181

Bug: 301081714
Change-Id: Ibadc862f015fc831c486fe239b884128151f014b
Test: presubmit

Auto-generated-cl: translation import
Change-Id: I6fabf6a9cbf5bb558024255c0109ff0492d7c876

Auto-generated-cl: translation import
Change-Id: I5d54e43a6e8bfecc4864fc695a744a1e7bca0f96

Auto-generated-cl: translation import
Change-Id: Idb9fc22bd538e2d184a744932be293bbd52d842b

Auto-generated-cl: translation import
Change-Id: I80a7dfc20b2e00d3570d1b51ee62f307d8b96e6b

Auto-generated-cl: translation import
Change-Id: I48959749682badf0e4e3da1f6661699d2cd006dc

Auto-generated-cl: translation import
Change-Id: Iae8cdefd1da15f23f35a2c064e66de3b3b4b8e5a

[automerger skipped] Disallow system apps to be installed/updated as instant. am: 2fd2ee45 -s ours am: 3ddaf9bf -s ours am: 7ca4dcca -s ours am: 757e85f7 -s ours am: 98e4d5ba -s ours am: a2d923a1 -s ours am: 685c812a -s ours am: 5ee95d20 -s ours am: 74ed2822 -s ours

am skip reason: Merged-In Idd89a6dd72f0e68259095f677185f0494391025c with SHA-1 c091f7f5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25716267



Change-Id: Icad3b4065b1d65a0d64d16d14e884d570dc6e049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Disallow system apps to be installed/updated as instant." into rvc-dev am: 35b1a471 am: 0109c597 -s ours am: fca53583 -s ours am: a984fc59 -s ours am: 2b43e225 -s ours am: c0cc7052 -s ours am: 38f6f0b3 -s ours am: e766ea3f -s ours am: a396f525 -s ours am: 1d83e37e -s ours

am skip reason: Merged-In Idd89a6dd72f0e68259095f677185f0494391025c with SHA-1 0d0f185c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25716297



Change-Id: Id0d162b15296b00bfdcf23b77427f033fa5e6c50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Disallow system apps to be installed/updated as instant. am: 2fd2ee45 -s ours am: 3ddaf9bf -s ours am: 7ca4dcca -s ours am: 757e85f7 -s ours am: 98e4d5ba -s ours am: 0b4062c8 -s ours am: 99b1c730 -s ours am: 509773d9 -s ours

am skip reason: Merged-In Idd89a6dd72f0e68259095f677185f0494391025c with SHA-1 c091f7f5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25716267



Change-Id: Ie446a3aaf279fce6d38d42960029c82b8ddec334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Disallow system apps to be installed/updated as instant." into rvc-dev am: 35b1a471 am: 0109c597 -s ours am: fca53583 -s ours am: a984fc59 -s ours am: 2b43e225 -s ours am: c0cc7052 -s ours am: 77a3661e -s ours am: cb1f57bf -s ours am: c990da52 -s ours

am skip reason: Merged-In Idd89a6dd72f0e68259095f677185f0494391025c with SHA-1 0d0f185c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25716297



Change-Id: Ie8df7f6ad37d9fd286645f453793e02069728ee9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>