summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarangelov <arangelov@google.com>2020-06-29 17:43:24 +0100
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-10-27 20:56:30 +0000
commit4ce02f59968283046dccf70ea58099cf5f7f40e2 (patch)
tree6fff4cd587062791bdfd2f67d4285f9b22734187
parentf5184a65fa134718444376ff8eb7944717990a3a (diff)
downloadbase-4ce02f59968283046dccf70ea58099cf5f7f40e2.tar.gz
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 (cherry picked from commit 61d251fb66e6f4cc3de735ad8ee9e1c0e697f4f9)
-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