Merge "Disallow scrolling if workspace is in transition." into ub-launcher3-burnaby-polish

am: ac929f4ad8

* commit 'ac929f4ad80fabeddfae51e30ec5d7ff434652c8':
  Disallow scrolling if workspace is in transition.
This commit is contained in:
Tony Wickham
2015-12-02 23:18:22 +00:00
committed by android-build-merger
2 changed files with 10 additions and 3 deletions

View File

@@ -1328,6 +1328,13 @@ public class Workspace extends PagedView
mWallpaperOffset.syncWithScroll();
}
@Override
protected void determineScrollingStart(MotionEvent ev, float touchSlopScale) {
if (!isSwitchingState()) {
super.determineScrollingStart(ev, touchSlopScale);
}
}
@Override
public void announceForAccessibility(CharSequence text) {
// Don't announce if apps is on top of us.