Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae925af0 authored by Shan Huang's avatar Shan Huang Committed by Android (Google) Code Review
Browse files

Merge "Fix swipe thresholds not being propagated." into tm-dev

parents a7b858cd 6d96f919

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

+8 −3
Original line number Original line Diff line number Diff line
@@ -360,9 +360,7 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl 
                .getDimension(R.dimen.navigation_edge_action_drag_threshold);

                .getDimension(R.dimen.navigation_edge_action_drag_threshold);

        mSwipeProgressThreshold = context.getResources()

        mSwipeProgressThreshold = context.getResources()

                .getDimension(R.dimen.navigation_edge_action_progress_threshold);

                .getDimension(R.dimen.navigation_edge_action_progress_threshold);

        if (mBackAnimation != null) {

        initializeBackAnimation();

            mBackAnimation.setSwipeThresholds(mSwipeTriggerThreshold, mSwipeProgressThreshold);

        }





        setVisibility(GONE);

        setVisibility(GONE);

        Executor backgroundExecutor = Dependency.get(Dependency.BACKGROUND_EXECUTOR);

        Executor backgroundExecutor = Dependency.get(Dependency.BACKGROUND_EXECUTOR);
@@ -391,6 +389,13 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl 




    public void setBackAnimation(BackAnimation backAnimation) {

    public void setBackAnimation(BackAnimation backAnimation) {

        mBackAnimation = backAnimation;

        mBackAnimation = backAnimation;

        initializeBackAnimation();

    }



    private void initializeBackAnimation() {

        if (mBackAnimation != null) {

            mBackAnimation.setSwipeThresholds(mSwipeTriggerThreshold, mSwipeProgressThreshold);

        }

    }

    }





    @Override

    @Override