Fix swipe thresholds not being propagated.

The race is the same one that caused b/220709601

Bug: 227483349
Test: atest BackAnimationControllerTest
Test: Enable back animation flag and test swipe to home animation on P22
device.

Change-Id: I251787cb1ccd1593da4f973894e9845ee58c6244
This commit is contained in:
Shan Huang
2022-03-30 18:09:51 +00:00
parent 477735ae40
commit 6d96f919c4

View File

@@ -360,9 +360,7 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl
.getDimension(R.dimen.navigation_edge_action_drag_threshold);
mSwipeProgressThreshold = context.getResources()
.getDimension(R.dimen.navigation_edge_action_progress_threshold);
if (mBackAnimation != null) {
mBackAnimation.setSwipeThresholds(mSwipeTriggerThreshold, mSwipeProgressThreshold);
}
initializeBackAnimation();
setVisibility(GONE);
Executor backgroundExecutor = Dependency.get(Dependency.BACKGROUND_EXECUTOR);
@@ -391,6 +389,13 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl
public void setBackAnimation(BackAnimation backAnimation) {
mBackAnimation = backAnimation;
initializeBackAnimation();
}
private void initializeBackAnimation() {
if (mBackAnimation != null) {
mBackAnimation.setSwipeThresholds(mSwipeTriggerThreshold, mSwipeProgressThreshold);
}
}
@Override