Skip to content
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

Jump to bottom

[7_1_X][TIMOB-25552] Android: Fixed nested scrolling within disabled ScrollView to propagate to parent view #9835

Merged
merged 3 commits into from
Feb 27, 2018
Merged

[7_1_X][TIMOB-25552] Android: Fixed nested scrolling within disabled ScrollView to propagate to parent view #9835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d16a69
[TIMOB-25552] Android: Fixed nested scrolling within disabled ScrollV…
jquick-axway Nov 23, 2017
3b2266b
Merge branch '7_1_X' into TIMOB-25552-7_1_X
ssjsamir Feb 20, 2018
cafdc6d
Merge branch '7_1_X' into TIMOB-25552-7_1_X
longton95 Feb 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIScrollView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,8 @@ public void onNestedScroll(View target, int dxConsumed, int dyConsumed, int dxUn
{
if (mScrollingEnabled) {
super.onNestedScroll(target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed);
} else {
dispatchNestedScroll(dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, null);
}
}

Expand Down
2 changes: 2 additions & 0 deletions android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiNestedListView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,8 @@ public void onNestedScroll(View target, int dxConsumed, int dyConsumed, int dxUn
{
if (isTouchScrollable()) {
super.onNestedScroll(target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed);
} else {
dispatchNestedScroll(dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, null);
}
}
}
Expand Down