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

Commit 432c49aa authored by Bidhya Sharma's avatar Bidhya Sharma Committed by Android (Google) Code Review
Browse files

Merge "Revert "Move binder call to bg thread"" into tm-qpr-dev

parents dbe79735 552d097f
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -626,7 +626,6 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
                    }
                }, mainExecutor, bgExecutor);

        mView.setBackgroundExecutor(bgExecutor);
        mView.setEdgeBackGestureHandler(mEdgeBackGestureHandler);
        mNavBarMode = mNavigationModeController.addListener(mModeChangedListener);
    }
+2 −9
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ import com.android.wm.shell.pip.Pip;
import java.io.PrintWriter;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.Executor;
import java.util.function.Consumer;

/** */
@@ -98,8 +97,6 @@ public class NavigationBarView extends FrameLayout {

    final static boolean ALTERNATE_CAR_MODE_UI = false;

    private Executor mBgExecutor;

    // The current view is one of mHorizontal or mVertical depending on the current configuration
    View mCurrentView = null;
    private View mVertical;
@@ -352,10 +349,6 @@ public class NavigationBarView extends FrameLayout {
        notifyVerticalChangedListener(mIsVertical);
    }

    public void setBackgroundExecutor(Executor bgExecutor) {
        mBgExecutor = bgExecutor;
    }

    public void setTouchHandler(Gefingerpoken touchHandler) {
        mTouchHandler = touchHandler;
    }
@@ -775,8 +768,8 @@ public class NavigationBarView extends FrameLayout {
        updateSlippery();
        reloadNavIcons();
        updateNavButtonIcons();
        mBgExecutor.execute(() -> WindowManagerWrapper.getInstance()
                .setNavBarVirtualKeyHapticFeedbackEnabled(!mShowSwipeUpUi));
        WindowManagerWrapper.getInstance().setNavBarVirtualKeyHapticFeedbackEnabled(
                !mShowSwipeUpUi);
        getHomeButton().setAccessibilityDelegate(
                mShowSwipeUpUi ? mQuickStepAccessibilityDelegate : null);
    }