Skip to content

Commit 795979c

Browse files
hunterstichdsn5ft
authored andcommitted
[Carousel] Fixed MultiBrowseCarouselStrategy method visibility.
PiperOrigin-RevId: 508728594
1 parent 25b3c2b commit 795979c

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

lib/java/com/google/android/material/carousel/MultiBrowseCarouselStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ private float getSmallSize(@NonNull Context context) {
8181

8282
@Override
8383
@NonNull
84-
protected KeylineState onFirstChildMeasuredWithMargins(
84+
KeylineState onFirstChildMeasuredWithMargins(
8585
@NonNull Carousel carousel, @NonNull View child) {
8686
LayoutParams childLayoutParams = (LayoutParams) child.getLayoutParams();
8787
float childHorizontalMargins = childLayoutParams.leftMargin + childLayoutParams.rightMargin;

lib/javatests/com/google/android/material/carousel/CarouselLayoutManagerRtlTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void testFirstAdapterItem_isDrawnAtRightOfContainer() throws Throwable {
7373
layoutManager.setCarouselStrategy(
7474
new CarouselStrategy() {
7575
@Override
76-
protected KeylineState onFirstChildMeasuredWithMargins(
76+
KeylineState onFirstChildMeasuredWithMargins(
7777
@NonNull Carousel carousel, @NonNull View child) {
7878
return getTestCenteredKeylineState();
7979
}
@@ -92,7 +92,7 @@ public void testScrollBeyondMaxHorizontalScroll_shouldLimitToMaxScrollOffset() t
9292
layoutManager.setCarouselStrategy(
9393
new CarouselStrategy() {
9494
@Override
95-
protected KeylineState onFirstChildMeasuredWithMargins(
95+
KeylineState onFirstChildMeasuredWithMargins(
9696
@NonNull Carousel carousel, @NonNull View child) {
9797
return keylineState;
9898
}

lib/javatests/com/google/android/material/carousel/CarouselLayoutManagerTest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void testAddAdapterItem_isAddedByLayoutManager() throws Throwable {
6060
layoutManager.setCarouselStrategy(
6161
new CarouselStrategy() {
6262
@Override
63-
protected KeylineState onFirstChildMeasuredWithMargins(
63+
KeylineState onFirstChildMeasuredWithMargins(
6464
@NonNull Carousel carousel, @NonNull View child) {
6565
return getTestCenteredKeylineState();
6666
}
@@ -74,7 +74,7 @@ public void testMeasureChild_usesStateItemSize() throws Throwable {
7474
layoutManager.setCarouselStrategy(
7575
new CarouselStrategy() {
7676
@Override
77-
protected KeylineState onFirstChildMeasuredWithMargins(
77+
KeylineState onFirstChildMeasuredWithMargins(
7878
@NonNull Carousel carousel, @NonNull View child) {
7979
return getTestCenteredKeylineState();
8080
}
@@ -88,7 +88,7 @@ public void testMaskedChild_isStillGivenFullWidthBounds() throws Throwable {
8888
layoutManager.setCarouselStrategy(
8989
new CarouselStrategy() {
9090
@Override
91-
protected KeylineState onFirstChildMeasuredWithMargins(
91+
KeylineState onFirstChildMeasuredWithMargins(
9292
@NonNull Carousel carousel, @NonNull View child) {
9393
return new KeylineState.Builder(DEFAULT_ITEM_WIDTH)
9494
.addKeyline(225F, .5F, 225F, true)
@@ -107,7 +107,7 @@ public void testMaskedChild_isMaskedToCorrectSize() throws Throwable {
107107
layoutManager.setCarouselStrategy(
108108
new CarouselStrategy() {
109109
@Override
110-
protected KeylineState onFirstChildMeasuredWithMargins(
110+
KeylineState onFirstChildMeasuredWithMargins(
111111
@NonNull Carousel carousel, @NonNull View child) {
112112
return new KeylineState.Builder(DEFAULT_ITEM_WIDTH)
113113
.addKeyline(225F, .8F, 90F, true)
@@ -126,7 +126,7 @@ public void testKnownArrangement_initialScrollPositionHasAllItemsWithinCarouselC
126126
layoutManager.setCarouselStrategy(
127127
new CarouselStrategy() {
128128
@Override
129-
protected KeylineState onFirstChildMeasuredWithMargins(
129+
KeylineState onFirstChildMeasuredWithMargins(
130130
@NonNull Carousel carousel, @NonNull View child) {
131131
return getTestCenteredKeylineState();
132132
}
@@ -149,7 +149,7 @@ public void testScrollToPosition_movesChildToFocalStartKeyline() throws Throwabl
149149
layoutManager.setCarouselStrategy(
150150
new CarouselStrategy() {
151151
@Override
152-
protected KeylineState onFirstChildMeasuredWithMargins(
152+
KeylineState onFirstChildMeasuredWithMargins(
153153
@NonNull Carousel carousel, @NonNull View child) {
154154
return keylineState;
155155
}
@@ -170,7 +170,7 @@ public void testScrollBeyondMaxHorizontalScroll_shouldLimitToMaxScrollOffset() t
170170
layoutManager.setCarouselStrategy(
171171
new CarouselStrategy() {
172172
@Override
173-
protected KeylineState onFirstChildMeasuredWithMargins(
173+
KeylineState onFirstChildMeasuredWithMargins(
174174
@NonNull Carousel carousel, @NonNull View child) {
175175
return keylineState;
176176
}
@@ -191,7 +191,7 @@ public void testInitialFill_shouldFillMinimumItemCountForContainer() throws Thro
191191
layoutManager.setCarouselStrategy(
192192
new CarouselStrategy() {
193193
@Override
194-
protected KeylineState onFirstChildMeasuredWithMargins(
194+
KeylineState onFirstChildMeasuredWithMargins(
195195
@NonNull Carousel carousel, @NonNull View child) {
196196
return getTestCenteredKeylineState();
197197
}
@@ -207,7 +207,7 @@ public void testScrollAndFill_shouldRecycleAndFillMinimumItemCountForContainer()
207207
layoutManager.setCarouselStrategy(
208208
new CarouselStrategy() {
209209
@Override
210-
protected KeylineState onFirstChildMeasuredWithMargins(
210+
KeylineState onFirstChildMeasuredWithMargins(
211211
@NonNull Carousel carousel, @NonNull View child) {
212212
return getTestCenteredKeylineState();
213213
}
@@ -223,7 +223,7 @@ public void testEmptyAdapter_shouldClearAllViewsFromRecyclerView() throws Throwa
223223
layoutManager.setCarouselStrategy(
224224
new CarouselStrategy() {
225225
@Override
226-
protected KeylineState onFirstChildMeasuredWithMargins(
226+
KeylineState onFirstChildMeasuredWithMargins(
227227
@NonNull Carousel carousel, @NonNull View child) {
228228
return getTestCenteredKeylineState();
229229
}

0 commit comments

Comments
 (0)