commit 61d251fb66e6f4cc3de735ad8ee9e1c0e697f4f9
author arangelov <arangelov@google.com> Mon Jun 29 17:43:24 2020 +0100
committer Antoan Angelov <arangelov@google.com> Thu Jul 02 12:22:06 2020 +0000
tree d035e373635edbdb3ee97d46e5c4099c54d82181
parent 54b3e2a38a228e6e0d02e05705eab3226c3a19da

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

diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index 14cf258..87d3509 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -3127,6 +3127,10 @@
         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