Merge "Fix swipe thresholds not being propagated." into tm-dev (ae925af0) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationBarEdgePanel.java

+8 −3

Original line number	Diff line number	Diff line
		@@ -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