Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ia59f5d7d56f3b49c744e954e76d35ca080d00d9c
This commit is contained in:
TreeHugger Robot
2020-06-11 19:29:20 +00:00
committed by Automerger Merge Worker
parent 43ed483221 f4644641c6
commit ba34c5b156
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/app/ChooserActivity.java
View File

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