Skip to content

Mark FPS listener in ScrollViews as final, avoid reset in initView (#56609) #56609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Abbondanzo wants to merge 1 commit into from
Closed

Mark FPS listener in ScrollViews as final, avoid reset in initView (#56609) #56609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
private final VelocityHelper mVelocityHelper = new VelocityHelper();
private final Rect mTempRect = new Rect();
private final ValueAnimator DEFAULT_FLING_ANIMATOR = ObjectAnimator.ofInt(this, "scrollX", 0, 0);
private final @Nullable FpsListener mFpsListener;

private Rect mOverflowInset = new Rect();
private @Nullable VirtualViewContainerState mVirtualViewContainerState;
Expand All @@ -113,7 +114,6 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
private boolean mRemoveClippedSubviews;
private boolean mScrollEnabled = true;
private boolean mSendMomentumEvents;
private @Nullable FpsListener mFpsListener = null;
private @Nullable String mScrollPerfTag;
private @Nullable Drawable mEndBackground;
private int mEndFillColor = Color.TRANSPARENT;
Expand Down Expand Up @@ -177,7 +177,6 @@ private void initView() {
mRemoveClippedSubviews = false;
mScrollEnabled = true;
mSendMomentumEvents = false;
mFpsListener = null;
mScrollPerfTag = null;
mEndBackground = null;
mEndFillColor = Color.TRANSPARENT;
Expand Down
4 changes: 2 additions & 2 deletions ...ive/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactNestedScrollView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<41d03f4948562c0fae870a660e6e1eac>>
* @generated SignedSource<<2aa191314924bd0f969fba0e64b86142>>
*/

/**
Expand Down Expand Up @@ -106,6 +106,7 @@ class ReactNestedScrollView extends NestedScrollView
private final VelocityHelper mVelocityHelper = new VelocityHelper();
private final Rect mTempRect = new Rect();
private final ValueAnimator DEFAULT_FLING_ANIMATOR = ObjectAnimator.ofInt(this, "scrollY", 0, 0);
private final @Nullable FpsListener mFpsListener;

private Rect mOverflowInset;
private @Nullable VirtualViewContainerState mVirtualViewContainerState;
Expand All @@ -118,7 +119,6 @@ class ReactNestedScrollView extends NestedScrollView
private boolean mRemoveClippedSubviews;
private boolean mScrollEnabled;
private boolean mSendMomentumEvents;
private @Nullable FpsListener mFpsListener;
private @Nullable String mScrollPerfTag;
private @Nullable Drawable mEndBackground;
private int mEndFillColor;
Expand Down
2 changes: 1 addition & 1 deletion ...ct-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ public class ReactScrollView extends ScrollView
private final VelocityHelper mVelocityHelper = new VelocityHelper();
private final Rect mTempRect = new Rect();
private final ValueAnimator DEFAULT_FLING_ANIMATOR = ObjectAnimator.ofInt(this, "scrollY", 0, 0);
private final @Nullable FpsListener mFpsListener;

private Rect mOverflowInset;
private @Nullable VirtualViewContainerState mVirtualViewContainerState;
Expand All @@ -110,7 +111,6 @@ public class ReactScrollView extends ScrollView
private boolean mRemoveClippedSubviews;
private boolean mScrollEnabled;
private boolean mSendMomentumEvents;
private @Nullable FpsListener mFpsListener;
private @Nullable String mScrollPerfTag;
private @Nullable Drawable mEndBackground;
private int mEndFillColor;
Expand Down
Loading