From 61d251fb66e6f4cc3de735ad8ee9e1c0e697f4f9 Mon Sep 17 00:00:00 2001 From: arangelov Date: Mon, 29 Jun 2020 17:43:24 +0100 Subject: [PATCH] Force enable vertical scrolling on profile tab change 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. Fixes: 160086572 Test: manually played with scrolling and swiping Test: atest ChoserActivityTest Test: atest ResolverActivityTest Change-Id: Id241bef19af88a48bf43217627d636403a514568 --- core/java/com/android/internal/app/ChooserActivity.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index 14cf258f18ab2..87d35092a2453 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