summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-07-13 11:56:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-07-13 11:56:54 +0000
commitd11465be489fea6477ce454eef7760459125f933 (patch)
treeaf431dc289b5bafc63c98a9b161d2390d1ee73bd
parent175a1a7df9143109822f4507c92dd0b8a9d779ab (diff)
parentbcd952aec4afec18c383298902f525c5cd4697e0 (diff)
Merge "Force enable vertical scrolling on profile tab change" into rvc-qpr-dev am: bcd952aec4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12066922 Change-Id: I1826d834b79e1580d1ce85dbec590ffd05c65c3b
-rw-r--r--core/java/com/android/internal/app/ChooserActivity.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index 14cf258f18ab..87d35092a245 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -3127,6 +3127,10 @@ public class ChooserActivity extends ResolverActivity implements
ChooserGridAdapter currentRootAdapter =
mChooserMultiProfilePagerAdapter.getCurrentRootAdapter();
currentRootAdapter.updateDirectShareExpansion();
+ // This fixes an edge case where after performing a variety of gestures, vertical scrolling
+ // ends up disabled. That's because at some point the old tab's vertical scrolling is
+ // disabled and the new tab's is enabled. For context, see b/159997845
+ setVerticalScrollEnabled(true);
}
@Override