aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 10:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tony Wickham
2015-12-02 23:11:09 +00:00
committed by Android (Google) Code Review
parent 093a58cc77 a5209e33fc
commit ac929f4ad8
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/launcher3/LauncherStateTransitionAnimation.java
View File

@@ -641,11 +641,11 @@ public class LauncherStateTransitionAnimation {
}
animation.play(reveal);
}
dispatchOnLauncherTransitionPrepare(fromView, animated, true);
dispatchOnLauncherTransitionPrepare(toView, animated, true);
}
dispatchOnLauncherTransitionPrepare(fromView, animated, true);
dispatchOnLauncherTransitionPrepare(toView, animated, true);
animation.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {

7
src/com/android/launcher3/Workspace.java
View File

@@ -1542,6 +1542,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.