Merge "Fix restoring vertical scroll after horizontal." into rvc-dev am: b367074347

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

Change-Id: I89de0f3ee8285b204ef3ba8ca16589694def7cd2
This commit is contained in:
TreeHugger Robot
2020-06-11 19:23:06 +00:00
committed by Automerger Merge Worker

View File

@@ -3100,7 +3100,7 @@ public class ChooserActivity extends ResolverActivity implements
setVerticalScrollEnabled(false);
}
} else if (state == ViewPager.SCROLL_STATE_IDLE) {
if (mScrollStatus == SCROLL_STATUS_SCROLLING_VERTICAL) {
if (mScrollStatus == SCROLL_STATUS_SCROLLING_HORIZONTAL) {
mScrollStatus = SCROLL_STATUS_IDLE;
setVerticalScrollEnabled(true);
}