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

Commit 38ca8176 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Revert "Move binder call to bg thread""" into tm-qpr-dev am: f729b8d0 am: 74a6491b

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



Change-Id: I88b31c8e2e8bd01f3a59204e5e79c7ad75c70af1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 38e45b5a 74a6491b

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

+1 −0
Original line number Diff line number Diff line
@@ -626,6 +626,7 @@ 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

+9 −2
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ 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;



/** */
@@ -97,6 +98,8 @@ 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;
@@ -349,6 +352,10 @@ public class NavigationBarView extends FrameLayout { 
        notifyVerticalChangedListener(mIsVertical);

    }



    public void setBackgroundExecutor(Executor bgExecutor) {

        mBgExecutor = bgExecutor;

    }



    public void setTouchHandler(Gefingerpoken touchHandler) {

        mTouchHandler = touchHandler;

    }
@@ -768,8 +775,8 @@ public class NavigationBarView extends FrameLayout { 
        updateSlippery();

        reloadNavIcons();

        updateNavButtonIcons();

        WindowManagerWrapper.getInstance().setNavBarVirtualKeyHapticFeedbackEnabled(

                !mShowSwipeUpUi);

        mBgExecutor.execute(() -> WindowManagerWrapper.getInstance()

                .setNavBarVirtualKeyHapticFeedbackEnabled(!mShowSwipeUpUi));

        getHomeButton().setAccessibilityDelegate(

                mShowSwipeUpUi ? mQuickStepAccessibilityDelegate : null);

    }