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

Commit 41a2462e authored by Shan Huang's avatar Shan Huang Committed by Automerger Merge Worker
Browse files

Merge "Fix swipe thresholds not being propagated." into tm-dev am: ae925af0 am: 698682b1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17508938



Change-Id: Id96e4594da181c65430bfb2dd8b8d5829300680f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3018986f 698682b1

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