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

Fixes a bug where the user ends in freescroll state even for regular workspace mode.

Browse Source 
The bug happened while reordering pages in overview mode and clicking the back button.
The fix is to check the precodition in enableFreeScroll if we are in a valid state for enabling freescroll (currently only overview mode).

Bug: 33347786
Change-Id: Icc3005fd431569e2b9e3f52d2249de8ba8d13eab
This commit is contained in:
Mario Bertschler
2016-12-21 11:48:48 -08:00
parent c9c57631a9
commit dcc26fc693
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/launcher3/PagedView.java
View File

@@ -1372,8 +1372,12 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
dampedOverScroll(amount);
}
public void enableFreeScroll() {
/**
* return true if freescroll has been enabled, false otherwise
*/
public boolean enableFreeScroll() {
setEnableFreeScroll(true);
return true;
}
public void disableFreeScroll() {
@@ -2074,20 +2078,14 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
if (!mReorderingStarted) return;
mReorderingStarted = false;
// If we haven't flung-to-delete the current child, then we just animate the drag view
// back into position
final Runnable onCompleteRunnable = new Runnable() {
@Override
public void run() {
onEndReordering();
}
};
mPostReorderingPreZoomInRunnable = new Runnable() {
public void run() {
onCompleteRunnable.run();
// If we haven't flung-to-delete the current child,
// then we just animate the drag view back into position
onEndReordering();
enableFreeScroll();
};
}
};
mPostReorderingPreZoomInRemainingAnimationCount =