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

Commit bf16f5e9 authored by Bidhya Sharma's avatar Bidhya Sharma Committed by Automerger Merge Worker
Browse files

Merge "Revert "Move binder call to bg thread"" into tm-qpr-dev am: 432c49aa 

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



Change-Id: I9f8e56710e7a6297d7a24f4397454f4d00c1706c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0fc41ea9 432c49aa

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java

+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);

    }

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java

+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);

    }