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

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

Change-Id: I276c792b22f4cc3f7f04dbb4d26b48358b205cd1
This commit is contained in:
TreeHugger Robot
2020-06-11 19:42:17 +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);
}