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

Commit 5995d21a authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Update onboarding based on swipe up state" into pi-dev

parents a9975804 f9e30270

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ public class NavigationBarFragment extends Fragment implements Callbacks { 
    private final OverviewProxyListener mOverviewProxyListener = new OverviewProxyListener() {

        @Override

        public void onConnectionChanged(boolean isConnected) {

            mNavigationBarView.onOverviewProxyConnectionChanged(isConnected);

            mNavigationBarView.updateStates();

            updateScreenPinningGestures();

            WindowManagerWrapper.getInstance()

                    .setNavBarVirtualKeyHapticFeedbackEnabled(!isConnected);
@@ -188,6 +188,7 @@ public class NavigationBarFragment extends Fragment implements Callbacks { 
        @Override

        public void onInteractionFlagsChanged(@InteractionType int flags) {

            mNavigationBarView.updateStates();

            updateScreenPinningGestures();

        }

    };

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java

+2 −6
Original line number Diff line number Diff line
@@ -681,6 +681,7 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
        updateSlippery();

        reloadNavIcons();

        updateNavButtonIcons();

        setUpSwipeUpOnboarding(isQuickStepSwipeUpEnabled());

    }



    private void updateSlippery() {
@@ -816,11 +817,6 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
        }

    }



    public void onOverviewProxyConnectionChanged(boolean isConnected) {

        updateStates();

        setUpSwipeUpOnboarding(isQuickStepSwipeUpEnabled());

    }



    @Override

    protected void onDraw(Canvas canvas) {

        mGestureHelper.onDraw(canvas);
@@ -1045,7 +1041,7 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
        onPluginDisconnected(null); // Create default gesture helper

        Dependency.get(PluginManager.class).addPluginListener(this,

                NavGesture.class, false /* Only one */);

        setUpSwipeUpOnboarding(mOverviewProxyService.getProxy() != null);

        setUpSwipeUpOnboarding(isQuickStepSwipeUpEnabled());

    }



    @Override