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

Commit 73f83613 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixes no vibration on old nav bar" into pi-dev

parents e3b59d63 84db1610

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

+0 −3
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ import com.android.systemui.fragments.FragmentHostManager.FragmentListener; 
import com.android.systemui.recents.Recents;

import com.android.systemui.recents.misc.SysUiTaskStackChangeListener;

import com.android.systemui.shared.system.ActivityManagerWrapper;

import com.android.systemui.shared.system.WindowManagerWrapper;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.CommandQueue.Callbacks;
@@ -174,8 +173,6 @@ public class NavigationBarFragment extends Fragment implements Callbacks { 
        public void onConnectionChanged(boolean isConnected) {

            mNavigationBarView.updateStates();

            updateScreenPinningGestures();

            WindowManagerWrapper.getInstance()

                    .setNavBarVirtualKeyHapticFeedbackEnabled(!isConnected);

        }



        @Override

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

+3 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ import com.android.systemui.plugins.statusbar.phone.NavGesture.GestureHelper; 
import com.android.systemui.recents.RecentsOnboarding;

import com.android.systemui.shared.system.ActivityManagerWrapper;

import com.android.systemui.shared.system.NavigationBarCompat;

import com.android.systemui.shared.system.WindowManagerWrapper;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.statusbar.policy.DeadZone;

import com.android.systemui.statusbar.policy.KeyButtonDrawable;
@@ -682,6 +683,8 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
        reloadNavIcons();

        updateNavButtonIcons();

        setUpSwipeUpOnboarding(isQuickStepSwipeUpEnabled());

        WindowManagerWrapper.getInstance().setNavBarVirtualKeyHapticFeedbackEnabled(

                !mOverviewProxyService.shouldShowSwipeUpUI());

    }



    private void updateSlippery() {